squeel 0.9.5 → 1.0.0

data/.travis.yml

@@ -1,10 +1,13 @@
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - ree
-  - rbx
-  - ruby-head
+# TODO: Re-enable when updates to Rubinius on
+# Travis stop randomly breaking specs that
+# pass on MRI. :(
+#  - rbx-18mode
+#  - rbx-19mode
 
 env:
   - RAILS=3-2-stable
+  - RAILS=3-1-stable AREL=2-2-stable
+  - RAILS=3-0-stable AREL=2-0-stable

data/Gemfile

@@ -34,4 +34,4 @@ else
     gem 'activemodel'
     gem 'activerecord'
   end
-end
+end

data/README.md

@@ -1,6 +1,6 @@
 # Squeel [![Build Status](https://secure.travis-ci.org/ernie/squeel.png)](http://travis-ci.org/ernie/squeel)
 
-Squeel lets you write your ActiveRecord queries with with fewer strings, and more Ruby,
+Squeel lets you write your ActiveRecord queries with fewer strings, and more Ruby,
 by making the ARel awesomeness that lies beneath ActiveRecord more accessible.
 
 Squeel lets you rewrite...
@@ -21,20 +21,13 @@ In your Gemfile:
     gem "squeel"  # Last officially released gem
     # gem "squeel", :git => "git://github.com/ernie/squeel.git" # Track git repo
 
-In an initializer:
+Then bundle as usual.
 
-    Squeel.configure do |config|
-      # To load hash extensions (to allow for AND (&), OR (|), and NOT (-) against
-      # hashes of conditions)
-      config.load_core_extensions :hash
-
-      # To load symbol extensions (for a subset of the old MetaWhere functionality,
-      # via ARel predicate methods on Symbols: :name.matches, etc)
-      # config.load_core_extensions :symbol
+If you'd like to customize Squeel's functionality by enabling core
+extensions for hashes or symbols, or aliasing some predicates, you can
+create a sample initializer with:
 
-      # To load both hash and symbol extensions
-      # config.load_core_extensions :hash, :symbol
-    end
+    rails g squeel:initializer
 
 ## The Squeel Query DSL
 
@@ -443,4 +436,4 @@ To support the project in other ways:
 
 ## Copyright
 
-Copyright © 2011 [Ernie Miller](http://twitter.com/erniemiller)
+Copyright © 2011 [Ernie Miller](http://twitter.com/erniemiller)

data/Rakefile

@@ -1,4 +1,4 @@
-require 'bundler'
+require 'bundler/setup'
 require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
@@ -16,4 +16,4 @@ task :console do
   require 'console'
   ARGV.clear
   IRB.start
-end
+end

data/lib/generators/squeel/initializer_generator.rb

@@ -0,0 +1,15 @@
+module Squeel
+  module Generators
+    class InitializerGenerator < ::Rails::Generators::Base
+
+      source_root File.expand_path("../../templates", __FILE__)
+
+      desc 'Creates a sample Squeel initializer.'
+
+      def copy_initializer
+        copy_file 'squeel.rb', 'config/initializers/squeel.rb'
+      end
+
+    end
+  end
+end

data/lib/generators/templates/squeel.rb

@@ -0,0 +1,24 @@
+Squeel.configure do |config|
+  # To load hash extensions (to allow for AND (&), OR (|), and NOT (-) against
+  # hashes of conditions):
+  #
+  # config.load_core_extensions :hash
+
+  # To load symbol extensions (for a subset of the old MetaWhere functionality,
+  # via ARel predicate methods on Symbols: :name.matches, etc):
+  #
+  # NOTE: Not recommended. Learn the new DSL. Use it. Love it.
+  #
+  # config.load_core_extensions :symbol
+
+  # To load both hash and symbol extensions:
+  #
+  # config.load_core_extensions :hash, :symbol
+
+  # Alias an existing predicate to a new name. Use the non-grouped
+  # name -- the any/all variants will also be created. For example,
+  # to alias the standard "lt" predicate to "less_than", and gain
+  # "less_than_any" and "less_than_all" as well:
+  #
+  # config.alias_predicate :less_than, :lt
+end

data/lib/squeel/adapters/active_record/3.0/relation_extensions.rb

@@ -106,6 +106,35 @@ module Squeel
           arel
         end
 
+        # So, building a select for a count query in ActiveRecord is
+        # pretty heavily dependent on select_values containing strings.
+        # I'd initially expected that I could just hack together a fix
+        # to select_for_count and everything would fall in line, but
+        # unfortunately, pretty much everything from that point on
+        # in ActiveRecord::Calculations#perform_calculation expects
+        # the column to be a string, or at worst, a symbol.
+        #
+        # In the long term, I would like to refactor the code in
+        # Rails core, but for now, I'm going to settle for this hack
+        # that tries really hard to coerce things to a string.
+        def select_for_count
+          visited_values = attribute_visitor.accept(select_values.uniq)
+          if visited_values.size == 1
+            select = visited_values.first
+
+            str_select = case select
+            when String
+              select
+            when Symbol
+              select.to_s
+            else
+              select.to_sql if select.respond_to?(:to_sql)
+            end
+
+            str_select if str_select && str_select !~ /[,*]/
+          end
+        end
+
         def build_join_dependency(relation, joins)
           association_joins = []
 
@@ -336,4 +365,4 @@ module Squeel
       end
     end
   end
-end
+end

data/lib/squeel/adapters/active_record/3.1/relation_extensions.rb

@@ -117,6 +117,35 @@ module Squeel
           end
         end
 
+        # So, building a select for a count query in ActiveRecord is
+        # pretty heavily dependent on select_values containing strings.
+        # I'd initially expected that I could just hack together a fix
+        # to select_for_count and everything would fall in line, but
+        # unfortunately, pretty much everything from that point on
+        # in ActiveRecord::Calculations#perform_calculation expects
+        # the column to be a string, or at worst, a symbol.
+        #
+        # In the long term, I would like to refactor the code in
+        # Rails core, but for now, I'm going to settle for this hack
+        # that tries really hard to coerce things to a string.
+        def select_for_count
+          visited_values = attribute_visitor.accept(select_values.uniq)
+          if visited_values.size == 1
+            select = visited_values.first
+
+            str_select = case select
+            when String
+              select
+            when Symbol
+              select.to_s
+            else
+              select.to_sql if select.respond_to?(:to_sql)
+            end
+
+            str_select if str_select && str_select !~ /[,*]/
+          end
+        end
+
         def build_join_dependency(manager, joins)
           buckets = joins.group_by do |join|
             case join
@@ -344,7 +373,7 @@ module Squeel
         end
 
         def where_values_hash_with_squeel
-          equalities = find_equality_predicates(predicate_visitor.accept(@where_values))
+          equalities = find_equality_predicates(predicate_visitor.accept(with_default_scope.where_values))
 
           Hash[equalities.map { |where| [where.left.name, where.right] }]
         end
@@ -352,4 +381,4 @@ module Squeel
       end
     end
   end
-end
+end

data/lib/squeel/nodes/function.rb

@@ -6,6 +6,7 @@ module Squeel
     class Function
 
       include PredicateMethods
+      include PredicateOperators
       include Operators
 
       alias :== :eq
@@ -63,4 +64,4 @@ module Squeel
 
     end
   end
-end
+end

data/lib/squeel/nodes/join.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/module'
+
 module Squeel
   module Nodes
     # A node representing a joined association
@@ -83,4 +85,4 @@ module Squeel
 
     end
   end
-end
+end

data/lib/squeel/nodes/key_path.rb

@@ -1,5 +1,6 @@
 require 'squeel/nodes/operators'
 require 'squeel/nodes/predicate_operators'
+require 'active_support/core_ext/module'
 
 module Squeel
   module Nodes
@@ -204,4 +205,4 @@ module Squeel
 
     end
   end
-end
+end

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.9.5"
+  VERSION = "1.0.0"
 end

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

@@ -108,6 +108,13 @@ module Squeel
             arel.to_sql.should match /"people"."name" LIKE '%bob%'/
           end
 
+	  it 'handles multiple wheres using a keypath' do
+	    relation = Person.joins{articles}.where{articles.title == 'Hello'}.
+	                      where{articles.body == 'World'}
+	    arel = relation.build_arel
+	    arel.to_sql.should match /articles/
+	  end
+
           it 'maps wheres inside a hash to their appropriate association table' do
             relation = Person.joins({
               :children => {
@@ -394,6 +401,10 @@ module Squeel
             aric.last_article_id.should eq Article.where(:person_id => 1).last.id
           end
 
+          it "doesn't break #count if non-strings are used" do
+            Article.select{distinct(title)}.count.should eq 51
+          end
+
         end
 
         describe '#group' do
@@ -477,7 +488,7 @@ module Squeel
             relation = Person.joins(:authored_article_comments)
             relation.first.authored_article_comments.first.should eq Comment.first
           end
-          
+
           it 'creates a unique join when joining a table used in a has_many :through association' do
             Person.first.authored_article_comments.joins(:article).first.should eq Comment.first
           end
@@ -597,6 +608,10 @@ module Squeel
             @person.name.should eq 'bob'
           end
 
+          it "maintains activerecord default scope functionality" do
+            PersonNamedBill.new.name.should eq 'Bill'
+          end
+
           it 'uses the last supplied equality predicate in where_values when creating new records' do
             @person = Person.where(:name => 'bob', :parent_id => 3).where(:name => 'joe').new
             @person.parent_id.should eq 3
@@ -674,7 +689,9 @@ module Squeel
 
             queries.should have(2).queries
 
-            queries.last.should match /IN \(1, ?34, ?67, ?100\)/
+            matched_ids = queries.last.match(/IN \(([^)]*)/).captures.first
+            matched_ids = matched_ids.split(/,\s*/).map(&:to_i)
+            matched_ids.should =~ [1, 34, 67, 100]
           end
 
         end
@@ -682,4 +699,4 @@ module Squeel
       end
     end
   end
-end
+end

data/spec/squeel/nodes/function_spec.rb

@@ -4,7 +4,7 @@ module Squeel
   module Nodes
     describe Function do
       before do
-        @f = :function.func(1,2,3)
+        @f = Function.new(:function, [1, 2, 3])
       end
 
       Squeel::Constants::PREDICATES.each do |method_name|
@@ -132,6 +132,27 @@ module Squeel
         predicate.value.should eq 1
       end
 
+      it 'can be ORed with another node' do
+        right = Predicate.new :name, :eq, 'Bob'
+        combined = @f | right
+        combined.should be_a Nodes::Or
+        combined.left.should eq @f
+        combined.right.should eq right
+      end
+
+      it 'can be ANDed with another node' do
+        right = Predicate.new :name, :eq, 'Bob'
+        combined = @f & right
+        combined.should be_a Nodes::And
+        combined.children.should eq [@f, right]
+      end
+
+      it 'can be negated' do
+        negated = -@f
+        negated.should be_a Nodes::Not
+        negated.expr.should eq @f
+      end
+
       describe '#as' do
 
         it 'aliases the function' do
@@ -148,4 +169,4 @@ module Squeel
 
     end
   end
-end
+end

data/spec/squeel/nodes/operation_spec.rb

@@ -132,6 +132,27 @@ module Squeel
         predicate.value.should eq 1
       end
 
+      it 'can be ORed with another node' do
+        right = Predicate.new :name, :eq, 'Bob'
+        combined = @o | right
+        combined.should be_a Nodes::Or
+        combined.left.should eq @o
+        combined.right.should eq right
+      end
+
+      it 'can be ANDed with another node' do
+        right = Predicate.new :name, :eq, 'Bob'
+        combined = @o & right
+        combined.should be_a Nodes::And
+        combined.children.should eq [@o, right]
+      end
+
+      it 'can be negated' do
+        negated = -@o
+        negated.should be_a Nodes::Not
+        negated.expr.should eq @o
+      end
+
       describe '#as' do
 
         it 'aliases the function' do
@@ -148,4 +169,4 @@ module Squeel
 
     end
   end
-end
+end

data/spec/support/schema.rb

@@ -33,6 +33,11 @@ class PersonWithNamePrimaryKey < ActiveRecord::Base
   set_table_name 'people'
 end
 
+class PersonNamedBill < ActiveRecord::Base
+  self.table_name = 'people'
+  default_scope where(:name => 'Bill')
+end
+
 class Message < ActiveRecord::Base
   belongs_to :author, :class_name => 'Person'
   belongs_to :recipient, :class_name => 'Person'
@@ -141,4 +146,4 @@ module Schema
     Comment.make(:body => 'Last post!', :article => Article.first, :person => Article.first.commenters.first)
 
   end
-end
+end

data/squeel.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.version     = Squeel::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ernie Miller"]
-  s.email       = ["ernie@metautonomo.us"]
-  s.homepage    = "http://metautonomo.us/projects/squeel"
+  s.email       = ["ernie@erniemiller.org"]
+  s.homepage    = "http://erniemiller.org/projects/squeel"
   s.summary     = %q{ActiveRecord 3, improved.}
   s.description = %q{
       Squeel unlocks the power of ARel in your Rails 3 application with
@@ -16,15 +16,6 @@ Gem::Specification.new do |s|
       functions provided by your RDBMS, and more, all without writing
       SQL strings.
     }
-  s.post_install_message = %q{
-*** Thanks for installing Squeel! ***
-Be sure to check out http://metautonomo.us/projects/squeel/ for a
-walkthrough of Squeel's features, and click the donate link if
-you're feeling especially appreciative. It'd help me justify this
-"open source" stuff to my lovely wife. :)
-
-}
-
   s.rubyforge_project = "squeel"
 
   s.add_dependency 'activerecord', '~> 3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000 Z
+date: 2012-04-22 00:00:00.000000000 -04:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70289249898780 !ruby/object:Gem::Requirement
+  requirement: &70321134916300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70289249898780
+  version_requirements: *70321134916300
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70289249898020 !ruby/object:Gem::Requirement
+  requirement: &70321134915080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70289249898020
+  version_requirements: *70321134915080
 - !ruby/object:Gem::Dependency
   name: polyamorous
-  requirement: &70289249897260 !ruby/object:Gem::Requirement
+  requirement: &70321134914020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +44,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70289249897260
+  version_requirements: *70321134914020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70289249896240 !ruby/object:Gem::Requirement
+  requirement: &70321134911960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +55,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70289249896240
+  version_requirements: *70321134911960
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70289249894040 !ruby/object:Gem::Requirement
+  requirement: &70321134928680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +66,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70289249894040
+  version_requirements: *70321134928680
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70289249893140 !ruby/object:Gem::Requirement
+  requirement: &70321134927360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +77,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70289249893140
+  version_requirements: *70321134927360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70289249892520 !ruby/object:Gem::Requirement
+  requirement: &70321134925640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,13 +88,13 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70289249892520
+  version_requirements: *70321134925640
 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    "
 email:
-- ernie@metautonomo.us
+- ernie@erniemiller.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -105,6 +106,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/generators/squeel/initializer_generator.rb
+- lib/generators/templates/squeel.rb
 - lib/squeel.rb
 - lib/squeel/adapters/active_record.rb
 - lib/squeel/adapters/active_record/3.0/association_preload_extensions.rb
@@ -183,22 +186,10 @@ files:
 - spec/squeel/visitors/symbol_visitor_spec.rb
 - spec/support/schema.rb
 - squeel.gemspec
-homepage: http://metautonomo.us/projects/squeel
+has_rdoc: true
+homepage: http://erniemiller.org/projects/squeel
 licenses: []
-post_install_message: ! '
-
-  *** Thanks for installing Squeel! ***
-
-  Be sure to check out http://metautonomo.us/projects/squeel/ for a
-
-  walkthrough of Squeel''s features, and click the donate link if
-
-  you''re feeling especially appreciative. It''d help me justify this
-
-  "open source" stuff to my lovely wife. :)
-
-
-'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -208,15 +199,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1688941417700106629
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1688941417700106629
 requirements: []
 rubyforge_project: squeel
-rubygems_version: 1.8.10
+rubygems_version: 1.3.9.4
 signing_key: 
 specification_version: 3
 summary: ActiveRecord 3, improved.