squeel 1.0.13 → 1.0.14

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.14 (2012-12-04 OpenHack Louisville Edition!)
+
+* Use bind values in where_values_hash, to prep for compatibility with 3.2.10
+* Allow Symbol#to_proc blocks to fall through to Array's select method
+
 ## 1.0.13 (2012-10-11)
 
 * Allow strings in from_value. Fixes incompatibility with acts-as-taggable-on.

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

@@ -167,7 +167,7 @@ module Squeel
 
         def select(value = Proc.new)
           if block_given? && Proc === value
-            if value.arity > 0
+            if value.arity > 0 || (Squeel.sane_arity? && value.arity < 0)
               to_a.select {|*block_args| value.call(*block_args)}
             else
               relation = clone
@@ -388,7 +388,12 @@ module Squeel
         def where_values_hash_with_squeel
           equalities = find_equality_predicates(where_visit(with_default_scope.where_values))
 
-          Hash[equalities.map { |where| [where.left.name, where.right] }]
+          binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]
+
+          Hash[equalities.map { |where|
+            name = where.left.name
+            [name, binds.fetch(name.to_s) { where.right }]
+          }]
         end
 
       end

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "1.0.13"
+  VERSION = "1.0.14"
 end

data/lib/squeel.rb

@@ -18,6 +18,12 @@ module Squeel
     warn "DEPRECATION WARNING: #{message} (called from #{external_caller})"
   end
 
+  # Ruby 1.9 has a zero arity on a Proc with no arity. Prior to that, it mimics
+  # Symbol#to_proc and returns -1.
+  def self.sane_arity?
+    @sane_arity ||= Proc.new {}.arity == 0
+  end
+
   # Set up initial predicate aliases
   Constants::PREDICATE_ALIASES.each do |original, aliases|
     aliases.each do |aliaz|

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

@@ -364,12 +364,21 @@ module Squeel
             block.to_sql.should eq standard.to_sql
           end
 
-          it 'falls back to Array#select behavior with a block that has an arity' do
+          it 'falls back to Array#select with a block that has an arity > 0' do
             people = Person.select{|p| p.id == 1}
             people.should have(1).person
             people.first.id.should eq 1
           end
 
+          it 'falls back to Array#select with Symbol#to_proc block' do
+            if Squeel.sane_arity?
+              people = Person.select(&:odd?)
+              people.map(&:id)[0..3].should eq [1, 3, 5, 7]
+            else
+              pending 'This version of Ruby has insane Proc#arity behavior.'
+            end
+          end
+
           it 'behaves as normal with standard parameters' do
             people = Person.select(:id)
             people.should have(332).people

data/spec/support/models.rb

@@ -21,6 +21,10 @@ class Person < ActiveRecord::Base
   sifter :name_starts_or_ends_with do |value|
     (name =~ "#{value}%") | (name =~ "%#{value}")
   end
+
+  def odd?
+    id.odd?
+  end
 end
 
 class PersonWithNamePrimaryKey < ActiveRecord::Base

metadata

@@ -1,138 +1,142 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: squeel
-version: !ruby/object:Gem::Version
-  version: 1.0.13
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 14
+  version: 1.0.14
 platform: ruby
-authors:
+authors: 
 - Ernie Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
+  requirement: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
+  requirement: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: polyamorous
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
   type: :runtime
+  requirement: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
+  requirement: *id004
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: machinist
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 0
+        - 6
         version: 1.0.6
   type: :development
+  requirement: *id005
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: faker
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 9
+        - 5
         version: 0.9.5
   type: :development
+  requirement: *id006
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.5
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
   type: :development
+  requirement: *id007
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-description: ! "\n      Squeel unlocks the power of ARel in your Rails 3 application
-  with\n      a handy block-based syntax. You can write subqueries, access named\n
-  \     functions provided by your RDBMS, and more, all without writing\n      SQL
-  strings.\n    "
-email:
+description: "\n      Squeel unlocks the power of ARel in your Rails 3 application with\n      a handy block-based syntax. You can write subqueries, access named\n      functions provided by your RDBMS, and more, all without writing\n      SQL strings.\n    "
+email: 
 - ernie@erniemiller.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -243,35 +247,38 @@ files:
 - squeel.gemspec
 homepage: http://erniemiller.org/projects/squeel
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2470259262111794419
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2470259262111794419
+      version: "0"
 requirements: []
+
 rubyforge_project: squeel
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveRecord 3, improved.
-test_files:
+test_files: 
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
 - spec/blueprints/notes.rb