ar-ondemand 1.3.1 → 1.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2NlZmEyMjljODU5YzNlZDlhMTVkN2VjZGYwNDc1ZDY0Zjg5YzRkOQ==
+    ZTlmOGRjOTFkOWRjNDk3ZTgxMDY4NzJlZDMxM2UwMDdlMjY2MDczMQ==
   data.tar.gz: !binary |-
-    NmM3MWQ2N2ZhYWRiYjRmYTJmNGQ2NTI4YjY1NmE0MjQxYTNkODgzOA==
+    ZmZhNDk1ZmQ2MWU3YmYxZGI0ZGU0MjNlOGRkMWJmMjMyMTJkMTQwNg==
 SHA512:
   metadata.gz: !binary |-
-    NzdlODIwMGM2YTRkNzIwMDhjNDg3MDJmNzBlOWNhNDAyYTkwYmJjZTAwNzg5
-    OGRmNmMwMWVmMDVhMGIxODdkNTk3OWJlYmU3NmQ0NTNiYzU1MmQ5ZTc1NjFj
-    OWJhM2M1YzFhYzgwNTJjY2IxYmY3NWJkNGRjOWUyZjA0OWYxYjg=
+    MDRjMTk2NDEwYTBjYjc2ZjlhOTY0MjJmNWRkMTE0MTQ3YzEzNDJmODYzYjI4
+    ZDdhOTAwM2MxZTk5NjU3ODhhY2ZlY2QwYjU3MjFmNGQ3YjgzYzdmMWE4NjBm
+    NjFjYWRlZGY3MWQxYzJjM2Y0NzRjY2NlMDFlZDA1YzQ0YWUxODc=
   data.tar.gz: !binary |-
-    MTlkYTZhYzY5YjllOTM5NTc2ZDYxOWFjZDU3NjU5MmU4ZmMyMzZmZmM0NDhj
-    NDhlMTBjYTRmZTc5YmUyY2IxZTQxMDIxM2U4NTQwNDYyMWNmMDI1MTM2MTA5
-    ZDI5OWEzNTIwN2ZlMWRkZTBhNGI5NzQ5ZDE5ODNjMDBlOTMyM2E=
+    NDNmZDBkYzcyZmViMWE0M2IyN2ZjMDYwMzY0OGVhYTBiYzE1YzBkYjJhYzNh
+    MmQ1Njk5YmU2ZGM5ZDc1ODFiYTg1Zjc4NmMzOGNjNGMzNjgyMzgzM2ZlNDFi
+    MjllNDUzNGQ1NGVkMzU5NTQwYmEwZWQ5NzhiYmY3Nzg5ZDY2Njk=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.2
+
+* Select customer params, not just attributes of the model
+
 # 1.3.0
 
 * Support for Rails 5+

data/Gemfile

@@ -11,6 +11,6 @@ group :test, :development do
 
   gem 'rake'
   gem 'rspec'
-  gem 'factory_girl'
+  gem 'factory_bot'
   gem 'pry'
 end

data/README.md

@@ -15,7 +15,7 @@ Please note that this library has been written for our needs, and even though it
 production environments, it hasn't seen the myriad ways others use and abuse ActiveRecord, so please experiment
 locally first.
 
-It has been used with ActiveRecord 3.2, MRI 1.9.3, JRuby 1.7 and the MySQL adapter.
+It has been used with ActiveRecord 3.2, MRI 1.9.3, MRI 2.3.3, JRuby 1.7, JRuby 9, all with the MySQL adapter.
 
 # Functionality
 
@@ -55,7 +55,7 @@ method makes it easy to get access to ActiveRecord-like functionality at 100th t
 
 ### Usage
 
-Let's say you have some Widget's. Instead of:
+Let's say you have some Widgets. Instead of:
 
 ```rb
 Widget.where(customer_id: 1).each { |r| ... }
@@ -75,23 +75,15 @@ The big limitation is that you can't use `.includes` so you have to be writing a
 Widget.where(customer_id: 1).for_reading(batch_size: 50000).each { |b| b.each { |r| } }
 ```
 
-## raw_results
-
-This is just a nice little helper to get the raw database results, which you'd get by calling `ActiveRecord::Base.connection.select_all`
-but for some reason you can't call that on a model.
+## for_enumeration_reading
 
-```rb
-ActiveRecord::Base.connection.select_all "select * from widgets"
-ActiveRecord::Base.connection.select_all "select * from widgets where customer_id = 1"
-ActiveRecord::Base.connection.select_all "select * from widgets where customer_id = 1 limit 100000"
-```
-
-### Usage
+This version of `for_reading` allows even faster access to the record when you just need to pull out some properties
+while looping over the dataset. Access to the data is *only* available in the block passed to `for_enumeration_reading`.
 
 ```rb
-Widget.raw_results
-Widget.where(customer_id: 1).raw_results
-Widget.where(customer_id: 1).limit(100_000).raw_results
+res = Widget.where(customer_id: 1).for_enumeration_reading.inject([]) do |i, r|
+    i << [r.id, r.name]
+end
 ```
 
 ## for_streaming
@@ -123,6 +115,40 @@ Widget.where(customer_id: 1).for_streaming(for_reading: true).each { |r| }
 Widget.where(customer_id: 1).for_streaming(for_reading: true, batch_size: 1_000_000).each { |r| }
 ```
 
+## for_enumeration_streaming
+
+Just as `for_reading` has an enumeration version, `for_streaming` does as well. This helper function
+is aimed at queries of millions of records that need to stream over the results, and only need to pull
+out values witin the supplied block.
+
+### Usage
+
+```rb
+res = []
+Widget.where(customer_id: 1).for_enumeration_streaming(batch_size: 200_000).each do |r|
+  res.add [r.id, r.name]
+end
+```
+
+## raw_results
+
+This is just a nice little helper to get the raw database results, which you'd get by calling `ActiveRecord::Base.connection.select_all`
+but for some reason you can't call that on a model.
+
+```rb
+ActiveRecord::Base.connection.select_all "select * from widgets"
+ActiveRecord::Base.connection.select_all "select * from widgets where customer_id = 1"
+ActiveRecord::Base.connection.select_all "select * from widgets where customer_id = 1 limit 100000"
+```
+
+### Usage
+
+```rb
+Widget.raw_results
+Widget.where(customer_id: 1).raw_results
+Widget.where(customer_id: 1).limit(100_000).raw_results
+```
+
 ## 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

data/lib/ar-ondemand/fast_enumeration.rb

@@ -8,7 +8,9 @@ module ActiveRecord
           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)
+          ar_type = (column_model.type.is_a?(::Symbol) ?
+                         ActiveRecord::Type.registry.lookup(column_model.type) :
+                         column_model.type) if column_model && 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_cast)
@@ -23,7 +25,7 @@ module ActiveRecord
               # Rails 5+
               ar_type.is_a?(::Symbol) ? @row[index] : ar_type.cast(@row[index])
             else
-              raise 'Unable to determine type cast method for column'
+              @row[index]
             end
           end
         end

data/lib/ar-ondemand/result.rb

@@ -11,7 +11,9 @@ module ActiveRecord
         @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
+        @ar_types = defined?(ActiveRecord::Type.registry.lookup) ? Hash[@model.columns.map { |x|
+          [x.name, (x.type.is_a?(::Symbol) ?  ActiveRecord::Type.registry.lookup(x.type) : x.type)]
+        }] : nil
 
         determine_type_cast_method
         @col_indexes = HashWithIndifferentAccess[@results.columns.each_with_index.map { |x, i| [x,i] }]

data/lib/ar-ondemand/version.rb

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

data/rails_5.2.Gemfile

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

data/solano.yml

@@ -18,6 +18,7 @@ pipeline:
   - rails_4_1
   - rails_4_2
   - rails_5_1
+  - rails_5_2
 
 # Named profile steps that can be used by build profiles and pipelines
 profiles:
@@ -41,3 +42,7 @@ profiles:
     ruby_version: ruby-2.3.4
     environment:
       BUNDLE_GEMFILE: rails_5.1.Gemfile
+  rails_5_2:
+    ruby_version: ruby-2.3.4
+    environment:
+      BUNDLE_GEMFILE: rails_5.2.Gemfile

data/spec/factories/audit_record.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :audit_record do
     customer_id 1
     sequence(:model_id)

data/spec/factories/widget.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:identifier) { |n| "w-#{n}" }
 
   factory :widget do

data/spec/lib/for_enumeration_reading_spec.rb

@@ -79,6 +79,13 @@ describe 'ForEnumerationReading' do
         end
       end
 
+      it 'should allow reading computed fields' do
+        AuditRecord.where(customer_id: 1).select("id as id_computed, action as action_computed").for_enumeration_reading.each do |r|
+          expect(r.action_computed).to eq('create')
+          expect(r.action_computed).to be_an_instance_of(String)
+          expect(r.id_computed).to be_an_instance_of(Fixnum)
+        end
+      end
     end
   end
 end

data/spec/lib/for_enumeration_streaming_spec.rb

@@ -71,6 +71,14 @@ describe 'ForEnumerationStreaming' do
           end
         }.to raise_error(ActiveRecord::StatementInvalid)
       end
+
+      it 'should allow reading computed fields' do
+        AuditRecord.where(customer_id: 1).select(:id).select("id as id_computed, action as action_computed").for_enumeration_streaming.each do |r|
+          expect(r.action_computed).to eq('create')
+          expect(r.action_computed).to be_an_instance_of(String)
+          expect(r.id_computed).to be_an_instance_of(Fixnum)
+        end
+      end
     end
   end
 end

data/spec/lib/for_reading_spec.rb

@@ -60,6 +60,13 @@ describe 'ForReading' do
         end
       end
 
+      it 'should allow reading computed fields' do
+        AuditRecord.where(customer_id: 1).select("id as id_computed, action as action_computed").for_reading.each do |r|
+          expect(r.action_computed).to eq('create')
+          expect(r.action_computed).to be_an_instance_of(String)
+          expect(r.id_computed).to be_an_instance_of(Fixnum)
+        end
+      end
     end
   end
 end

data/spec/lib/for_streaming_spec.rb

@@ -39,6 +39,14 @@ describe 'ForStreaming' do
           end
           expect(total).to be 25
         end
+
+        it 'should allow reading computed fields' do
+          AuditRecord.where(customer_id: 1).select(:id).select("id as id_computed, action as action_computed").for_streaming.each do |r|
+            expect(r.action_computed).to eq('create')
+            expect(r.action_computed).to be_an_instance_of(String)
+            expect(r.id_computed).to be_an_instance_of(Fixnum)
+          end
+        end
       end
 
       context 'For Reading' do
@@ -61,6 +69,18 @@ describe 'ForStreaming' do
           end
           expect(total).to be 25
         end
+
+        it 'should allow reading computed fields' do
+          AuditRecord.where(customer_id: 1).select(:id).select("id as id_computed, action as action_computed, DATE(created_at)").for_streaming(for_reading: true).each do |r|
+            expect(r.action_computed).to eq('create')
+            expect(r.action_computed).to be_an_instance_of(String)
+            expect(r.id_computed).to be_an_instance_of(Fixnum)
+
+            # no date typecasting, but we have a String
+            expect(r["DATE(created_at)"]).to be_an_instance_of(String)
+            expect(r["DATE(created_at)"]).to eq(Date.today.to_s)
+          end
+        end
       end
 
     end

data/spec/spec_helper.rb

@@ -8,12 +8,12 @@ I18n.enforce_available_locales = false
 
 Dir['spec/support/**/*.rb'].sort.each { |f| load f }
 
-require 'factory_girl'
+require 'factory_bot'
 
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 end
 
-FactoryGirl.find_definitions
+FactoryBot.find_definitions
 
 Dir['spec/app/models/*.rb'].sort.each { |f| load f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-ondemand
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Steve Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,6 +98,7 @@ files:
 - rails_4.1.Gemfile
 - rails_4.2.Gemfile
 - rails_5.1.Gemfile
+- rails_5.2.Gemfile
 - solano.yml
 - spec/app/models/audit_record.rb
 - spec/app/models/widget.rb
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: ActiveRecord On-demand