ar-ondemand 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDk0NjYyYTNiZDkzNTRkNzlhNTcxNGY5OTQ3NzlkY2E4MjZhMDczOQ==
-  data.tar.gz: !binary |-
-    ZDc5YzJjODZjZDM3Yjk1ODcwZWE1MTZjMzEyZGI4MGM2NWQ2MmJlZQ==
+SHA1:
+  metadata.gz: 2c4521729983f1090784fec916b04caaaf25aa21
+  data.tar.gz: f7bd9bdd35059b675d80aaf687b8e8e612da4ddf
 SHA512:
-  metadata.gz: !binary |-
-    MTA2NGM0NmM2YWU0MzgyNjI2ZmNkMWQxZGEyYWMwZWY1ODk4ZmJkODljNzM0
-    MzQ0NTY4ZGI3YjJiZGIyZjA0NTI3ZTRkNmRkMWUxOWQyMzI0OThjNDJhNjQy
-    ZDk3Y2NmZGRhNzM0ZGFlOTc1NDQzNTJlYzNhYmJiN2Q3OTFhZDc=
-  data.tar.gz: !binary |-
-    YWQwZTFlMjU3Yjc3NTNkMzdhODJlMGVjZmVlZTI3ZjE5MDE1NzRlZGY4Y2M2
-    MTYyN2ZhZWQ2ZjEyNmU3NDIyNDgyMjU1ZjVmYmQwMmQzZjllNDQwZTgxZDJi
-    YzhhMzExN2NkN2FiZGQ2ZDkwM2I2ZmU1OThkNDBkNGM3ZTZmNDQ=
+  metadata.gz: 384adac8921cbbfcbf79145a5371e9424cc2c9e52713d07023f457db4647818d6fb999237c68be3035d93e199b58d41d04d1e9c2e388ba4aee14a4450ca480d6
+  data.tar.gz: 8cc4b2d553068f51afeb8712f8f89787a0c4b81c7039e67d2bc695ccdd5aba2110dda633303a19379a0823a2fd1233679848041a08ce10887d4fcbd35d245526

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.0
+
+* Support for Rails 5+
+
 # 1.1.4
 
 ## [misc]

data/Gemfile

@@ -9,6 +9,7 @@ group :test, :development do
     gem 'sqlite3'
   end
 
+  gem 'rake'
   gem 'rspec'
   gem 'factory_girl'
   gem 'pry'

data/ar-ondemand.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
 
   s.require_paths = %w(lib)
 
-  s.add_dependency 'activesupport', '>= 3.2', '< 5'
-  s.add_dependency 'activerecord',  '>= 3.2', '< 5'
+  s.add_dependency 'activesupport', '>= 3.2'
+  s.add_dependency 'activerecord',  '>= 3.2'
+
+  s.add_development_dependency 'bundler', '>= 1.14'
+  s.add_development_dependency 'rake', '>= 12.0'
 end

data/lib/ar-ondemand/fast_enumeration.rb

@@ -4,22 +4,26 @@ module ActiveRecord
 
       def initialize(model, result_set)
         @result_set = result_set
-        @column_models = model.columns.inject({}) {|h,c| h[c.name] = c; h}
+        @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]
-          self.define_singleton_method(name) {
-            raise "Not accessible outside of enumeration" if @row.nil?
+          self.define_singleton_method(name) do
+            raise 'Not accessible outside of enumeration' if @row.nil?
 
-            # 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
-            # TODO Remove this when dropping support for Rails 3
-            if column_model.respond_to?(:type_cast)
+            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)
+              # TODO Remove this when dropping support for Rails 3
               column_model.type_cast @row[index]
             else
+              # 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]
             end
-          }
+          end
         end
       end
 
@@ -46,7 +50,6 @@ module ActiveRecord
       def size
         @result_set.rows.size
       end
-
     end
   end
 end

data/lib/ar-ondemand/for_enumeration_reading.rb

@@ -13,7 +13,6 @@ module ActiveRecord
 
         private
         def query_for_enumeration_reading(ar)
-
           # TODO Clean this up after dropping support for Rails 3
           if ActiveRecord::VERSION::MAJOR == 3
             ar = ar.scoped unless ar.respond_to?(:to_sql)
@@ -21,9 +20,10 @@ module ActiveRecord
             ar = ar.all unless ar.respond_to?(:to_sql)
           end
 
-          ::ActiveRecord::OnDemand::FastEnumeration.new(ar.arel.engine, ::ActiveRecord::Base.connection.exec_query(ar.to_sql))
+          model = ar.respond_to?(:model) ? ar.model : ar.arel.engine
+          result_set = ::ActiveRecord::Base.connection.exec_query ar.to_sql
+          ::ActiveRecord::OnDemand::FastEnumeration.new model, result_set
         end
-
       end
     end
   end

data/lib/ar-ondemand/for_reading.rb

@@ -61,8 +61,9 @@ module ActiveRecord
             ar = ar.all unless ar.respond_to?(:to_sql)
           end
 
+          model = ar.respond_to?(:model) ? ar.model : ar.arel.engine
           results = ::ActiveRecord::Base.connection.exec_query ar.to_sql
-          ::ActiveRecord::OnDemand::ResultSet.new ar.arel.engine, results, options
+          ::ActiveRecord::OnDemand::ResultSet.new model, results, options
         end
 
         def batch_order_for_reading

data/lib/ar-ondemand/record.rb

@@ -75,11 +75,11 @@ module ActiveRecord
         # replaced with `instantiate` (see http://stackoverflow.com/q/20409650/1935861
         # and https://github.com/rails/rails/blob/31a95ed/activerecord/lib/active_record/persistence.rb#L56-L70).
         # TODO Remove when dropping Rails 3 support
-        if @model_instantiate
-          rec = @model.instantiate(@record)
-        else
-          rec = @model.allocate.init_with('attributes' => @record)
-        end
+        rec = if @model_instantiate
+                @model.instantiate(@record)
+              else
+                @model.allocate.init_with('attributes' => @record)
+              end
         @changes.each_pair do |key, val|
           next if key == 'id'
           rec.send("#{key}=".to_sym, val)

data/lib/ar-ondemand/result.rb

@@ -9,6 +9,7 @@ module ActiveRecord
         @model = model
         @results = results
         @column_types = Hash[@model.columns.map { |x| [x.name, x] }]
+        determine_type_cast_method
         @col_indexes = HashWithIndifferentAccess[@results.columns.each_with_index.map { |x, i| [x,i] }]
         @raw = options.delete :raw
         @readonly = options.delete :readonly
@@ -56,40 +57,53 @@ module ActiveRecord
         CACHED_READONLY_CLASSES[attrs] = ::Struct.new(*attrs)
       end
 
+      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)
+                       # Rails 3
+                       :type_cast
+                     elsif col.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
+                       :type_cast_from_database
+                     else
+                       raise 'Unable to determine type cast method for column'
+                     end
+      end
+
       def convert_to_hash(rec)
         # TODO: Is using HashWithIndifferentAccess[] more efficient?
-        h = {}
+        h = HashWithIndifferentAccess.new
         @col_indexes.each_pair do |k, v|
-          if @column_types[k]
-            # 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
-            if @column_types[k].respond_to?(:type_cast)
-              h[k] = @column_types[k].type_cast rec[v]
-            else
-              h[k] = @column_types[k].type_cast_from_database rec[v]
-            end
-          else
-            h[k] = rec[v]
-          end
+          h[k] = cast_value k, rec[v]
         end
-        h.with_indifferent_access
+        h
       end
 
       def convert_to_struct(klass, rec)
         vals = []
         @col_indexes.each_pair do |k, v|
-          # 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
-          if @column_types[k].respond_to?(:type_cast)
-            vals << @column_types[k].type_cast(rec[v])
-          else
-            vals << @column_types[k].type_cast_from_database(rec[v])
-          end
+          vals << cast_value(k, rec[v])
         end
         klass.new(*vals)
       end
+
+      def cast_value(k, v)
+        return v unless @column_types[k]
+        if @type_cast == :type
+          t = @column_types[k].type
+          t.is_a?(::Symbol) ? v : t.cast(v)
+        elsif @type_cast == :type_cast
+          @column_types[k].type_cast v
+        else
+          @column_types[k].type_cast_from_database v
+        end
+      end
     end
   end
 end

data/lib/ar-ondemand/version.rb

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

data/rails_5.1.Gemfile

@@ -0,0 +1,4 @@
+eval_gemfile 'Gemfile'
+
+gem 'activesupport', '~> 5.1.1'
+gem 'activerecord', '~> 5.1.1'

data/solano.yml

@@ -1,5 +1,4 @@
 ---
-ruby_version: ruby-1.9.3-p392
 coverage: false
 
 rake:
@@ -8,24 +7,37 @@ rake:
 environment:
   TZ: UTC
 
+hooks:
+  # Runs after repository is checked out and replaces automatic dependency installation
+  package_setup: gem install bundler && bundle install --path=$HOME/bundle --no-deployment
+
 # Build pipelines run concurrently (http://docs.solanolabs.com/Beta/build-pipelines/)
 pipeline:
   - rails_3_2
   - rails_4_0
   - rails_4_1
   - rails_4_2
+  - rails_5_1
 
 # Named profile steps that can be used by build profiles and pipelines
 profiles:
   rails_3_2:
+    ruby_version: ruby-1.9.3-p392
     environment:
       BUNDLE_GEMFILE: rails_3.2.Gemfile
   rails_4_0:
+    ruby_version: ruby-1.9.3-p392
     environment:
       BUNDLE_GEMFILE: rails_4.0.Gemfile
   rails_4_1:
+    ruby_version: ruby-1.9.3-p392
     environment:
       BUNDLE_GEMFILE: rails_4.1.Gemfile
   rails_4_2:
+    ruby_version: ruby-1.9.3-p392
     environment:
       BUNDLE_GEMFILE: rails_4.2.Gemfile
+  rails_5_1:
+    ruby_version: ruby-2.3.4
+    environment:
+      BUNDLE_GEMFILE: rails_5.1.Gemfile

metadata

@@ -1,55 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: ar-ondemand
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Steve Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-06-14 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'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5'
   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: '5'
+        version: '12.0'
 description: Fast access to database results without the memory overhead of ActiveRecord
   objects
 email:
@@ -59,7 +75,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - CONTRIBUTORS.md
 - Gemfile
@@ -81,6 +97,7 @@ files:
 - rails_4.0.Gemfile
 - rails_4.1.Gemfile
 - rails_4.2.Gemfile
+- rails_5.1.Gemfile
 - solano.yml
 - spec/app/models/audit_record.rb
 - spec/app/models/widget.rb
@@ -106,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.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord On-demand