relation_to_struct 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e144536f0414aeccfb958f8ccf336ecec3bc3e8
-  data.tar.gz: d5c5785c24474b4629081346ef5f1c2eb1620ffd
+  metadata.gz: f3c97c2553a7d275a6830b61306a9980db46f98c
+  data.tar.gz: d466c23b0d22e28fd1892314f35bc547d913425d
 SHA512:
-  metadata.gz: 0eede8794be139c326deca580ec817adffe746454848af34ee701e7a540d97267e6de44d0b9245c8f7128335b574013a2bea1fdb6c12f750c497f51cc49f47dc
-  data.tar.gz: 9b7e3a0e055c2501d7d5c23eb11bc08727d71a008f382580c328d746e43037d2c7791094acee393381ec8da822971ee3ec7679d1877b0c9bd2b9efb4b86d3b90
+  metadata.gz: 4885ef40deeb19798257eca384395bf7469f8e5363b05019e2fc64b99e711d6988755198b55a1c6f9da279f0dc7499e8569d0eccdbaf15d676ff66fcbaad6234
+  data.tar.gz: 96f902d4a3259653b5c6f9288655728f588202cffb0b8c941172797b063395abedd9e6d97283a4705d5f70b3e63fd901127ba6902574787ee8ab08d3d5478bb4

data/.gitignore

@@ -12,4 +12,5 @@
 *.so
 *.o
 *.a
+.ruby-version
 mkmf.log

data/Appraisals

@@ -1,5 +1,5 @@
-%w(4.1 4.2 5.0 5.1).each do |version|
+%w(5.0 5.1).each do |version|
   appraise "rails-#{version.gsub(/\./, "-")}" do
-    gem "rails", "~> #{version}.0"
+    gem "rails", "~> #{version}"
   end
 end

data/gemfiles/rails_5_0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0"
+gem "rails", "~> 5.0"
 
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
+gem "rails", "~> 5.1"
 
 gemspec path: "../"

data/lib/relation_to_struct.rb

@@ -1,7 +1,6 @@
 require "relation_to_struct/version"
 require "relation_to_struct/active_record_base_extension"
 require "relation_to_struct/active_record_relation_extension"
-require "relation_to_struct/active_record_result_41_extension"
 
 module RelationToStruct
 end

data/lib/relation_to_struct/active_record_relation_extension.rb

@@ -5,7 +5,10 @@ module RelationToStruct::ActiveRecordRelationExtension
     raise ArgumentError, 'Expected select_values to be present' unless self.select_values.present?
 
     relation = spawn
-    result = klass.connection.select_all(relation.arel, nil, relation.arel.bind_values + bind_values)
+
+    # See the definition of #pluck in:
+    # activerecord/lib/active_record/relation/calculations.rb
+    result = klass.connection.select_all(relation.arel, nil, bound_attributes)
 
     if result.columns.size != struct_class.members.size
       raise ArgumentError, 'Expected struct fields and columns lengths to be equal'
@@ -15,7 +18,7 @@ module RelationToStruct::ActiveRecordRelationExtension
       raise ArgumentError, 'Expected column names to be unique'
     end
 
-    values_after_casting = ActiveRecord::VERSION::MAJOR >= 5 ? result.cast_values() : result.cast_values(klass.column_types)
+    values_after_casting = result.cast_values()
 
     if result.columns.size == 1
       values_after_casting.map do |tuple|

data/lib/relation_to_struct/version.rb

@@ -1,3 +1,3 @@
 module RelationToStruct
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/relation_to_struct.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pg"
 
-  spec.add_dependency "activerecord", ">= 4.1", "< 5.2"
-  spec.add_dependency "activesupport", ">= 4.1", "< 5.2"
+  spec.add_dependency "activerecord", ">= 5.0", "< 5.2"
+  spec.add_dependency "activesupport", ">= 5.0", "< 5.2"
 end

data/spec/active_record_relation_spec.rb

@@ -39,6 +39,21 @@ describe ActiveRecord::Relation do
       ).to eq([test_struct.new(hayek.name, austrian.name)])
     end
 
+    it 'incorporates both integer and text where bind parameters' do
+      hayek = Economist.create!(name: 'F.A. Hayek')
+      test_struct = Struct.new(:id, :name)
+
+      structs = Economist
+        .where(
+          :id => [hayek.id],
+          :name => hayek.name,
+        )
+        .select(:id, :name)
+        .to_structs(test_struct)
+
+      expect(structs).to eq([test_struct.new(hayek.id, hayek.name)])
+    end
+
     it 'properly casts values from arbitrary calculated columns' do
       hayek = Economist.create!(name: 'F.A. Hayek')
       scope = Economist.all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relation_to_struct
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - James Coleman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
@@ -124,7 +124,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
@@ -134,7 +134,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
@@ -144,7 +144,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
@@ -162,14 +162,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_4_1.gemfile
-- gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
 - lib/relation_to_struct.rb
 - lib/relation_to_struct/active_record_base_extension.rb
 - lib/relation_to_struct/active_record_relation_extension.rb
-- lib/relation_to_struct/active_record_result_41_extension.rb
 - lib/relation_to_struct/version.rb
 - relation_to_struct.gemspec
 - spec/active_record_base_spec.rb
@@ -200,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Return struct results from ActiveRecord relation queries

data/gemfiles/rails_4_1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.1.0"
-
-gemspec path: "../"

data/gemfiles/rails_4_2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.2.0"
-
-gemspec path: "../"

data/lib/relation_to_struct/active_record_result_41_extension.rb

@@ -1,26 +0,0 @@
-module RelationToStruct::ActiveRecord41ResultExtension
-  extend ::ActiveSupport::Concern
-
-  included do
-    alias_method_chain :column_type, :ar_42_semantics
-  end
-
-  def cast_values(type_overrides = {}) # :nodoc:
-    types = columns.map { |name| column_type(name, type_overrides) }
-    result = rows.map do |values|
-      types.zip(values).map { |type, value| type.type_cast(value) }
-    end
-
-    columns.one? ? result.map!(&:first) : result
-  end
-
-  def column_type_with_ar_42_semantics(name, type_overrides = {})
-    type_overrides.fetch(name) do
-      column_types.fetch(name, ::ActiveRecord::Result::IDENTITY_TYPE)
-    end
-  end
-end
-
-if ActiveRecord.version < Gem::Version.new("4.2.0")
-  ::ActiveRecord::Result.send(:include, RelationToStruct::ActiveRecord41ResultExtension)
-end