squeel 1.0.1 → 1.0.2

data/spec/squeel/nodes/grouping_spec.rb

@@ -0,0 +1,177 @@
+require 'spec_helper'
+
+module Squeel
+  module Nodes
+    describe Grouping do
+      before do
+        @g = Grouping.new('foo')
+      end
+
+      Squeel::Constants::PREDICATES.each do |method_name|
+        it "creates #{method_name} predicates with no value" do
+          predicate = @g.send(method_name)
+          predicate.expr.should eq @g
+          predicate.method_name.should eq method_name
+          predicate.value?.should be_false
+        end
+
+        it "creates #{method_name} predicates with a value" do
+          predicate = @g.send(method_name, 'value')
+          predicate.expr.should eq @g
+          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 = @g.send(aliaz.to_s + suffix)
+              predicate.expr.should eq @g
+              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 = @g.send((aliaz.to_s + suffix), 'value')
+              predicate.expr.should eq @g
+              predicate.method_name.should eq "#{method_name}#{suffix}".to_sym
+              predicate.value.should eq 'value'
+            end
+          end
+        end
+      end
+
+      it 'creates ascending Order nodes with #asc' do
+        order = @g.asc
+        order.expr.should eq @g
+        order.should be_ascending
+      end
+
+      it 'creates descending Order nodes with #desc' do
+        order = @g.desc
+        order.expr.should eq @g
+        order.should be_descending
+      end
+
+      it 'creates eq predicates with ==' do
+        predicate = @g == 1
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :eq
+        predicate.value.should eq 1
+      end
+
+      it 'creates not_eq predicates with ^' do
+        predicate = @g ^ 1
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :not_eq
+        predicate.value.should eq 1
+      end
+
+      it 'creates not_eq predicates with !=' do
+        predicate = @g != 1
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :not_eq
+        predicate.value.should eq 1
+      end if respond_to?('!=')
+
+      it 'creates in predicates with >>' do
+        predicate = @g >> [1,2,3]
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :in
+        predicate.value.should eq [1,2,3]
+      end
+
+      it 'creates not_in predicates with <<' do
+        predicate = @g << [1,2,3]
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :not_in
+        predicate.value.should eq [1,2,3]
+      end
+
+      it 'creates matches predicates with =~' do
+        predicate = @g =~ '%bob%'
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :matches
+        predicate.value.should eq '%bob%'
+      end
+
+      it 'creates does_not_match predicates with !~' do
+        predicate = @g !~ '%bob%'
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :does_not_match
+        predicate.value.should eq '%bob%'
+      end if respond_to?('!~')
+
+      it 'creates gt predicates with >' do
+        predicate = @g > 1
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :gt
+        predicate.value.should eq 1
+      end
+
+      it 'creates gteq predicates with >=' do
+        predicate = @g >= 1
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :gteq
+        predicate.value.should eq 1
+      end
+
+      it 'creates lt predicates with <' do
+        predicate = @g < 1
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :lt
+        predicate.value.should eq 1
+      end
+
+      it 'creates lteq predicates with <=' do
+        predicate = @g <= 1
+        predicate.expr.should eq @g
+        predicate.method_name.should eq :lteq
+        predicate.value.should eq 1
+      end
+
+      it 'can be ORed with another node' do
+        right = Predicate.new :name, :eq, 'Bob'
+        combined = @g | right
+        combined.should be_a Nodes::Or
+        combined.left.should eq @g
+        combined.right.should eq right
+      end
+
+      it 'can be ANDed with another node' do
+        right = Predicate.new :name, :eq, 'Bob'
+        combined = @g & right
+        combined.should be_a Nodes::And
+        combined.children.should eq [@g, right]
+      end
+
+      it 'can be negated' do
+        negated = -@g
+        negated.should be_a Nodes::Not
+        negated.expr.should eq @g
+      end
+
+      describe '#as' do
+
+        it 'aliases the function' do
+          a = @g.as('the_alias')
+          a.should be_a As
+          a.expr.should eq @g
+          a.alias.should eq 'the_alias'
+        end
+
+        it 'casts the alias to a string' do
+          a = @g.as(:the_alias)
+          a.should be_a As
+          a.expr.should eq @g
+          a.alias.should eq 'the_alias'
+        end
+
+      end
+
+    end
+  end
+end
+

data/spec/squeel/nodes/join_spec.rb

@@ -26,22 +26,21 @@ module Squeel
       it 'creates a KeyPath when sent an unknown method' do
         keypath = @j.another
         keypath.should be_a KeyPath
-        keypath.path_with_endpoint.should eq [@j, Stub.new(:another)]
+        keypath.path.should eq [@j, Stub.new(:another)]
       end
 
       it 'creates a KeyPath with a join endpoint when sent a method with a Class param' do
         keypath = @j.another(Person)
         keypath.should be_a KeyPath
-        keypath.path_with_endpoint.should eq [@j, Join.new(:another, Arel::InnerJoin, Person)]
+        keypath.path.should eq [@j, Join.new(:another, Arel::InnerJoin, Person)]
       end
 
       it 'creates an absolute keypath with just an endpoint with ~' do
         node = ~@j
         node.should be_a KeyPath
-        node.path.should eq []
-        node.endpoint.should eq @j
+        node.path.should eq [@j]
       end
 
     end
   end
-end
+end

data/spec/squeel/nodes/key_path_spec.rb

@@ -4,19 +4,17 @@ module Squeel
   module Nodes
     describe KeyPath do
       before do
-        @k = KeyPath.new(:first, :second)
+        @k = KeyPath.new([:first, :second])
       end
 
       it 'appends to its path when endpoint is a Stub' do
         @k.third.fourth.fifth
-        @k.path.should eq [:first, :second, :third, :fourth]
-        @k.endpoint.should eq Stub.new(:fifth)
+        @k.path.should eq [:first, :second, :third, :fourth, Stub.new(:fifth)]
       end
 
       it 'becomes absolute when prefixed with ~' do
         ~@k.third.fourth.fifth
-        @k.path.should eq [:first, :second, :third, :fourth]
-        @k.endpoint.should eq Stub.new(:fifth)
+        @k.path.should eq [:first, :second, :third, :fourth, Stub.new(:fifth)]
         @k.should be_absolute
       end
 

data/spec/squeel/nodes/operators_spec.rb

@@ -16,7 +16,7 @@ module Squeel
           end
 
           it "creates Operations with #{operator} operator from key paths" do
-            left = KeyPath.new(:first, :second)
+            left = KeyPath.new([:first, :second])
             node = left.send(operator, 1)
             node.should be_an Operation
             node.left.should eq left
@@ -55,7 +55,7 @@ module Squeel
         end
 
         it "creates Operations with custom operator from key paths" do
-          left = KeyPath.new(:first, :second)
+          left = KeyPath.new([:first, :second])
           node = left.op('||', 1)
           node.should be_an Operation
           node.left.should eq left
@@ -84,4 +84,4 @@ module Squeel
 
     end
   end
-end
+end

data/spec/squeel/nodes/stub_spec.rb

@@ -30,38 +30,37 @@ module Squeel
       it 'creates a KeyPath when sent an unknown method' do
         keypath = @s.another
         keypath.should be_a KeyPath
-        keypath.path_with_endpoint.should eq [@s, Stub.new(:another)]
+        keypath.path.should eq [@s, Stub.new(:another)]
       end
 
       it 'creates a KeyPath when sent #id' do
         keypath = @s.id
         keypath.should be_a KeyPath
-        keypath.path_with_endpoint.should eq [@s, Stub.new(:id)]
+        keypath.path.should eq [@s, Stub.new(:id)]
       end
 
       it 'creates a KeyPath when sent #type' do
         keypath = @s.type
         keypath.should be_a KeyPath
-        keypath.path_with_endpoint.should eq [@s, Stub.new(:type)]
+        keypath.path.should eq [@s, Stub.new(:type)]
       end
 
       it 'creates a KeyPath with a join endpoint when sent a method with a Class param' do
         keypath = @s.another(Person)
         keypath.should be_a KeyPath
-        keypath.path_with_endpoint.should eq [@s, Join.new(:another, Arel::InnerJoin, Person)]
+        keypath.path.should eq [@s, Join.new(:another, Arel::InnerJoin, Person)]
       end
 
       it 'creates a KeyPath with a sifter endpoint when sent #sift' do
         keypath = @s.sift(:blah, 1)
         keypath.should be_a KeyPath
-        keypath.path_with_endpoint.should eq [@s, Sifter.new(:blah, [1])]
+        keypath.path.should eq [@s, Sifter.new(:blah, [1])]
       end
 
       it 'creates an absolute keypath with just an endpoint with ~' do
         node = ~@s
         node.should be_a KeyPath
-        node.path.should eq []
-        node.endpoint.should eq @s
+        node.path.should eq [@s]
       end
 
       Squeel::Constants::PREDICATES.each do |method_name|

data/spec/squeel/visitors/attribute_visitor_spec.rb

@@ -115,6 +115,11 @@ module Squeel
         as.to_sql.should match /"children_people"."name" AS other_name/
       end
 
+      it 'creates an ARel Grouping node for a Squeel Grouping node' do
+        grouping = @v.accept(dsl{_(id)})
+        grouping.should be_a Arel::Nodes::Grouping
+      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
@@ -147,4 +152,4 @@ module Squeel
 
     end
   end
-end
+end

data/spec/squeel/visitors/predicate_visitor_spec.rb

@@ -55,6 +55,24 @@ module Squeel
         predicate.should eq '1=1'
       end
 
+      it 'visits Grouping nodes' do
+        predicate = @v.accept(dsl{_(`foo`)})
+        predicate.should be_a Arel::Nodes::Grouping
+        predicate.to_sql.should eq '(foo)'
+      end
+
+      it 'visits Grouping nodes on the attribute side of predicates' do
+        predicate = @v.accept(dsl{_(`foo`) == `foo`})
+        predicate.should be_a Arel::Nodes::Equality
+        predicate.to_sql.should eq '(foo) = foo'
+      end
+
+      it 'visits operations containing Grouping nodes' do
+        predicate = @v.accept(dsl{_(1) + _(1) == 2})
+        predicate.should be_a Arel::Nodes::Equality
+        predicate.to_sql.should eq '(1) + (1) = 2'
+      end
+
       it 'creates OR nodes against a Literal' do
         predicate = @v.accept(dsl{`blah` | `blah`})
         predicate.should be_a Arel::Nodes::Grouping
@@ -384,6 +402,16 @@ 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 '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

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 -04:00
-default_executable: 
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70156349477400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70156349477400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70156349476680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +37,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70156349476680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: polyamorous
-  requirement: &70156349475880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +53,15 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70156349475880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70156349475260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +69,15 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70156349475260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70156349474620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +85,15 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70156349474620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70156349473320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +101,15 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70156349473320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70156349488720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +117,12 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70156349488720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 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
@@ -102,6 +136,7 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -114,10 +149,12 @@ files:
 - lib/squeel/adapters/active_record/3.0/compat.rb
 - lib/squeel/adapters/active_record/3.0/context.rb
 - lib/squeel/adapters/active_record/3.0/relation_extensions.rb
+- lib/squeel/adapters/active_record/3.1/compat.rb
 - lib/squeel/adapters/active_record/3.1/context.rb
 - lib/squeel/adapters/active_record/3.1/preloader_extensions.rb
 - lib/squeel/adapters/active_record/3.1/relation_extensions.rb
 - lib/squeel/adapters/active_record/base_extensions.rb
+- lib/squeel/adapters/active_record/compat.rb
 - lib/squeel/adapters/active_record/context.rb
 - lib/squeel/adapters/active_record/join_dependency_extensions.rb
 - lib/squeel/adapters/active_record/preloader_extensions.rb
@@ -134,6 +171,7 @@ files:
 - lib/squeel/nodes/as.rb
 - lib/squeel/nodes/binary.rb
 - lib/squeel/nodes/function.rb
+- lib/squeel/nodes/grouping.rb
 - lib/squeel/nodes/join.rb
 - lib/squeel/nodes/key_path.rb
 - lib/squeel/nodes/literal.rb
@@ -143,12 +181,13 @@ files:
 - lib/squeel/nodes/operators.rb
 - lib/squeel/nodes/or.rb
 - lib/squeel/nodes/order.rb
+- lib/squeel/nodes/ordering.rb
 - lib/squeel/nodes/predicate.rb
+- lib/squeel/nodes/predicate_methods.rb
 - lib/squeel/nodes/predicate_operators.rb
 - lib/squeel/nodes/sifter.rb
 - lib/squeel/nodes/stub.rb
 - lib/squeel/nodes/unary.rb
-- lib/squeel/predicate_methods.rb
 - lib/squeel/version.rb
 - lib/squeel/visitors.rb
 - lib/squeel/visitors/attribute_visitor.rb
@@ -171,6 +210,7 @@ files:
 - spec/squeel/core_ext/symbol_spec.rb
 - spec/squeel/dsl_spec.rb
 - spec/squeel/nodes/function_spec.rb
+- spec/squeel/nodes/grouping_spec.rb
 - spec/squeel/nodes/join_spec.rb
 - spec/squeel/nodes/key_path_spec.rb
 - spec/squeel/nodes/literal_spec.rb
@@ -186,7 +226,6 @@ files:
 - spec/squeel/visitors/symbol_visitor_spec.rb
 - spec/support/schema.rb
 - squeel.gemspec
-has_rdoc: true
 homepage: http://erniemiller.org/projects/squeel
 licenses: []
 post_install_message: 
@@ -201,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3396698856870050214
+      hash: -3844391929361765236
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,10 +249,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3396698856870050214
+      hash: -3844391929361765236
 requirements: []
 rubyforge_project: squeel
-rubygems_version: 1.3.9.4
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveRecord 3, improved.
@@ -234,6 +273,7 @@ test_files:
 - spec/squeel/core_ext/symbol_spec.rb
 - spec/squeel/dsl_spec.rb
 - spec/squeel/nodes/function_spec.rb
+- spec/squeel/nodes/grouping_spec.rb
 - spec/squeel/nodes/join_spec.rb
 - spec/squeel/nodes/key_path_spec.rb
 - spec/squeel/nodes/literal_spec.rb