squeel 1.0.5 → 1.0.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.6 (2012-06-16)
+
+* Prevent cloned KeyPaths from modifying each other. Fixes #135
+
 ## 1.0.5 (2012-06-08)
 
 * Stop visiting group_values on merge. AR hates ARel attributes in

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 gem 'rake'
 
 rails = ENV['RAILS'] || '3-2-stable'
-arel = ENV['AREL'] || 'master'
+arel = ENV['AREL'] || '3-0-stable'
 
 arel_opts = case arel
 when /\// # A path

data/lib/squeel/nodes/key_path.rb

@@ -200,6 +200,13 @@ module Squeel
 
       private
 
+      # Prevent a cloned keypath from inadvertently modifying the
+      # path of its source.
+      def initialize_copy(orig)
+        super
+        @path = @path.dup
+      end
+
       # Raises a NoMethodError manually, bypassing #method_missing.
       # Used by special-case operator overrides.
       def no_method_error(method_id)

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

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

@@ -258,6 +258,14 @@ module Squeel
             block.debug_sql.should eq standard.debug_sql
           end
 
+          it 'eager loads belongs_to_associations' do
+            relation = Article.includes(:person).
+              where{person.name == 'Ernie'}
+            sql = relation.debug_sql
+            sql.should match /LEFT OUTER JOIN "people"/
+            sql.should match /"people"."name" = 'Ernie'/
+          end
+
           it 'eager loads polymorphic belongs_to associations' do
             relation = Note.includes{notable(Article)}.where{{notable(Article) => {title => 'hey'}}}
             relation.debug_sql.should match /"notes"."notable_type" = 'Article'/

data/spec/squeel/nodes/key_path_spec.rb

@@ -106,6 +106,14 @@ module Squeel
         expect {-@k.third.fourth}.to raise_error NoMethodError
       end
 
+      it 'dups its path when it is duped' do
+        k1 = KeyPath.new([:one, :two])
+        k2 = k1.dup
+        k2.three
+        k2.path.should have(3).items
+        k1.path.should have(2).items
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-16 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: -4324622899470909075
+      hash: -4410929732049188226
 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: -4324622899470909075
+      hash: -4410929732049188226
 requirements: []
 rubyforge_project: squeel
 rubygems_version: 1.8.24