fake_arel 0.5 → 0.6

data/lib/fake_arel/extensions.rb

@@ -33,7 +33,10 @@ module ActiveRecord
         local_scope = proxy_scope
         ret = proxy_options
         while local_scope.class == ActiveRecord::NamedScope::Scope
-          ret[:conditions] = merge_conditions(ret[:conditions], local_scope.proxy_options[:conditions])
+          local_conditions = merge_conditions(local_scope.proxy_options[:conditions])
+          if local_conditions and ret[:conditions] and not ret[:conditions].index local_conditions
+            ret[:conditions] = merge_conditions(ret[:conditions], local_scope.proxy_options[:conditions])
+          end
           ret[:includes] = merge_includes(ret[:includes], local_scope.proxy_options[:includes]) if ret[:includes] || local_scope.proxy_options[:includes]
           ret[:joins] = merge_includes(ret[:joins], local_scope.proxy_options[:joins])
           ret[:order] = [local_scope.proxy_options[:order], ret[:order]].select{|o| !o.blank?}.join(',') if ret[:order] || local_scope.proxy_options[:order]

data/lib/fake_arel.rb

@@ -8,7 +8,7 @@ require 'fake_arel/with_scope_replacement'
 require 'fake_arel/rails_3_finders'
 
 module FakeArel
-  VERSION = '0.5'
+  VERSION = '0.6'
   ActiveRecord::Base.send :include, Rails3Finders
   ActiveRecord::Base.send :include, WithScopeReplacement
 end

data/spec/fake_arel_spec.rb

@@ -48,7 +48,7 @@ describe "chained nested named scopes" do
   it "should be able to chain named scopes within a named_scope" do
     Reply.recent_with_content_like_ar.should == Reply.find(:all, :conditions => "id = 5")
     Reply.recent_with_content_like_ar_and_id_4.should == []
-    Reply.recent_joins_topic.topic_title_is("ActiveRecord").first.should == Reply.find(5)
+    Reply.recent_joins_topic.topic_title_is("ActiveRecord").first.should == Reply.find(4)
     Reply.recent_joins_topic.topic_title_is("Nothin").first.should == nil
   end
 
@@ -99,3 +99,28 @@ describe "keep scoped functionality" do
     Reply.scoped({}).class.should == ActiveRecord::NamedScope::Scope
   end
 end
+
+describe "not generate redundant queries" do
+  # Github issue #8, fake_arel was adding conditions over and over
+  # to a names scope.
+  it "should not add a billion parens and conditions" do
+    pass_1 = Reply.recent.to_sql
+    pass_2 = Reply.recent.to_sql
+    pass_3 = Reply.recent.to_sql
+    pass_1.should == pass_2
+    pass_2.should == pass_3
+
+    pass1 = Reply.filter_join_topic_and_author.to_sql
+    pass2 = Reply.filter_join_topic_and_author.to_sql
+    pass3 = Reply.filter_join_topic_and_author.to_sql
+    pass_1.should == pass_2
+    pass_2.should == pass_3
+
+    pass1 = Reply.recent_joins_topic.topic_title_is('Nothin').to_sql
+    pass2 = Reply.recent_joins_topic.topic_title_is('Nothin').to_sql
+    pass3 = Reply.recent_joins_topic.topic_title_is('Nothin').to_sql
+    pass_1.should == pass_2
+    pass_2.should == pass_3
+  end
+end
+

data/spec/fixtures/reply.rb

@@ -2,6 +2,7 @@ class Reply < ActiveRecord::Base
   belongs_to :topic, :include => [:replies]
 
   named_scope :recent, where('replies.created_at > ?', 15.minutes.ago)
+  named_scope :recent_two_wheres, where('replies.created_at > ?', 15.minutes.ago).where(:id => 5)
   named_scope :recent_limit_1, where('replies.created_at > ?', 15.minutes.ago).limit(1)
   named_scope :recent_with_content_like_ar, recent.where('lower(replies.content) like ?', "AR%")
   named_scope :recent_with_content_like_ar_and_id_4, recent.where('lower(replies.content) like ?', "AR%").where("id = 4")

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fake_arel
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  version: "0.5"
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Grant Ammons
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 -04:00
+date: 2010-08-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency