fake_arel 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/fake_arel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fake_arel}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Grant Ammons"]
-  s.date = %q{2013-05-15}
+  s.date = %q{2013-05-30}
   s.description = %q{fake_arel will simulate rails 3 arel syntax for Rails 2.}
   s.email = %q{grant@pipelinedealsco.com}
   s.extra_rdoc_files = [

data/lib/fake_arel/with_scope_replacement.rb

@@ -3,7 +3,8 @@ module WithScopeReplacement
     base.class_eval do
       class << self
         def to_sql
-          construct_finder_sql({})
+          jd = JoinDependency.new(self, merge_includes(scope(:find, :include), nil), nil)
+          construct_finder_sql_with_included_associations(current_scoped_methods, jd)
         end
         
         def with_scope(method_scoping = {}, action = :merge, &block)

data/spec/fake_arel_spec.rb

@@ -37,16 +37,24 @@ describe "Fake Arel" do
     Reply.find_all_but_first.map(&:id).should == [2,3,4,5,6]
   end
 
-  it "should be able to output sql" do
-    sql = Topic.select('content').joins(:replies).limit(1).order('id desc').where(:author_id => 1).to_sql
-    sql.should =~ /SELECT content/i
-    sql.should =~ /JOIN "replies"/i
-    sql.should =~ /"author_id" = 1/
-    sql.should =~ /LIMIT 1/i
-    sql.should =~ /ORDER BY id desc/i
-    sql = Reply.topic_4_id_desc.to_sql
-    sql.should =~ /"topic_id" = 4/
-    sql.should =~ /ORDER BY id desc/i
+  describe ".to_sql" do
+    it "should be able to output sql" do
+      sql = Topic.select('content').joins(:replies).limit(1).order('id desc').where(:author_id => 1).to_sql
+      sql.should =~ /SELECT content/i
+      sql.should =~ /JOIN "replies"/i
+      sql.should =~ /"author_id" = 1/
+      sql.should =~ /LIMIT 1/i
+      sql.should =~ /ORDER BY id desc/i
+      sql = Reply.topic_4_id_desc.to_sql
+      sql.should =~ /"topic_id" = 4/
+      sql.should =~ /ORDER BY id desc/i
+    end
+
+    it "should includes includes when including included includes" do
+      sql = Topic.includes(:replies, :author).where("replies.id = 1").to_sql
+      p sql
+      sql.should =~ /JOIN "replies"/i
+    end
   end
 
   it "should generate same sql always" do

data/spec/fixtures/replies.yml

@@ -2,34 +2,34 @@ witty_retort:
   id: 1
   topic_id: 1
   content: Birdman is better!
-  created_at: <%= 6.hours.ago.utc.to_s(:db) %>
+  created_at: <%= 6.hours.ago.to_s(:db) %>
   
 another:
   id: 2
   topic_id: 2
   content: Nuh uh!
-  created_at: <%= 1.hour.ago.utc.to_s(:db) %>
+  created_at: <%= 1.hour.ago.to_s(:db) %>
   
 spam:
   id: 3
   topic_id: 1
   content: Nice site!
-  created_at: <%= 1.hour.ago.utc.to_s(:db) %>
+  created_at: <%= 1.hour.ago.to_s(:db) %>
 
 decisive:
   id: 4
   topic_id: 4
   content: "I'm getting to the bottom of this"
-  created_at: <%= 30.minutes.ago.utc.to_s(:db) %>
+  created_at: <%= 30.minutes.ago.to_s(:db) %>
 
 brave:
   id: 5
   topic_id: 4
   content: "AR doesn't scare me a bit"
-  created_at: <%= 10.minutes.ago.utc.to_s(:db) %>
+  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.utc.to_s(:db) %>
+  created_at: <%= 10.hours.ago.to_s(:db) %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fake_arel
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-15 00:00:00 -04:00
+date: 2013-05-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency