ar-ondemand 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2c4521729983f1090784fec916b04caaaf25aa21
-  data.tar.gz: f7bd9bdd35059b675d80aaf687b8e8e612da4ddf
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2NlZmEyMjljODU5YzNlZDlhMTVkN2VjZGYwNDc1ZDY0Zjg5YzRkOQ==
+  data.tar.gz: !binary |-
+    NmM3MWQ2N2ZhYWRiYjRmYTJmNGQ2NTI4YjY1NmE0MjQxYTNkODgzOA==
 SHA512:
-  metadata.gz: 384adac8921cbbfcbf79145a5371e9424cc2c9e52713d07023f457db4647818d6fb999237c68be3035d93e199b58d41d04d1e9c2e388ba4aee14a4450ca480d6
-  data.tar.gz: 8cc4b2d553068f51afeb8712f8f89787a0c4b81c7039e67d2bc695ccdd5aba2110dda633303a19379a0823a2fd1233679848041a08ce10887d4fcbd35d245526
+  metadata.gz: !binary |-
+    NzdlODIwMGM2YTRkNzIwMDhjNDg3MDJmNzBlOWNhNDAyYTkwYmJjZTAwNzg5
+    OGRmNmMwMWVmMDVhMGIxODdkNTk3OWJlYmU3NmQ0NTNiYzU1MmQ5ZTc1NjFj
+    OWJhM2M1YzFhYzgwNTJjY2IxYmY3NWJkNGRjOWUyZjA0OWYxYjg=
+  data.tar.gz: !binary |-
+    MTlkYTZhYzY5YjllOTM5NTc2ZDYxOWFjZDU3NjU5MmU4ZmMyMzZmZmM0NDhj
+    NDhlMTBjYTRmZTc5YmUyY2IxZTQxMDIxM2U4NTQwNDYyMWNmMDI1MTM2MTA5
+    ZDI5OWEzNTIwN2ZlMWRkZTBhNGI5NzQ5ZDE5ODNjMDBlOTMyM2E=

data/lib/ar-ondemand/fast_enumeration.rb

@@ -1,27 +1,29 @@
 module ActiveRecord
   module OnDemand
     class FastEnumeration
-
       def initialize(model, result_set)
         @result_set = result_set
         @column_models = model.columns.inject({}) { |h, c| h[c.name] = c; h }
         result_set.columns.each_with_index do |name, index|
           column_model = @column_models[name]
+
+          # For AR 5.x type casting
+          ar_type = ActiveRecord::Type.registry.lookup(column_model.type) if defined?(ActiveRecord::Type.registry.lookup)
           self.define_singleton_method(name) do
             raise 'Not accessible outside of enumeration' if @row.nil?
-
-            if column_model.respond_to?(:type)
-              # Rails 5+
-              t = column_model.type
-              t.is_a?(::Symbol) ? @row[index] : t.cast(@row[index])
-            elsif column_model.respond_to?(:type_cast)
+            if column_model.respond_to?(:type_cast)
               # TODO Remove this when dropping support for Rails 3
               column_model.type_cast @row[index]
-            else
+            elsif column_model.respond_to?(:type_cast_from_database)
               # Rails 4.2 renamed type_cast into type_cast_from_database
               # This is not documented in their upgrade docs or release notes.
               # See https://github.com/rails/rails/commit/d24e640
               column_model.type_cast_from_database @row[index]
+            elsif ar_type
+              # Rails 5+
+              ar_type.is_a?(::Symbol) ? @row[index] : ar_type.cast(@row[index])
+            else
+              raise 'Unable to determine type cast method for column'
             end
           end
         end

data/lib/ar-ondemand/result.rb

@@ -9,6 +9,10 @@ module ActiveRecord
         @model = model
         @results = results
         @column_types = Hash[@model.columns.map { |x| [x.name, x] }]
+
+        # For AR 5.x capture the types from registry to use for conversion
+        @ar_types = defined?(ActiveRecord::Type.registry.lookup) ? Hash[@model.columns.map { |x| [x.name, ActiveRecord::Type.registry.lookup(x.type)] }] : nil
+
         determine_type_cast_method
         @col_indexes = HashWithIndifferentAccess[@results.columns.each_with_index.map { |x, i| [x,i] }]
         @raw = options.delete :raw
@@ -60,10 +64,7 @@ module ActiveRecord
       def determine_type_cast_method
         _, col = @column_types.first
         return if col.nil?
-        @type_cast = if col.respond_to?(:type)
-                       # Rails 5+
-                       :type
-                     elsif col.respond_to?(:type_cast)
+        @type_cast = if col.respond_to?(:type_cast)
                        # Rails 3
                        :type_cast
                      elsif col.respond_to?(:type_cast_from_database)
@@ -71,6 +72,9 @@ module ActiveRecord
                        # This is not documented in their upgrade docs or release notes.
                        # See https://github.com/rails/rails/commit/d24e640
                        :type_cast_from_database
+                     elsif @ar_types
+                       # Rails 5+
+                       :type
                      else
                        raise 'Unable to determine type cast method for column'
                      end
@@ -96,7 +100,7 @@ module ActiveRecord
       def cast_value(k, v)
         return v unless @column_types[k]
         if @type_cast == :type
-          t = @column_types[k].type
+          t = @ar_types[k]
           t.is_a?(::Symbol) ? v : t.cast(v)
         elsif @type_cast == :type_cast
           @column_types[k].type_cast v

data/lib/ar-ondemand/version.rb

@@ -1,3 +1,3 @@
 module ArOnDemand
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/spec/lib/for_enumeration_reading_spec.rb

@@ -73,6 +73,12 @@ describe 'ForEnumerationReading' do
         expect(AuditRecord.where(customer_id: 1).for_enumeration_reading.size).to be 25
       end
 
+      it 'should convert date/time fields properly' do
+        AuditRecord.where(customer_id: 1).for_enumeration_reading.each do |r|
+          expect(r.created_at.class).to be Time
+        end
+      end
+
     end
   end
 end

data/spec/lib/for_reading_spec.rb

@@ -54,6 +54,12 @@ describe 'ForReading' do
         expect(records_a).to eq records_b
       end
 
+      it 'should convert date/time fields properly' do
+        AuditRecord.for_reading.each do |r|
+          expect(r.created_at.class).to be Time
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ar-ondemand
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Steve Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '12.0'
 description: Fast access to database results without the memory overhead of ActiveRecord
@@ -75,7 +75,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS.md
 - Gemfile
@@ -123,17 +123,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: ActiveRecord On-demand