fake_arel 0.8.1 → 0.9

data/README.rdoc

@@ -35,6 +35,22 @@ http://github.com/gammons/fake_arel
       named_scope :recent_by_john, recent(15).by_john
     end
 
+=== Recently Added!
+
+* <tt>or</tt> syntax. Because named scopes load lazily, we're able to pass the scope to another scope, in this case, <tr>or</tr>.
+
+    q1 = Reply.where(:id => 1)
+    q2 = Reply.where(:id => 2)
+    q3 = Reply.where(:id => 3)
+    q4 = Reply.where(:id => 4)
+
+    Reply.or(q1,q2).all.map(&:id)  # equals [1,2]
+    Reply.or(q1,q2,q3).all.map(&:id) # equals [1,2,3]
+
+    or1 = Reply.or(q1,q2)
+    or2 = Reply.or(q3,q4)
+    Reply.or(or1,or2).all.map(&:id) # equals [1,2,3,4]
+
 
 == REQUIREMENTS:
 

data/fake_arel.gemspec

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

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

data/lib/fake_arel/rails_3_finders.rb

@@ -25,6 +25,31 @@ module Rails3Finders
       end
 
       named_scope :where, __where_fn
+
+      __or_fn = lambda do |*scopes|
+        where = []
+        joins = []
+        includes = []
+
+        # for some reason, flatten is actually executing the scope
+        scopes = scopes[0] if scopes.size == 1
+        scopes.each do |s|
+          s = s.proxy_options
+          begin
+            where << merge_conditions(s[:conditions])
+          rescue NoMethodError
+            where << scopes[0].first.class.merge_conditions(s[:conditions])
+          end
+          #where << merge_conditions(s[:conditions])
+          joins << s[:joins] unless s[:joins].nil?
+          includes << s[:include] unless s[:include].nil?
+        end
+        scoped = self
+        scoped = scoped.includes(includes.uniq.flatten) unless includes.blank?
+        scoped = scoped.joins(joins.uniq.flatten) unless joins.blank?
+        scoped.where(where.join(" OR "))
+      end
+      named_scope :or, __or_fn
     end
   end
 end

data/spec/fake_arel_spec.rb

@@ -3,7 +3,7 @@ require 'reply'
 require 'topic'
 require 'author'
 
-describe "Basics" do
+describe "Fake Arel" do
   it "should accomplish basic where" do
     Reply.where(:id => 1).first.id.should == 1
     Reply.where("id = 1").first.id.should == 1
@@ -36,15 +36,11 @@ describe "Basics" do
   it "should work with scope and with exclusive scope" do
     Reply.find_all_but_first.map(&:id).should == [2,3,4,5,6]
   end
-end
 
-describe "to sql" do
   it "should be able to output 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 == []
@@ -123,16 +119,11 @@ describe "chained nested named scopes" do
       topic.replies.loaded?.should be_true
     }
   end
-  
-end
 
-describe "keep scoped functionality" do
   it "should respond to scoped" do
     Reply.scoped({}).class.should == ActiveRecord::NamedScope::Scope
   end
-end
 
-describe "not generate redundant queries" do
   # Github issue #8, fake_arel was adding conditions over and over
   # to a names scope.
   it "should not add a billion parens and conditions" do
@@ -154,5 +145,22 @@ describe "not generate redundant queries" do
     pass_1.should == pass_2
     pass_2.should == pass_3
   end
+
+  it "should be able to combine named scopes with or" do
+    q1 = Reply.where(:id => 1)
+    q2 = Reply.where(:id => 2)
+    q3 = Reply.where(:id => 3)
+    q4 = Reply.where(:id => 4)
+    Reply.or(q1,q2).all.map(&:id).should == [1,2]
+    Reply.or(q1,q2,q3).all.map(&:id).should == [1,2,3]
+
+    # here's something crazy
+    or1 = Reply.or(q1,q2)
+    or2 = Reply.or(q3,q4)
+    Reply.or(or1,or2).all.map(&:id).should == [1,2,3,4]
+
+    # 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
 end
 

data/spec/fixtures/reply.rb

@@ -7,7 +7,7 @@ class Reply < ActiveRecord::Base
   named_scope :recent_with_content_like_ar, recent.where('lower(replies.content) like ?', "AR%")
   named_scope :recent_with_content_like_ar_and_id_4, recent.where('lower(replies.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 :topic_title_is, lambda {|topic_title| joins(:topic).where("topics.title like ?", topic_title + "%") }
 
   named_scope :join_topic_and_author, joins(:topic => [:author])
   named_scope :filter_join_topic_and_author, joins(:topic => [:author]).where('lower(replies.content) like ?','AR%')

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fake_arel
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  version: "0.9"
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,12 +57,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 2
         - 6
-        - 1
-        version: 2.6.1
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id003
 description: |-