squeel 0.8.4 → 0.8.5

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - jruby
+  - rbx
+  - rbx-2.0
+  - ruby-head

data/Gemfile

@@ -1,6 +1,8 @@
 source "http://rubygems.org"
 gemspec
 
+gem 'rake'
+
 if ENV['RAILS_VERSION'] == 'release'
   gem 'activesupport'
   gem 'activerecord'

data/README.md

@@ -1,4 +1,4 @@
-# Squeel
+# Squeel [![Build Status](http://travis-ci.org/ernie/squeel.png)](http://travis-ci.org/ernie/squeel)
 
 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.

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

@@ -5,10 +5,6 @@ module Squeel
     module ActiveRecord
       module JoinDependency
 
-        # Yes, I'm using alias_method_chain here. No, I don't feel too
-        # bad about it. JoinDependency, or, to call it by its full proper
-        # name, ::ActiveRecord::Associations::JoinDependency, is one of the
-        # most "for internal use only" chunks of ActiveRecord.
         def self.included(base)
           base.class_eval do
             alias_method_chain :build, :squeel

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

@@ -62,8 +62,8 @@ module Squeel
         end
 
         def prepare_relation_for_association_merge!(r, association_name)
-          r.where_values.map! {|w| Squeel::Visitors::PredicateVisitor.can_accept?(w) ? {association_name => w} : w}
-          r.having_values.map! {|h| Squeel::Visitors::PredicateVisitor.can_accept?(h) ? {association_name => h} : h}
+          r.where_values.map! {|w| Squeel::Visitors::PredicateVisitor.can_visit?(w) ? {association_name => w} : w}
+          r.having_values.map! {|h| Squeel::Visitors::PredicateVisitor.can_visit?(h) ? {association_name => h} : h}
           r.joins_values.map! {|j| [Symbol, Hash, Nodes::Stub, Nodes::Join].include?(j.class) ? {association_name => j} : j}
         end
 

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

@@ -5,10 +5,6 @@ module Squeel
     module ActiveRecord
       module JoinDependency
 
-        # Yes, I'm using alias_method_chain here. No, I don't feel too
-        # bad about it. JoinDependency, or, to call it by its full proper
-        # name, ::ActiveRecord::Associations::JoinDependency, is one of the
-        # most "for internal use only" chunks of ActiveRecord.
         def self.included(base)
           base.class_eval do
             alias_method_chain :build, :squeel

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

@@ -61,11 +61,11 @@ module Squeel
         end
 
         def prepare_relation_for_association_merge!(r, association_name)
-          r.where_values.map! {|w| Squeel::Visitors::PredicateVisitor.can_accept?(w) ? {association_name => w} : w}
-          r.having_values.map! {|h| Squeel::Visitors::PredicateVisitor.can_accept?(h) ? {association_name => h} : h}
-          r.group_values.map! {|g| Squeel::Visitors::AttributeVisitor.can_accept?(g) ? {association_name => g} : g}
-          r.order_values.map! {|o| Squeel::Visitors::AttributeVisitor.can_accept?(o) ? {association_name => o} : o}
-          r.select_values.map! {|s| Squeel::Visitors::AttributeVisitor.can_accept?(s) ? {association_name => s} : s}
+          r.where_values.map! {|w| Squeel::Visitors::PredicateVisitor.can_visit?(w) ? {association_name => w} : w}
+          r.having_values.map! {|h| Squeel::Visitors::PredicateVisitor.can_visit?(h) ? {association_name => h} : h}
+          r.group_values.map! {|g| Squeel::Visitors::AttributeVisitor.can_visit?(g) ? {association_name => g} : g}
+          r.order_values.map! {|o| Squeel::Visitors::AttributeVisitor.can_visit?(o) ? {association_name => o} : o}
+          r.select_values.map! {|s| Squeel::Visitors::AttributeVisitor.can_visit?(s) ? {association_name => s} : s}
           r.joins_values.map! {|j| [Symbol, Hash, Nodes::Stub, Nodes::Join, Nodes::KeyPath].include?(j.class) ? {association_name => j} : j}
           r.includes_values.map! {|i| [Symbol, Hash, Nodes::Stub, Nodes::Join, Nodes::KeyPath].include?(i.class) ? {association_name => i} : i}
         end

data/lib/squeel/dsl.rb

@@ -50,11 +50,19 @@ module Squeel
     # programmer hell.
     #
     # @param &block A block to instance_eval against the DSL's caller.
-    # @return
+    # @return The results of evaluating the block in the instance of the DSL's caller.
     def my(&block)
       @caller.instance_eval &block
     end
 
+    # Shorthand for creating ARel SqlLiteral nodes.
+    #
+    # @param [String] string The string to convert to an SQL literal.
+    # @return [Arel::Nodes::SqlLiteral] The SQL literal.
+    def `(string)
+      Nodes::Literal.new(string)
+    end
+
     # Node generation inside DSL blocks.
     #
     # @overload node_name

data/lib/squeel/nodes.rb

@@ -4,6 +4,7 @@ module Squeel
   module Nodes
   end
 end
+require 'squeel/nodes/literal'
 require 'squeel/nodes/stub'
 require 'squeel/nodes/key_path'
 require 'squeel/nodes/predicate'

data/lib/squeel/nodes/literal.rb

@@ -0,0 +1,70 @@
+require 'squeel/predicate_methods'
+require 'squeel/nodes/operators'
+require 'squeel/nodes/aliasing'
+
+module Squeel
+  module Nodes
+    # Literal nodes are a container for raw SQL.
+    class Literal
+      include PredicateMethods
+      include Operators
+      include Aliasing
+
+      attr_reader :expr
+
+      def initialize(expr)
+        @expr = expr
+      end
+
+      alias :== :eq
+      alias :'^' :not_eq
+      alias :'!=' :not_eq if respond_to?(:'!=')
+      alias :>> :in
+      alias :<< :not_in
+      alias :=~ :matches
+      alias :'!~' :does_not_match if respond_to?(:'!~')
+      alias :> :gt
+      alias :>= :gteq
+      alias :< :lt
+      alias :<= :lteq
+
+      # Create an ascending Order node with this Literal as its expression
+      # @return [Order] The new Order node
+      def asc
+        Order.new self, 1
+      end
+
+      # Create a descending Order node with this Literal as its expression
+      # @return [Order] The new Order node
+      def desc
+        Order.new self, -1
+      end
+
+      # Object comparison
+      def eql?(other)
+        self.class == other.class &&
+        self.expr == other.expr
+      end
+
+      # To support object equality tests
+      def hash
+        expr.hash
+      end
+
+      # expand_hash_conditions_for_aggregates assumes our hash keys can be
+      # converted to symbols, so this has to be implemented, but it doesn't
+      # really have to do anything useful.
+      # @return [NilClass] Just to avoid bombing out on expand_hash_conditions_for_aggregates
+      def to_sym
+        nil
+      end
+
+      # @return [String] The Literal's String equivalent.
+      def to_s
+        expr.to_s
+      end
+      alias :to_str :to_s
+
+    end
+  end
+end

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/lib/squeel/visitors/attribute_visitor.rb

@@ -31,7 +31,7 @@ module Squeel
       # @param parent The array's parent within the context
       # @return [Array] The flattened array with elements visited
       def visit_Array(o, parent)
-        o.map { |v| can_accept?(v) ? accept(v, parent) : v }.flatten
+        o.map { |v| can_visit?(v) ? visit(v, parent) : v }.flatten
       end
 
       # Visit a symbol. This will return an attribute named after the symbol against
@@ -54,6 +54,15 @@ module Squeel
         contextualize(parent)[o.symbol]
       end
 
+      # Visit a Literal by converting it to an ARel SqlLiteral
+      #
+      # @param [Nodes::Literal] o The Literal to visit
+      # @param parent The parent object in the context (unused)
+      # @return [Arel::Nodes::SqlLiteral] An SqlLiteral
+      def visit_Squeel_Nodes_Literal(o, parent)
+        Arel.sql(o.expr)
+      end
+
       # Visit a keypath. This will traverse the keypath's "path", setting a new
       # parent as though the keypath's endpoint was in a deeply-nested hash,
       # then visit the endpoint with the new parent.
@@ -64,7 +73,7 @@ module Squeel
       def visit_Squeel_Nodes_KeyPath(o, parent)
         parent = traverse(o, parent)
 
-        accept(o.endpoint, parent)
+        visit(o.endpoint, parent)
       end
 
       # Visit an Order node.
@@ -73,10 +82,10 @@ module Squeel
       # @param parent The node's parent within the context
       # @return [Arel::Nodes::Ordering] An ascending or desending ordering
       def visit_Squeel_Nodes_Order(o, parent)
-        accept(o.expr, parent).send(o.descending? ? :desc : :asc)
+        visit(o.expr, parent).send(o.descending? ? :desc : :asc)
       end
 
-      # Visit a Function node. Each function argument will be accepted or
+      # Visit a Function node. Each function argument will be visiteded or
       # contextualized if appropriate. Keep in mind that this occurs with
       # the current parent within the context.
       #
@@ -92,8 +101,8 @@ module Squeel
       def visit_Squeel_Nodes_Function(o, parent)
         args = o.args.map do |arg|
           case arg
-          when Nodes::Function, Nodes::KeyPath
-            accept(arg, parent)
+          when Nodes::Function, Nodes::KeyPath, Nodes::As, Nodes::Literal
+            visit(arg, parent)
           when Symbol, Nodes::Stub
             Arel.sql(arel_visitor.accept contextualize(parent)[arg.to_sym])
           else
@@ -114,8 +123,8 @@ module Squeel
       def visit_Squeel_Nodes_Operation(o, parent)
         args = o.args.map do |arg|
           case arg
-          when Nodes::Function
-            accept(arg, parent)
+          when Nodes::Function, Nodes::KeyPath, Nodes::As, Nodes::Literal
+            visit(arg, parent)
           when Symbol, Nodes::Stub
             Arel.sql(arel_visitor.accept contextualize(parent)[arg.to_sym])
           else
@@ -144,7 +153,7 @@ module Squeel
       # @param parent The parent object in the context
       # @return [Arel::Nodes::As] The resulting as node.
       def visit_Squeel_Nodes_As(o, parent)
-        accept(o.left, parent).as(o.right)
+        visit(o.left, parent).as(o.right)
       end
 
       # Visit an ActiveRecord Relation, returning an Arel::SelectManager
@@ -159,7 +168,7 @@ module Squeel
       # @return [Boolean] Whether the given value implies a context change
       # @param v The value to consider
       def implies_context_change?(v)
-        can_accept?(v)
+        can_visit?(v)
       end
 
       # Change context (by setting the new parent to the result of a #find or
@@ -178,9 +187,9 @@ module Squeel
           end
 
         if Array === v
-          v.map {|val| accept(val, parent || k)}
+          v.map {|val| visit(val, parent || k)}
         else
-          can_accept?(v) ? accept(v, parent || k) : v
+          can_visit?(v) ? visit(v, parent || k) : v
         end
       end
 

data/lib/squeel/visitors/base.rb

@@ -27,20 +27,20 @@ module Squeel
       end
 
       # @param object The object to check
-      # @return [Boolean] Whether or not the visitor can accept the given object
-      def can_accept?(object)
-        self.class.can_accept? object
+      # @return [Boolean] Whether or not the visitor can visit the given object
+      def can_visit?(object)
+        self.class.can_visit? object
       end
 
       # @param object The object to check
-      # @return [Boolean] Whether or not visitors of this class can accept the given object
-      def self.can_accept?(object)
-        @can_accept ||= Hash.new do |hash, klass|
+      # @return [Boolean] Whether or not visitors of this class can visit the given object
+      def self.can_visit?(object)
+        @can_visit ||= Hash.new do |hash, klass|
           hash[klass] = klass.ancestors.detect { |ancestor|
             private_method_defined? DISPATCH[ancestor]
           } ? true : false
         end
-        @can_accept[object.class]
+        @can_visit[object.class]
       end
 
       private
@@ -89,8 +89,7 @@ module Squeel
         end
       end
 
-      # Visit the object. This is not called directly, but instead via the public
-      # #accept method.
+      # Visit the object.
       #
       # @param object The object to visit
       # @param parent The object's parent within the context

data/lib/squeel/visitors/predicate_visitor.rb

@@ -40,7 +40,7 @@ module Squeel
       # @param parent The current parent object in the context
       # @return [Array] The visited array
       def visit_Array(o, parent)
-        o.map { |v| can_accept?(v) ? accept(v, parent) : v }.flatten
+        o.map { |v| can_visit?(v) ? visit(v, parent) : v }.flatten
       end
 
       # Visit ActiveRecord::Base objects. These should be converted to their
@@ -61,7 +61,7 @@ module Squeel
       def visit_Squeel_Nodes_KeyPath(o, parent)
         parent = traverse(o, parent)
 
-        accept(o.endpoint, parent)
+        visit(o.endpoint, parent)
       end
 
       # Visit a Stub by converting it to an ARel attribute
@@ -74,6 +74,15 @@ module Squeel
         contextualize(parent)[o.symbol]
       end
 
+      # Visit a Literal by converting it to an ARel SqlLiteral
+      #
+      # @param [Nodes::Literal] o The Literal to visit
+      # @param parent The parent object in the context (unused)
+      # @return [Arel::Nodes::SqlLiteral] An SqlLiteral
+      def visit_Squeel_Nodes_Literal(o, parent)
+        Arel.sql(o.expr)
+      end
+
       # Visit a Squeel predicate, converting it into an ARel predicate
       #
       # @param [Nodes::Predicate] o The predicate to visit
@@ -83,24 +92,25 @@ module Squeel
       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
+        if Nodes::KeyPath === value
+          value = can_visit?(value.endpoint) ? visit(value, parent) : contextualize(traverse(value, parent))[value.endpoint.to_sym]
+        else
+          value = visit(value, parent) if can_visit?(value)
         end
 
-        if Nodes::KeyPath === value
-          value = can_accept?(value.endpoint) ? accept(value, parent) : contextualize(traverse(value, parent))[value.endpoint.to_sym]
+        value = quote_for_node(o.expr, value)
+
+        attribute = case o.expr
+        when Nodes::Stub, Nodes::Function, Nodes::Literal
+          visit(o.expr, parent)
         else
-          value = accept(value, parent) if can_accept?(value)
+          contextualize(parent)[o.expr]
         end
 
-        case o.expr
-        when Nodes::Stub
-          accept(o.expr, parent).send(o.method_name, value)
-        when Nodes::Function
-          accept(o.expr, parent).send(o.method_name, quote(value))
+        if Array === value && [:in, :not_in].include?(o.method_name)
+          o.method_name == :in ? attribute_in_array(attribute, value) : attribute_not_in_array(attribute, value)
         else
-          contextualize(parent)[o.expr].send(o.method_name, value)
+          attribute.send(o.method_name, value)
         end
       end
 
@@ -113,12 +123,12 @@ module Squeel
       def visit_Squeel_Nodes_Function(o, parent)
         args = o.args.map do |arg|
           case arg
-          when Nodes::Function
-            accept(arg, parent)
+          when Nodes::Function, Nodes::As, Nodes::Literal
+            visit(arg, parent)
           when ActiveRecord::Relation
             arg.arel.ast
           when Nodes::KeyPath
-            can_accept?(arg.endpoint) ? accept(arg, parent) : contextualize(traverse(arg, parent))[arg.endpoint.to_sym]
+            can_visit?(arg.endpoint) ? visit(arg, parent) : contextualize(traverse(arg, parent))[arg.endpoint.to_sym]
           when Symbol, Nodes::Stub
             Arel.sql(arel_visitor.accept contextualize(parent)[arg.to_sym])
           else
@@ -149,10 +159,10 @@ module Squeel
       def visit_Squeel_Nodes_Operation(o, parent)
         args = o.args.map do |arg|
           case arg
-          when Nodes::Function
-            accept(arg, parent)
+          when Nodes::Function, Nodes::As, Nodes::Literal
+            visit(arg, parent)
           when Nodes::KeyPath
-            can_accept?(arg.endpoint) ? accept(arg, parent) : contextualize(traverse(arg, parent))[arg.endpoint.to_sym]
+            can_visit?(arg.endpoint) ? visit(arg, parent) : contextualize(traverse(arg, parent))[arg.endpoint.to_sym]
           when Symbol, Nodes::Stub
             Arel.sql(arel_visitor.accept contextualize(parent)[arg.to_sym])
           else
@@ -184,7 +194,7 @@ module Squeel
       #   And node as its expression. All children will be visited before
       #   being passed to the And.
       def visit_Squeel_Nodes_And(o, parent)
-        Arel::Nodes::Grouping.new(Arel::Nodes::And.new(accept(o.children, parent)))
+        Arel::Nodes::Grouping.new(Arel::Nodes::And.new(visit(o.children, parent)))
       end
 
       # Visit a Squeel Or node, returning an ARel Or node.
@@ -193,11 +203,11 @@ module Squeel
       # @param parent The parent object in the context
       # @return [Arel::Nodes::Or] An ARel Or node, with left and right sides visited
       def visit_Squeel_Nodes_Or(o, parent)
-        accept(o.left, parent).or(accept(o.right, parent))
+        visit(o.left, parent).or(visit(o.right, parent))
       end
 
       def visit_Squeel_Nodes_Not(o, parent)
-        accept(o.expr, parent).not
+        visit(o.expr, parent).not
       end
 
       # @return [Boolean] Whether the given value implies a context change
@@ -207,7 +217,7 @@ module Squeel
         when Hash, Nodes::Predicate, Nodes::Unary, Nodes::Binary, Nodes::Nary
           true
         when Nodes::KeyPath
-          can_accept?(v.endpoint) && !(Nodes::Stub === v.endpoint)
+          can_visit?(v.endpoint) && !(Nodes::Stub === v.endpoint)
         else
           false
         end
@@ -230,9 +240,9 @@ module Squeel
 
         case v
         when Hash, Nodes::KeyPath, Nodes::Predicate, Nodes::Unary, Nodes::Binary, Nodes::Nary
-          accept(v, parent || k)
+          visit(v, parent || k)
         when Array
-          v.map {|val| accept(val, parent || k)}
+          v.map {|val| visit(val, parent || k)}
         else
           raise ArgumentError, <<-END
           Hashes, Predicates, and arrays of visitables as values imply that their
@@ -254,17 +264,17 @@ module Squeel
         case v
         when Nodes::Stub, Symbol
           v = contextualize(parent)[v.to_sym]
-        when Nodes::KeyPath # If we could accept the endpoint, we wouldn't be here
+        when Nodes::KeyPath # If we could visit the endpoint, we wouldn't be here
           v = contextualize(traverse(v, parent))[v.endpoint.to_sym]
         end
 
         case k
         when Nodes::Predicate
-          accept(k % quote_for_node(k.expr, v), parent)
-        when Nodes::Function
-          arel_predicate_for(accept(k, parent), quote(v), parent)
+          visit(k % quote_for_node(k.expr, v), parent)
+        when Nodes::Function, Nodes::Literal
+          arel_predicate_for(visit(k, parent), quote(v), parent)
         when Nodes::KeyPath
-          accept(k % quote_for_node(k.endpoint, v), parent)
+          visit(k % quote_for_node(k.endpoint, v), parent)
         else
           attr_name = k.to_s
           attribute = if attr_name.include?('.')
@@ -285,19 +295,40 @@ module Squeel
       # @param value The value to be compared against
       # @return [Arel::Nodes::Node] An ARel predicate node
       def arel_predicate_for(attribute, value, parent)
-        value = can_accept?(value) ? accept(value, parent) : value
-        if [Array, Range, Arel::SelectManager].include?(value.class)
-          if Array === value && value.empty?
-            FALSE_SQL
-          else
-            attribute.in(value)
-          end
+        value = can_visit?(value) ? visit(value, parent) : value
+        case value
+        when Array
+          attribute_in_array(attribute, value)
+        when Range, Arel::SelectManager
+          attribute.in(value)
         else
           attribute.eq(value)
         end
       end
 
-      # Function nodes require us to do the quoting before the ARel
+      def attribute_in_array(attribute, array)
+        if array.empty?
+          FALSE_SQL
+        elsif array.include? nil
+          array = array.compact
+          array.empty? ? attribute.eq(nil) : attribute.in(array).or(attribute.eq nil)
+        else
+          attribute.in array
+        end
+      end
+
+      def attribute_not_in_array(attribute, array)
+        if array.empty?
+          TRUE_SQL
+        elsif array.include? nil
+          array = array.compact
+          array.empty? ? attribute.not_eq(nil) : attribute.not_in(array).and(attribute.not_eq nil)
+        else
+          attribute.not_in array
+        end
+      end
+
+      # Certain nodes require us to do the quoting before the ARel
       # visitor gets a chance to try, because we want to avoid having our
       # values quoted as a type of the last visited column. Otherwise, we
       # can end up with annoyances like having "joe" quoted to 0, if the
@@ -307,10 +338,10 @@ module Squeel
       # @param v The value to (possibly) quote
       def quote_for_node(node, v)
         case node
-        when Nodes::Function
+        when Nodes::Function, Nodes::Literal
           quote(v)
         when Nodes::Predicate
-          Nodes::Function === node.expr ? quote(v) : v
+          quote_for_node(node.expr, v)
         else
           v
         end

data/lib/squeel/visitors/symbol_visitor.rb

@@ -14,13 +14,13 @@ module Squeel
       private
 
       def visit_Array(o, parent)
-        o.map {|e| accept(e, parent)}.flatten
+        o.map {|e| visit(e, parent)}.flatten
       end
 
       def visit_Hash(o, parent)
         {}.tap do |hash|
           o.each do |key, value|
-            hash[accept(key, parent)] = accept(value, parent)
+            hash[visit(key, parent)] = visit(value, parent)
           end
         end
       end

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

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module Squeel
   module Adapters
     module ActiveRecord

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

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module Squeel
   module Adapters
     module ActiveRecord

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

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module Squeel
   module Adapters
     module ActiveRecord
@@ -335,9 +337,9 @@ module Squeel
           end
 
           it 'falls back to Array#select behavior with a block that has an arity' do
-            people = Person.select{|p| p.name =~ /John/}
+            people = Person.select{|p| p.id == 1}
             people.should have(1).person
-            people.first.name.should eq 'Miss Cameron Johnson'
+            people.first.id.should eq 1
           end
 
           it 'behaves as normal with standard parameters' do
@@ -363,7 +365,7 @@ module Squeel
 
           it 'allows custom operators in the select values via block' do
             relation = Person.select{name.op('||', '-diddly').as(flanderized_name)}
-            relation.first.flanderized_name.should eq 'Aric Smith-diddly'
+            relation.first.flanderized_name.should eq Person.first.name + '-diddly'
           end
 
           it 'allows a subquery in the select values' do
@@ -429,8 +431,9 @@ module Squeel
           end
 
           it 'allows a subquery on the value side of a predicate' do
-            old_and_busted = Person.where(:name => ['Aric Smith', 'Gladyce Kulas'])
-            new_hotness = Person.where{name.in(Person.select{name}.where{name.in(['Aric Smith', 'Gladyce Kulas'])})}
+            names = [Person.first.name, Person.last.name]
+            old_and_busted = Person.where(:name => names)
+            new_hotness = Person.where{name.in(Person.select{name}.where{name.in(names)})}
             new_hotness.should have(2).items
             old_and_busted.to_a.should eq new_hotness.to_a
           end
@@ -489,7 +492,7 @@ module Squeel
 
           it 'allows complex conditions on aggregate columns' do
             relation = Person.group(:parent_id).having{salary == max(salary)}
-            relation.first.name.should eq 'Gladyce Kulas'
+            relation.first.name.should eq Person.last.name
           end
 
           it 'allows a condition on a function via block' do
@@ -613,7 +616,7 @@ module Squeel
           end
 
           it 'merges relations with a different base' do
-            relation = Person.where{name == 'bob'}.joins(:articles).merge(Article.where{title == 'Hello world!'})
+            relation = Person.where{name == 'bob'}.joins(:articles).merge(Article.where{title == 'Hello world!'}, :articles)
             sql = relation.to_sql
             sql.should match /INNER JOIN "articles" ON "articles"."person_id" = "people"."id"/
             sql.should match /"people"."name" = 'bob'/
@@ -635,7 +638,7 @@ module Squeel
               where{{comments => {body => 'First post!'}}}
             relation.size.should be 1
             person = relation.first
-            person.name.should eq 'Gladyce Kulas'
+            person.should eq Person.last
             person.comments.loaded?.should be true
           end
 

data/spec/squeel/dsl_spec.rb

@@ -88,5 +88,13 @@ module Squeel
       end
     end
 
+    describe '`string`' do
+      it 'creates a Literal' do
+        result = dsl{`blah`}
+        result.should be_a Nodes::Literal
+        result.should eq 'blah'
+      end
+    end
+
   end
 end

data/spec/squeel/nodes/function_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module Squeel
   module Nodes
     describe Function do

data/spec/squeel/nodes/key_path_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module Squeel
   module Nodes
     describe KeyPath do

data/spec/squeel/nodes/literal_spec.rb

@@ -0,0 +1,155 @@
+require 'spec_helper'
+
+module Squeel
+  module Nodes
+    describe Literal do
+      before do
+        @l = Literal.new 'string'
+      end
+
+      it 'hashes like its expr' do
+        @l.hash.should eq 'string'.hash
+      end
+
+      it 'returns nil when sent to_sym' do
+        @l.to_sym.should be_nil
+      end
+
+      it 'returns a string matching its expr when sent to_s' do
+        @l.to_s.should eq 'string'
+      end
+
+      Squeel::Constants::PREDICATES.each do |method_name|
+        it "creates #{method_name} predicates with no value" do
+          predicate = @l.send(method_name)
+          predicate.expr.should eq @l
+          predicate.method_name.should eq method_name
+          predicate.value?.should be_false
+        end
+
+        it "creates #{method_name} predicates with a value" do
+          predicate = @l.send(method_name, 'value')
+          predicate.expr.should eq @l
+          predicate.method_name.should eq method_name
+          predicate.value.should eq 'value'
+        end
+      end
+
+      Squeel::Constants::PREDICATE_ALIASES.each do |method_name, aliases|
+        aliases.each do |aliaz|
+          ['', '_any', '_all'].each do |suffix|
+            it "creates #{method_name.to_s + suffix} predicates with no value using the alias #{aliaz.to_s + suffix}" do
+              predicate = @l.send(aliaz.to_s + suffix)
+              predicate.expr.should eq @l
+              predicate.method_name.should eq "#{method_name}#{suffix}".to_sym
+              predicate.value?.should be_false
+            end
+
+            it "creates #{method_name.to_s + suffix} predicates with a value using the alias #{aliaz.to_s + suffix}" do
+              predicate = @l.send((aliaz.to_s + suffix), 'value')
+              predicate.expr.should eq @l
+              predicate.method_name.should eq "#{method_name}#{suffix}".to_sym
+              predicate.value.should eq 'value'
+            end
+          end
+        end
+      end
+
+      it 'creates eq predicates with ==' do
+        predicate = @l == 1
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :eq
+        predicate.value.should eq 1
+      end
+
+      it 'creates not_eq predicates with ^' do
+        predicate = @l ^ 1
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :not_eq
+        predicate.value.should eq 1
+      end
+
+      it 'creates not_eq predicates with !=' do
+        predicate = @l != 1
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :not_eq
+        predicate.value.should eq 1
+      end if respond_to?('!=')
+
+      it 'creates in predicates with >>' do
+        predicate = @l >> [1,2,3]
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :in
+        predicate.value.should eq [1,2,3]
+      end
+
+      it 'creates not_in predicates with <<' do
+        predicate = @l << [1,2,3]
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :not_in
+        predicate.value.should eq [1,2,3]
+      end
+
+      it 'creates matches predicates with =~' do
+        predicate = @l =~ '%bob%'
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :matches
+        predicate.value.should eq '%bob%'
+      end
+
+      it 'creates does_not_match predicates with !~' do
+        predicate = @l !~ '%bob%'
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :does_not_match
+        predicate.value.should eq '%bob%'
+      end if respond_to?('!~')
+
+      it 'creates gt predicates with >' do
+        predicate = @l > 1
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :gt
+        predicate.value.should eq 1
+      end
+
+      it 'creates gteq predicates with >=' do
+        predicate = @l >= 1
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :gteq
+        predicate.value.should eq 1
+      end
+
+      it 'creates lt predicates with <' do
+        predicate = @l < 1
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :lt
+        predicate.value.should eq 1
+      end
+
+      it 'creates lteq predicates with <=' do
+        predicate = @l <= 1
+        predicate.expr.should eq @l
+        predicate.method_name.should eq :lteq
+        predicate.value.should eq 1
+      end
+
+      it 'creates ascending orders' do
+        order = @l.asc
+        order.should be_ascending
+      end
+
+      it 'creates descending orders' do
+        order = @l.desc
+        order.should be_descending
+      end
+
+      it 'creates as nodes with #as' do
+        as = @l.as('other_name')
+        as.should be_a Squeel::Nodes::As
+        as.left.should eq @l
+        as.right.should be_a Arel::Nodes::SqlLiteral
+        as.right.should eq 'other_name'
+      end
+
+    end
+  end
+end

data/spec/squeel/nodes/operation_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module Squeel
   module Nodes
     describe Operation do

data/spec/squeel/visitors/attribute_visitor_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module Squeel
   module Visitors
     describe AttributeVisitor do

data/spec/squeel/visitors/predicate_visitor_spec.rb

@@ -55,6 +55,36 @@ module Squeel
         predicate.should eq '1=1'
       end
 
+      it 'generates IS NULL for hash keys with a value of [nil]' do
+        predicate = @v.accept(:id => [nil])
+        predicate.to_sql.should be_like '"people"."id" IS NULL'
+      end
+
+      it 'generates IS NULL for in predicates with a value of [nil]' do
+        predicate = @v.accept(:id.in => [nil])
+        predicate.to_sql.should be_like '"people"."id" IS NULL'
+      end
+
+      it 'generates IS NOT NULL for not_in predicates with a value of [nil]' do
+        predicate = @v.accept(:id.not_in => [nil])
+        predicate.to_sql.should be_like '"people"."id" IS NOT NULL'
+      end
+
+      it 'generates IN OR IS NULL for hash keys with a value of [1, 2, 3, nil]' do
+        predicate = @v.accept(:id => [1, 2, 3, nil])
+        predicate.to_sql.should be_like '("people"."id" IN (1, 2, 3) OR "people"."id" IS NULL)'
+      end
+
+      it 'generates IN OR IS NULL for in predicates with a value of [1, 2, 3, nil]' do
+        predicate = @v.accept(:id.in => [1, 2, 3, nil])
+        predicate.to_sql.should be_like '("people"."id" IN (1, 2, 3) OR "people"."id" IS NULL)'
+      end
+
+      it 'generates IN AND IS NOT NULL for not_in predicates with a value of [1, 2, 3, nil]' do
+        predicate = @v.accept(:id.not_in => [1, 2, 3, nil])
+        predicate.to_sql.should be_like '"people"."id" NOT IN (1, 2, 3) AND "people"."id" IS NOT NULL'
+      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

data/squeel.gemspec

@@ -29,7 +29,7 @@ you're feeling especially appreciative. It'd help me justify this
 
   s.add_dependency 'activerecord', '~> 3.0'
   s.add_dependency 'activesupport', '~> 3.0'
-  s.add_development_dependency 'rspec', '~> 2.5.0'
+  s.add_development_dependency 'rspec', '~> 2.6.0'
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'
   s.add_development_dependency 'sqlite3', '~> 1.3.3'

metadata

@@ -1,93 +1,129 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: squeel
-version: !ruby/object:Gem::Version
-  version: 0.8.4
+version: !ruby/object:Gem::Version 
+  hash: 53
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 5
+  version: 0.8.5
 platform: ruby
-authors:
+authors: 
 - Ernie Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-20 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-07-02 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &2156148420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &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
-  prerelease: false
-  version_requirements: *2156148420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2156147780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &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
-  prerelease: false
-  version_requirements: *2156147780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2156147200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
   type: :development
-  prerelease: false
-  version_requirements: *2156147200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: machinist
-  requirement: &2156146440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !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
-  prerelease: false
-  version_requirements: *2156146440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: faker
-  requirement: &2156145780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !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
-  prerelease: false
-  version_requirements: *2156145780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &2156145020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !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
-  prerelease: false
-  version_requirements: *2156145020
-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:
+  version_requirements: *id006
+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@metautonomo.us
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .travis.yml
 - .yardopts
 - Gemfile
 - LICENSE
@@ -120,6 +156,7 @@ files:
 - lib/squeel/nodes/function.rb
 - lib/squeel/nodes/join.rb
 - lib/squeel/nodes/key_path.rb
+- lib/squeel/nodes/literal.rb
 - lib/squeel/nodes/nary.rb
 - lib/squeel/nodes/not.rb
 - lib/squeel/nodes/operation.rb
@@ -155,6 +192,7 @@ files:
 - spec/squeel/nodes/function_spec.rb
 - spec/squeel/nodes/join_spec.rb
 - spec/squeel/nodes/key_path_spec.rb
+- spec/squeel/nodes/literal_spec.rb
 - spec/squeel/nodes/operation_spec.rb
 - spec/squeel/nodes/operators_spec.rb
 - spec/squeel/nodes/order_spec.rb
@@ -166,44 +204,48 @@ files:
 - spec/squeel/visitors/symbol_visitor_spec.rb
 - spec/support/schema.rb
 - squeel.gemspec
+has_rdoc: true
 homepage: http://metautonomo.us/projects/squeel
 licenses: []
-post_install_message: ! '
 
+post_install_message: |+
+  
   *** Thanks for installing Squeel! ***
-
   Be sure to check out http://metautonomo.us/projects/squeel/ for a
-
-  walkthrough of Squeel''s features, and click the donate link if
-
-  you''re feeling especially appreciative. It''d help me justify this
-
+  walkthrough of Squeel's features, and click the donate link if
+  you're feeling especially appreciative. It'd help me justify this
   "open source" stuff to my lovely wife. :)
-
-
-'
+  
 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'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: squeel
-rubygems_version: 1.8.5
+rubygems_version: 1.5.2
 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
@@ -222,6 +264,7 @@ test_files:
 - spec/squeel/nodes/function_spec.rb
 - spec/squeel/nodes/join_spec.rb
 - spec/squeel/nodes/key_path_spec.rb
+- spec/squeel/nodes/literal_spec.rb
 - spec/squeel/nodes/operation_spec.rb
 - spec/squeel/nodes/operators_spec.rb
 - spec/squeel/nodes/order_spec.rb