squeel 1.0.9 → 1.0.11

data/spec/squeel/nodes/as_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+module Squeel
+  module Nodes
+    describe As do
+
+      subject { As.new 'name', 'alias'}
+
+      it { should respond_to :& }
+      it { should respond_to :| }
+      it { should respond_to :-@ }
+
+      specify { (subject & subject).should be_a And }
+      specify { (subject | subject).should be_a Or }
+      specify { (-subject).should be_a Not }
+      specify { [subject, As.new('name', 'alias')].uniq.should have(1).as }
+
+    end
+  end
+end

data/spec/squeel/nodes/function_spec.rb

@@ -153,6 +153,12 @@ module Squeel
         negated.expr.should eq @f
       end
 
+      it 'implements equivalence check' do
+        other = Function.new(:function, [1, 2, 3])
+        array = [@f, other]
+        array.uniq.should have(1).function
+      end
+
     end
   end
 end

data/spec/squeel/nodes/grouping_spec.rb

@@ -153,6 +153,12 @@ module Squeel
         negated.expr.should eq @g
       end
 
+      it 'implements equivalence check' do
+        other = Grouping.new('foo')
+        array = [@g, other]
+        array.uniq.should have(1).grouping
+      end
+
       describe '#as' do
 
         it 'aliases the function' do

data/spec/squeel/nodes/key_path_spec.rb

@@ -20,7 +20,7 @@ module Squeel
 
       it 'stops appending once its endpoint is not a Stub' do
         @k.third.fourth.fifth == 'cinco'
-        @k.endpoint.should eq Predicate.new(Stub.new(:fifth), :eq, 'cinco')
+        @k.endpoint.should eql Predicate.new(Stub.new(:fifth), :eq, 'cinco')
         expect { @k.another }.to raise_error NoMethodError
       end
 
@@ -67,7 +67,7 @@ module Squeel
       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
-        node.children.should eq [@k, Stub.new(:attr).eq('Joe')]
+        node.children.should eql [@k, Stub.new(:attr).eq('Joe')]
       end
 
       it 'raises NoMethodError with & if the endpoint does not respond to &' do
@@ -78,7 +78,7 @@ module Squeel
         node = @k.third.fourth.eq('Bob') | Stub.new(:attr).eq('Joe')
         node.should be_a Or
         node.left.should eq @k
-        node.right.should eq Stub.new(:attr).eq('Joe')
+        node.right.should eql Stub.new(:attr).eq('Joe')
       end
 
       it 'raises NoMethodError with | if the endpoint does not respond to |' do

data/spec/squeel/nodes/operation_spec.rb

@@ -153,6 +153,12 @@ module Squeel
         negated.expr.should eq @o
       end
 
+      it 'implements equivalence check' do
+        other = dsl{name + 1}
+        array = [@o, other]
+        array.uniq.should have(1).operation
+      end
+
     end
   end
 end

data/spec/squeel/nodes/order_spec.rb

@@ -25,6 +25,11 @@ module Squeel
         @o.should be_descending
       end
 
+      it 'implements equivalence check' do
+        array = [Order.new(:attribute, 1), Order.new(:attribute, 1)]
+        array.uniq.should have(1).order
+      end
+
     end
   end
-end
+end

data/spec/squeel/nodes/predicate_operators_spec.rb

@@ -85,4 +85,4 @@ module Squeel
 
     end
   end
-end
+end

data/spec/squeel/nodes/predicate_spec.rb

@@ -45,6 +45,19 @@ module Squeel
         combined.children.should eq [left, right]
       end
 
+      it 'implements equivalence check' do
+        p1 = dsl{name.eq 'blargh'}
+        p2 = dsl{name.eq 'blargh'}
+        [p1, p2].uniq.should have(1).predicate
+      end
+
+      it 'can be aliased' do
+        aliased = dsl{(name == 'joe').as('zomg_its_joe')}
+        aliased.should be_a Squeel::Nodes::As
+        aliased.left.should eql dsl{(name == 'joe')}
+        aliased.right.should eq 'zomg_its_joe'
+      end
+
     end
   end
-end
+end

data/spec/squeel/nodes/sifter_spec.rb

@@ -16,7 +16,8 @@ module Squeel
       specify { (subject & subject).should be_a And }
       specify { (subject | subject).should be_a Or }
       specify { (-subject).should be_a Not }
+      specify { [subject, Sifter.new(:title_or_body_contains, ['awesome'])].uniq.should have(1).sifter }
 
     end
   end
-end
+end

data/spec/squeel/nodes/stub_spec.rb

@@ -211,6 +211,10 @@ module Squeel
         as.right.should eq 'other_name'
       end
 
+      it 'implements equivalence check' do
+        [@s, Stub.new(:attribute)].uniq.should have(1).element
+      end
+
     end
   end
 end

data/spec/squeel/visitors/order_visitor_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+module Squeel
+  module Visitors
+    describe OrderVisitor do
+
+      before do
+        @jd = new_join_dependency(Person, {
+               :children => {
+                 :children => {
+                   :parent => :parent
+                 }
+               }
+             }, [])
+        @c = Squeel::Adapters::ActiveRecord::Context.new(@jd)
+        @v = OrderVisitor.new(@c)
+      end
+
+      it 'accepts Order with Function expression' do
+        function = @v.accept(dsl{find_in_set(children.children.id, '1,2,3').desc})
+        function.to_sql.should match /find_in_set\("children_people_2"."id", '1,2,3'\) DESC/
+      end
+
+      it 'accepts Order with Operation expression' do
+        operation = @v.accept(dsl{(id / 1).desc})
+        operation.to_sql.should match /"people"."id" \/ 1 DESC/
+      end
+
+      it 'orders by predicates' do
+        orders = @v.accept(dsl{name == 'Ernie'})
+        orders.to_sql.should match /"people"."name" = 'Ernie'/
+      end
+
+    end
+  end
+end

data/spec/squeel/visitors/{symbol_visitor_spec.rb → preload_visitor_spec.rb}

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 module Squeel
   module Visitors
-    describe SymbolVisitor do
+    describe PreloadVisitor do
+
       before do
-        @v = SymbolVisitor.new
+        @v = PreloadVisitor.new
       end
 
       it 'returns symbols unmodified' do
@@ -39,4 +40,4 @@ module Squeel
 
     end
   end
-end
+end

data/spec/squeel/visitors/select_visitor_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module Squeel
+  module Visitors
+    describe SelectVisitor do
+
+      before do
+        @jd = new_join_dependency(Person, {
+               :children => {
+                 :children => {
+                   :parent => :parent
+                 }
+               }
+             }, [])
+        @c = Squeel::Adapters::ActiveRecord::Context.new(@jd)
+        @v = SelectVisitor.new(@c)
+      end
+
+      it 'selects predicates' do
+        selects = @v.accept(dsl{name == 'Ernie'})
+        selects.to_sql.should match /"people"."name" = 'Ernie'/
+      end
+
+    end
+  end
+end

data/spec/squeel/visitors/{attribute_visitor_spec.rb → visitor_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Squeel
   module Visitors
-    describe AttributeVisitor do
+    describe Visitor do
 
       before do
         @jd = new_join_dependency(Person, {
@@ -13,7 +13,7 @@ module Squeel
                }
              }, [])
         @c = Squeel::Adapters::ActiveRecord::Context.new(@jd)
-        @v = AttributeVisitor.new(@c)
+        @v = Visitor.new(@c)
       end
 
       it 'creates a bare ARel attribute given a symbol with no asc/desc' do
@@ -23,50 +23,46 @@ module Squeel
         attribute.relation.name.should eq 'people'
       end
 
-      it 'creates the ordering against the proper table for nested hashes' do
-        orders = @v.accept({
+      it 'creates attributes against the proper table for nested hashes' do
+        attributes = @v.accept({
           :children => {
             :children => {
               :parent => {
-                :parent => :name.asc
+                :parent => :name
               }
             }
           }
         })
-        orders.should be_a Array
-        ordering = orders.first
-        ordering.should be_a Arel::Nodes::Ordering
-        ordering.expr.relation.table_alias.should eq 'parents_people_2'
-        ordering.direction.should eq :asc
+        attributes.should be_a Array
+        attribute = attributes.first
+        attribute.should be_a Arel::Attributes::Attribute
+        attribute.relation.table_alias.should eq 'parents_people_2'
       end
 
       it 'does not alter values it is unable to accept' do
-        orders = @v.accept(['THIS PARAMETER', 'WHAT DOES IT MEAN???'])
-        orders.should eq ['THIS PARAMETER', 'WHAT DOES IT MEAN???']
+        values = @v.accept(['THIS PARAMETER', 'WHAT DOES IT MEAN???'])
+        values.should eq ['THIS PARAMETER', 'WHAT DOES IT MEAN???']
       end
 
       it 'treats keypath keys like nested hashes' do
-        ordering = @v.accept(Nodes::Stub.new(:children).children.parent.parent.name.asc)
-        ordering.should be_a Arel::Nodes::Ordering
-        ordering.expr.relation.table_alias.should eq 'parents_people_2'
-        ordering.direction.should eq :asc
+        attribute = @v.accept(Nodes::Stub.new(:children).children.parent.parent.name)
+        attribute.should be_a Arel::Attributes::Attribute
+        attribute.relation.table_alias.should eq 'parents_people_2'
       end
 
       it 'honors absolute keypaths' do
-        orders = @v.accept(dsl{{children => {children => ~children.children.name.asc}}})
-        orders.should be_a Array
-        ordering = orders.first
-        ordering.expr.relation.table_alias.should eq 'children_people_2'
-        ordering.direction.should eq :asc
+        attributes = @v.accept(dsl{{children => {children => ~children.children.name}}})
+        attributes.should be_a Array
+        attribute = attributes.first
+        attribute.relation.table_alias.should eq 'children_people_2'
       end
 
       it 'allows hashes with keypath keys' do
-        orders = @v.accept(Nodes::Stub.new(:children).children.parent.parent => :name.asc)
-        orders.should be_a Array
-        ordering = orders.first
-        ordering.should be_a Arel::Nodes::Ordering
-        ordering.expr.relation.table_alias.should eq 'parents_people_2'
-        ordering.direction.should eq :asc
+        attributes = @v.accept(Nodes::Stub.new(:children).children.parent.parent => :name)
+        attributes.should be_a Array
+        attribute = attributes.first
+        attribute.should be_a Arel::Attributes::Attribute
+        attribute.relation.table_alias.should eq 'parents_people_2'
       end
 
       it 'allows a subquery as a selection' do
@@ -85,11 +81,6 @@ module Squeel
         function.to_sql.should match /find_in_set\("people"."id", '1,2,3'\)/
       end
 
-      it 'accepts Order with Function expression' do
-        function = @v.accept(dsl{find_in_set(children.children.id, '1,2,3').desc})
-        function.to_sql.should match /find_in_set\("children_people_2"."id", '1,2,3'\) DESC/
-      end
-
       it 'accepts keypaths as function args' do
         function = @v.accept(dsl{find_in_set(children.children.id, '1,2,3')})
         function.to_sql.should match /find_in_set\("children_people_2"."id", '1,2,3'\)/
@@ -145,11 +136,6 @@ module Squeel
         operation.to_sql.should match /incremented_id/
       end
 
-      it 'accepts Order with Operation expression' do
-        operation = @v.accept(dsl{(id / 1).desc})
-        operation.to_sql.should match /"people"."id" \/ 1 DESC/
-      end
-
     end
   end
 end

data/spec/support/models.rb

@@ -5,6 +5,7 @@ class Person < ActiveRecord::Base
   has_many   :articles_with_condition, :class_name => 'Article', :conditions => {:title => 'Condition'}
   has_many   :comments
   has_many   :condition_article_comments, :through => :articles_with_condition, :source => :comments
+  has_many   :article_comments_with_first_post, :through => :articles, :source => :comments, :conditions => {:body => 'first post'}
   has_many   :authored_article_comments, :through => :articles,
              :source => :comments
   has_many   :notes, :as => :notable
@@ -14,6 +15,8 @@ class Person < ActiveRecord::Base
   has_many   :incoming_messages, :class_name => 'Message', :foreign_key => :recipient_id
 
   scope :nil_scope, lambda { nil }
+  scope :with_article_title, lambda {|t| joins{articles}.where{articles.title == t}}
+  scope :with_article_condition_title, lambda {|t| joins{articles_with_condition}.where{articles_with_condition.title == t}}
 
   sifter :name_starts_or_ends_with do |value|
     (name =~ "#{value}%") | (name =~ "%#{value}")
@@ -33,6 +36,7 @@ class PersonNamedBill < ActiveRecord::Base
   default_scope where{name == 'Bill'}.order{id}
   scope :highly_compensated, where{salary > 200000}
   scope :ending_with_ill, where{name =~ '%ill'}
+  scope :with_salary_equal_to, lambda { |value| where{abs(salary) == value} }
 end
 
 class Message < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -190,10 +190,16 @@ files:
 - lib/squeel/nodes/unary.rb
 - lib/squeel/version.rb
 - lib/squeel/visitors.rb
-- lib/squeel/visitors/attribute_visitor.rb
+- lib/squeel/visitors/from_visitor.rb
+- lib/squeel/visitors/group_visitor.rb
+- lib/squeel/visitors/having_visitor.rb
+- lib/squeel/visitors/order_visitor.rb
+- lib/squeel/visitors/predicate_visitation.rb
 - lib/squeel/visitors/predicate_visitor.rb
-- lib/squeel/visitors/symbol_visitor.rb
+- lib/squeel/visitors/preload_visitor.rb
+- lib/squeel/visitors/select_visitor.rb
 - lib/squeel/visitors/visitor.rb
+- lib/squeel/visitors/where_visitor.rb
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
 - spec/blueprints/notes.rb
@@ -209,6 +215,7 @@ files:
 - spec/squeel/adapters/active_record/relation_extensions_spec.rb
 - spec/squeel/core_ext/symbol_spec.rb
 - spec/squeel/dsl_spec.rb
+- spec/squeel/nodes/as_spec.rb
 - spec/squeel/nodes/function_spec.rb
 - spec/squeel/nodes/grouping_spec.rb
 - spec/squeel/nodes/join_spec.rb
@@ -221,9 +228,11 @@ files:
 - spec/squeel/nodes/predicate_spec.rb
 - spec/squeel/nodes/sifter_spec.rb
 - spec/squeel/nodes/stub_spec.rb
-- spec/squeel/visitors/attribute_visitor_spec.rb
+- spec/squeel/visitors/order_visitor_spec.rb
 - spec/squeel/visitors/predicate_visitor_spec.rb
-- spec/squeel/visitors/symbol_visitor_spec.rb
+- spec/squeel/visitors/preload_visitor_spec.rb
+- spec/squeel/visitors/select_visitor_spec.rb
+- spec/squeel/visitors/visitor_spec.rb
 - spec/support/models.rb
 - spec/support/schema.rb
 - squeel.gemspec
@@ -241,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -377980682331781514
+      hash: -801751597998124956
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -250,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -377980682331781514
+      hash: -801751597998124956
 requirements: []
 rubyforge_project: squeel
 rubygems_version: 1.8.24
@@ -273,6 +282,7 @@ test_files:
 - spec/squeel/adapters/active_record/relation_extensions_spec.rb
 - spec/squeel/core_ext/symbol_spec.rb
 - spec/squeel/dsl_spec.rb
+- spec/squeel/nodes/as_spec.rb
 - spec/squeel/nodes/function_spec.rb
 - spec/squeel/nodes/grouping_spec.rb
 - spec/squeel/nodes/join_spec.rb
@@ -285,8 +295,10 @@ test_files:
 - spec/squeel/nodes/predicate_spec.rb
 - spec/squeel/nodes/sifter_spec.rb
 - spec/squeel/nodes/stub_spec.rb
-- spec/squeel/visitors/attribute_visitor_spec.rb
+- spec/squeel/visitors/order_visitor_spec.rb
 - spec/squeel/visitors/predicate_visitor_spec.rb
-- spec/squeel/visitors/symbol_visitor_spec.rb
+- spec/squeel/visitors/preload_visitor_spec.rb
+- spec/squeel/visitors/select_visitor_spec.rb
+- spec/squeel/visitors/visitor_spec.rb
 - spec/support/models.rb
 - spec/support/schema.rb