fake_arel 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/fake_arel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fake_arel}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Grant Ammons"]
-  s.date = %q{2013-03-08}
+  s.date = %q{2013-05-15}
   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

@@ -37,6 +37,8 @@ module WithScopeReplacement
                         else
                           hash[method][key] = merge_conditions(params[key], hash[method][key])
                         end
+                      elsif key == :select && merge
+                        hash[method][key] = merge_includes(hash[method][key], params[key]).uniq.join(', ')
                       elsif key == :include && merge
                         hash[method][key] = merge_includes(hash[method][key], params[key]).uniq
                       elsif key == :joins && merge

data/spec/fake_arel_spec.rb

@@ -257,6 +257,14 @@ describe "NameScope bug" do
       Reply.group('replies.topic_id').count.should == Reply.count(:group => 'replies.topic_id')
     end
   end
+
+  context "using multiple select statements" do
+    it "should respect multiple select statements" do
+      topics = Topic.select("distinct(topics.id)").select("topics.title as topic_title").first
+      topics.topic_title.should_not be_nil
+      topics.id.should_not be_nil
+    end
+  end
 end
 
 describe "using select with include" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fake_arel
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Grant Ammons
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-08 00:00:00 -05:00
+date: 2013-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,10 +30,10 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
-  version_requirements: *id001
+  type: :runtime
   name: activerecord
+  version_requirements: *id001
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,10 +44,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
+  type: :development
   name: bundler
+  version_requirements: *id002
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,10 +60,10 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  version_requirements: *id003
+  type: :development
   name: jeweler
+  version_requirements: *id003
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,10 +74,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
+  type: :development
   name: rcov
+  version_requirements: *id004
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,10 +88,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
+  type: :development
   name: debugger
+  version_requirements: *id005
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -104,10 +104,10 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  version_requirements: *id006
+  type: :development
   name: rspec
+  version_requirements: *id006
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -118,10 +118,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  type: :development
   name: sqlite3-ruby
+  version_requirements: *id007
   prerelease: false
-  type: :development
 description: fake_arel will simulate rails 3 arel syntax for Rails 2.
 email: grant@pipelinedealsco.com
 executables: []