relation_to_struct 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20d99ebc500ab5e07fd4b78fcb158790fa26b475
-  data.tar.gz: 5af91e2d780a6e0ec03383c3c29599674707f0a5
+  metadata.gz: 3f6639fc279267133528f887315dc029f1089880
+  data.tar.gz: 6865cc290bf029d43c9b9dc72c75a262164bdbc8
 SHA512:
-  metadata.gz: 732739b20458d9223cb161bdc4c3c9928b28a2b1c70536aca9371ddf642264a83b6f78ea1dd8eb78862d22069672a78b4cc12930d9cfbb97f448aa506ecdc759
-  data.tar.gz: 258ea4297e9b7f2538d54a727b9b4eeee01df5f8dfae0041c5ee8ebf2ecc0ba1753866aa0d127e9699aedfc2af95005a74d76b35e97995899e3450b9d444b4c4
+  metadata.gz: eb0f5c09deb989f4bfede6bfa8f1e1cee914188b72923e69a98a468746564a8a030587130691a38eb58b97434f0258ac452065120c295fd2ba0138e68c004ce3
+  data.tar.gz: c16127b078adb408b6076c2b5bbf60b0f93a29520398e46e916b46ff43ed55eb29cb095ce20bccf62bd2b4c713da9c030a0349c128f7a64b72c5390140d1e7df

data/Appraisals

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

data/README.md

@@ -57,6 +57,16 @@ eos
 ActiveRecord::Base.value_from_sql(sql) # => single value
 ```
 
+```
+sql = <<-eos
+  SELECT users.id, users.name
+  FROM users
+  LIMIT 1
+eos
+
+ActiveRecord::Base.tuple_from_sql(sql) # => [id, name]
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/jcoleman/relation_to_struct/fork )

data/gemfiles/rails_5_0.gemfile

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

data/lib/relation_to_struct/active_record_base_extension.rb

@@ -2,8 +2,13 @@ module RelationToStruct::ActiveRecordBaseExtension
   extend ::ActiveSupport::Concern
 
   module ClassMethods
+    def _sanitize_sql_for_relation_to_struct(sql)
+      sanitized_sql = ActiveRecord::VERSION::MAJOR >= 5 ? sanitize_sql(sql) : sanitize_sql(sql, nil)
+    end
+
     def structs_from_sql(struct_class, sql, binds=[])
-      result = connection.select_all(sanitize_sql(sql, nil), "Structs SQL Load", binds)
+      sanitized_sql = _sanitize_sql_for_relation_to_struct(sql)
+      result = connection.select_all(sanitized_sql, "Structs SQL Load", binds)
 
       if result.columns.size != result.columns.uniq.size
         raise ArgumentError, 'Expected column names to be unique'
@@ -25,12 +30,14 @@ module RelationToStruct::ActiveRecordBaseExtension
     end
 
     def pluck_from_sql(sql, binds=[])
-      result = connection.select_all(sanitize_sql(sql, nil), "Pluck SQL Load", binds)
+      sanitized_sql = _sanitize_sql_for_relation_to_struct(sql)
+      result = connection.select_all(sanitized_sql, "Pluck SQL Load", binds)
       result.cast_values()
     end
 
     def value_from_sql(sql, binds=[])
-      result = connection.select_all(sanitize_sql(sql, nil), "Value SQL Load", binds)
+      sanitized_sql = _sanitize_sql_for_relation_to_struct(sql)
+      result = connection.select_all(sanitized_sql, "Value SQL Load", binds)
       raise ArgumentError, 'Expected exactly one column to be selected' unless result.columns.size == 1
 
       values = result.cast_values()
@@ -45,7 +52,8 @@ module RelationToStruct::ActiveRecordBaseExtension
     end
 
     def tuple_from_sql(sql, binds=[])
-      result = connection.select_all(sanitize_sql(sql, nil), "Value SQL Load", binds)
+      sanitized_sql = _sanitize_sql_for_relation_to_struct(sql)
+      result = connection.select_all(sanitized_sql, "Value SQL Load", binds)
       values = result.cast_values()
 
       case values.size

data/lib/relation_to_struct/active_record_relation_extension.rb

@@ -15,14 +15,14 @@ module RelationToStruct::ActiveRecordRelationExtension
       raise ArgumentError, 'Expected column names to be unique'
     end
 
-    result.cast_values(klass.column_types)
+    values_after_casting = ActiveRecord::VERSION::MAJOR >= 5 ? result.cast_values() : result.cast_values(klass.column_types)
 
     if result.columns.size == 1
-      result.cast_values(klass.column_types).map do |tuple|
+      values_after_casting.map do |tuple|
         struct_class.new(tuple)
       end
     else
-      result.cast_values(klass.column_types).map do |tuple|
+      values_after_casting.map do |tuple|
         struct_class.new(*tuple)
       end
     end

data/lib/relation_to_struct/version.rb

@@ -1,3 +1,3 @@
 module RelationToStruct
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 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"
-  spec.add_dependency "activesupport", "~> 4.1"
+  spec.add_dependency "activerecord", ">= 4.1", "< 5.1"
+  spec.add_dependency "activesupport", ">= 4.1", "< 5.1"
 end

data/spec/active_record_helper/setup.rb

@@ -13,17 +13,17 @@ ActiveRecord::Base.configurations = {
 }
 
 env = ENV['DATABASE'] ||= 'sqlite'
+config = ActiveRecord::Base.configurations[env]
+
 case env
 when 'postgresql'
   ActiveRecord::Tasks::DatabaseTasks.instance_variable_set('@env', env)
-  config = ActiveRecord::Base.configurations[env]
-
   ActiveRecord::Tasks::DatabaseTasks.drop_current
   ActiveRecord::Tasks::DatabaseTasks.create_current
   ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:ruby, File.expand_path('../schema.rb', __FILE__))
-  ActiveRecord::Base.establish_connection(env)
+  ActiveRecord::Base.establish_connection(config)
 when 'sqlite'
-  ActiveRecord::Base.establish_connection(env)
+  ActiveRecord::Base.establish_connection(config)
   require_relative 'schema'
 else
   raise ArgumentError, 'Unrecognized ENV["DATABASE"] argument.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relation_to_struct
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - James Coleman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -112,30 +112,42 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 description: ''
 email:
 - jtc331@gmail.com
@@ -152,6 +164,7 @@ files:
 - Rakefile
 - gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
 - lib/relation_to_struct.rb
 - lib/relation_to_struct/active_record_base_extension.rb
 - lib/relation_to_struct/active_record_relation_extension.rb
@@ -186,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Return struct results from ActiveRecord relation queries
@@ -199,4 +212,3 @@ test_files:
 - spec/active_record_relation_spec.rb
 - spec/relation_to_struct_spec.rb
 - spec/spec_helper.rb
-has_rdoc: