fake_arel 0.1.3 → 0.2

data/lib/fake_arel/extensions.rb

@@ -14,8 +14,9 @@ module ActiveRecord
               ret = options.proxy_options
               while local_scope.class == ActiveRecord::NamedScope::Scope
                 ret[:conditions] = merge_conditions(ret[:conditions], local_scope.proxy_options[:conditions])
-                ret[:includes] = merge_includes(ret[:includes], local_scope.proxy_options[:includes]) if ret[:includes] or local_scope.proxy_options[:includes]
+                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] = merge_includes(ret[:order], local_scope.proxy_options[:order]) if ret[:order] || local_scope.proxy_options[:order]
                 local_scope = local_scope.proxy_scope
               end
               ret
@@ -36,8 +37,9 @@ module ActiveRecord
 
     class Scope
       attr_reader :proxy_scope, :proxy_options, :current_scoped_methods_when_defined
+      undef select
       [].methods.each do |m|
-        unless m =~ /^__/ || NON_DELEGATE_METHODS.include?(m.to_s)
+        unless m =~ /^__/ || (NON_DELEGATE_METHODS + ['select']).include?(m.to_s)
           delegate m, :to => :proxy_found
         end
       end

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

data/spec/fake_arel_spec.rb

@@ -57,6 +57,16 @@ describe "chained nested named scopes" do
     Reply.filter_join_topic_and_author.recent_with_content_like_ar.all.should == Reply.find(:all, :conditions => "id = 5")
   end
 
+  it "should be able to take a select after a where" do
+    replies = Reply.where("id = 5").select(:id).all
+    replies.size.should == 1
+    replies[0].attributes.should == {"id" => 5}
+  end
+
+  it "should properly chain order scope in definitions" do
+    Reply.topic_4_id_asc.all.should == Reply.find(:all, :conditions => {:topic_id => 4}, :order=>'id asc')
+    Reply.topic_4_id_desc.all.should == Reply.find(:all, :conditions => {:topic_id => 4}, :order=>'id desc')
+  end
 end
 
 describe "keep scoped functionality" do

data/spec/fixtures/reply.rb

@@ -14,6 +14,11 @@ class Reply < ActiveRecord::Base
   named_scope :arel_id, :conditions => "id = 1"
   named_scope :arel_id_with_lambda, lambda {|aid| arel_id}
   named_scope :arel_id_with_nested_lambda, lambda {|aid| arel_id_with_lambda(aid)}
+
+  named_scope :id_asc, order('id asc')
+  named_scope :id_desc, order('id desc')
+  named_scope :topic_4_id_asc, id_asc.where(:topic_id => 4)
+  named_scope :topic_4_id_desc, id_desc.where(:topic_id => 4)
   
   validates_presence_of :content
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fake_arel
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -04:00
+date: 2010-08-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency