squeel 0.8.5 → 0.8.6

data/.travis.yml

@@ -2,7 +2,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - ree
-  - jruby
   - rbx
   - rbx-2.0
   - ruby-head

data/Gemfile

@@ -3,13 +3,35 @@ gemspec
 
 gem 'rake'
 
-if ENV['RAILS_VERSION'] == 'release'
-  gem 'activesupport'
-  gem 'activerecord'
+rails = ENV['RAILS'] || 'master'
+arel = ENV['AREL'] || 'master'
+
+arel_opts = case arel
+when /\// # A path
+  {:path => arel}
+when /^v/ # A tagged version
+  {:git => 'git://github.com/rails/arel.git', :tag => arel}
+else
+  {:git => 'git://github.com/rails/arel.git', :branch => arel}
+end
+
+gem 'arel', arel_opts
+
+case rails
+when /\// # A path
+  gem 'activesupport', :path => "#{rails}/activesupport"
+  gem 'activemodel', :path => "#{rails}/activemodel"
+  gem 'activerecord', :path => "#{rails}/activerecord"
+when /^v/ # A tagged version
+  git 'git://github.com/rails/rails.git', :tag => rails do
+    gem 'activesupport'
+    gem 'activemodel'
+    gem 'activerecord'
+  end
 else
-  gem 'arel',  :git => 'git://github.com/rails/arel.git'
-  git 'git://github.com/rails/rails.git' do
+  git 'git://github.com/rails/rails.git', :branch => rails do
     gem 'activesupport'
+    gem 'activemodel'
     gem 'activerecord'
   end
 end

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

@@ -4,8 +4,6 @@ module Squeel
       module AssociationPreload
 
         def preload_associations(records, associations, preload_options={})
-          records = Array.wrap(records).compact.uniq
-          return if records.empty?
           super(records, Visitors::SymbolVisitor.new.accept(associations), preload_options)
         end
 

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

@@ -64,7 +64,11 @@ module Squeel
         def prepare_relation_for_association_merge!(r, association_name)
           r.where_values.map! {|w| Squeel::Visitors::PredicateVisitor.can_visit?(w) ? {association_name => w} : w}
           r.having_values.map! {|h| Squeel::Visitors::PredicateVisitor.can_visit?(h) ? {association_name => h} : h}
-          r.joins_values.map! {|j| [Symbol, Hash, Nodes::Stub, Nodes::Join].include?(j.class) ? {association_name => j} : j}
+          r.group_values.map! {|g| Squeel::Visitors::AttributeVisitor.can_visit?(g) ? {association_name => g} : g}
+          r.order_values.map! {|o| Squeel::Visitors::AttributeVisitor.can_visit?(o) ? {association_name => o} : o}
+          r.select_values.map! {|s| Squeel::Visitors::AttributeVisitor.can_visit?(s) ? {association_name => s} : s}
+          r.joins_values.map! {|j| [Symbol, Hash, Nodes::Stub, Nodes::Join, Nodes::KeyPath].include?(j.class) ? {association_name => j} : j}
+          r.includes_values.map! {|i| [Symbol, Hash, Nodes::Stub, Nodes::Join, Nodes::KeyPath].include?(i.class) ? {association_name => i} : i}
         end
 
         def build_arel

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/spec/console.rb

@@ -8,12 +8,13 @@ Dir[File.expand_path('../../spec/{helpers,support,blueprints}/*.rb', __FILE__)].
 end
 
 Sham.define do
-  name     { Faker::Name.name }
-  title    { Faker::Lorem.sentence }
-  body     { Faker::Lorem.paragraph }
-  salary   {|index| 30000 + (index * 1000)}
-  tag_name { Faker::Lorem.words(3).join(' ') }
-  note     { Faker::Lorem.words(7).join(' ') }
+  name        { Faker::Name.name }
+  title       { Faker::Lorem.sentence }
+  body        { Faker::Lorem.paragraph }
+  salary      {|index| 30000 + (index * 1000)}
+  tag_name    { Faker::Lorem.words(3).join(' ') }
+  note        { Faker::Lorem.words(7).join(' ') }
+  object_name { Faker::Lorem.words(1).first }
 end
 
 Schema.create

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'faker'
 
 module ActiveRecord
   class SQLCounter
-    IGNORED_SQL = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/,
+    IGNORED_SQL = [/^PRAGMA /, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/,
       /SELECT name\s+FROM sqlite_master\s+WHERE type = 'table' AND NOT name = 'sqlite_sequence'/]
 
     # FIXME: this needs to be refactored so specific database can add their own
@@ -37,6 +37,7 @@ Sham.define do
   salary   {|index| 30000 + (index * 1000)}
   tag_name { Faker::Lorem.words(3).join(' ') }
   note     { Faker::Lorem.words(7).join(' ') }
+  object_name { Faker::Lorem.words(1).first }
 end
 
 RSpec.configure do |config|

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

@@ -642,6 +642,18 @@ module Squeel
             person.comments.loaded?.should be true
           end
 
+          it 'includes a belongs_to association even if the child model has no primary key' do
+            relation = UnidentifiedObject.where{person_id < 120}.includes(:person)
+            queries = queries_for do
+              vals = relation.to_a
+              vals.should have(8).items
+            end
+
+            queries.should have(2).queries
+
+            queries.last.should match /IN \(1, ?34, ?67, ?100\)/
+          end
+
         end
 
       end

data/spec/support/schema.rb

@@ -15,6 +15,11 @@ class Person < ActiveRecord::Base
   has_many   :authored_article_comments, :through => :articles,
              :source => :comments
   has_many   :notes, :as => :notable
+  has_many   :unidentified_objects
+end
+
+class UnidentifiedObject < ActiveRecord::Base
+  belongs_to :person
 end
 
 class Article < ActiveRecord::Base
@@ -50,6 +55,11 @@ module Schema
           t.integer  :salary
         end
 
+        create_table :unidentified_objects, :id => false, :force => true do |t|
+          t.integer  :person_id
+          t.string   :name
+        end
+
         create_table :articles, :force => true do |t|
           t.integer :person_id
           t.string  :title
@@ -82,6 +92,9 @@ module Schema
 
     10.times do
       person = Person.make
+      2.times do
+        UnidentifiedObject.create(:person => person, :name => Sham.object_name)
+      end
       Note.make(:notable => person)
       3.times do
         article = Article.make(:person => person)

metadata

@@ -1,127 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: squeel
-version: !ruby/object:Gem::Version 
-  hash: 53
+version: !ruby/object:Gem::Version
+  version: 0.8.6
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 5
-  version: 0.8.5
 platform: ruby
-authors: 
+authors:
 - Ernie Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-02 00:00:00 -04:00
+date: 2011-08-01 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70148779727860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70148779727860
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70148779727360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70148779727360
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70148779726900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: machinist
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70148779726900
+- !ruby/object:Gem::Dependency
+  name: machinist
+  requirement: &70148779726440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 0
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.0.6
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: faker
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70148779726440
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: &70148779725980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 9
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.9.5
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70148779725980
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70148779725520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
-  version_requirements: *id006
-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: 
+  prerelease: false
+  version_requirements: *70148779725520
+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
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -207,45 +173,42 @@ files:
 has_rdoc: true
 homepage: http://metautonomo.us/projects/squeel
 licenses: []
+post_install_message: ! '
 
-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
+
+  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. :)
-  
-rdoc_options: []
 
-require_paths: 
+
+'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: squeel
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ActiveRecord 3, improved.
-test_files: 
+test_files:
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
 - spec/blueprints/notes.rb