ar-ondemand 1.1.8 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmJkZGE0ZjJmOTAxNGMzNTQ2M2VhZWIxODJkZmYxODE5OTc1ZjQyMA==
+    NDk0NjYyYTNiZDkzNTRkNzlhNTcxNGY5OTQ3NzlkY2E4MjZhMDczOQ==
   data.tar.gz: !binary |-
-    ZjgxOGJjYWVjMzVhY2U2ZjYzZTk4OWZmMTI1MThmZThkYTA1ZTYxNw==
+    ZDc5YzJjODZjZDM3Yjk1ODcwZWE1MTZjMzEyZGI4MGM2NWQ2MmJlZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDNjOTY4Y2MyN2JlYzRjZGU2YzFhNjEyNmY0YmQzZWE5YTAzYWU2Y2NmNjlm
-    MWM1N2U2MmFmYWU1ZDZiYTAzMzg0NmM5MThjYTNkMjEyMGU3NjAyYWQzZWMy
-    ODMzNGVmNTE2ZThjMjk4YTI2ZmE0NTcwZjNkMTAzNjdiYzkyMDY=
+    MTA2NGM0NmM2YWU0MzgyNjI2ZmNkMWQxZGEyYWMwZWY1ODk4ZmJkODljNzM0
+    MzQ0NTY4ZGI3YjJiZGIyZjA0NTI3ZTRkNmRkMWUxOWQyMzI0OThjNDJhNjQy
+    ZDk3Y2NmZGRhNzM0ZGFlOTc1NDQzNTJlYzNhYmJiN2Q3OTFhZDc=
   data.tar.gz: !binary |-
-    MWU1ZTlkYzYyZGM0ZGY1ZDgxYTUyMGRkZWVmMTg1ODk1M2YwZGNhNjdiYzVh
-    NWQyMzVlOTQwNTJhNGU4ZjViNDgzMWJjYmFhNGVjMmYzMGIxYTM2MGY1NDE2
-    OWY3ZDMwYzNjZjQ0ZTI0OWRkYTEyZWJlYmM5MzU1ZDdkZDlmMGU=
+    YWQwZTFlMjU3Yjc3NTNkMzdhODJlMGVjZmVlZTI3ZjE5MDE1NzRlZGY4Y2M2
+    MTYyN2ZhZWQ2ZjEyNmU3NDIyNDgyMjU1ZjVmYmQwMmQzZjllNDQwZTgxZDJi
+    YzhhMzExN2NkN2FiZGQ2ZDkwM2I2ZmU1OThkNDBkNGM3ZTZmNDQ=

data/.gitignore

@@ -6,3 +6,4 @@ spec/log
 .ruby*
 .rspec
 ar-ondemand*.gem
+*Gemfile.lock

data/README.md

@@ -3,7 +3,7 @@
 The `ar-ondemand` gem adds functionality to ActiveRecord to help deal with AR's bloat.
 
 [![Gem Version](https://badge.fury.io/rb/ar-ondemand.svg)](http://badge.fury.io/rb/ar-ondemand)
-[![](https://ci.solanolabs.com:443/cloudhealthtech/ar-ondemand/badges/170027.png?badge_token=bd73a19d5421a68f29e22ad15ad080cbabc56ba7)](https://ci.solanolabs.com:443/cloudhealthtech/ar-ondemand/suites/170027)
+[![Build Status](https://ci.solanolabs.com:443/cloudhealthtech/ar-ondemand/badges/branches/master?badge_token=bd73a19d5421a68f29e22ad15ad080cbabc56ba7)](https://ci.solanolabs.com:443/cloudhealthtech/ar-ondemand/suites/170027)
 
 # Getting Started
 
@@ -11,7 +11,7 @@ The `ar-ondemand` gem adds functionality to ActiveRecord to help deal with AR's
 require 'ar-ondemand'
 ```
 
-Please note that this library has been written for our needs, and even though it has gotten significant usage in 
+Please note that this library has been written for our needs, and even though it has gotten significant usage in
 production environments, it hasn't seen the myriad ways others use and abuse ActiveRecord, so please experiment
 locally first.
 
@@ -21,14 +21,14 @@ It has been used with ActiveRecord 3.2, MRI 1.9.3, JRuby 1.7 and the MySQL adapt
 
 ## on_demand
 
-This was the original impetus for the gem. The issue was that we had to compare ~500k records between the source 
+This was the original impetus for the gem. The issue was that we had to compare ~500k records between the source
 dataset and our database, and we had no idea which records were new, changed or deleted. We'd preload everything from
 the database, but due to ActiveRecord's massive bloat, we'd constantly run into OOM exceptions. To get around that,
 the concept of a [lightweight ActiveRecord object](https://github.com/CloudHealth/ar-ondemand/blob/master/lib/ar-ondemand/record.rb)
 was introduced that had the absolute bare minimum needed to handle comparing the source data with the database.
 
 With this new type of object, we could easily interate over the 500k records extremely quickly and determine what has
-changed. The on-demand aspect comes when `.save` is called. If changes were noticed, it 
+changed. The on-demand aspect comes when `.save` is called. If changes were noticed, it
 [secretly](https://github.com/CloudHealth/ar-ondemand/blob/master/lib/ar-ondemand/record.rb#L67) instantiates an actual
 ActiveRecord model so that all the real functionality you'd expect, such as validation and callbacks, occurs.
 
@@ -38,8 +38,8 @@ ActiveRecord model so that all the real functionality you'd expect, such as vali
 assets = Widget.on_demand :identifier, {customer_id: 1, account_id: 42}
 source.each do |dso|
   w = assets[dso[:identifier]]
-  w.name = dso[:name] 
-  w.foo = dso[:foo] 
+  w.name = dso[:name]
+  w.foo = dso[:foo]
   w.bar = dso[:bar]
   ar_obj = w.save
   # If new or changed, ar_obj will be an ActiveRecord instance, and ar_obj.id will now be set
@@ -126,7 +126,7 @@ Widget.where(customer_id: 1).for_streaming(for_reading: true, batch_size: 1_000_
 ## delete_all_by_pk
 
 Deleting many records or even a few records in a massive table can be an expensive operation, and can even lock up
-your table during the duration of the delete, as well as perform a complete table scan. A common pattern to deal with 
+your table during the duration of the delete, as well as perform a complete table scan. A common pattern to deal with
 this is querying the table first to find the primary keys that meet the criteria and then doing a delete specifying
 the primary keys as the `where` condition. This function does that all for you.
 

data/ar-ondemand.gemspec

@@ -5,7 +5,6 @@ require File.dirname(__FILE__) + '/lib/ar-ondemand/version'
 Gem::Specification.new do |s|
   s.name        = 'ar-ondemand'
   s.version     = ::ArOnDemand::VERSION
-  s.date        = '2015-01-06'
   s.summary     = 'ActiveRecord On-demand'
   s.description = 'Fast access to database results without the memory overhead of ActiveRecord objects'
   s.authors     = ['Steve Frank']
@@ -20,6 +19,6 @@ Gem::Specification.new do |s|
 
   s.require_paths = %w(lib)
 
-  s.add_dependency 'activesupport', '~> 3.2'
-  s.add_dependency 'activerecord',  '~> 3.2'
+  s.add_dependency 'activesupport', '>= 3.2', '< 5'
+  s.add_dependency 'activerecord',  '>= 3.2', '< 5'
 end

data/lib/ar-ondemand/delete_all_by_pk.rb

@@ -10,17 +10,16 @@ module ActiveRecord
         # Based on find_in_batches function
         def delete_all_by_pk(options = {})
           relation = self
-          relation = self.scoped unless respond_to? :arel
 
-          unless relation.arel.orders.blank? && relation.arel.taken.blank?
-            ::ActiveRecord::Base.logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
+          # TODO Clean this up after dropping support for Rails 3
+          if ActiveRecord::VERSION::MAJOR == 3
+            relation = self.scoped unless respond_to? :arel
+          else
+            relation = self.all unless respond_to? :arel
           end
 
-          if (finder_options = options.except(:start, :batch_size)).present?
-            raise "You can't specify an order, it's forced to be #{batch_order_delete_all_by_pk}" if options[:order].present?
-            raise "You can't specify a limit, it's forced to be the batch_size"  if options[:limit].present?
-
-            relation = apply_finder_options(finder_options)
+          unless relation.arel.orders.blank? && relation.arel.taken.blank?
+            ::ActiveRecord::Base.logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
           end
 
           start = options.delete(:start)

data/lib/ar-ondemand/fast_enumeration.rb

@@ -9,7 +9,16 @@ module ActiveRecord
           column_model = @column_models[name]
           self.define_singleton_method(name) {
             raise "Not accessible outside of enumeration" if @row.nil?
-            column_model.type_cast @row[index]
+
+            # 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)
+              column_model.type_cast @row[index]
+            else
+              column_model.type_cast_from_database @row[index]
+            end
           }
         end
       end

data/lib/ar-ondemand/for_enumeration_reading.rb

@@ -13,7 +13,14 @@ module ActiveRecord
 
         private
         def query_for_enumeration_reading(ar)
-          ar = ar.scoped unless ar.respond_to?(:to_sql)
+
+          # TODO Clean this up after dropping support for Rails 3
+          if ActiveRecord::VERSION::MAJOR == 3
+            ar = ar.scoped unless ar.respond_to?(:to_sql)
+          else
+            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))
         end
 
@@ -24,4 +31,3 @@ end
 
 ::ActiveRecord::Base.send     :include, ::ActiveRecord::OnDemand::EnumerationReading
 ::ActiveRecord::Relation.send :include, ::ActiveRecord::OnDemand::EnumerationReading::ClassMethods
-

data/lib/ar-ondemand/for_reading.rb

@@ -25,17 +25,10 @@ module ActiveRecord
 
           relation = self
 
-          unless arel.orders.blank? && arel.taken.blank?
+          unless self.arel.orders.blank? && self.arel.taken.blank?
             ::ActiveRecord::Base.logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
           end
 
-          if (finder_options = options.except(:start, :batch_size)).present?
-            raise "You can't specify an order, it's forced to be #{batch_order_for_reading}" if options[:order].present?
-            raise "You can't specify a limit, it's forced to be the batch_size"  if options[:limit].present?
-
-            relation = apply_finder_options(finder_options)
-          end
-
           start = options.delete(:start)
           batch_size = options.delete(:batch_size) || 1000
 
@@ -61,7 +54,13 @@ module ActiveRecord
         private
 
         def query_for_reading(ar, options = {})
-          ar = ar.scoped unless ar.respond_to?(:to_sql)
+          # TODO Clean this up after dropping support for Rails 3
+          if ActiveRecord::VERSION::MAJOR == 3
+            ar = ar.scoped unless ar.respond_to?(:to_sql)
+          else
+            ar = ar.all unless ar.respond_to?(:to_sql)
+          end
+
           results = ::ActiveRecord::Base.connection.exec_query ar.to_sql
           ::ActiveRecord::OnDemand::ResultSet.new ar.arel.engine, results, options
         end

data/lib/ar-ondemand/for_streaming.rb

@@ -10,7 +10,14 @@ module ActiveRecord
         def for_streaming(options = {})
           options[:batch_size] ||= 50_000
           fr = options.delete(:for_reading)
-          s = self.respond_to?(:scoped) ? self.scoped : self
+
+          # TODO Clean this up after dropping support for Rails 3
+          if ActiveRecord::VERSION::MAJOR == 3
+            s = self.respond_to?(:to_sql) ? self : self.scoped
+          else
+            s = self.respond_to?(:to_sql) ? self : self.all
+          end
+
           ::Enumerator.new do |n|
             s.send(fr ? :for_reading : :find_in_batches, options) do |b|
               b.each { |r| n << r }

data/lib/ar-ondemand/record.rb

@@ -9,6 +9,11 @@ module ActiveRecord
         @model = model
         @defaults = defaults
         @changes = {}
+
+        # Memoizing Rails 4.2 capability here for performance purposes. See
+        # `#save` method for more details
+        # TODO Remove when dropping Rails 3 support
+        @model_instantiate = @model.respond_to?(:instantiate)
       end
 
       def is_readonly?
@@ -65,10 +70,19 @@ module ActiveRecord
       def save
         raise ActiveRecord::ReadOnlyRecord if is_readonly?
         return nil if @changes.empty?
-        rec = @model.allocate.init_with('attributes' => @record)
+
+        # `@model.allocate.init_with` breaks in Rails 4.2. Construction has been
+        # 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
         @changes.each_pair do |key, val|
           next if key == 'id'
-          rec[key] = val
+          rec.send("#{key}=".to_sym, val)
         end
         rec.save
         @changes.clear

data/lib/ar-ondemand/result.rb

@@ -53,7 +53,7 @@ module ActiveRecord
       def create_readonly_class
         attrs = @col_indexes.keys.map(&:to_sym)
         return CACHED_READONLY_CLASSES[attrs] if CACHED_READONLY_CLASSES[attrs]
-        CACHED_READONLY_CLASSES[attrs] = ::Struct.new *attrs
+        CACHED_READONLY_CLASSES[attrs] = ::Struct.new(*attrs)
       end
 
       def convert_to_hash(rec)
@@ -61,7 +61,14 @@ module ActiveRecord
         h = {}
         @col_indexes.each_pair do |k, v|
           if @column_types[k]
-            h[k] = @column_types[k].type_cast rec[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)
+              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
@@ -72,9 +79,16 @@ module ActiveRecord
       def convert_to_struct(klass, rec)
         vals = []
         @col_indexes.each_pair do |k, v|
-          vals << @column_types[k].type_cast(rec[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
         end
-        klass.new *vals
+        klass.new(*vals)
       end
     end
   end

data/lib/ar-ondemand/version.rb

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

data/rails_3.2.Gemfile

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

data/rails_4.0.Gemfile

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

data/rails_4.1.Gemfile

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

data/rails_4.2.Gemfile

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

data/solano.yml

@@ -1,8 +1,31 @@
 ---
-:tddium:
-  :ruby_version: ruby-1.9.3-p392
-  :coverage: false
-  :rake:
-    :rails_env: test
-  :environment:
-    TZ: UTC
+ruby_version: ruby-1.9.3-p392
+coverage: false
+
+rake:
+  rails_env: test
+
+environment:
+  TZ: UTC
+
+# Build pipelines run concurrently (http://docs.solanolabs.com/Beta/build-pipelines/)
+pipeline:
+  - rails_3_2
+  - rails_4_0
+  - rails_4_1
+  - rails_4_2
+
+# Named profile steps that can be used by build profiles and pipelines
+profiles:
+  rails_3_2:
+    environment:
+      BUNDLE_GEMFILE: rails_3.2.Gemfile
+  rails_4_0:
+    environment:
+      BUNDLE_GEMFILE: rails_4.0.Gemfile
+  rails_4_1:
+    environment:
+      BUNDLE_GEMFILE: rails_4.1.Gemfile
+  rails_4_2:
+    environment:
+      BUNDLE_GEMFILE: rails_4.2.Gemfile

data/spec/lib/for_streaming_spec.rb

@@ -31,7 +31,7 @@ describe 'ForStreaming' do
 
         it 'should support select' do
           total = 0
-          AuditRecord.select([:customer_id]).where(customer_id: 1).for_streaming.each do |r|
+          AuditRecord.select([:id, :customer_id]).where(customer_id: 1).for_streaming.each do |r|
             expect(r).to be_an_instance_of(AuditRecord)
             expect(r.customer_id).to eq(1)
             expect { r.model_type_id }.to raise_error(::ActiveModel::MissingAttributeError)

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ar-ondemand
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Steve Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2017-02-01 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::Version
+        version: '5'
 description: Fast access to database results without the memory overhead of ActiveRecord
   objects
 email:
@@ -51,7 +63,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTORS.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
 - ar-ondemand.gemspec
@@ -66,6 +77,10 @@ files:
 - lib/ar-ondemand/record.rb
 - lib/ar-ondemand/result.rb
 - lib/ar-ondemand/version.rb
+- rails_3.2.Gemfile
+- rails_4.0.Gemfile
+- rails_4.1.Gemfile
+- rails_4.2.Gemfile
 - solano.yml
 - spec/app/models/audit_record.rb
 - spec/app/models/widget.rb

data/Gemfile.lock

@@ -1,60 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ar-ondemand (1.1.8)
-      activerecord (~> 3.2)
-      activesupport (~> 3.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    coderay (1.1.1)
-    diff-lcs (1.2.5)
-    factory_girl (4.7.0)
-      activesupport (>= 3.0.0)
-    i18n (0.7.0)
-    method_source (0.8.2)
-    multi_json (1.12.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    slop (3.6.0)
-    sqlite3 (1.3.12)
-    tzinfo (0.3.52)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ar-ondemand!
-  factory_girl
-  pry
-  rspec
-  sqlite3