47 files changed, 47 insertions, 48 deletions
diff --git a/activerecord/test/fixtures/example.log b/activerecord/test/assets/example.log
index f084369d8c..f084369d8c 100644
--- a/activerecord/test/fixtures/example.log
+++ b/activerecord/test/assets/example.log
diff --git a/activerecord/test/fixtures/flowers.jpg b/activerecord/test/assets/flowers.jpg
index fe9df546df..fe9df546df 100644
--- a/activerecord/test/fixtures/flowers.jpg
+++ b/activerecord/test/assets/flowers.jpg
diff --git a/activerecord/test/fixtures/author.rb b/activerecord/test/models/author.rb
index 538ed7ac7f..bf0c993c50 100644
--- a/activerecord/test/fixtures/author.rb
+++ b/activerecord/test/models/author.rb
@@ -23,7 +23,7 @@ class Author < ActiveRecord::Base
 
   has_many :special_posts
   has_many :special_post_comments, :through => :special_posts, :source => :comments
-  
+
   has_many :special_nonexistant_posts, :class_name => "SpecialPost", :conditions => "posts.body = 'nonexistant'"
   has_many :special_nonexistant_post_comments, :through => :special_nonexistant_posts, :source => :comments, :conditions => "comments.post_id = 0"
   has_many :nonexistant_comments, :through => :posts
@@ -34,7 +34,7 @@ class Author < ActiveRecord::Base
 
   has_many :other_posts,          :class_name => "Post"
   has_many :posts_with_callbacks, :class_name => "Post", :before_add => :log_before_adding,
-           :after_add     => :log_after_adding, 
+           :after_add     => :log_after_adding,
            :before_remove => :log_before_removing,
            :after_remove  => :log_after_removing
   has_many :posts_with_proc_callbacks, :class_name => "Post",
diff --git a/activerecord/test/fixtures/auto_id.rb b/activerecord/test/models/auto_id.rb
index d720e2be5e..d720e2be5e 100644
--- a/activerecord/test/fixtures/auto_id.rb
+++ b/activerecord/test/models/auto_id.rb
diff --git a/activerecord/test/fixtures/binary.rb b/activerecord/test/models/binary.rb
index 950c459199..950c459199 100644
--- a/activerecord/test/fixtures/binary.rb
+++ b/activerecord/test/models/binary.rb
diff --git a/activerecord/test/fixtures/book.rb b/activerecord/test/models/book.rb
index cfd07abddc..cfd07abddc 100644
--- a/activerecord/test/fixtures/book.rb
+++ b/activerecord/test/models/book.rb
diff --git a/activerecord/test/fixtures/categorization.rb b/activerecord/test/models/categorization.rb
index 10594323ff..10594323ff 100644
--- a/activerecord/test/fixtures/categorization.rb
+++ b/activerecord/test/models/categorization.rb
diff --git a/activerecord/test/fixtures/category.rb b/activerecord/test/models/category.rb
index 71685234e3..89d61b7e4e 100644
--- a/activerecord/test/fixtures/category.rb
+++ b/activerecord/test/models/category.rb
@@ -2,7 +2,7 @@ class Category < ActiveRecord::Base
   has_and_belongs_to_many :posts
   has_and_belongs_to_many :special_posts, :class_name => "Post"
   has_and_belongs_to_many :other_posts, :class_name => "Post"
-  
+
   has_and_belongs_to_many(:select_testing_posts,
                           :class_name => 'Post',
                           :foreign_key => 'category_id',
@@ -12,15 +12,15 @@ class Category < ActiveRecord::Base
   def self.what_are_you
     'a category...'
   end
-  
+
   has_many :categorizations
   has_many :authors, :through => :categorizations, :select => 'authors.*, categorizations.post_id'
 end
 
 class SpecialCategory < Category
-  
+
   def self.what_are_you
     'a special category...'
-  end  
-  
+  end
+
 end
diff --git a/activerecord/test/fixtures/citation.rb b/activerecord/test/models/citation.rb
index 545aa8110d..545aa8110d 100644
--- a/activerecord/test/fixtures/citation.rb
+++ b/activerecord/test/models/citation.rb
diff --git a/activerecord/test/fixtures/column_name.rb b/activerecord/test/models/column_name.rb
index ec07205a3a..ec07205a3a 100644
--- a/activerecord/test/fixtures/column_name.rb
+++ b/activerecord/test/models/column_name.rb
diff --git a/activerecord/test/fixtures/comment.rb b/activerecord/test/models/comment.rb
index 3eab263fa4..60ca082c2e 100644
--- a/activerecord/test/fixtures/comment.rb
+++ b/activerecord/test/models/comment.rb
@@ -1,10 +1,10 @@
 class Comment < ActiveRecord::Base
   belongs_to :post
-  
+
   def self.what_are_you
     'a comment...'
   end
-  
+
   def self.search_by_type(q)
     self.find(:all, :conditions => ["#{QUOTED_TYPE} = ?", q])
   end
diff --git a/activerecord/test/fixtures/company.rb b/activerecord/test/models/company.rb
index 1048d5a652..c33f188a02 100755
--- a/activerecord/test/fixtures/company.rb
+++ b/activerecord/test/models/company.rb
@@ -9,7 +9,7 @@ class Company < AbstractCompany
   validates_presence_of :name
 
   has_one :dummy_account, :foreign_key => "firm_id", :class_name => "Account"
-  
+
   def arbitrary_method
     "I am Jack's profound disappointment"
   end
@@ -74,12 +74,12 @@ class Client < Company
     end
     true
   end
-  
+
   # Used to test that read and question methods are not generated for these attributes
   def ruby_type
     read_attribute :ruby_type
   end
-  
+
   def rating?
     query_attribute :rating
   end
@@ -94,7 +94,7 @@ end
 
 class Account < ActiveRecord::Base
   belongs_to :firm
-  
+
   def self.destroyed_account_ids
     @destroyed_account_ids ||= Hash.new { |h,k| h[k] = [] }
   end
@@ -105,8 +105,8 @@ class Account < ActiveRecord::Base
     end
     true
   end
-  
-  
+
+
   protected
     def validate
       errors.add_on_empty "credit_limit"
diff --git a/activerecord/test/fixtures/company_in_module.rb b/activerecord/test/models/company_in_module.rb
index feb3210c02..2f269f9c3f 100644
--- a/activerecord/test/fixtures/company_in_module.rb
+++ b/activerecord/test/models/company_in_module.rb
@@ -3,7 +3,7 @@ module MyApplication
     class Company < ActiveRecord::Base
       attr_protected :rating
     end
-    
+
     class Firm < Company
       has_many :clients, :order => "id", :dependent => :destroy
       has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
@@ -18,12 +18,12 @@ module MyApplication
       belongs_to :firm, :foreign_key => "client_of"
       belongs_to :firm_with_other_name, :class_name => "Firm", :foreign_key => "client_of"
     end
-    
+
     class Developer < ActiveRecord::Base
       has_and_belongs_to_many :projects
       validates_length_of :name, :within => (3..20)
     end
-    
+
     class Project < ActiveRecord::Base
       has_and_belongs_to_many :developers
     end
diff --git a/activerecord/test/fixtures/computer.rb b/activerecord/test/models/computer.rb
index f26312f9a6..cc8deb1b2b 100644
--- a/activerecord/test/fixtures/computer.rb
+++ b/activerecord/test/models/computer.rb
@@ -1,4 +1,3 @@
 class Computer < ActiveRecord::Base
   belongs_to :developer, :foreign_key=>'developer'
 end
-
diff --git a/activerecord/test/fixtures/contact.rb b/activerecord/test/models/contact.rb
index c574196d94..dbfa57bf49 100644
--- a/activerecord/test/fixtures/contact.rb
+++ b/activerecord/test/models/contact.rb
@@ -11,6 +11,6 @@ class Contact < ActiveRecord::Base
   column :created_at,  :datetime
   column :awesome,     :boolean
   column :preferences, :string
-  
+
   serialize :preferences
 end
 \ No newline at end of file
diff --git a/activerecord/test/fixtures/course.rb b/activerecord/test/models/course.rb
index 8a40fa740d..8a40fa740d 100644
--- a/activerecord/test/fixtures/course.rb
+++ b/activerecord/test/models/course.rb
diff --git a/activerecord/test/fixtures/customer.rb b/activerecord/test/models/customer.rb
index 3d8d644f12..030bbc6237 100644
--- a/activerecord/test/fixtures/customer.rb
+++ b/activerecord/test/models/customer.rb
@@ -10,25 +10,25 @@ class Address
   def initialize(street, city, country)
     @street, @city, @country = street, city, country
   end
-  
+
   def close_to?(other_address)
     city == other_address.city && country == other_address.country
   end
 
   def ==(other)
     other.is_a?(self.class) && other.street == street && other.city == city && other.country == country
-  end  
+  end
 end
 
 class Money
   attr_reader :amount, :currency
-  
+
   EXCHANGE_RATES = { "USD_TO_DKK" => 6, "DKK_TO_USD" => 0.6 }
-  
+
   def initialize(amount, currency = "USD")
     @amount, @currency = amount, currency
   end
-  
+
   def exchange_to(other_currency)
     Money.new((amount * EXCHANGE_RATES["#{currency}_TO_#{other_currency}"]).floor, other_currency)
   end
@@ -36,15 +36,15 @@ end
 
 class GpsLocation
   attr_reader :gps_location
-  
+
   def initialize(gps_location)
     @gps_location = gps_location
   end
-  
+
   def latitude
     gps_location.split("x").first
   end
-  
+
   def longitude
     gps_location.split("x").last
   end
diff --git a/activerecord/test/fixtures/default.rb b/activerecord/test/models/default.rb
index 887e9cc999..887e9cc999 100644
--- a/activerecord/test/fixtures/default.rb
+++ b/activerecord/test/models/default.rb
diff --git a/activerecord/test/fixtures/developer.rb b/activerecord/test/models/developer.rb
index 20005ed04e..192c2cb5ab 100644
--- a/activerecord/test/fixtures/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -16,22 +16,22 @@ class Developer < ActiveRecord::Base
       find(:first, :order => "id DESC")
     end
   end
-  
-  has_and_belongs_to_many :projects_extended_by_name, 
-      :class_name => "Project", 
-      :join_table => "developers_projects", 
+
+  has_and_belongs_to_many :projects_extended_by_name,
+      :class_name => "Project",
+      :join_table => "developers_projects",
       :association_foreign_key => "project_id",
       :extend => DeveloperProjectsAssociationExtension
 
-  has_and_belongs_to_many :projects_extended_by_name_twice, 
-      :class_name => "Project", 
-      :join_table => "developers_projects", 
+  has_and_belongs_to_many :projects_extended_by_name_twice,
+      :class_name => "Project",
+      :join_table => "developers_projects",
       :association_foreign_key => "project_id",
       :extend => [DeveloperProjectsAssociationExtension, DeveloperProjectsAssociationExtension2]
 
-  has_and_belongs_to_many :projects_extended_by_name_and_block, 
-      :class_name => "Project", 
-      :join_table => "developers_projects", 
+  has_and_belongs_to_many :projects_extended_by_name_and_block,
+      :class_name => "Project",
+      :join_table => "developers_projects",
       :association_foreign_key => "project_id",
       :extend => DeveloperProjectsAssociationExtension do
         def find_least_recent
diff --git a/activerecord/test/fixtures/edge.rb b/activerecord/test/models/edge.rb
index 55e0c31fcb..55e0c31fcb 100644
--- a/activerecord/test/fixtures/edge.rb
+++ b/activerecord/test/models/edge.rb
diff --git a/activerecord/test/fixtures/entrant.rb b/activerecord/test/models/entrant.rb
index 4682ce48c8..4682ce48c8 100644
--- a/activerecord/test/fixtures/entrant.rb
+++ b/activerecord/test/models/entrant.rb
diff --git a/activerecord/test/fixtures/item.rb b/activerecord/test/models/item.rb
index c2571dd7fb..c2571dd7fb 100644
--- a/activerecord/test/fixtures/item.rb
+++ b/activerecord/test/models/item.rb
diff --git a/activerecord/test/fixtures/joke.rb b/activerecord/test/models/joke.rb
index 3978abc2ba..3978abc2ba 100644
--- a/activerecord/test/fixtures/joke.rb
+++ b/activerecord/test/models/joke.rb
diff --git a/activerecord/test/fixtures/keyboard.rb b/activerecord/test/models/keyboard.rb
index 32a4a7fad0..32a4a7fad0 100644
--- a/activerecord/test/fixtures/keyboard.rb
+++ b/activerecord/test/models/keyboard.rb
diff --git a/activerecord/test/fixtures/legacy_thing.rb b/activerecord/test/models/legacy_thing.rb
index eaeb642d12..eaeb642d12 100644
--- a/activerecord/test/fixtures/legacy_thing.rb
+++ b/activerecord/test/models/legacy_thing.rb
diff --git a/activerecord/test/fixtures/matey.rb b/activerecord/test/models/matey.rb
index 47b0baa974..47b0baa974 100644
--- a/activerecord/test/fixtures/matey.rb
+++ b/activerecord/test/models/matey.rb
diff --git a/activerecord/test/fixtures/minimalistic.rb b/activerecord/test/models/minimalistic.rb
index 2e3f8e081a..2e3f8e081a 100644
--- a/activerecord/test/fixtures/minimalistic.rb
+++ b/activerecord/test/models/minimalistic.rb
diff --git a/activerecord/test/fixtures/mixed_case_monkey.rb b/activerecord/test/models/mixed_case_monkey.rb
index 853f2682b3..853f2682b3 100644
--- a/activerecord/test/fixtures/mixed_case_monkey.rb
+++ b/activerecord/test/models/mixed_case_monkey.rb
diff --git a/activerecord/test/fixtures/movie.rb b/activerecord/test/models/movie.rb
index 6384b4c801..6384b4c801 100644
--- a/activerecord/test/fixtures/movie.rb
+++ b/activerecord/test/models/movie.rb
diff --git a/activerecord/test/fixtures/order.rb b/activerecord/test/models/order.rb
index ba114f22c6..e838c0b70d 100644
--- a/activerecord/test/fixtures/order.rb
+++ b/activerecord/test/models/order.rb
@@ -1,4 +1,4 @@
 class Order < ActiveRecord::Base
-  belongs_to :billing, :class_name => 'Customer', :foreign_key => 'billing_customer_id' 
-  belongs_to :shipping, :class_name => 'Customer', :foreign_key => 'shipping_customer_id' 
+  belongs_to :billing, :class_name => 'Customer', :foreign_key => 'billing_customer_id'
+  belongs_to :shipping, :class_name => 'Customer', :foreign_key => 'shipping_customer_id'
 end
diff --git a/activerecord/test/fixtures/parrot.rb b/activerecord/test/models/parrot.rb
index 65191c1aa5..65191c1aa5 100644
--- a/activerecord/test/fixtures/parrot.rb
+++ b/activerecord/test/models/parrot.rb
diff --git a/activerecord/test/fixtures/person.rb b/activerecord/test/models/person.rb
index 7a9666f4eb..7a9666f4eb 100644
--- a/activerecord/test/fixtures/person.rb
+++ b/activerecord/test/models/person.rb
diff --git a/activerecord/test/fixtures/pirate.rb b/activerecord/test/models/pirate.rb
index f7193dfbe0..f7193dfbe0 100644
--- a/activerecord/test/fixtures/pirate.rb
+++ b/activerecord/test/models/pirate.rb
diff --git a/activerecord/test/fixtures/post.rb b/activerecord/test/models/post.rb
index 4627da5206..53dcbb74f3 100644
--- a/activerecord/test/fixtures/post.rb
+++ b/activerecord/test/models/post.rb
@@ -28,7 +28,7 @@ class Post < ActiveRecord::Base
         :joins => 'left outer join posts on taggings.taggable_id = posts.id left outer join authors on posts.author_id = authors.id'
     end
   end
-  
+
   has_many :funky_tags, :through => :taggings, :source => :tag
   has_many :super_tags, :through => :taggings
   has_one :tagging, :as => :taggable
diff --git a/activerecord/test/fixtures/project.rb b/activerecord/test/models/project.rb
index b90d2c6fbc..b90d2c6fbc 100644
--- a/activerecord/test/fixtures/project.rb
+++ b/activerecord/test/models/project.rb
diff --git a/activerecord/test/fixtures/reader.rb b/activerecord/test/models/reader.rb
index 27527bf566..27527bf566 100644
--- a/activerecord/test/fixtures/reader.rb
+++ b/activerecord/test/models/reader.rb
diff --git a/activerecord/test/fixtures/reply.rb b/activerecord/test/models/reply.rb
index bf7781e814..b719bc2e82 100755
--- a/activerecord/test/fixtures/reply.rb
+++ b/activerecord/test/models/reply.rb
@@ -6,20 +6,20 @@ class Reply < Topic
 
   validate :errors_on_empty_content
   validate_on_create :title_is_wrong_create
-  
+
   attr_accessible :title, :author_name, :author_email_address, :written_on, :content, :last_read
 
   def validate
     errors.add("title", "Empty")   unless attribute_present? "title"
   end
-  
+
   def errors_on_empty_content
     errors.add("content", "Empty") unless attribute_present? "content"
   end
-  
+
   def validate_on_create
     if attribute_present?("title") && attribute_present?("content") && content == "Mismatch"
-      errors.add("title", "is Content Mismatch") 
+      errors.add("title", "is Content Mismatch")
     end
   end
 
diff --git a/activerecord/test/fixtures/ship.rb b/activerecord/test/models/ship.rb
index 05b09fc1b9..05b09fc1b9 100644
--- a/activerecord/test/fixtures/ship.rb
+++ b/activerecord/test/models/ship.rb
diff --git a/activerecord/test/fixtures/subject.rb b/activerecord/test/models/subject.rb
index 3502943f3a..3502943f3a 100644
--- a/activerecord/test/fixtures/subject.rb
+++ b/activerecord/test/models/subject.rb
diff --git a/activerecord/test/fixtures/subscriber.rb b/activerecord/test/models/subscriber.rb
index 51335a8f20..51335a8f20 100644
--- a/activerecord/test/fixtures/subscriber.rb
+++ b/activerecord/test/models/subscriber.rb
diff --git a/activerecord/test/fixtures/tag.rb b/activerecord/test/models/tag.rb
index a581b381e8..a581b381e8 100644
--- a/activerecord/test/fixtures/tag.rb
+++ b/activerecord/test/models/tag.rb
diff --git a/activerecord/test/fixtures/tagging.rb b/activerecord/test/models/tagging.rb
index a1fa1a9750..a1fa1a9750 100644
--- a/activerecord/test/fixtures/tagging.rb
+++ b/activerecord/test/models/tagging.rb
diff --git a/activerecord/test/fixtures/task.rb b/activerecord/test/models/task.rb
index ee0282c79b..ee0282c79b 100644
--- a/activerecord/test/fixtures/task.rb
+++ b/activerecord/test/models/task.rb
diff --git a/activerecord/test/fixtures/topic.rb b/activerecord/test/models/topic.rb
index b2541c8640..17e91e4b13 100755
--- a/activerecord/test/fixtures/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -1,19 +1,19 @@
 class Topic < ActiveRecord::Base
   has_many :replies, :dependent => :destroy, :foreign_key => "parent_id"
   serialize :content
-  
+
   before_create  :default_written_on
   before_destroy :destroy_children
 
   def parent
     Topic.find(parent_id)
   end
-  
+
   # trivial method for testing Array#to_xml with :methods
   def topic_id
     id
   end
-  
+
 
   protected
     def approved=(val)
diff --git a/activerecord/test/fixtures/treasure.rb b/activerecord/test/models/treasure.rb
index 7a429e2a2f..7a429e2a2f 100644
--- a/activerecord/test/fixtures/treasure.rb
+++ b/activerecord/test/models/treasure.rb
diff --git a/activerecord/test/fixtures/vertex.rb b/activerecord/test/models/vertex.rb
index 48bb851e62..48bb851e62 100644
--- a/activerecord/test/fixtures/vertex.rb
+++ b/activerecord/test/models/vertex.rb
diff --git a/activerecord/test/fixtures/warehouse_thing.rb b/activerecord/test/models/warehouse_thing.rb
index 6ace1183cc..6ace1183cc 100644
--- a/activerecord/test/fixtures/warehouse_thing.rb
+++ b/activerecord/test/models/warehouse_thing.rb