squeel 1.0.1 → 1.0.2

data/lib/squeel/nodes/literal.rb

@@ -1,7 +1,3 @@
-require 'squeel/predicate_methods'
-require 'squeel/nodes/operators'
-require 'squeel/nodes/aliasing'
-
 module Squeel
   module Nodes
     # Literal nodes are a container for raw SQL.
@@ -10,6 +6,7 @@ module Squeel
       include PredicateOperators
       include Operators
       include Aliasing
+      include Ordering
 
       attr_reader :expr
 
@@ -29,18 +26,6 @@ module Squeel
       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.eql?(other.class) &&
@@ -68,4 +53,4 @@ module Squeel
 
     end
   end
-end
+end

data/lib/squeel/nodes/nary.rb

@@ -43,8 +43,7 @@ module Squeel
         self.class.eql?(other.class) &&
         self.children.eql?(other.children)
       end
-      alias :== :eql?
 
     end
   end
-end
+end

data/lib/squeel/nodes/ordering.rb

@@ -0,0 +1,21 @@
+require 'squeel/nodes/order'
+
+module Squeel
+  module Nodes
+    module Ordering
+
+      # Create an ascending Order node with this Node as its expression
+      # @return [Order] The new Order node
+      def asc
+        Order.new self, 1
+      end
+
+      # Create a descending Order node with this Node as its expression
+      # @return [Order] The new Order node
+      def desc
+        Order.new self, -1
+      end
+
+    end
+  end
+end

data/lib/squeel/nodes/predicate.rb

@@ -1,6 +1,3 @@
-require 'squeel/predicate_methods'
-require 'squeel/nodes/predicate_operators'
-
 module Squeel
   module Nodes
     # This node is essentially a container that will result in ARel predicate nodes
@@ -68,4 +65,4 @@ module Squeel
 
     end
   end
-end
+end

data/lib/squeel/nodes/predicate_methods.rb

@@ -0,0 +1,16 @@
+module Squeel
+  module Nodes
+    # Defines Predicate factories named for each of the ARel predication methods
+    module PredicateMethods
+
+      Constants::PREDICATES.each do |method_name|
+        class_eval <<-RUBY
+          def #{method_name}(value = :__undefined__)
+            Nodes::Predicate.new self, :#{method_name}, value
+          end
+        RUBY
+      end
+
+    end
+  end
+end

data/lib/squeel/nodes/stub.rb

@@ -1,7 +1,3 @@
-require 'squeel/predicate_methods'
-require 'squeel/nodes/operators'
-require 'squeel/nodes/aliasing'
-
 module Squeel
   module Nodes
     # Stub nodes are basically a container for a Symbol that can have handy predicate
@@ -11,6 +7,7 @@ module Squeel
       include PredicateMethods
       include Operators
       include Aliasing
+      include Ordering
 
       alias :== :eq
       alias :'^' :not_eq
@@ -62,6 +59,11 @@ module Squeel
       end
       alias :to_str :to_s
 
+      # @return [Array] An array with a copy of this Stub as the only element.
+      def to_a
+        [dup]
+      end
+
       # Create a KeyPath when any undefined method is called on a Stub.
       # @overload node_name
       #   Creates a new KeyPath with this Stub as the base and the method_name as the endpoint
@@ -73,11 +75,11 @@ module Squeel
       def method_missing(method_id, *args)
         super if method_id == :to_ary
         if args.empty?
-          KeyPath.new(self, method_id)
+          KeyPath.new([self, method_id])
         elsif (args.size == 1) && (Class === args[0])
-          KeyPath.new(self, Join.new(method_id, Arel::InnerJoin, args[0]))
+          KeyPath.new([self, Join.new(method_id, Arel::InnerJoin, args[0])])
         else
-          KeyPath.new(self, Nodes::Function.new(method_id, args))
+          KeyPath.new([self, Nodes::Function.new(method_id, args)])
         end
       end
 
@@ -86,19 +88,7 @@ module Squeel
       # DSL is likely to think of them as such.
       # @return [KeyPath] An absolute KeyPath, containing only this Stub
       def ~
-        KeyPath.new [], self, true
-      end
-
-      # Create an ascending Order node with this Stub's symbol as its expression
-      # @return [Order] The new Order node
-      def asc
-        Order.new self.symbol, 1
-      end
-
-      # Create a descending Order node with this Stub's symbol as its expression
-      # @return [Order] The new Order node
-      def desc
-        Order.new self.symbol, -1
+        KeyPath.new [self], true
       end
 
       # Create a Function node for a function named the same as this Stub and with the given arguments
@@ -116,7 +106,7 @@ module Squeel
       # Create a keypath with a sifter as its endpoint
       # @return [KeyPath] The new KeyPath
       def sift(name, *args)
-        KeyPath.new(self, Sifter.new(name, args))
+        KeyPath.new([self, Sifter.new(name, args)])
       end
 
       # Create an outer Join node for the association named by this Stub

data/lib/squeel/nodes/unary.rb

@@ -1,5 +1,3 @@
-require 'squeel/nodes/predicate_operators'
-
 module Squeel
   module Nodes
     # A node that contains a single expression.
@@ -21,8 +19,7 @@ module Squeel
         self.class.eql?(other.class) &&
         self.expr.eql?(other.expr)
       end
-      alias :== :eql?
 
     end
   end
-end
+end

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/squeel/visitors/attribute_visitor.rb

@@ -24,16 +24,6 @@ module Squeel
         end.flatten
       end
 
-      # Visit elements of an array that it's possible to visit -- leave other
-      # elements untouched.
-      #
-      # @param [Array] o The array to visit
-      # @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_visit?(v) ? visit(v, parent) : v }.flatten
-      end
-
       # Visit a symbol. This will return an attribute named after the symbol against
       # the current parent's contextualized table.
       #
@@ -101,7 +91,7 @@ module Squeel
       def visit_Squeel_Nodes_Function(o, parent)
         args = o.args.map do |arg|
           case arg
-          when Nodes::Function, Nodes::KeyPath, Nodes::As, Nodes::Literal
+          when Nodes::Function, Nodes::KeyPath, Nodes::As, Nodes::Literal, Nodes::Grouping
             visit(arg, parent)
           when Symbol, Nodes::Stub
             Arel.sql(arel_visitor.accept contextualize(parent)[arg.to_sym])
@@ -123,7 +113,7 @@ module Squeel
       def visit_Squeel_Nodes_Operation(o, parent)
         args = o.args.map do |arg|
           case arg
-          when Nodes::Function, Nodes::KeyPath, Nodes::As, Nodes::Literal
+          when Nodes::Function, Nodes::KeyPath, Nodes::As, Nodes::Literal, Nodes::Grouping
             visit(arg, parent)
           when Symbol, Nodes::Stub
             Arel.sql(arel_visitor.accept contextualize(parent)[arg.to_sym])
@@ -147,6 +137,15 @@ module Squeel
         o.alias ? op.as(o.alias) : op
       end
 
+      # Visit a Squeel Grouping node, resulting in am ARel Grouping node.
+      #
+      # @param [Nodes::Grouping] The Grouping node to visit
+      # @param parent The parent object in the context
+      # @return [Arel::Nodes::Grouping] The resulting grouping node.
+      def visit_Squeel_Nodes_Grouping(o, parent)
+        Arel::Nodes::Grouping.new(visit(o.expr, parent))
+      end
+
       # Visit a Squeel As node, resulting in am ARel As node.
       #
       # @param [Nodes::As] The As node to visit
@@ -208,4 +207,4 @@ module Squeel
 
     end
   end
-end
+end

data/lib/squeel/visitors/predicate_visitor.rb

@@ -33,16 +33,6 @@ module Squeel
         end
       end
 
-      # Visit an array, which involves accepting any values we know how to
-      # accept, and skipping the rest.
-      #
-      # @param [Array] o The Array to visit
-      # @param parent The current parent object in the context
-      # @return [Array] The visited array
-      def visit_Array(o, parent)
-        o.map { |v| can_visit?(v) ? visit(v, parent) : v }.flatten
-      end
-
       # Visit ActiveRecord::Base objects. These should be converted to their
       # id before being used in a comparison.
       #
@@ -64,6 +54,16 @@ module Squeel
         visit(o.endpoint, parent)
       end
 
+      # Visit a symbol. This will return an attribute named after the symbol against
+      # the current parent's contextualized table.
+      #
+      # @param [Symbol] o The symbol to visit
+      # @param parent The symbol's parent within the context
+      # @return [Arel::Attribute] An attribute on the contextualized parent table
+      def visit_Symbol(o, parent)
+        contextualize(parent)[o]
+      end
+
       # Visit a Stub by converting it to an ARel attribute
       #
       # @param [Nodes::Stub] o The Stub to visit
@@ -118,7 +118,7 @@ module Squeel
         value = quote_for_node(o.expr, value)
 
         attribute = case o.expr
-        when Nodes::Stub, Nodes::Function, Nodes::Literal
+        when Nodes::Stub, Nodes::Function, Nodes::Literal, Nodes::Grouping
           visit(o.expr, parent)
         else
           contextualize(parent)[o.expr]
@@ -140,7 +140,7 @@ module Squeel
       def visit_Squeel_Nodes_Function(o, parent)
         args = o.args.map do |arg|
           case arg
-          when Nodes::Function, Nodes::As, Nodes::Literal
+          when Nodes::Function, Nodes::As, Nodes::Literal, Nodes::Grouping
             visit(arg, parent)
           when ActiveRecord::Relation
             arg.arel.ast
@@ -176,7 +176,7 @@ module Squeel
       def visit_Squeel_Nodes_Operation(o, parent)
         args = o.args.map do |arg|
           case arg
-          when Nodes::Function, Nodes::As, Nodes::Literal
+          when Nodes::Function, Nodes::As, Nodes::Literal, Nodes::Grouping
             visit(arg, parent)
           when Nodes::KeyPath
             can_visit?(arg.endpoint) ? visit(arg, parent) : contextualize(traverse(arg, parent))[arg.endpoint.to_sym]
@@ -223,8 +223,31 @@ module Squeel
         Arel::Nodes::Grouping.new(Arel::Nodes::Or.new(visit(o.left, parent), (visit(o.right, parent))))
       end
 
+      # Visit a Squeel Not node, returning an ARel Not node.
+      #
+      # @param [Nodes::Not] o The Not node to visit
+      # @param parent The parent object in the context
+      # @return [Arel::Nodes::Not] An ARel Not node, with expression visited
       def visit_Squeel_Nodes_Not(o, parent)
-        visit(o.expr, parent).not
+        Arel::Nodes::Not.new(visit(o.expr, parent))
+      end
+
+      # Visit a Squeel Grouping node, returning an ARel Grouping node.
+      #
+      # @param [Nodes::Grouping] o The Grouping node to visit
+      # @param parent The parent object in the context
+      # @return [Arel::Nodes::Grouping] An ARel Grouping node, with expression visited
+      def visit_Squeel_Nodes_Grouping(o, parent)
+        Arel::Nodes::Grouping.new(visit(o.expr, parent))
+      end
+
+      # Visit a Squeel As node, resulting in am ARel As node.
+      #
+      # @param [Nodes::As] The As node to visit
+      # @param parent The parent object in the context
+      # @return [Arel::Nodes::As] The resulting as node.
+      def visit_Squeel_Nodes_As(o, parent)
+        visit(o.left, parent).as(o.right)
       end
 
       # @return [Boolean] Whether the given value implies a context change
@@ -371,4 +394,4 @@ module Squeel
 
     end
   end
-end
+end

data/lib/squeel/visitors/symbol_visitor.rb

@@ -13,10 +13,6 @@ module Squeel
 
       private
 
-      def visit_Array(o, parent)
-        o.map {|e| visit(e, parent)}.flatten
-      end
-
       def visit_Hash(o, parent)
         {}.tap do |hash|
           o.each do |key, value|
@@ -34,7 +30,7 @@ module Squeel
       end
 
       def visit_Squeel_Nodes_KeyPath(o, parent)
-        o.path_with_endpoint.reverse.map(&:to_sym).inject do |hash, key|
+        o.path.reverse.map(&:to_sym).inject do |hash, key|
           {key => hash}
         end
       end
@@ -45,4 +41,4 @@ module Squeel
 
     end
   end
-end
+end

data/lib/squeel/visitors/visitor.rb

@@ -106,6 +106,29 @@ module Squeel
         retry
       end
 
+      # Visit an array, which involves accepting any values we know how to
+      # accept, and skipping the rest.
+      #
+      # @param [Array] o The Array to visit
+      # @param parent The current parent object in the context
+      # @return [Array] The visited array
+      def visit_Array(o, parent)
+        o.map { |v| can_visit?(v) ? visit(v, parent) : v }.flatten
+      end
+
+      # Pass an object through the visitor unmodified. This is
+      # in order to allow objects that don't require modification
+      # to be handled by ARel directly.
+      #
+      # @param object The object to visit
+      # @param parent The object's parent within the context
+      # @return The object, unmodified
+      def visit_passthrough(object, parent)
+        object
+      end
+      alias :visit_Fixnum :visit_passthrough
+      alias :visit_Bignum :visit_passthrough
+
     end
   end
-end
+end

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

@@ -97,7 +97,7 @@ module Squeel
             relation.join_dependency.join_associations.should have(6).items
             arel.to_sql.should match /INNER JOIN "people" "parents_people_3" ON "parents_people_3"."id" = "children_people_3"."parent_id"/
           end
-          
+
           it 'respects :uniq option on associations' do
             Article.first.uniq_commenters.length.should eq Article.first.uniq_commenters.count
           end
@@ -468,6 +468,11 @@ module Squeel
             old_and_busted.to_a.should eq new_hotness.to_a
           end
 
+          it "doesn't break #count if wheres contain InfixOperations" do
+            first_name = Person.first.name
+            Person.where{name.op('=', first_name)}.count.should eq 1
+          end
+
         end
 
         describe '#joins' do

data/spec/squeel/dsl_spec.rb

@@ -110,5 +110,13 @@ module Squeel
       end
     end
 
+    describe '#_' do
+      it 'creates a Grouping' do
+        result = dsl{_(id + 1)}
+        result.should be_a Nodes::Grouping
+        result.expr.should eq Nodes::Operation.new(:+, Nodes::Stub.new(:id), 1)
+      end
+    end
+
   end
-end
+end