squeel 0.7.4 → 0.7.5

data/README.md

@@ -46,7 +46,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 and 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{|dsl| dsl.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/core_ext/symbol.rb

@@ -1,4 +1,5 @@
 require 'squeel/predicate_methods'
+require 'squeel/nodes/aliasing'
 
 # These extensions to Symbol are loaded optionally, mostly to provide
 # a small amount of backwards compatibility with MetaWhere.
@@ -9,6 +10,7 @@ require 'squeel/predicate_methods'
 #   end
 class Symbol
   include Squeel::PredicateMethods
+  include Squeel::Nodes::Aliasing
 
   def asc
     Squeel::Nodes::Order.new self, 1

data/lib/squeel/nodes/aliasing.rb

@@ -0,0 +1,13 @@
+require 'squeel/nodes/as'
+
+module Squeel
+  module Nodes
+    module Aliasing
+
+      def as(name)
+        As.new(self, name.to_s)
+      end
+
+    end
+  end
+end

data/lib/squeel/nodes/as.rb

@@ -0,0 +1,14 @@
+require 'squeel/nodes/binary'
+
+module Squeel
+  module Nodes
+    # A node representing an SQL alias, which will result in same when visited.
+    class As < Binary
+      # @param left The node to be aliased
+      # @param right The alias name
+      def initialize(left, right)
+        @left, @right = left, right
+      end
+    end
+  end
+end

data/lib/squeel/nodes/stub.rb

@@ -1,5 +1,6 @@
 require 'squeel/predicate_methods'
 require 'squeel/nodes/operators'
+require 'squeel/nodes/aliasing'
 
 module Squeel
   module Nodes
@@ -7,9 +8,9 @@ module Squeel
     # methods and operators defined on it since doing so on Symbol will incur the
     # nerdrage of many.
     class Stub
-
       include PredicateMethods
       include Operators
+      include Aliasing
 
       alias :== :eq
       alias :'^' :not_eq

data/lib/squeel/nodes.rb

@@ -12,5 +12,6 @@ require 'squeel/nodes/operation'
 require 'squeel/nodes/order'
 require 'squeel/nodes/and'
 require 'squeel/nodes/or'
+require 'squeel/nodes/as'
 require 'squeel/nodes/not'
 require 'squeel/nodes/join'

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/lib/squeel/visitors/attribute_visitor.rb

@@ -136,6 +136,15 @@ module Squeel
         o.alias ? op.as(o.alias) : op
       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)
+        accept(o.left, parent).as(o.right)
+      end
+
       # @return [Boolean] Whether the given value implies a context change
       # @param v The value to consider
       def implies_context_change?(v)

data/lib/squeel/visitors/predicate_visitor.rb

@@ -165,7 +165,7 @@ module Squeel
       # Visit a Squeel And node, returning an ARel Grouping containing an
       # ARel And node.
       #
-      # @param [Nodes::And] The And node to visit
+      # @param [Nodes::And] o The And node to visit
       # @param parent The parent object in the context
       # @return [Arel::Nodes::Grouping] A grouping node, containnig an ARel
       #   And node as its expression. All children will be visited before
@@ -176,9 +176,9 @@ module Squeel
 
       # Visit a Squeel Or node, returning an ARel Or node.
       #
-      # @param [Nodes::Or] The Or node to visit
+      # @param [Nodes::Or] o The Or node to visit
       # @param parent The parent object in the context
-      # @return [Arel::Nodes::Or] An ARel Or node, with left and ride sides visited
+      # @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))
       end

data/spec/core_ext/symbol_spec.rb

@@ -65,4 +65,11 @@ describe Symbol do
     join._type.should eq Arel::OuterJoin
   end
 
+  it 'creates as nodes' do
+    as = :column.as('other_name')
+    as.should be_a Squeel::Nodes::As
+    as.left.should eq :column
+    as.right.should eq 'other_name'
+  end
+
 end

data/spec/squeel/nodes/key_path_spec.rb

@@ -45,6 +45,14 @@ module Squeel
         @k.endpoint.args.should eq [1,2,3]
       end
 
+      it 'creates as nodes with #as' do
+        @k.as('other_name')
+        as = @k.endpoint
+        as.should be_a Squeel::Nodes::As
+        as.left.should eq Stub.new(:fourth)
+        as.right.should eq 'other_name'
+      end
+
       it 'creates AND nodes with & if the endpoint responds to &' do
         node = @k.third.fourth.eq('Bob') & Stub.new(:attr).eq('Joe')
         node.should be_a And

data/spec/squeel/nodes/stub_spec.rb

@@ -186,6 +186,13 @@ module Squeel
         function.should be_a Function
       end
 
+      it 'creates as nodes with #as' do
+        as = @s.as('other_name')
+        as.should be_a Squeel::Nodes::As
+        as.left.should eq @s
+        as.right.should eq 'other_name'
+      end
+
     end
   end
 end

data/spec/squeel/visitors/attribute_visitor_spec.rb

@@ -92,6 +92,21 @@ module Squeel
         function.to_sql.should match /newname/
       end
 
+      it 'accepts As nodes containing symbols' do
+        as = @v.accept(:name.as('other_name'))
+        as.to_sql.should match /"people"."name" AS other_name/
+      end
+
+      it 'accepts As nodes containing stubs' do
+        as = @v.accept(dsl{name.as(other_name)})
+        as.to_sql.should match /"people"."name" AS other_name/
+      end
+
+      it 'accepts As nodes containing keypaths' do
+        as = @v.accept(dsl{children.name.as(other_name)})
+        as.to_sql.should match /"children_people"."name" AS other_name/
+      end
+
       it 'creates an ARel Addition node for an Operation node with + as operator' do
         operation = @v.accept(dsl{id + 1})
         operation.should be_a Arel::Nodes::Addition

metadata

@@ -2,7 +2,7 @@
 name: squeel
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Ernie Miller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 Z
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -114,7 +114,9 @@ files:
 - lib/squeel/context.rb
 - lib/squeel/dsl.rb
 - lib/squeel/nodes.rb
+- lib/squeel/nodes/aliasing.rb
 - lib/squeel/nodes/and.rb
+- lib/squeel/nodes/as.rb
 - lib/squeel/nodes/binary.rb
 - lib/squeel/nodes/function.rb
 - lib/squeel/nodes/join.rb