fake_arel 0.7 → 0.8

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.7'
+  VERSION = '0.8'
   ActiveRecord::Base.send :include, Rails3Finders
   ActiveRecord::Base.send :include, WithScopeReplacement
 end

data/lib/fake_arel/extensions.rb

@@ -41,8 +41,8 @@ module ActiveRecord
           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])
+          ret[:include] = merge_includes(ret[:include], local_scope.proxy_options[:include])
+          ret[:joins] = merge_joins(ret[:joins], local_scope.proxy_options[:joins]) if 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]
           local_scope = local_scope.proxy_scope
         end

data/spec/fake_arel_spec.rb

@@ -96,6 +96,34 @@ describe "chained nested named scopes" do
       end
     end.should == Reply.find(:all, :order=>'created_at desc, topic_id asc')
   end
+  
+  it "should chain string join scope" do
+    lambda {
+      Topic.join_replies_by_string_and_author.all
+      Topic.join_replies_by_string_and_author_lambda.all
+    }.should_not raise_error
+  end
+  
+  it "should properly chain with includes" do
+    topics = nil
+    lambda {
+      topics = Topic.mentions_activerecord_with_replies.all
+    }.should_not raise_error
+    topics.each {|topic|
+      topic.replies.loaded?.should be_true
+    }
+  end
+
+  it "should properly chain with includes in lambda" do
+    topics = nil
+    lambda {
+      topics = Topic.by_title_with_replies('%ActiveRecord%').all
+    }.should_not raise_error
+    topics.each {|topic|
+      topic.replies.loaded?.should be_true
+    }
+  end
+  
 end
 
 describe "keep scoped functionality" do

data/spec/fixtures/topic.rb

@@ -7,4 +7,11 @@ class Topic < ActiveRecord::Base
   named_scope :with_replies_starting_with, lambda { |text|
     { :conditions => "replies.content LIKE '#{text}%' ", :include  => :replies }
   }
+  
+  named_scope :mentions_activerecord_with_replies, includes(:replies).mentions_activerecord
+  named_scope :by_title_with_replies, lambda {|title| includes(:replies).where('topics.title like ?', title) }
+  
+  named_scope :join_replies_by_string, joins('inner join replies on topics.id = replies.topic_id')
+  named_scope :join_replies_by_string_and_author, join_replies_by_string.joins(:author)
+  named_scope :join_replies_by_string_and_author_lambda, join_replies_by_string.joins(:author)
 end

metadata

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