fake_arel 0.1.1 → 0.1.2

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

data/lib/fake_arel/extensions.rb

@@ -13,11 +13,9 @@ module ActiveRecord
               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
+                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])
                 local_scope = local_scope.proxy_scope
               end
               ret

data/spec/fake_arel_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'reply'
 require 'topic'
-
+require 'author'
 
 describe "Basics" do
   it "should accomplish basic where" do
@@ -51,4 +51,8 @@ describe "chained nested named scopes" do
     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
+
+  it "should be able to join multiple items" do
+    Reply.filter_join_topic_and_author.first.topic.author
+  end
 end

data/spec/fixtures/reply.rb

@@ -8,6 +8,9 @@ class Reply < ActiveRecord::Base
   named_scope :recent_joins_topic, recent.joins(:topic)
   named_scope :topic_title_is, lambda {|topic_title| 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%')
+
   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)}

data/spec/fixtures/schema.rb

@@ -1,6 +1,6 @@
 ActiveRecord::Schema.define do
   create_table "topics", :force => true do |t|
-    t.column "project_id", :integer
+    t.column "author_id", :integer
     t.column "title",      :string
     t.column "subtitle",   :string
     t.column "content",    :text
@@ -14,4 +14,10 @@ ActiveRecord::Schema.define do
     t.column "updated_at", :datetime
     t.column "topic_id",   :integer
   end
+
+  create_table "authors", :force => true do |t|
+    t.column "name",    :string
+    t.column "created_at", :datetime
+    t.column "updated_at", :datetime
+  end
 end

data/spec/fixtures/topic.rb

@@ -1,6 +1,6 @@
 class Topic < ActiveRecord::Base
   has_many :replies, :dependent => :destroy, :order => 'replies.created_at DESC'
-  belongs_to :project
+  belongs_to :author
 
   named_scope :mentions_activerecord, :conditions => ['topics.title LIKE ?', '%ActiveRecord%']
   

data/spec/fixtures/topics.yml

@@ -1,5 +1,6 @@
 futurama:
   id: 1
+  author_id: 1
   title: Isnt futurama awesome?
   subtitle: It really is, isnt it.
   content: I like futurama
@@ -8,6 +9,7 @@ futurama:
   
 harvey_birdman:
   id: 2
+  author_id: 1
   title: Harvey Birdman is the king of all men
   subtitle: yup
   content: He really is
@@ -16,7 +18,7 @@ harvey_birdman:
 
 rails:
   id: 3
-  project_id: 1
+  author_id: 1
   title: Rails is nice
   subtitle: It makes me happy
   content: except when I have to hack internals to fix pagination. even then really.
@@ -24,7 +26,7 @@ rails:
 
 ar:
   id: 4
-  project_id: 1
+  author_id: 1
   title: ActiveRecord sometimes freaks me out
   content: "I mean, what's the deal with eager loading?"
   created_at: <%= 15.minutes.ago.to_s(:db) %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fake_arel
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Grant Ammons