fake_arel 0.1 → 0.1.1

data/README.rdoc

@@ -48,7 +48,7 @@ http://github.com/gammons/fake_arel
 
 (The MIT License)
 
-Copyright (c) 2010 FIXME full name
+Copyright (c) 2010 Grant Ammons (grant@pipelinedealsco.com)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/fake_arel/extensions.rb

@@ -9,7 +9,18 @@ module ActiveRecord
             when Hash
               options
             when Scope
-              options.proxy_options
+              # unspin the scope and generate a hash
+              local_scope = options.proxy_scope
+              ret = options.proxy_options
+              while local_scope.class == ActiveRecord::NamedScope::Scope
+                unless ret[:conditions].to_s.index merge_conditions(local_scope.proxy_options[:conditions])
+                  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[:joins] = merge_includes(ret[:joins], local_scope.proxy_options[:joins])
+                end
+                local_scope = local_scope.proxy_scope
+              end
+              ret
             when Proc
               if self.model_name != parent_scope.model_name
                 options.bind(parent_scope).call(*args)

data/lib/fake_arel/with_scope_replacement.rb

@@ -1,12 +1,3 @@
-module ActiveRecord
-  class Base
-
-    def self.grant_scope_2
-      p "BANGO"
-    end
-  end
-end
-
 module WithScopeReplacement
   def self.included(base)
     base.class_eval do

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

data/spec/fake_arel_spec.rb

@@ -34,7 +34,7 @@ describe "Basics" do
   end
 
   it "should work with scope and with exclusive scope" do
-    Reply.find_all_but_first.map(&:id).should == [2,3,4,5]
+    Reply.find_all_but_first.map(&:id).should == [2,3,4,5,6]
   end
 end
 
@@ -43,3 +43,12 @@ describe "to sql" do
     Topic.joins(:replies).limit(1).to_sql
   end
 end
+
+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("Nothin").first.should == nil
+  end
+end

data/spec/fixtures/replies.yml

@@ -27,3 +27,9 @@ brave:
   topic_id: 4
   content: "AR doesn't scare me a bit"
   created_at: <%= 10.minutes.ago.to_s(:db) %>
+
+thang:
+  id: 6
+  topic_id: 4
+  content: "AR This is some more content"
+  created_at: <%= 10.hours.ago.to_s(:db) %>

data/spec/fixtures/reply.rb

@@ -3,6 +3,10 @@ class Reply < ActiveRecord::Base
 
   named_scope :recent, where('replies.created_at > ?', 15.minutes.ago)
   named_scope :recent_limit_1, where('replies.created_at > ?', 15.minutes.ago).limit(1)
+  named_scope :recent_with_content_like_ar, recent.where('lower(content) like ?', "AR%")
+  named_scope :recent_with_content_like_ar_and_id_4, recent.where('lower(content) like ?', "AR%").where("id = 4")
+  named_scope :recent_joins_topic, recent.joins(:topic)
+  named_scope :topic_title_is, lambda {|topic_title| where("topics.title like ?", topic_title + "%") }
 
   named_scope :arel_id, :conditions => "id = 1"
   named_scope :arel_id_with_lambda, lambda {|aid| arel_id}

metadata

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