1 files changed, 31 insertions, 49 deletions
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 4dc9fff9fd..1caf8fca53 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -2,42 +2,42 @@ require 'ostruct'
 
 module DeveloperProjectsAssociationExtension
   def find_most_recent
-    find(:first, :order => "id DESC")
+    scoped(:order => "id DESC").first
   end
 end
 
 module DeveloperProjectsAssociationExtension2
   def find_least_recent
-    find(:first, :order => "id ASC")
+    scoped(:order => "id ASC").first
   end
 end
 
 class Developer < ActiveRecord::Base
   has_and_belongs_to_many :projects do
     def find_most_recent
-      find(:first, :order => "id DESC")
+      scoped(:order => "id DESC").first
     end
   end
 
   has_and_belongs_to_many :projects_extended_by_name,
+      -> { extending(DeveloperProjectsAssociationExtension) },
       :class_name => "Project",
       :join_table => "developers_projects",
-      :association_foreign_key => "project_id",
-      :extend => DeveloperProjectsAssociationExtension
+      :association_foreign_key => "project_id"
 
   has_and_belongs_to_many :projects_extended_by_name_twice,
+      -> { extending(DeveloperProjectsAssociationExtension, DeveloperProjectsAssociationExtension2) },
       :class_name => "Project",
       :join_table => "developers_projects",
-      :association_foreign_key => "project_id",
-      :extend => [DeveloperProjectsAssociationExtension, DeveloperProjectsAssociationExtension2]
+      :association_foreign_key => "project_id"
 
   has_and_belongs_to_many :projects_extended_by_name_and_block,
+      -> { extending(DeveloperProjectsAssociationExtension) },
       :class_name => "Project",
       :join_table => "developers_projects",
-      :association_foreign_key => "project_id",
-      :extend => DeveloperProjectsAssociationExtension do
+      :association_foreign_key => "project_id" do
         def find_least_recent
-          find(:first, :order => "id ASC")
+          scoped(:order => "id ASC").first
         end
       end
 
@@ -45,7 +45,7 @@ class Developer < ActiveRecord::Base
 
   has_many :audit_logs
 
-  scope :jamises, :conditions => {:name => 'Jamis'}
+  scope :jamises, -> { where(:name => 'Jamis') }
 
   validates_inclusion_of :salary, :in => 50000..200000
   validates_length_of    :name, :within => 3..20
@@ -57,12 +57,6 @@ class Developer < ActiveRecord::Base
   def log=(message)
     audit_logs.build :message => message
   end
-
-  def self.all_johns
-    self.with_exclusive_scope :find => where(:name => 'John') do
-      self.all
-    end
-  end
 end
 
 class AuditLog < ActiveRecord::Base
@@ -70,12 +64,6 @@ class AuditLog < ActiveRecord::Base
   belongs_to :unvalidated_developer, :class_name => 'Developer'
 end
 
-DeveloperSalary = Struct.new(:amount)
-class DeveloperWithAggregate < ActiveRecord::Base
-  self.table_name = 'developers'
-  composed_of :salary, :class_name => 'DeveloperSalary', :mapping => [%w(salary amount)]
-end
-
 class DeveloperWithBeforeDestroyRaise < ActiveRecord::Base
   self.table_name = 'developers'
   has_and_belongs_to_many :projects, :join_table => 'developers_projects', :foreign_key => 'developer_id'
@@ -88,31 +76,25 @@ end
 
 class DeveloperWithSelect < ActiveRecord::Base
   self.table_name = 'developers'
-  default_scope select('name')
+  default_scope { select('name') }
 end
 
 class DeveloperWithIncludes < ActiveRecord::Base
   self.table_name = 'developers'
   has_many :audit_logs, :foreign_key => :developer_id
-  default_scope includes(:audit_logs)
+  default_scope { includes(:audit_logs) }
 end
 
 class DeveloperOrderedBySalary < ActiveRecord::Base
   self.table_name = 'developers'
-  default_scope :order => 'salary DESC'
-
-  scope :by_name, order('name DESC')
+  default_scope { order('salary DESC') }
 
-  def self.all_ordered_by_name
-    with_scope(:find => { :order => 'name DESC' }) do
-      find(:all)
-    end
-  end
+  scope :by_name, -> { order('name DESC') }
 end
 
 class DeveloperCalledDavid < ActiveRecord::Base
   self.table_name = 'developers'
-  default_scope where("name = 'David'")
+  default_scope { where("name = 'David'") }
 end
 
 class LazyLambdaDeveloperCalledDavid < ActiveRecord::Base
@@ -140,7 +122,7 @@ end
 
 class ClassMethodReferencingScopeDeveloperCalledDavid < ActiveRecord::Base
   self.table_name = 'developers'
-  scope :david, where(:name => 'David')
+  scope :david, -> { where(:name => 'David') }
 
   def self.default_scope
     david
@@ -149,40 +131,40 @@ end
 
 class LazyBlockReferencingScopeDeveloperCalledDavid < ActiveRecord::Base
   self.table_name = 'developers'
-  scope :david, where(:name => 'David')
+  scope :david, -> { where(:name => 'David') }
   default_scope { david }
 end
 
 class DeveloperCalledJamis < ActiveRecord::Base
   self.table_name = 'developers'
 
-  default_scope where(:name => 'Jamis')
-  scope :poor, where('salary < 150000')
+  default_scope { where(:name => 'Jamis') }
+  scope :poor, -> { where('salary < 150000') }
 end
 
 class PoorDeveloperCalledJamis < ActiveRecord::Base
   self.table_name = 'developers'
 
-  default_scope where(:name => 'Jamis', :salary => 50000)
+  default_scope -> { where(:name => 'Jamis', :salary => 50000) }
 end
 
 class InheritedPoorDeveloperCalledJamis < DeveloperCalledJamis
   self.table_name = 'developers'
 
-  default_scope where(:salary => 50000)
+  default_scope -> { where(:salary => 50000) }
 end
 
 class MultiplePoorDeveloperCalledJamis < ActiveRecord::Base
   self.table_name = 'developers'
 
-  default_scope where(:name => 'Jamis')
-  default_scope where(:salary => 50000)
+  default_scope -> { where(:name => 'Jamis') }
+  default_scope -> { where(:salary => 50000) }
 end
 
 module SalaryDefaultScope
   extend ActiveSupport::Concern
 
-  included { default_scope where(:salary => 50000) }
+  included { default_scope { where(:salary => 50000) } }
 end
 
 class ModuleIncludedPoorDeveloperCalledJamis < DeveloperCalledJamis
@@ -193,14 +175,14 @@ end
 
 class EagerDeveloperWithDefaultScope < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects, :foreign_key => 'developer_id', :join_table => 'developers_projects', :order => 'projects.id'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
 
-  default_scope includes(:projects)
+  default_scope { includes(:projects) }
 end
 
 class EagerDeveloperWithClassMethodDefaultScope < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects, :foreign_key => 'developer_id', :join_table => 'developers_projects', :order => 'projects.id'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
 
   def self.default_scope
     includes(:projects)
@@ -209,21 +191,21 @@ end
 
 class EagerDeveloperWithLambdaDefaultScope < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects, :foreign_key => 'developer_id', :join_table => 'developers_projects', :order => 'projects.id'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
 
   default_scope lambda { includes(:projects) }
 end
 
 class EagerDeveloperWithBlockDefaultScope < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects, :foreign_key => 'developer_id', :join_table => 'developers_projects', :order => 'projects.id'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
 
   default_scope { includes(:projects) }
 end
 
 class EagerDeveloperWithCallableDefaultScope < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects, :foreign_key => 'developer_id', :join_table => 'developers_projects', :order => 'projects.id'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
 
   default_scope OpenStruct.new(:call => includes(:projects))
 end