squeel 1.0.18 → 1.1.0

data/spec/squeel/core_ext/symbol_spec.rb

@@ -23,7 +23,7 @@ describe Symbol do
     it 'creates a function node' do
       function = :blah.func('foo')
       function.should be_a Squeel::Nodes::Function
-      function.name.should eq :blah
+      function.function_name.should eq :blah
       function.args.should eq ['foo']
     end
   end
@@ -55,4 +55,4 @@ describe Symbol do
       join._klass.should eq Person
     end
   end
-end
+end

data/spec/squeel/nodes/key_path_spec.rb

@@ -46,7 +46,7 @@ module Squeel
       it 'creates a named function at its endpoint' do
         @k.third.fourth.fifth.max(1,2,3)
         @k.endpoint.should be_a Function
-        @k.endpoint.name.should eq :max
+        @k.endpoint.function_name.should eq :max
         @k.endpoint.args.should eq [1,2,3]
       end
 
@@ -77,7 +77,7 @@ module Squeel
       it 'creates Or nodes with | if the endpoint responds to |' do
         node = @k.third.fourth.eq('Bob') | Stub.new(:attr).eq('Joe')
         node.should be_a Or
-        node.left.should eq @k
+        node.left.should eql @k
         node.right.should eql Stub.new(:attr).eq('Joe')
       end
 
@@ -99,7 +99,7 @@ module Squeel
       it 'creates NOT nodes with -@ if the endpoint responds to -@' do
         node = - @k.third.fourth.eq('Bob')
         node.should be_a Not
-        node.expr.should eq @k
+        node.expr.should eql @k
       end
 
       it 'raises NoMethodError with -@ if the endpoint does not respond to -@' do

data/spec/squeel/nodes/predicate_operators_spec.rb

@@ -21,13 +21,13 @@ module Squeel
           n.children.should eq [left, right]
         end
 
-        it 'appends nodes to children from other And nodes' do
+        it 'creates And nodes by appending a new child' do
           left = :name.matches % 'J%' & :name.matches % '%e'
           right = :id.gt % 0
           expected = left.children + [right]
-          left & right
-          left.should be_a And
-          left.children.should eq expected
+          new_and = left & right
+          new_and.should be_a And
+          new_and.children.should eq expected
         end
       end
 

data/spec/squeel/visitors/predicate_visitor_spec.rb

@@ -327,7 +327,7 @@ module Squeel
         predicate.to_sql.should be_like '"people"."id" IN (SELECT  "people"."id" FROM "people"  ORDER BY "people"."id" DESC LIMIT 3)'
       end
 
-      it 'converts ActiveRecord::Relation values in function arguments to their ARel AST' do
+      it 'converts ActiveRecord::Relation values in function arguments to their Arel AST' do
         predicate = @v.accept(dsl{exists(Person.where{name == 'Aric Smith'})})
         predicate.should be_a Arel::Nodes::NamedFunction
         predicate.expressions.first.should be_a Arel::Nodes::SelectStatement
@@ -386,7 +386,7 @@ module Squeel
         predicate.right.should eq 'Joe'
       end
 
-      it 'creates an ARel Grouping node containing an Or node for Or nodes' do
+      it 'creates an Arel Grouping node containing an Or node for Or nodes' do
         left = :name.matches % 'Joe%'
         right = :id.gt % 1
         predicate = @v.accept(left | right)
@@ -396,23 +396,23 @@ module Squeel
         predicate.expr.right.should be_a Arel::Nodes::GreaterThan
       end
 
-      it 'creates an ARel Not node for a Not node' do
+      it 'creates an Arel Not node for a Not node' do
         expr = -(:name.matches % 'Joe%')
         predicate = @v.accept(expr)
         predicate.should be_a Arel::Nodes::Not
       end
 
-      it 'creates an ARel NamedFunction node for a Function node' do
+      it 'creates an Arel NamedFunction node for a Function node' do
         function = @v.accept(:find_in_set.func())
         function.should be_a Arel::Nodes::NamedFunction
       end
 
-      it 'maps symbols in Function args to ARel attributes' do
+      it 'maps symbols in Function args to Arel attributes' do
         function = @v.accept(:find_in_set.func(:id, '1,2,3'))
         function.to_sql.should match /"people"."id"/
       end
 
-      it 'sets the alias on the ARel NamedFunction from the Function alias' do
+      it 'sets the alias on the Arel NamedFunction from the Function alias' do
         function = @v.accept(:find_in_set.func(:id, '1,2,3').as('newname'))
         function.to_sql.should match /newname/
       end
@@ -427,27 +427,27 @@ module Squeel
         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
+      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
       end
 
-      it 'creates an ARel Subtraction node for an Operation node with - as operator' do
+      it 'creates an Arel Subtraction node for an Operation node with - as operator' do
         operation = @v.accept(dsl{id - 1})
         operation.should be_a Arel::Nodes::Subtraction
       end
 
-      it 'creates an ARel Multiplication node for an Operation node with * as operator' do
+      it 'creates an Arel Multiplication node for an Operation node with * as operator' do
         operation = @v.accept(dsl{id * 1})
         operation.should be_a Arel::Nodes::Multiplication
       end
 
-      it 'creates an ARel Division node for an Operation node with / as operator' do
+      it 'creates an Arel Division node for an Operation node with / as operator' do
         operation = @v.accept(dsl{id / 1})
         operation.should be_a Arel::Nodes::Division
       end
 
-      it 'creates an ARel InfixOperation node for an Operation with a custom operator' do
+      it 'creates an Arel InfixOperation node for an Operation with a custom operator' do
         operation = @v.accept(dsl{id.op(:blah, 1)})
         operation.should be_a Arel::Nodes::InfixOperation
       end

data/spec/squeel/visitors/visitor_spec.rb

@@ -16,7 +16,7 @@ module Squeel
         @v = Visitor.new(@c)
       end
 
-      it 'creates a bare ARel attribute given a symbol with no asc/desc' do
+      it 'creates a bare Arel attribute given a symbol with no asc/desc' do
         attribute = @v.accept(:name)
         attribute.should be_a Arel::Attribute
         attribute.name.should eq :name
@@ -71,12 +71,12 @@ module Squeel
         node.to_sql.should be_like "(SELECT \"people\".\"id\" FROM \"people\"  WHERE \"people\".\"name\" = 'Aric Smith') aric"
       end
 
-      it 'creates an ARel NamedFunction node for a Function node' do
+      it 'creates an Arel NamedFunction node for a Function node' do
         function = @v.accept(:find_in_set.func())
         function.should be_a Arel::Nodes::NamedFunction
       end
 
-      it 'maps symbols in Function args to ARel attributes' do
+      it 'maps symbols in Function args to Arel attributes' do
         function = @v.accept(:find_in_set.func(:id, '1,2,3'))
         function.to_sql.should match /find_in_set\("people"."id", '1,2,3'\)/
       end
@@ -86,7 +86,7 @@ module Squeel
         function.to_sql.should match /find_in_set\("children_people_2"."id", '1,2,3'\)/
       end
 
-      it 'sets the alias on the ARel NamedFunction from the Function alias' do
+      it 'sets the alias on the Arel NamedFunction from the Function alias' do
         function = @v.accept(:find_in_set.func(:id, '1,2,3').as('newname'))
         function.to_sql.should match /newname/
       end
@@ -106,27 +106,27 @@ 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
+      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
+      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
       end
 
-      it 'creates an ARel Subtraction node for an Operation node with - as operator' do
+      it 'creates an Arel Subtraction node for an Operation node with - as operator' do
         operation = @v.accept(dsl{id - 1})
         operation.should be_a Arel::Nodes::Subtraction
       end
 
-      it 'creates an ARel Multiplication node for an Operation node with * as operator' do
+      it 'creates an Arel Multiplication node for an Operation node with * as operator' do
         operation = @v.accept(dsl{id * 1})
         operation.should be_a Arel::Nodes::Multiplication
       end
 
-      it 'creates an ARel Division node for an Operation node with / as operator' do
+      it 'creates an Arel Division node for an Operation node with / as operator' do
         operation = @v.accept(dsl{id / 1})
         operation.should be_a Arel::Nodes::Division
       end

data/spec/support/models.rb

@@ -2,10 +2,24 @@ class Person < ActiveRecord::Base
   belongs_to :parent, :class_name => 'Person', :foreign_key => :parent_id
   has_many   :children, :class_name => 'Person', :foreign_key => :parent_id
   has_many   :articles
-  has_many   :articles_with_condition, :class_name => 'Article', :conditions => {:title => 'Condition'}
   has_many   :comments
+  if ActiveRecord::VERSION::MAJOR == 4
+    has_many   :articles_with_condition, lambda { where :title => 'Condition' },
+      :class_name => 'Article'
+    has_many   :article_comments_with_first_post,
+      lambda { where :body => 'first post' },
+      :through => :articles, :source => :comments
+  else
+    has_many   :articles_with_condition, :conditions => {:title => 'Condition'},
+      :class_name => 'Article'
+    has_many   :article_comments_with_first_post,
+      :conditions => { :body => 'first post' },
+      :through => :articles, :source => :comments
+  end
   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'}
+  if ActiveRecord::VERSION::MAJOR == 4
+  else
+  end
   has_many   :authored_article_comments, :through => :articles,
              :source => :comments
   has_many   :notes, :as => :notable
@@ -28,18 +42,22 @@ class Person < ActiveRecord::Base
 end
 
 class PersonWithNamePrimaryKey < ActiveRecord::Base
-  set_primary_key 'name'
+  self.primary_key = 'name'
   # Set this second, because I'm lazy and don't want to populate another table,
   # and also don't want to clobber the AR connection's primary_key cache.
-  set_table_name 'people'
+  self.table_name = 'people'
 end
 
 class PersonNamedBill < ActiveRecord::Base
   self.table_name = 'people'
   belongs_to :parent, :class_name => 'Person', :foreign_key => :parent_id
-  default_scope where{name == 'Bill'}.order{id}
-  scope :highly_compensated, where{salary > 200000}
-  scope :ending_with_ill, where{name =~ '%ill'}
+  if ActiveRecord::VERSION::MAJOR > 3 || ActiveRecord::VERSION::MINOR > 0
+    default_scope lambda { where{name == 'Bill'}.order{id} }
+  else # 3.0 doesn't support callables for default_scope
+    default_scope where{name == 'Bill'}.order{id}
+  end
+  scope :highly_compensated, lambda { where {salary > 200000} }
+  scope :ending_with_ill, lambda { where{name =~ '%ill'} }
   scope :with_salary_equal_to, lambda { |value| where{abs(salary) == value} }
 end
 

data/spec/support/schema.rb

@@ -6,7 +6,7 @@ ActiveRecord::Base.establish_connection(
   :database => ':memory:'
 )
 
-ActiveRecord::Base.silence do
+silence_stream(STDOUT) do
   ActiveRecord::Migration.verbose = false
 
   ActiveRecord::Schema.define do

data/squeel.gemspec

@@ -11,16 +11,16 @@ Gem::Specification.new do |s|
   s.homepage    = "http://erniemiller.org/projects/squeel"
   s.summary     = %q{Active Record 3, improved.}
   s.description = %q{
-      Squeel unlocks the power of ARel in your Rails 3 application with
+      Squeel unlocks the power of Arel in your Rails 3 application with
       a handy block-based syntax. You can write subqueries, access named
       functions provided by your RDBMS, and more, all without writing
       SQL strings.
     }
   s.rubyforge_project = "squeel"
 
-  s.add_dependency 'activerecord', '~> 3.0'
-  s.add_dependency 'activesupport', '~> 3.0'
-  s.add_dependency 'polyamorous', '~> 0.5.0'
+  s.add_dependency 'activerecord', '>= 3.0'
+  s.add_dependency 'activesupport', '>= 3.0'
+  s.add_dependency 'polyamorous', '~> 0.6.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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
-description: ! "\n      Squeel unlocks the power of ARel in your Rails 3 application
+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    "
@@ -134,6 +134,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
@@ -157,6 +159,10 @@ files:
 - lib/squeel/adapters/active_record/3.2/context.rb
 - lib/squeel/adapters/active_record/3.2/preloader_extensions.rb
 - lib/squeel/adapters/active_record/3.2/relation_extensions.rb
+- lib/squeel/adapters/active_record/4.0/compat.rb
+- lib/squeel/adapters/active_record/4.0/context.rb
+- lib/squeel/adapters/active_record/4.0/preloader_extensions.rb
+- lib/squeel/adapters/active_record/4.0/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
@@ -180,6 +186,7 @@ files:
 - lib/squeel/nodes/key_path.rb
 - lib/squeel/nodes/literal.rb
 - lib/squeel/nodes/nary.rb
+- lib/squeel/nodes/node.rb
 - lib/squeel/nodes/not.rb
 - lib/squeel/nodes/operation.rb
 - lib/squeel/nodes/operators.rb
@@ -255,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -663297487386746255
+      hash: 3013172818139711392
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,10 +271,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -663297487386746255
+      hash: 3013172818139711392
 requirements: []
 rubyforge_project: squeel
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Active Record 3, improved.