From 2e79ec71a542c2d2e7bedbe12eda0b5e177fb0e0 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 26 Dec 2009 01:31:11 +0530
Subject: Model.scoped now returns a relation if invoked without any arguments

  Example :

    posts = Post.scoped
    posts.size # Fires "select count(*) from  posts" and returns the count
    posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
---
 activerecord/test/cases/relations_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 1a2c8030fb..5fa151df45 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -12,6 +12,12 @@ require 'models/company'
 class RelationTest < ActiveRecord::TestCase
   fixtures :authors, :topics, :entrants, :developers, :companies, :developers_projects, :accounts, :categories, :categorizations, :posts, :comments
 
+  def test_scoped
+    topics = Topic.scoped
+    assert_kind_of ActiveRecord::Relation, topics
+    assert_equal 4, topics.size
+  end
+
   def test_finding_with_conditions
     assert_equal Author.find(:all, :conditions => "name = 'David'"), Author.all.conditions("name = 'David'").to_a
   end
-- 
cgit v1.2.3


From a7fd564ab197a376336ebfa8bceaf14553e7628f Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 26 Dec 2009 02:53:10 +0530
Subject: Add
 Model.select/group/order/limit/joins/conditions/preload/eager_load class
 methods returning a lazy relation.

  Examples :

    posts = Post.select('id).order('name') # Returns a lazy relation
    posts.each {|p| puts p.id } # Fires "select id from posts order by name"
---
 activerecord/test/cases/relations_test.rb | 60 +++++++++++++++++--------------
 1 file changed, 33 insertions(+), 27 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 5fa151df45..910b954c8c 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -19,47 +19,49 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_finding_with_conditions
-    assert_equal Author.find(:all, :conditions => "name = 'David'"), Author.all.conditions("name = 'David'").to_a
+    assert_equal ["David"], Author.conditions(:name => 'David').map(&:name)
+    assert_equal ['Mary'],  Author.conditions(["name = ?", 'Mary']).map(&:name)
   end
 
   def test_finding_with_order
-    topics = Topic.all.order('id')
+    topics = Topic.order('id')
     assert_equal 4, topics.size
     assert_equal topics(:first).title, topics.first.title
   end
 
   def test_finding_with_order_and_take
-    entrants = Entrant.all.order("id ASC").limit(2).to_a
+    entrants = Entrant.order("id ASC").limit(2).to_a
 
     assert_equal(2, entrants.size)
     assert_equal(entrants(:first).name, entrants.first.name)
   end
 
   def test_finding_with_order_limit_and_offset
-    entrants = Entrant.all.order("id ASC").limit(2).offset(1)
+    entrants = Entrant.order("id ASC").limit(2).offset(1)
 
     assert_equal(2, entrants.size)
     assert_equal(entrants(:second).name, entrants.first.name)
 
-    entrants = Entrant.all.order("id ASC").limit(2).offset(2)
+    entrants = Entrant.order("id ASC").limit(2).offset(2)
     assert_equal(1, entrants.size)
     assert_equal(entrants(:third).name, entrants.first.name)
   end
 
   def test_finding_with_group
-    developers = Developer.all.group("salary").select("salary").to_a
+    developers = Developer.group("salary").select("salary").to_a
     assert_equal 4, developers.size
     assert_equal 4, developers.map(&:salary).uniq.size
   end
 
   def test_finding_with_hash_conditions_on_joined_table
-    firms = DependentFirm.all.joins(:account).conditions({:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }}).to_a
+    firms = DependentFirm.joins(:account).conditions({:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }}).to_a
     assert_equal 1, firms.size
     assert_equal companies(:rails_core), firms.first
   end
 
   def test_find_all_with_join
-    developers_on_project_one = Developer.all.joins('LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id').conditions('project_id=1').to_a
+    developers_on_project_one = Developer.joins('LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id').
+      conditions('project_id=1').to_a
 
     assert_equal 3, developers_on_project_one.length
     developer_names = developers_on_project_one.map { |d| d.name }
@@ -68,11 +70,11 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_find_on_hash_conditions
-    assert_equal Topic.find(:all, :conditions => {:approved => false}), Topic.all.conditions({ :approved => false }).to_a
+    assert_equal Topic.find(:all, :conditions => {:approved => false}), Topic.conditions({ :approved => false }).to_a
   end
 
   def test_joins_with_string_array
-    person_with_reader_and_post = Post.all.joins([
+    person_with_reader_and_post = Post.joins([
         "INNER JOIN categorizations ON categorizations.post_id = posts.id",
         "INNER JOIN categories ON categories.id = categorizations.category_id AND categories.type = 'SpecialCategory'"
       ]
@@ -80,8 +82,8 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal 1, person_with_reader_and_post.size
   end
 
-  def test_relation_responds_to_delegated_methods
-    relation = Topic.all
+  def test_scoped_responds_to_delegated_methods
+    relation = Topic.scoped
 
     ["map", "uniq", "sort", "insert", "delete", "update"].each do |method|
       assert relation.respond_to?(method), "Topic.all should respond to #{method.inspect}"
@@ -89,13 +91,14 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_find_with_readonly_option
-    Developer.all.each { |d| assert !d.readonly? }
-    Developer.all.readonly.each { |d| assert d.readonly? }
-    Developer.all(:readonly => true).each { |d| assert d.readonly? }
+    Developer.scoped.each { |d| assert !d.readonly? }
+    Developer.scoped.readonly.each { |d| assert d.readonly? }
   end
 
   def test_eager_association_loading_of_stis_with_multiple_references
-    authors = Author.all(:include => { :posts => { :special_comments => { :post => [ :special_comments, :very_special_comment ] } } }, :order => 'comments.body, very_special_comments_posts.body', :conditions => 'posts.id = 4').to_a
+    authors = Author.eager_load(:posts => { :special_comments => { :post => [ :special_comments, :very_special_comment ] } }).
+      order('comments.body, very_special_comments_posts.body').conditions('posts.id = 4').to_a
+
     assert_equal [authors(:david)], authors
     assert_no_queries do
       authors.first.posts.first.special_comments.first.post.special_comments
@@ -105,50 +108,53 @@ class RelationTest < ActiveRecord::TestCase
 
   def test_find_with_included_associations
     assert_queries(2) do
-      posts = Post.find(:all, :include => :comments)
+      posts = Post.preload(:comments)
       posts.first.comments.first
     end
+
     assert_queries(2) do
-      posts = Post.all(:include => :comments).to_a
+      posts = Post.preload(:comments).to_a
       posts.first.comments.first
     end
+
     assert_queries(2) do
-      posts = Post.find(:all, :include => :author)
+      posts = Post.preload(:author)
       posts.first.author
     end
+
     assert_queries(2) do
-      posts = Post.all(:include => :author).to_a
+      posts = Post.preload(:author).to_a
       posts.first.author
     end
   end
 
     def test_default_scope_with_conditions_string
-    assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.all.to_a.map(&:id).sort
+    assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.scoped.to_a.map(&:id).sort
     assert_equal nil, DeveloperCalledDavid.create!.name
   end
 
   def test_default_scope_with_conditions_hash
-    assert_equal Developer.find_all_by_name('Jamis').map(&:id).sort, DeveloperCalledJamis.all.map(&:id).sort
+    assert_equal Developer.find_all_by_name('Jamis').map(&:id).sort, DeveloperCalledJamis.scoped.map(&:id).sort
     assert_equal 'Jamis', DeveloperCalledJamis.create!.name
   end
 
-    def test_loading_with_one_association
-    posts = Post.all(:include => :comments)
+  def test_loading_with_one_association
+    posts = Post.preload(:comments)
     post = posts.find { |p| p.id == 1 }
     assert_equal 2, post.comments.size
     assert post.comments.include?(comments(:greetings))
 
-    post = Post.find(:first, :include => :comments, :conditions => "posts.title = 'Welcome to the weblog'")
+    post = Post.conditions("posts.title = 'Welcome to the weblog'").preload(:comments).first
     assert_equal 2, post.comments.size
     assert post.comments.include?(comments(:greetings))
 
-    posts = Post.all(:include => :last_comment)
+    posts = Post.preload(:last_comment)
     post = posts.find { |p| p.id == 1 }
     assert_equal Post.find(1).last_comment, post.last_comment
   end
 
   def test_loading_with_one_association_with_non_preload
-    posts = Post.all(:include => :last_comment, :order => 'comments.id DESC')
+    posts = Post.eager_load(:last_comment).order('comments.id DESC')
     post = posts.find { |p| p.id == 1 }
     assert_equal Post.find(1).last_comment, post.last_comment
   end
-- 
cgit v1.2.3


From 1a993371805122cf50531b95651c6933d568080e Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 26 Dec 2009 03:10:55 +0530
Subject: No parentheses for assert_equal

---
 activerecord/test/cases/relations_test.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 910b954c8c..769a920a8b 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -32,19 +32,19 @@ class RelationTest < ActiveRecord::TestCase
   def test_finding_with_order_and_take
     entrants = Entrant.order("id ASC").limit(2).to_a
 
-    assert_equal(2, entrants.size)
-    assert_equal(entrants(:first).name, entrants.first.name)
+    assert_equal 2, entrants.size
+    assert_equal entrants(:first).name, entrants.first.name
   end
 
   def test_finding_with_order_limit_and_offset
     entrants = Entrant.order("id ASC").limit(2).offset(1)
 
-    assert_equal(2, entrants.size)
-    assert_equal(entrants(:second).name, entrants.first.name)
+    assert_equal 2, entrants.size
+    assert_equal entrants(:second).name, entrants.first.name
 
     entrants = Entrant.order("id ASC").limit(2).offset(2)
-    assert_equal(1, entrants.size)
-    assert_equal(entrants(:third).name, entrants.first.name)
+    assert_equal 1, entrants.size
+    assert_equal entrants(:third).name, entrants.first.name
   end
 
   def test_finding_with_group
-- 
cgit v1.2.3


From 95274b28d95ad85ada25eb0c697ce5650ae488a9 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 26 Dec 2009 03:50:57 +0530
Subject: Rename Model.conditions and relation.conditions to .where

---
 activerecord/test/cases/relations_test.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 769a920a8b..06e040cd6d 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -19,8 +19,8 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_finding_with_conditions
-    assert_equal ["David"], Author.conditions(:name => 'David').map(&:name)
-    assert_equal ['Mary'],  Author.conditions(["name = ?", 'Mary']).map(&:name)
+    assert_equal ["David"], Author.where(:name => 'David').map(&:name)
+    assert_equal ['Mary'],  Author.where(["name = ?", 'Mary']).map(&:name)
   end
 
   def test_finding_with_order
@@ -54,14 +54,14 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_finding_with_hash_conditions_on_joined_table
-    firms = DependentFirm.joins(:account).conditions({:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }}).to_a
+    firms = DependentFirm.joins(:account).where({:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }}).to_a
     assert_equal 1, firms.size
     assert_equal companies(:rails_core), firms.first
   end
 
   def test_find_all_with_join
     developers_on_project_one = Developer.joins('LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id').
-      conditions('project_id=1').to_a
+      where('project_id=1').to_a
 
     assert_equal 3, developers_on_project_one.length
     developer_names = developers_on_project_one.map { |d| d.name }
@@ -70,7 +70,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_find_on_hash_conditions
-    assert_equal Topic.find(:all, :conditions => {:approved => false}), Topic.conditions({ :approved => false }).to_a
+    assert_equal Topic.find(:all, :conditions => {:approved => false}), Topic.where({ :approved => false }).to_a
   end
 
   def test_joins_with_string_array
@@ -97,7 +97,7 @@ class RelationTest < ActiveRecord::TestCase
 
   def test_eager_association_loading_of_stis_with_multiple_references
     authors = Author.eager_load(:posts => { :special_comments => { :post => [ :special_comments, :very_special_comment ] } }).
-      order('comments.body, very_special_comments_posts.body').conditions('posts.id = 4').to_a
+      order('comments.body, very_special_comments_posts.body').where('posts.id = 4').to_a
 
     assert_equal [authors(:david)], authors
     assert_no_queries do
@@ -144,7 +144,7 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal 2, post.comments.size
     assert post.comments.include?(comments(:greetings))
 
-    post = Post.conditions("posts.title = 'Welcome to the weblog'").preload(:comments).first
+    post = Post.where("posts.title = 'Welcome to the weblog'").preload(:comments).first
     assert_equal 2, post.comments.size
     assert post.comments.include?(comments(:greetings))
 
-- 
cgit v1.2.3


From feb8b20eb552eee678448233672733c6e7ca9571 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 26 Dec 2009 12:39:44 +0530
Subject: Add Relation#all as an alias for to_a

---
 activerecord/test/cases/relations_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 06e040cd6d..529de4a6cf 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -18,6 +18,12 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal 4, topics.size
   end
 
+  def test_scoped_all
+    topics = Topic.scoped.all
+    assert_kind_of Array, topics
+    assert_no_queries { assert_equal 4, topics.size }
+  end
+
   def test_finding_with_conditions
     assert_equal ["David"], Author.where(:name => 'David').map(&:name)
     assert_equal ['Mary'],  Author.where(["name = ?", 'Mary']).map(&:name)
-- 
cgit v1.2.3


From 187fbe5cbadf9d6fe5009a4a436fac28bcf8c99c Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 26 Dec 2009 12:57:34 +0530
Subject: Add support for multiple arguments to .where finder

---
 activerecord/test/cases/relations_test.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 529de4a6cf..50bd221bb3 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -27,6 +27,7 @@ class RelationTest < ActiveRecord::TestCase
   def test_finding_with_conditions
     assert_equal ["David"], Author.where(:name => 'David').map(&:name)
     assert_equal ['Mary'],  Author.where(["name = ?", 'Mary']).map(&:name)
+    assert_equal ['Mary'],  Author.where("name = ?", 'Mary').map(&:name)
   end
 
   def test_finding_with_order
-- 
cgit v1.2.3


From 9d3d60c64a9ce69b9932f5c543112199e576c2ad Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 26 Dec 2009 14:40:45 +0530
Subject: Ensure preload and eager_load finder methods accept multiple
 arguments

---
 activerecord/test/cases/relations_test.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 50bd221bb3..d0a28c58e0 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -116,22 +116,28 @@ class RelationTest < ActiveRecord::TestCase
   def test_find_with_included_associations
     assert_queries(2) do
       posts = Post.preload(:comments)
-      posts.first.comments.first
+      assert posts.first.comments.first
     end
 
     assert_queries(2) do
       posts = Post.preload(:comments).to_a
-      posts.first.comments.first
+      assert posts.first.comments.first
     end
 
     assert_queries(2) do
       posts = Post.preload(:author)
-      posts.first.author
+      assert posts.first.author
     end
 
     assert_queries(2) do
       posts = Post.preload(:author).to_a
-      posts.first.author
+      assert posts.first.author
+    end
+
+    assert_queries(3) do
+      posts = Post.preload(:author, :comments).to_a
+      assert posts.first.author
+      assert posts.first.comments.first
     end
   end
 
-- 
cgit v1.2.3


From 3c5a7dcaf55f427f3a48e206feb06410d011ca4f Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 26 Dec 2009 15:07:00 +0530
Subject: Cache the loaded relations

---
 activerecord/test/cases/relations_test.rb | 33 ++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index d0a28c58e0..475090fbd8 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -24,6 +24,37 @@ class RelationTest < ActiveRecord::TestCase
     assert_no_queries { assert_equal 4, topics.size }
   end
 
+  def test_loaded_all
+    topics = Topic.scoped
+
+    assert_queries(1) do
+      2.times { assert_equal 4, topics.all.size }
+    end
+
+    assert topics.loaded?
+  end
+
+  def test_scoped_first
+    topics = Topic.scoped
+
+    assert_queries(1) do
+      2.times { assert_equal "The First Topic", topics.first.title }
+    end
+
+    assert ! topics.loaded?
+  end
+
+  def test_loaded_first
+    topics = Topic.scoped
+
+    assert_queries(1) do
+      topics.all # force load
+      2.times { assert_equal "The First Topic", topics.first.title }
+    end
+
+    assert topics.loaded?
+  end
+
   def test_finding_with_conditions
     assert_equal ["David"], Author.where(:name => 'David').map(&:name)
     assert_equal ['Mary'],  Author.where(["name = ?", 'Mary']).map(&:name)
@@ -141,7 +172,7 @@ class RelationTest < ActiveRecord::TestCase
     end
   end
 
-    def test_default_scope_with_conditions_string
+  def test_default_scope_with_conditions_string
     assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.scoped.to_a.map(&:id).sort
     assert_equal nil, DeveloperCalledDavid.create!.name
   end
-- 
cgit v1.2.3


From 9a9f97af2815469e6f28dee9b88577251ef1b832 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 26 Dec 2009 15:28:23 +0530
Subject: Add relation.reload to force reloading the records

---
 activerecord/test/cases/relations_test.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 475090fbd8..2b3c6eec1d 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -55,6 +55,21 @@ class RelationTest < ActiveRecord::TestCase
     assert topics.loaded?
   end
 
+  def test_reload
+    topics = Topic.scoped
+
+    assert_queries(1) do
+      2.times { topics.to_a }
+    end
+
+    assert topics.loaded?
+
+    topics.reload
+    assert ! topics.loaded?
+
+    assert_queries(1) { topics.to_a }
+  end
+
   def test_finding_with_conditions
     assert_equal ["David"], Author.where(:name => 'David').map(&:name)
     assert_equal ['Mary'],  Author.where(["name = ?", 'Mary']).map(&:name)
-- 
cgit v1.2.3


From c6258ee313653bc54e94e0008f1c098ed68aa3f4 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 26 Dec 2009 19:15:05 +0530
Subject: Ensure all the finder methods respect scoping

---
 activerecord/test/cases/relations_test.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 2b3c6eec1d..e05da58ae6 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -188,7 +188,7 @@ class RelationTest < ActiveRecord::TestCase
   end
 
   def test_default_scope_with_conditions_string
-    assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.scoped.to_a.map(&:id).sort
+    assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.scoped.map(&:id).sort
     assert_equal nil, DeveloperCalledDavid.create!.name
   end
 
@@ -197,6 +197,11 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal 'Jamis', DeveloperCalledJamis.create!.name
   end
 
+  def test_default_scoping_finder_methods
+    developers = DeveloperCalledDavid.order('id').map(&:id).sort
+    assert_equal Developer.find_all_by_name('David').map(&:id).sort, developers
+  end
+
   def test_loading_with_one_association
     posts = Post.preload(:comments)
     post = posts.find { |p| p.id == 1 }
-- 
cgit v1.2.3


From f3741506981d8d4aafb28066f5a3a0509a4da846 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 27 Dec 2009 00:11:31 +0530
Subject: Ensure Model.scoped adds type conditions for STI models

---
 activerecord/test/cases/finder_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 3de07797d4..57ce0eee61 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -291,7 +291,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_with_hash_conditions_on_joined_table
-    firms = Firm.all :joins => :account, :conditions => {:accounts => { :credit_limit => 50 }}
+    firms = Firm.joins(:account).where(:accounts => { :credit_limit => 50 })
     assert_equal 1, firms.size
     assert_equal companies(:first_firm), firms.first
   end
-- 
cgit v1.2.3


From 83f24afd44ecd6fb6e38d5e8a6830dfca4bf5ffe Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 27 Dec 2009 00:21:24 +0530
Subject: Add new finder methods to association collection.

---
 .../test/cases/associations/has_many_through_associations_test.rb | 8 ++++----
 activerecord/test/cases/batches_test.rb                           | 2 +-
 activerecord/test/cases/named_scope_test.rb                       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index fe68d03de2..608d5a3608 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -140,23 +140,23 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   def test_replace_order_is_preserved
     posts(:welcome).people.clear
     posts(:welcome).people = [people(:david), people(:michael)]
-    assert_equal [people(:david).id, people(:michael).id], posts(:welcome).readers.all(:order => 'id').map(&:person_id)
+    assert_equal [people(:david).id, people(:michael).id], posts(:welcome).readers.order('id').map(&:person_id)
 
     # Test the inverse order in case the first success was a coincidence
     posts(:welcome).people.clear
     posts(:welcome).people = [people(:michael), people(:david)]
-    assert_equal [people(:michael).id, people(:david).id], posts(:welcome).readers.all(:order => 'id').map(&:person_id)
+    assert_equal [people(:michael).id, people(:david).id], posts(:welcome).readers.order('id').map(&:person_id)
   end
 
   def test_replace_by_id_order_is_preserved
     posts(:welcome).people.clear
     posts(:welcome).person_ids = [people(:david).id, people(:michael).id]
-    assert_equal [people(:david).id, people(:michael).id], posts(:welcome).readers.all(:order => 'id').map(&:person_id)
+    assert_equal [people(:david).id, people(:michael).id], posts(:welcome).readers.order('id').map(&:person_id)
 
     # Test the inverse order in case the first success was a coincidence
     posts(:welcome).people.clear
     posts(:welcome).person_ids = [people(:michael).id, people(:david).id]
-    assert_equal [people(:michael).id, people(:david).id], posts(:welcome).readers.all(:order => 'id').map(&:person_id)
+    assert_equal [people(:michael).id, people(:david).id], posts(:welcome).readers.order('id').map(&:person_id)
   end
 
   def test_associate_with_create
diff --git a/activerecord/test/cases/batches_test.rb b/activerecord/test/cases/batches_test.rb
index 5009a90846..e417d8a803 100644
--- a/activerecord/test/cases/batches_test.rb
+++ b/activerecord/test/cases/batches_test.rb
@@ -5,7 +5,7 @@ class EachTest < ActiveRecord::TestCase
   fixtures :posts
 
   def setup
-    @posts = Post.all(:order => "id asc")
+    @posts = Post.order("id asc")
     @total = Post.count
   end
   
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 13427daf53..5d9232bc52 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -345,8 +345,8 @@ class NamedScopeTest < ActiveRecord::TestCase
 
   def test_chaining_should_use_latest_conditions_when_searching
     # Normal hash conditions
-    assert_equal Topic.all(:conditions => {:approved => true}).to_a, Topic.rejected.approved.all.to_a
-    assert_equal Topic.all(:conditions => {:approved => false}).to_a, Topic.approved.rejected.all.to_a
+    assert_equal Topic.where(:approved => true).to_a, Topic.rejected.approved.all.to_a
+    assert_equal Topic.where(:approved => false).to_a, Topic.approved.rejected.all.to_a
 
     # Nested hash conditions with same keys
     assert_equal [posts(:sti_comments)], Post.with_special_comments.with_very_special_comments.all.to_a
-- 
cgit v1.2.3


From cc753eaf589b6dfae92f6fc0031c5710e616a26c Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 27 Dec 2009 01:50:03 +0530
Subject: Replace Model.first(options) with new finder methods inside tests

---
 activerecord/test/cases/dirty_test.rb  | 2 +-
 activerecord/test/cases/finder_test.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index f456d273fe..4961d12a44 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -301,7 +301,7 @@ class DirtyTest < ActiveRecord::TestCase
   def test_save_should_not_save_serialized_attribute_with_partial_updates_if_not_present
     with_partial_updates(Topic) do
       Topic.create!(:author_name => 'Bill', :content => {:a => "a"})
-      topic = Topic.first(:select => 'id, author_name')
+      topic = Topic.select('id, author_name').first
       topic.update_attribute :author_name, 'John'
       topic = Topic.first
       assert_not_nil topic.content
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 57ce0eee61..efc850cffc 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -233,11 +233,11 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_first
-    assert_equal topics(:second).title, Topic.first(:conditions => "title = 'The Second Topic of the day'").title
+    assert_equal topics(:second).title, Topic.where("title = 'The Second Topic of the day'").first.title
   end
 
   def test_first_failing
-    assert_nil Topic.first(:conditions => "title = 'The Second Topic of the day!'")
+    assert_nil Topic.where("title = 'The Second Topic of the day!'").first
   end
 
   def test_unexisting_record_exception_handling
-- 
cgit v1.2.3


From f6f416c58e805604390314e2e8e5ecf6a0a78b4f Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 27 Dec 2009 03:25:29 +0530
Subject: Add find_by_* and find_all_by_* finders to ActiveRecord::Relation

---
 activerecord/test/cases/relations_test.rb | 34 ++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index e05da58ae6..f94402f57e 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1,4 +1,6 @@
 require "cases/helper"
+require 'models/tag'
+require 'models/tagging'
 require 'models/post'
 require 'models/topic'
 require 'models/comment'
@@ -10,7 +12,8 @@ require 'models/developer'
 require 'models/company'
 
 class RelationTest < ActiveRecord::TestCase
-  fixtures :authors, :topics, :entrants, :developers, :companies, :developers_projects, :accounts, :categories, :categorizations, :posts, :comments
+  fixtures :authors, :topics, :entrants, :developers, :companies, :developers_projects, :accounts, :categories, :categorizations, :posts, :comments,
+    :taggings
 
   def test_scoped
     topics = Topic.scoped
@@ -222,5 +225,34 @@ class RelationTest < ActiveRecord::TestCase
     post = posts.find { |p| p.id == 1 }
     assert_equal Post.find(1).last_comment, post.last_comment
   end
+
+  def test_dynamic_find_by_attributes
+    david = authors(:david)
+    author = Author.preload(:taggings).find_by_id(david.id)
+    expected_taggings = taggings(:welcome_general, :thinking_general)
+
+    assert_no_queries do
+      assert_equal expected_taggings, author.taggings.uniq.sort_by { |t| t.id }
+    end
+
+    authors = Author.scoped
+    assert_equal david, authors.find_by_id_and_name(david.id, david.name)
+    assert_equal david, authors.find_by_id_and_name!(david.id, david.name)
+  end
+
+  def test_dynamic_find_by_attributes_bang
+    author = Author.scoped.find_by_id!(authors(:david).id)
+    assert_equal "David", author.name
+
+    assert_raises(ActiveRecord::RecordNotFound) { Author.scoped.find_by_id_and_name!('invalid', 'wt') }
+  end
+
+  def test_dynamic_find_all_by_attributes
+    authors = Author.scoped
+
+    davids = authors.find_all_by_name('David')
+    assert_kind_of Array, davids
+    assert_equal [authors(:david)], davids
+  end
 end
 
-- 
cgit v1.2.3


From 8829d6ecc6b3e1a36a41decaf8237f6024be2c06 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 27 Dec 2009 13:15:00 +0530
Subject: Make Model.find_by_* and Model.find_all_by_* use relations and remove
 dynamic method caching

---
 activerecord/test/cases/finder_test.rb | 46 ----------------------------------
 1 file changed, 46 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index efc850cffc..59c016d19c 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -571,21 +571,6 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal(2, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 1]))
   end
 
-  def test_dynamic_finders_should_go_through_the_find_class_method
-    Topic.expects(:find).with(:first, :conditions => { :title => 'The First Topic!' })
-    Topic.find_by_title("The First Topic!")
-
-    Topic.expects(:find).with(:last, :conditions => { :title => 'The Last Topic!' })
-    Topic.find_last_by_title("The Last Topic!")
-
-    Topic.expects(:find).with(:all, :conditions => { :title => 'A Topic.' })
-    Topic.find_all_by_title("A Topic.")
-
-    Topic.expects(:find).with(:first, :conditions => { :title => 'Does not exist yet for sure!' }).times(2)
-    Topic.find_or_initialize_by_title('Does not exist yet for sure!')
-    Topic.find_or_create_by_title('Does not exist yet for sure!')
-  end
-
   def test_find_by_one_attribute
     assert_equal topics(:first), Topic.find_by_title("The First Topic")
     assert_nil Topic.find_by_title("The First Topic!")
@@ -596,21 +581,6 @@ class FinderTest < ActiveRecord::TestCase
     assert_raise(ActiveRecord::RecordNotFound) { Topic.find_by_title!("The First Topic!") }
   end
 
-  def test_find_by_one_attribute_caches_dynamic_finder
-    # ensure this test can run independently of order
-    class << Topic; self; end.send(:remove_method, :find_by_title) if Topic.public_methods.any? { |m| m.to_s == 'find_by_title' }
-    assert !Topic.public_methods.any? { |m| m.to_s == 'find_by_title' }
-    t = Topic.find_by_title("The First Topic")
-    assert Topic.public_methods.any? { |m| m.to_s == 'find_by_title' }
-  end
-
-  def test_dynamic_finder_returns_same_results_after_caching
-    # ensure this test can run independently of order
-    class << Topic; self; end.send(:remove_method, :find_by_title) if Topic.public_method_defined?(:find_by_title)
-    t = Topic.find_by_title("The First Topic")
-    assert_equal t, Topic.find_by_title("The First Topic") # find_by_title has been cached
-  end
-
   def test_find_by_one_attribute_with_order_option
     assert_equal accounts(:signals37), Account.find_by_credit_limit(50, :order => 'id')
     assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :order => 'id DESC')
@@ -654,14 +624,6 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal customers(:david), found_customer
   end
 
-  def test_dynamic_finder_on_one_attribute_with_conditions_caches_method
-    # ensure this test can run independently of order
-    class << Account; self; end.send(:remove_method, :find_by_credit_limit) if Account.public_methods.any? { |m| m.to_s == 'find_by_credit_limit' }
-    assert !Account.public_methods.any? { |m| m.to_s == 'find_by_credit_limit' }
-    a = Account.find_by_credit_limit(50, :conditions => ['firm_id = ?', 6])
-    assert Account.public_methods.any? { |m| m.to_s == 'find_by_credit_limit' }
-  end
-
   def test_dynamic_finder_on_one_attribute_with_conditions_returns_same_results_after_caching
     # ensure this test can run independently of order
     class << Account; self; end.send(:remove_method, :find_by_credit_limit) if Account.public_methods.any? { |m| m.to_s == 'find_by_credit_limit' }
@@ -694,14 +656,6 @@ class FinderTest < ActiveRecord::TestCase
     assert_nil Topic.find_last_by_title("A title with no matches")
   end
 
-  def test_find_last_by_one_attribute_caches_dynamic_finder
-    # ensure this test can run independently of order
-    class << Topic; self; end.send(:remove_method, :find_last_by_title) if Topic.public_methods.any? { |m| m.to_s == 'find_last_by_title' }
-    assert !Topic.public_methods.any? { |m| m.to_s == 'find_last_by_title' }
-    t = Topic.find_last_by_title(Topic.last.title)
-    assert Topic.public_methods.any? { |m| m.to_s == 'find_last_by_title' }
-  end
-
   def test_find_last_by_invalid_method_syntax
     assert_raise(NoMethodError) { Topic.fail_to_find_last_by_title("The First Topic") }
     assert_raise(NoMethodError) { Topic.find_last_by_title?("The First Topic") }
-- 
cgit v1.2.3


From d511de0261003aae4913e3c24f76df6e03a35916 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 27 Dec 2009 14:28:19 +0530
Subject: Add find_or_create_by_* and find_or_initialize_by_* to relations

---
 activerecord/test/cases/relations_test.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index f94402f57e..893ac9caf8 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -254,5 +254,26 @@ class RelationTest < ActiveRecord::TestCase
     assert_kind_of Array, davids
     assert_equal [authors(:david)], davids
   end
+
+  def test_dynamic_find_or_initialize_by_attributes
+    authors = Author.scoped
+
+    lifo = authors.find_or_initialize_by_name('Lifo')
+    assert_equal "Lifo", lifo.name
+    assert lifo.new_record?
+
+    assert_equal authors(:david), authors.find_or_initialize_by_name(:name => 'David')
+  end
+
+  def test_dynamic_find_or_create_by_attributes
+    authors = Author.scoped
+
+    lifo = authors.find_or_create_by_name('Lifo')
+    assert_equal "Lifo", lifo.name
+    assert ! lifo.new_record?
+
+    assert_equal authors(:david), authors.find_or_create_by_name(:name => 'David')
+  end
+
 end
 
-- 
cgit v1.2.3


From 85770ec7139fcba985310d239d4c57cfe6f6c60b Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 27 Dec 2009 14:46:38 +0530
Subject: Make Model.find_or_create_by_* and find_or_initialize_by_* use
 relations and remove method caching

---
 activerecord/test/cases/finder_test.rb | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 59c016d19c..c531a2dec1 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -880,13 +880,6 @@ class FinderTest < ActiveRecord::TestCase
     assert !c.new_record?
   end
 
-  def test_dynamic_find_or_initialize_from_one_attribute_caches_method
-    class << Company; self; end.send(:remove_method, :find_or_initialize_by_name) if Company.public_methods.any? { |m| m.to_s == 'find_or_initialize_by_name' }
-    assert !Company.public_methods.any? { |m| m.to_s == 'find_or_initialize_by_name' }
-    sig38 = Company.find_or_initialize_by_name("38signals")
-    assert Company.public_methods.any? { |m| m.to_s == 'find_or_initialize_by_name' }
-  end
-
   def test_find_or_initialize_from_two_attributes
     another = Topic.find_or_initialize_by_title_and_author_name("Another topic","John")
     assert_equal "Another topic", another.title
-- 
cgit v1.2.3


From 81608cf8fa61973d65f24efbc4ae4931016888e7 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 27 Dec 2009 15:06:45 +0530
Subject: Make Model.all return an array rather than a relation for
 consistency. Use Model.scoped to get a relation

---
 activerecord/test/cases/base_test.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 4c16cb4804..b51c9f0cb3 100755
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1902,8 +1902,14 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal Developer.find(:first, :order => 'id desc'), Developer.last
   end
 
+  def test_all
+    developers = Developer.all
+    assert_kind_of Array, developers
+    assert_equal Developer.find(:all), developers
+  end
+
   def test_all_with_conditions
-    assert_equal Developer.find(:all, :order => 'id desc'), Developer.all.order('id desc').to_a
+    assert_equal Developer.find(:all, :order => 'id desc'), Developer.order('id desc').all
   end
 
   def test_find_ordered_last
-- 
cgit v1.2.3


From d92c4a84023bc0c8dd75869c9b4d5e50277f4650 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 27 Dec 2009 16:14:04 +0530
Subject: Add find(ids) to relations

---
 activerecord/test/cases/relations_test.rb | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 893ac9caf8..9c5a38a399 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -275,5 +275,27 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal authors(:david), authors.find_or_create_by_name(:name => 'David')
   end
 
-end
+  def test_find_id
+    authors = Author.scoped
+
+    david = authors.find(authors(:david).id)
+    assert_equal 'David', david.name
+
+    assert_raises(ActiveRecord::RecordNotFound) { authors.where(:name => 'lifo').find('invalid') }
+  end
 
+  def test_find_ids
+    authors = Author.order('id ASC')
+
+    results = authors.find(authors(:david).id, authors(:mary).id)
+    assert_kind_of Array, results
+    assert_equal 2, results.size
+    assert_equal 'David', results[0].name
+    assert_equal 'Mary', results[1].name
+    assert_equal results, authors.find([authors(:david).id, authors(:mary).id])
+
+    assert_raises(ActiveRecord::RecordNotFound) { authors.where(:name => 'lifo').find(authors(:david).id, 'invalid') }
+    assert_raises(ActiveRecord::RecordNotFound) { authors.find(['invalid', 'oops']) }
+  end
+
+end
-- 
cgit v1.2.3