ar-ondemand 1.1.6 → 1.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmZhMmNkZmQzM2E0M2RlOGVhY2NkZDJmMjE1OTBlNDQ2Zjg2Zjk4Mw==
+    ZDlkODQyOThhNDU2OWIwOWIyYWE1MzAxNzBiZjQ3YzNjOWViOWRlYw==
   data.tar.gz: !binary |-
-    ZDFmNzAzZjRmN2E5ZTQ1NzM1NTdkNDEzZTA2YThlNGE5Yjc5OTlhMQ==
+    OGVlODFkZjdmMzA3OGVmNjQwYzY3NzY4NjE2OTY3YzA2NDJkN2NlYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDA3MDQzNTg2MDYyMjViNWYwYTdjNzVjOWJlOWYzZGM5Njc5NTlmYmYzNWMz
-    MzVlYzkwY2EyYzI2ZTJiNmE2ZTRkMzZjNzNjY2VhYjFkNDkwMzUxNDU1YTkz
-    YzRmNjBiMWJmMzg3YmM0YTUwNTk2OGE1NTQzZWQ2YThiYjRhYmI=
+    MTA4NDJlZDljZmU5MTM3MDE0Njg5ZTg3YmYzNzEzMGY0MTI5YjA4ZjFjNDVi
+    ODBkNDg2YWI4NWI3N2I0NWMyNzgwZmJjMTYwYTVjM2Y1YmNiZGI3Yzc1YjI0
+    ZjQ4YjFhZjJmZWI4ODY4YzlmNjY2MjY1NjI2M2Q1OGNlZjQ0NDc=
   data.tar.gz: !binary |-
-    YTA3MTE5ZDE4ZGM1ZGIxNzA0NzJmZjZiNmM3ZmE1Y2NlNjJjZjg3NTQxYWI0
-    OGRjOGZhNWM1M2Q5NTE4ZWRlZGMzYzM0MWM4YmI0OTRiYjk4MDY1NTEzMzdh
-    ZWNlZjcxYmZiZjljY2JmMGMzYmE4ZmJkN2NmMTc1NmIyMzlkZTA=
+    OWU1NWViMGY0MjA5YmFiOWIxN2ZjZjI3OWExOGJiYWY0OTgxODQwNmQ1Yjhh
+    Mzc1OGJiMzY0MDUzYjA1ZWQ4NGU4OThkZTQyOTQ5YmM4ZjMyYjU1NzNlYmMw
+    ZGMzNDhjNTYwYjZhY2VhNTE1ZTExNTdlZGM0ZDY4MzcyYWQxZTY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar-ondemand (1.1.6)
+    ar-ondemand (1.1.7)
       activerecord (~> 3.2)
       activesupport (~> 3.2)
 

data/lib/ar-ondemand.rb

@@ -2,4 +2,5 @@ require_dependency 'ar-ondemand/on_demand'
 require_dependency 'ar-ondemand/for_reading'
 require_dependency 'ar-ondemand/for_streaming'
 require_dependency 'ar-ondemand/for_enumeration_reading'
+require_dependency 'ar-ondemand/for_enumeration_streaming'
 require_dependency 'ar-ondemand/delete_all_by_pk'

data/lib/ar-ondemand/fast_enumeration.rb

@@ -33,6 +33,10 @@ module ActiveRecord
         @row = nil
       end
 
+      def size
+        @result_set.rows.size
+      end
+
     end
   end
 end

data/lib/ar-ondemand/for_enumeration_streaming.rb

@@ -0,0 +1,37 @@
+require 'active_support/concern'
+require 'ar-ondemand/fast_enumeration'
+
+module ActiveRecord
+  module OnDemand
+    module EnumerationStreaming
+      extend ::ActiveSupport::Concern
+
+      module ClassMethods
+        def for_enumeration_streaming(options = {})
+          query_for_enumeration_streaming self, options
+        end
+
+        private
+        def query_for_enumeration_streaming(ar, options)
+          options[:batch_size] ||= 50_000
+          options[:id_column] ||= 'id'
+          ::Enumerator.new do |eblock|
+            start_id = 0
+            loop do
+              batch = ar.where("#{options[:id_column]} > #{start_id}").order(options[:id_column]).limit(options[:batch_size]).for_enumeration_reading
+              break if batch.size == 0
+              batch.each do |r|
+                eblock << r
+                start_id = r.id
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+::ActiveRecord::Base.send     :include, ::ActiveRecord::OnDemand::EnumerationStreaming
+::ActiveRecord::Relation.send :include, ::ActiveRecord::OnDemand::EnumerationStreaming::ClassMethods
+

data/lib/ar-ondemand/version.rb

@@ -1,3 +1,3 @@
 module ArOnDemand
-  VERSION = '1.1.6'
+  VERSION = '1.1.7'
 end

data/spec/lib/for_enumeration_reading_spec.rb

@@ -69,6 +69,10 @@ describe 'ForEnumerationReading' do
         expect{cache.first[1].id}.to raise_error(RuntimeError)
       end
 
+      it 'should  return the correct size' do
+        expect(AuditRecord.where(customer_id: 1).for_enumeration_reading.size).to be 25
+      end
+
     end
   end
 end

data/spec/lib/for_enumeration_streaming_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+require 'ar-ondemand'
+
+describe 'ForEnumerationStreaming' do
+  context 'Testing' do
+    context 'Ensure Persistance Works' do
+      before(:each) do
+        create(:audit_record)
+      end
+
+      it 'should do persist' do
+        expect(AuditRecord.all.length).to be 1
+      end
+
+      it 'should do foo' do
+        expect(AuditRecord.first.action).to eq 'create'
+      end
+    end
+
+    context 'Iterating' do
+      before(:each) do
+        (1..25).each do
+          create(:audit_record)
+        end
+      end
+
+      it 'should support iterating' do
+        total = 0
+        AuditRecord.where(customer_id: 1).for_enumeration_streaming.each do |r|
+          total += 1
+        end
+        expect(total).to be 25
+      end
+
+      it 'should support iterating with small batch size' do
+        total = 0
+        AuditRecord.where(customer_id: 1).for_enumeration_streaming(batch_size: 1).each do |r|
+          total += 1
+        end
+        expect(total).to be 25
+      end
+
+
+
+      it 'should produce same results as regular iterating' do
+        records_a = Set.new
+        AuditRecord.where(customer_id: 1).for_enumeration_streaming(batch_size: 2).each do |r|
+          records_a.add r.id
+        end
+
+        records_b = Set.new
+        AuditRecord.where(customer_id: 1).each do |r|
+          records_b.add r.id
+        end
+
+        expect(records_a).to eq records_b
+      end
+
+      it 'should not allow access outside each enumeration' do
+        obj = nil
+        AuditRecord.where(customer_id: 1).for_enumeration_streaming.each do |r|
+          obj = r
+        end
+        expect{obj.id}.to raise_error(RuntimeError)
+      end
+
+      it 'should not allow bad id column' do
+        expect {
+          AuditRecord.where(customer_id: 1).for_enumeration_streaming(id_column: 'foo').each do |r|
+            obj = r
+          end
+        }.to raise_error(ActiveRecord::StatementInvalid)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-ondemand
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Steve Frank
@@ -59,6 +59,7 @@ files:
 - lib/ar-ondemand/delete_all_by_pk.rb
 - lib/ar-ondemand/fast_enumeration.rb
 - lib/ar-ondemand/for_enumeration_reading.rb
+- lib/ar-ondemand/for_enumeration_streaming.rb
 - lib/ar-ondemand/for_reading.rb
 - lib/ar-ondemand/for_streaming.rb
 - lib/ar-ondemand/on_demand.rb
@@ -74,6 +75,7 @@ files:
 - spec/factories/widget.rb
 - spec/lib/delete_all_by_pk_spec.rb
 - spec/lib/for_enumeration_reading_spec.rb
+- spec/lib/for_enumeration_streaming_spec.rb
 - spec/lib/for_reading_spec.rb
 - spec/lib/for_streaming_spec.rb
 - spec/lib/on_demand_spec.rb