squeel 0.7.6 → 0.8.0

data/README.md

@@ -1,6 +1,18 @@
 # Squeel
 
-Squeel is a rewrite of [MetaWhere](http://metautonomo.us/projects/metawhere).
+Squeel lets you write your ActiveRecord queries with with fewer strings, and more Ruby,
+by making the ARel awesomeness that lies beneath ActiveRecord more accessible.
+
+Squeel lets you rewrite...
+
+    Article.where ['created_at >= ?', 2.weeks.ago]
+
+...as...
+
+    Article.where{created_at >= 2.weeks.ago}
+
+This is a _good thing_. If you don't agree, Squeel might not be for you. The above is
+just a simple example -- Squeel's capable of a whole lot more. Keep reading.
 
 ## Getting started
 
@@ -9,7 +21,7 @@ In your Gemfile:
     gem "squeel"  # Last officially released gem
     # gem "squeel", :git => "git://github.com/ernie/squeel.git" # Track git repo
 
-In an intitializer:
+In an initializer:
 
     Squeel.configure do |config|
       # To load hash extensions (to allow for AND (&), OR (|), and NOT (-) against
@@ -34,7 +46,7 @@ Stubs and keypaths are the two primary building blocks used in a Squeel DSL quer
 start by taking a look at them. Most of the other examples that follow will be based on
 this "symbol-less" block syntax.
 
-*An important gotcha, before we begin:* The Squeel DSL works its magic using `instance_eval`.
+**An important gotcha, before we begin:** The Squeel DSL works its magic using `instance_eval`.
 If you've been working with Ruby for a while, you'll know immediately that this means that
 _inside_ a Squeel DSL block, `self` isn't the same thing that it is _outside_ the block.
 
@@ -46,7 +58,7 @@ to your object's methods and variables:
 
   1. Assign the variable locally before the DSL block, and access it as you would
      normally.
-  2. Supply an arity to the DSL block, as in `Person.where{|dsl| dsl.name == @my_name}`
+  2. Supply an arity to the DSL block, as in `Person.where{|q| q.name == @my_name}`
      Downside: You'll need to prefix stubs, keypaths, and functions (explained below)
      with the DSL object.
   3. Wrap the method or instance variable inside the block with `my{}`.

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.7.6"
+  VERSION = "0.8.0"
 end

data/lib/squeel/visitors/predicate_visitor.rb

@@ -4,6 +4,9 @@ module Squeel
   module Visitors
     class PredicateVisitor < Base
 
+      TRUE_SQL = Arel.sql('1=1').freeze
+      FALSE_SQL = Arel.sql('1=0').freeze
+
       private
 
       # Visit a Hash. This entails iterating through each key and value and
@@ -79,6 +82,12 @@ module Squeel
       #   (Arel::Nodes::Equality, Arel::Nodes::Matches, etc)
       def visit_Squeel_Nodes_Predicate(o, parent)
         value = o.value
+
+        if Array === value && value.empty? && [:in, :not_in].include?(o.method_name)
+          # Special case, in/not_in with empty arrays should be false/true respectively
+          return o.method_name == :in ? FALSE_SQL : TRUE_SQL
+        end
+
         if Nodes::KeyPath === value
           value = can_accept?(value.endpoint) ? accept(value, parent) : contextualize(traverse(value, parent))[value.endpoint.to_sym]
         else
@@ -274,7 +283,11 @@ module Squeel
       def arel_predicate_for(attribute, value, parent)
         value = can_accept?(value) ? accept(value, parent) : value
         if [Array, Range, Arel::SelectManager].include?(value.class)
-          attribute.in(value)
+          if Array === value && value.empty?
+            FALSE_SQL
+          else
+            attribute.in(value)
+          end
         else
           attribute.eq(value)
         end

data/spec/squeel/visitors/predicate_visitor_spec.rb

@@ -37,6 +37,24 @@ module Squeel
         predicate.right.should eq ['Joe', 'Bob']
       end
 
+      it 'generates "1=0" when given an empty array value in a hash' do
+        predicate = @v.accept(:id => [])
+        predicate.should be_a Arel::Nodes::SqlLiteral
+        predicate.should eq '1=0'
+      end
+
+      it 'generates "1=0" for in predicates when given an empty array value' do
+        predicate = @v.accept(:id.in => [])
+        predicate.should be_a Arel::Nodes::SqlLiteral
+        predicate.should eq '1=0'
+      end
+
+      it 'generates "1=1" for not_in predicates when given an empty array value' do
+        predicate = @v.accept(:id.not_in => [])
+        predicate.should be_a Arel::Nodes::SqlLiteral
+        predicate.should eq '1=1'
+      end
+
       it 'allows a subquery on the value side of an explicit predicate' do
         predicate = @v.accept dsl{name.in(Person.select{name}.where{name.in(['Aric Smith', 'Gladyce Kulas'])})}
         predicate.should be_a Arel::Nodes::In

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-06-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156244960 !ruby/object:Gem::Requirement
+  requirement: &2153399220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156244960
+  version_requirements: *2153399220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156244220 !ruby/object:Gem::Requirement
+  requirement: &2153398720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156244220
+  version_requirements: *2153398720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156242240 !ruby/object:Gem::Requirement
+  requirement: &2153398260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2156242240
+  version_requirements: *2153398260
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &2156236780 !ruby/object:Gem::Requirement
+  requirement: &2153397780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2156236780
+  version_requirements: *2153397780
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2156197500 !ruby/object:Gem::Requirement
+  requirement: &2153397280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *2156197500
+  version_requirements: *2153397280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156196800 !ruby/object:Gem::Requirement
+  requirement: &2153396780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2156196800
+  version_requirements: *2153396780
 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