squeel 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4 (2012-06-07)
+
+* Fix regression in merge causing issues with scopes returning nil
+
 ## 1.0.3 (2012-06-07)
 
 * Port fix for Rails CVE-2012-2661 to Squeel.

data/lib/squeel/adapters/active_record/3.0/relation_extensions.rb

@@ -40,7 +40,7 @@ module Squeel
         # the relations we're merging, and then use the default AR merge
         # code on the result.
         def merge(r, relations_visited = false)
-          if relations_visited
+          if relations_visited or not ::ActiveRecord::Relation === r
             super(r)
           else
             clone.visit!.merge(r.clone.visit!, true)

data/lib/squeel/adapters/active_record/3.1/relation_extensions.rb

@@ -40,7 +40,7 @@ module Squeel
         # the relations we're merging, and then use the default AR merge
         # code on the result.
         def merge(r, relations_visited = false)
-          if relations_visited
+          if relations_visited or not ::ActiveRecord::Relation === r
             super(r)
           else
             clone.visit!.merge(r.clone.visit!, true)

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/squeel/adapters/active_record/relation_extensions_spec.rb

@@ -681,6 +681,11 @@ module Squeel
             sql.should match /Bert/
           end
 
+          it "doesn't ruin everything when a scope returns nil" do
+            relation = Person.nil_scope
+            relation.should eq Person.scoped
+          end
+
         end
 
         describe '#to_a' do

data/spec/support/schema.rb

@@ -21,6 +21,8 @@ class Person < ActiveRecord::Base
   has_many   :outgoing_messages, :class_name => 'Message', :foreign_key => :author_id
   has_many   :incoming_messages, :class_name => 'Message', :foreign_key => :recipient_id
 
+  scope :nil_scope, lambda { nil }
+
   sifter :name_starts_or_ends_with do |value|
     (name =~ "#{value}%") | (name =~ "%#{value}")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -240,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3464922984987800394
+      hash: 4164570062879011051
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3464922984987800394
+      hash: 4164570062879011051
 requirements: []
 rubyforge_project: squeel
 rubygems_version: 1.8.24