fake_arel 0.6 → 0.7

data/README.rdoc

@@ -44,6 +44,11 @@ http://github.com/gammons/fake_arel
 
 * gem install fake_arel
 
+== AUTHORS:
+
+* Grant Ammons
+* Sokolov Yura
+
 == LICENSE:
 
 (The MIT License)

data/lib/fake_arel/extensions.rb

@@ -34,8 +34,12 @@ module ActiveRecord
         ret = proxy_options
         while local_scope.class == ActiveRecord::NamedScope::Scope
           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])
+          if local_conditions && ret[:conditions]
+            if !ret[:conditions].index(local_conditions)
+              ret[:conditions] = merge_conditions(ret[:conditions], local_scope.proxy_options[:conditions])
+            end
+          elsif local_conditions
+            ret[:conditions] = local_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])

data/lib/fake_arel/rails_3_finders.rb

@@ -9,7 +9,7 @@ module Rails3Finders
       named_scope :includes, lambda { |*includes| { :include => includes }}
       named_scope :select, lambda {|*select| {:select => select.join(',') }}
       named_scope :order, lambda {|*order| {:order => order.join(',') }}
-      named_scope :joins, lambda {|*join| {:joins => join }}
+      named_scope :joins, lambda {|*join| {:joins => join } if join[0]}
       named_scope :from, lambda {|*from| {:from => from }}
       named_scope :having, lambda {|*having| {:having => having }}
       named_scope :group, lambda {|*group| {:group => group }}

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.6'
+  VERSION = '0.7'
   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(4)
+    Reply.recent_joins_topic.topic_title_is("ActiveRecord").first.should == Reply.find(5)
     Reply.recent_joins_topic.topic_title_is("Nothin").first.should == nil
   end
 
@@ -75,7 +75,11 @@ describe "chained nested named scopes" do
   it "should properly chain order scope in definitions by lambda" do
     Reply.topic__id_asc(4).all.should == Reply.find(:all, :conditions => {:topic_id => 4}, :order=>'id asc')
     Reply.order('id desc').topic_id(4).all.should == Reply.find(:all, :conditions => {:topic_id => 4}, :order=>'id desc')
-    Reply.topic__id_desc(4).all.should == Reply.find(:all, :conditions => {:topic_id => 4}, :order=>'id desc')
+    topic_4_id_desc = Reply.find(:all, :conditions => {:topic_id => 4}, :order=>'id desc')
+    Reply.topic__id_desc(4).all.should == topic_4_id_desc
+    Reply.topic__id_desc1(4).all.should == topic_4_id_desc
+    Reply.topic__id_desc2(4).all.should == topic_4_id_desc
+    Reply.topic__id_desc3(4).all.should == topic_4_id_desc
   end
   
   it "should chain order scopes" do

data/spec/fixtures/reply.rb

@@ -24,6 +24,9 @@ class Reply < ActiveRecord::Base
   named_scope :recent_topic_id, lambda{|topic_id| recent.where(:topic_id => topic_id)}
   named_scope :topic__id_asc, lambda{|topic_id| id_asc.where(:topic_id => topic_id)}
   named_scope :topic__id_desc, lambda{|topic_id| id_desc.where(:topic_id => topic_id)}
+  named_scope :topic__id_desc1, lambda{|topic_id| where(:topic_id => topic_id).id_desc}
+  named_scope :topic__id_desc2, lambda{|topic_id| order('id desc').where(:topic_id => topic_id)}
+  named_scope :topic__id_desc3, lambda{|topic_id| where(:topic_id => topic_id).order('id desc')}
   named_scope :topic_id_asc, order('topic_id asc')
   named_scope :topic_id_asc_id_desc, order('topic_id asc').id_desc
   named_scope :lam_topic_id_asc_id_desc, lambda{ topic_id_asc.id_desc }

metadata

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