From ec71b420569ef6e01f141c6cc05c2e07b082d98b Mon Sep 17 00:00:00 2001
From: Philip Hale <phil989@gmail.com>
Date: Sun, 1 Sep 2013 03:16:51 +0100
Subject: [PATCH] [#18] Style, format fixes for models

---
 app/models/ability.rb       |  8 ++++----
 app/models/administrator.rb |  9 ++-------
 app/models/guide.rb         | 27 +++++++++++++--------------
 app/models/guide_step.rb    |  6 +++---
 app/models/keyword.rb       |  4 ++--
 app/models/quick_answer.rb  |  4 ++--
 app/models/user.rb          |  8 +++-----
 app/models/web_service.rb   |  6 +++---
 8 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 457684c6..534992d1 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -3,7 +3,7 @@ class Ability
 
   def initialize(user)
 
-    @articles = [QuickAnswer, WebService, Guide]
+  articles = [QuickAnswer, WebService, Guide]
 
     can :read, :all
 
@@ -12,12 +12,12 @@ def initialize(user)
     end
 
     if user.is_editor
-      can :manage, @articles + [Category, Contact, GuideStep]
+      can :manage, articles + [Category, Contact, GuideStep]
     end
 
     if user.is_writer
-      can :create, @articles + [Category, Contact, GuideStep]
-      can [:update, :destroy], @articles, status: "Draft", user_id: user.id
+      can :create, articles + [Category, Contact, GuideStep]
+      can [:update, :destroy], articles, status: "Draft", user_id: user.id
       can [:update, :destroy], GuideStep, guide: { user_id: user.id, status: "Draft" }
     end
 
diff --git a/app/models/administrator.rb b/app/models/administrator.rb
index 89b5898f..834fee47 100644
--- a/app/models/administrator.rb
+++ b/app/models/administrator.rb
@@ -1,9 +1,4 @@
 class Administrator < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :encryptable, :confirmable,  and :omniauthable
-  devise :database_authenticatable, :lockable, :timeoutable, :recoverable, :trackable #, :registerable, :validatable, :rememberable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation#, :remember_me
-  # attr_accessible :title, :body
+  devise :database_authenticatable, :lockable, :timeoutable, :recoverable, :trackable
+  attr_accessible :email, :password, :password_confirmation
 end
diff --git a/app/models/guide.rb b/app/models/guide.rb
index 03e62c9f..9b7160cf 100644
--- a/app/models/guide.rb
+++ b/app/models/guide.rb
@@ -1,19 +1,18 @@
 class Guide < Article
-	include TankerArticleDefaults
+  include TankerArticleDefaults
 
-	has_many :guide_steps
+  has_many :guide_steps
 
-	tankit do    
-	    indexes :guide_steps_content do
-	      guide_steps.map { |gs| gs.content }
-	    end
-	    indexes :guide_steps_title do
-	      guide_steps.map { |gs| gs.title }
-	    end
+  tankit do
+    indexes :guide_steps_content do
+      guide_steps.map { |gs| gs.content }
     end
+    indexes :guide_steps_title do
+      guide_steps.map { |gs| gs.title }
+    end
+  end
 
-
-	def guide_steps
-		GuideStep.where("article_id = #{self.id}").order("step")
-	end
-end
\ No newline at end of file
+  def guide_steps
+    GuideStep.where("article_id = #{self.id}").order("step")
+  end
+end
diff --git a/app/models/guide_step.rb b/app/models/guide_step.rb
index 1cb546af..da18e96e 100644
--- a/app/models/guide_step.rb
+++ b/app/models/guide_step.rb
@@ -1,5 +1,5 @@
 class GuideStep < ActiveRecord::Base
-	include TankerArticleDefaults
-    belongs_to :guide, :class_name => 'Guide', :foreign_key => 'article_id'
-    attr_accessible :article_id, :title, :content, :preview, :step
+  include TankerArticleDefaults
+  belongs_to :guide, :class_name => 'Guide', :foreign_key => 'article_id'
+  attr_accessible :article_id, :title, :content, :preview, :step
 end
diff --git a/app/models/keyword.rb b/app/models/keyword.rb
index 3a089cd8..03e3bf12 100644
--- a/app/models/keyword.rb
+++ b/app/models/keyword.rb
@@ -8,11 +8,11 @@ class Keyword < ActiveRecord::Base
 
   after_create :analyse
 
-  after_save do 
+  after_save do
     Rails.cache.clear
   end
 
-  # returns the total number of ocurrences of this keyword across all articles
+  # returns the total number of occurrences of this keyword across all articles
   def count
     self.wordcounts.map(&:count).inject(0, :+)
   end
diff --git a/app/models/quick_answer.rb b/app/models/quick_answer.rb
index 7350608e..dee82223 100644
--- a/app/models/quick_answer.rb
+++ b/app/models/quick_answer.rb
@@ -1,3 +1,3 @@
 class QuickAnswer < Article
-	include TankerArticleDefaults
-end
\ No newline at end of file
+  include TankerArticleDefaults
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 907eabaf..24a31b5e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,13 +1,11 @@
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable, :registerable,
   belongs_to :department
   has_many :articles
-  devise :database_authenticatable, 
+  devise :database_authenticatable,
          :recoverable, :rememberable, :trackable, :validatable
 
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :is_admin, :is_editor, :is_writer, :department_id #:admin
+  attr_accessible :email, :password, :password_confirmation, :remember_me,
+                  :is_admin, :is_editor, :is_writer, :department_id
 
   after_validation :make_roles_exclusive
 
diff --git a/app/models/web_service.rb b/app/models/web_service.rb
index e662871a..fa55c4d7 100644
--- a/app/models/web_service.rb
+++ b/app/models/web_service.rb
@@ -1,6 +1,6 @@
 class WebService < Article
-	include TankerArticleDefaults
+  include TankerArticleDefaults
 
-	attr_accessible :service_url
+  attr_accessible :service_url
 
-end
\ No newline at end of file
+end