fake_arel 0.9.3 → 0.9.4

data/fake_arel.gemspec

@@ -6,7 +6,7 @@ require 'bundler/version'
  
 Gem::Specification.new do |s|
   s.name        = "fake_arel"
-  s.version     = "0.9.3"
+  s.version     = "0.9.4"
   s.platform    = Gem::Platform::RUBY
   s.author     = "Grant Ammons"
   s.email       = ["grant@pipelinedealsco.com"]

data/lib/fake_arel.rb

@@ -9,7 +9,7 @@ require 'fake_arel/rails_3_finders'
 require 'fake_arel/calculations'
 
 module FakeArel
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
   ActiveRecord::Base.send :include, Rails3Finders
   ActiveRecord::Base.send :include, WithScopeReplacement
 end

data/lib/fake_arel/rails_3_finders.rb

@@ -45,7 +45,8 @@ module Rails3Finders
           begin
             where << merge_conditions(s[:conditions])
           rescue NoMethodError
-            where << scopes[0].first.class.merge_conditions(s[:conditions])
+            # I am ActiveRecord::Base. Only my subclasses define merge_conditions:
+            where << subclasses.first.merge_conditions(s[:conditions])
           end
           #where << merge_conditions(s[:conditions])
           joins << s[:joins] unless s[:joins].nil?

data/spec/fake_arel_spec.rb

@@ -174,6 +174,12 @@ describe "Fake Arel" do
     # an example using joins, as well as a query that returns nothing
     Reply.or(Reply.recent_joins_topic, Reply.topic_title_is("Nothin")).all.map(&:id).should == [5]
   end
+  
+  it 'should be able to combine with "or", an empty named scope with another non-empty one' do
+    q1 = Reply.where(:id => 0)
+    q2 = Reply.where(:id => 2)
+    Reply.or(q1,q2).all.map(&:id).should == [2]
+  end
 
   it "should use select like rails 3 uses select" do
     lambda { Reply.all.select {|r| r.id == 1 }}.should_not raise_error

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fake_arel
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 -05:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency