squeel 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bd3775d68a256e08489cd4c9e80f050c9048e46
-  data.tar.gz: d0c2141316dff16b8a0235f6ab1c8dae5224b139
+  metadata.gz: f09c217e5470f116d3894a55bc00252993b608ac
+  data.tar.gz: b53b4a457fa42594dfedee121a3f3060fbe7e6d9
 SHA512:
-  metadata.gz: ca682a51846f17fb4f74dd5f23a10e022841b6ac91d62f744f6378a64c59fce21519b0cabf55f9dccb0a58f0b25a74592a74073d8ac67a59eb14aad7ea30cd0a
-  data.tar.gz: 26ef0beb4f3b04d40b852cd20ed085279186aadb83718e6ebcda1e0a1b62ea5dfd63bd4f3af7f9f1365e5505893db717757409419f0fa0323bb714512c8f16a5
+  metadata.gz: a7455c54120d449e0a9d81c4b93afe1c6e5bdda6cf9db798b80cb91ea9d905ab2e7f16f52240cb1a022c2efab90c2669c3da1a91080114b4523eacb58b38f4a8
+  data.tar.gz: 12208d5ac32c0cfbb6fad4342f2a95b8260156016c2710716907c0c63de981dfb99de7a757fdc583c3472438253b4f9d0fe4095f66f7e0a6efe803c012e99126

data/.travis.yml

@@ -8,31 +8,30 @@ script:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - 2.1.2
+  - 2.1.5
 
 env:
   global:
     - SQ_CONFIG_FILE=$TRAVIS_BUILD_DIR/spec/config.travis.yml
   matrix:
-    - RAILS=master AREL=master ADAPTER=sqlite3
+    - RAILS=4-2-stable AREL=6-0-stable ADAPTER=sqlite3
     - RAILS=4-1-stable AREL=5-0-stable ADAPTER=sqlite3
     - RAILS=4-0-stable AREL=4-0-stable ADAPTER=sqlite3
     - RAILS=3-2-stable AREL=3-0-stable ADAPTER=sqlite3
     - RAILS=3-1-stable AREL=2-2-stable ADAPTER=sqlite3
     - RAILS=3-0-stable AREL=2-0-stable ADAPTER=sqlite3
-    - RAILS=master AREL=master ADAPTER=mysql
+    - RAILS=4-2-stable AREL=6-0-stable ADAPTER=mysql
     - RAILS=4-1-stable AREL=5-0-stable ADAPTER=mysql
     - RAILS=4-0-stable AREL=4-0-stable ADAPTER=mysql
     - RAILS=3-2-stable AREL=3-0-stable ADAPTER=mysql
     - RAILS=3-1-stable AREL=2-2-stable ADAPTER=mysql
     - RAILS=3-0-stable AREL=2-0-stable ADAPTER=mysql
-    - RAILS=master AREL=master ADAPTER=mysql2
+    - RAILS=4-2-stable AREL=6-0-stable ADAPTER=mysql2
     - RAILS=4-1-stable AREL=5-0-stable ADAPTER=mysql2
     - RAILS=4-0-stable AREL=4-0-stable ADAPTER=mysql2
     - RAILS=3-2-stable AREL=3-0-stable ADAPTER=mysql2
     - RAILS=3-1-stable AREL=2-2-stable ADAPTER=mysql2
-    - RAILS=master AREL=master ADAPTER=postgresql
+    - RAILS=4-2-stable AREL=6-0-stable ADAPTER=postgresql
     - RAILS=4-1-stable AREL=5-0-stable ADAPTER=postgresql
     - RAILS=4-0-stable AREL=4-0-stable ADAPTER=postgresql
     - RAILS=3-2-stable AREL=3-0-stable ADAPTER=postgresql

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 1.2.3 (Unreleased)
+## 1.2.4 (Unreleased)
+
+
+## 1.2.3 (2015-2-5)
+* Support the latest version of Rails 4.2 and 4.1. By @danielrhodes
 
 ## 1.2.2 (2014-11-25)
 

data/Gemfile

@@ -3,12 +3,8 @@ gemspec
 
 gem 'rake'
 
-rails = ENV['RAILS'] || 'master'
-arel = ENV['AREL'] || 'master'
-
-if rails == 'master'
-  gem 'i18n', github: 'svenfuchs/i18n', branch: 'master'
-end
+rails = ENV['RAILS'] || '4-2-stable'
+arel = ENV['AREL'] || '6-0-stable'
 
 arel_opts = case arel
 when /\// # A path

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

@@ -80,16 +80,15 @@ module Squeel
 
           collapse_wheres(arel, where_visit((where_values - ['']).uniq))
 
-          arel.having(*having_visit(having_values.uniq.reject{|h| h.blank?})) unless having_values.empty?
+          arel.having(*having_visit(having_values.uniq.reject(&:blank?))) unless having_values.empty?
 
           arel.take(connection.sanitize_limit(limit_value)) if limit_value
           arel.skip(offset_value.to_i) if offset_value
-
-          arel.group(*group_visit(group_values.uniq.reject{|g| g.blank?})) unless group_values.empty?
+          arel.group(*group_visit(group_values.uniq.reject(&:blank?))) unless group_values.empty?
 
           build_order(arel)
 
-          build_select(arel, select_visit(select_values.uniq))
+          build_select(arel)
 
           arel.distinct(distinct_value)
           arel.from(build_from) if from_value
@@ -231,6 +230,14 @@ module Squeel
           arel.order(*orders) unless orders.empty?
         end
 
+        def build_select(arel)
+          if select_values.any?
+            arel.project(*select_visit(select_values.uniq))
+          else
+            arel.project(@klass.arel_table[Arel.star])
+          end
+        end
+
         def where_values_hash_with_squeel(relation_table_name = table_name)
           equalities = find_equality_predicates(where_visit(where_values), relation_table_name)
           binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]

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

@@ -17,6 +17,30 @@ module Squeel
           self
         end
 
+        def build_arel
+          arel = Arel::SelectManager.new(table.engine, table)
+
+          build_joins(arel, joins_values.flatten) unless joins_values.empty?
+
+          collapse_wheres(arel, where_visit((where_values - ['']).uniq))
+
+          arel.having(*having_visit(having_values.uniq.reject(&:blank?))) unless having_values.empty?
+
+          arel.take(connection.sanitize_limit(limit_value)) if limit_value
+          arel.skip(offset_value.to_i) if offset_value
+          arel.group(*group_visit(group_values.uniq.reject(&:blank?))) unless group_values.empty?
+
+          build_order(arel)
+
+          build_select(arel)
+
+          arel.distinct(distinct_value)
+          arel.from(build_from) if from_value
+          arel.lock(lock_value) if lock_value
+
+          arel
+        end
+
         def build_join_dependency(manager, joins)
           buckets = joins.group_by do |join|
             case join
@@ -89,8 +113,7 @@ module Squeel
         def expand_attrs_from_hash(opts)
           opts = ::ActiveRecord::PredicateBuilder.resolve_column_aliases(klass, opts)
 
-          bv_len = bind_values.length
-          tmp_opts, bind_values = create_binds(opts, bv_len)
+          tmp_opts, bind_values = create_binds(opts)
           self.bind_values += bind_values
 
           attributes = @klass.send(:expand_hash_conditions_for_aggregates, tmp_opts)

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

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

@@ -134,7 +134,12 @@ module Squeel
             })
 
             arel = relation.build_arel
-            arel.to_sql.should match /#{Q}parents_people_2#{Q}.#{Q}name#{Q} = 'bob'/
+
+            if activerecord_version_at_least('4.2.0')
+              arel.to_sql.should match /#{Q}parents_people_2#{Q}.#{Q}name#{Q} = ?/
+            else
+              arel.to_sql.should match /#{Q}parents_people_2#{Q}.#{Q}name#{Q} = 'bob'/
+            end
           end
 
           it 'combines multiple conditions of the same type against the same column with AND' do
@@ -174,7 +179,12 @@ module Squeel
             })
 
             arel = relation.build_arel
-            arel.to_sql.should match /HAVING #{Q}parents_people_2#{Q}.#{Q}name#{Q} = 'joe'/
+
+            if activerecord_version_at_least('4.2.0')
+              arel.to_sql.should match /HAVING #{Q}parents_people_2#{Q}.#{Q}name#{Q} = ?/
+            else
+              arel.to_sql.should match /HAVING #{Q}parents_people_2#{Q}.#{Q}name#{Q} = 'joe'/
+            end
           end
 
           it 'maps orders inside a hash to their appropriate association table' do
@@ -1053,6 +1063,20 @@ module Squeel
             end
           end
 
+          it 'creates new records with equality predicates from has_many polymorphic associations' do
+            if activerecord_version_at_least '4.2.0'
+              Payment.transaction do
+                seat = Seat.first
+                order_item = seat.order_items.create(:quantity => 0)
+                order_item.should be_persisted
+                order_item.orderable_id.should eq seat.id
+                order_item.orderable_type.should eq 'Seat'
+                raise ::ActiveRecord::Rollback
+              end
+            else
+              pending 'Not required in AR versions < 4.2.0'
+            end
+          end
         end
 
         describe '#where_unscoping' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ernie Miller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord