ar-ondemand 1.1.5 → 1.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDhlMjQ2ZTkzNjRkMTc0MmJiMGM3Y2VkYjQ1NDcwZDVlYTA4ZGQzNQ==
+    ZmZhMmNkZmQzM2E0M2RlOGVhY2NkZDJmMjE1OTBlNDQ2Zjg2Zjk4Mw==
   data.tar.gz: !binary |-
-    Mzk5ZDY1OTdmZjg5YzEzZmI2YTNkNDNhMGI0MTliYzQ2Nzc0ZjU1Mw==
+    ZDFmNzAzZjRmN2E5ZTQ1NzM1NTdkNDEzZTA2YThlNGE5Yjc5OTlhMQ==
 SHA512:
   metadata.gz: !binary |-
-    OTRlYjk5NzhhZjU4MmVkOGViMGFjOTkyYWY2MjQ2ZGUxMmE3ZTFlMzE1NWZm
-    YTQ1ZGFhZWI0NDZlYmUwMDUzYjA0OWIwMGJjMzM1OWRkMTcwNDliODIwZWVl
-    NzZhN2QzMDc1MWMwY2UxMWI0ZTNhNThjMTFhODBkZjk4MTVjZWI=
+    ZDA3MDQzNTg2MDYyMjViNWYwYTdjNzVjOWJlOWYzZGM5Njc5NTlmYmYzNWMz
+    MzVlYzkwY2EyYzI2ZTJiNmE2ZTRkMzZjNzNjY2VhYjFkNDkwMzUxNDU1YTkz
+    YzRmNjBiMWJmMzg3YmM0YTUwNTk2OGE1NTQzZWQ2YThiYjRhYmI=
   data.tar.gz: !binary |-
-    ZDRmOTExOTU0Y2E0ZmI0YjQ2YmUxZGVkOGVhMWU5YTlmNDU4N2FkM2JlYTVj
-    N2Q0MWU1ZDI2NzViNjY0YTU2ZTU5ZTE2NzAyMmEyNGMzZjE5NTZiNjAyNDZh
-    NmI1YjFkZWJiZDQ2YTdkNDY2OGQyMDNmOGQwMjYyYjk1YmI0ZjY=
+    YTA3MTE5ZDE4ZGM1ZGIxNzA0NzJmZjZiNmM3ZmE1Y2NlNjJjZjg3NTQxYWI0
+    OGRjOGZhNWM1M2Q5NTE4ZWRlZGMzYzM0MWM4YmI0OTRiYjk4MDY1NTEzMzdh
+    ZWNlZjcxYmZiZjljY2JmMGMzYmE4ZmJkN2NmMTc1NmIyMzlkZTA=

data/Gemfile

@@ -11,7 +11,5 @@ group :test, :development do
 
   gem 'rspec'
   gem 'factory_girl'
-  gem 'shoulda'
-  gem 'shoulda-matchers'
   gem 'pry'
 end

data/Gemfile.lock

@@ -1,54 +1,53 @@
 PATH
   remote: .
   specs:
-    ar-ondemand (1.1.5)
-      activerecord (>= 3.2)
-      activesupport (>= 3.2)
+    ar-ondemand (1.1.6)
+      activerecord (~> 3.2)
+      activesupport (~> 3.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
+    activemodel (3.2.22.5)
+      activesupport (= 3.2.22.5)
       builder (~> 3.0.0)
-    activerecord (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
+    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.21)
+    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.0)
+    coderay (1.1.1)
     diff-lcs (1.2.5)
-    factory_girl (4.5.0)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    i18n (0.6.11)
+    i18n (0.7.0)
     method_source (0.8.2)
-    multi_json (1.10.1)
-    pry (0.10.1)
+    multi_json (1.12.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
-    shoulda-matchers (2.7.0)
-      activesupport (>= 3.0.0)
+    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.10)
-    tzinfo (0.3.42)
+    sqlite3 (1.3.12)
+    tzinfo (0.3.52)
 
 PLATFORMS
   ruby
@@ -58,6 +57,4 @@ DEPENDENCIES
   factory_girl
   pry
   rspec
-  shoulda
-  shoulda-matchers
   sqlite3

data/README.md

@@ -7,7 +7,7 @@ The `ar-ondemand` gem adds functionality to ActiveRecord to help deal with AR's
 
 # Getting Started
 
-```
+```rb
 require 'ar-ondemand'
 ```
 
@@ -34,7 +34,7 @@ ActiveRecord model so that all the real functionality you'd expect, such as vali
 
 ### Usage
 
-```
+```rb
 assets = Widget.on_demand :identifier, {customer_id: 1, account_id: 42}
 source.each do |dso|
   w = assets[dso[:identifier]]
@@ -57,13 +57,13 @@ method makes it easy to get access to ActiveRecord-like functionality at 100th t
 
 Let's say you have some Widget's. Instead of:
 
-```
+```rb
 Widget.where(customer_id: 1).each { |r| ... }
 ```
 
 use `for_reading` and get a significant speed boost, and use far less memory:
 
-```
+```rb
 Widget.where(customer_id: 1).for_reading.each { |r| ... }
 ```
 
@@ -71,24 +71,24 @@ The big limitation is that you can't use `.includes` so you have to be writing a
 
 ### Batch Results
 
-```
+```rb
 Widget.where(customer_id: 1).for_reading(batch_size: 50000).each { |b| b.each { |r| } }
 ```
 
-### raw_results
+## 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"
 ```
 
-use:
+### Usage
 
-```
+```rb
 Widget.raw_results
 Widget.where(customer_id: 1).raw_results
 Widget.where(customer_id: 1).limit(100_000).raw_results
@@ -103,7 +103,7 @@ change your code to use batching.
 
 ### Usage
 
-```
+```rb
 def run
   get_objects.each do |r|
     do_something r
@@ -117,7 +117,7 @@ end
 
 Additional usage:
 
-```
+```rb
 Widget.where(customer_id: 1).for_streaming(batch_size: 100_000).each { |r| }
 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| }
@@ -132,13 +132,13 @@ the primary keys as the `where` condition. This function does that all for you.
 
 ### Usage
 
-```
+```rb
 Widget.delete_all_by_pk
 Widget.where(Widget[:customer_id].eq(1).and(Widget[:usage].gt(42))).delete_all_by_pk
 ```
 
 If you know you could be deleting millions, then we recommend batching the deletes:
 
-```
+```rb
 Widget.where(Widget[:customer_id].eq(1).and(Widget[:usage].gt(42))).delete_all_by_pk(batch_size: 250_000)
 ```

data/ar-ondemand.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
 
   s.require_paths = %w(lib)
 
-  s.add_dependency 'activesupport', '>= 3.2'
-  s.add_dependency 'activerecord',  '>= 3.2'
-end
+  s.add_dependency 'activesupport', '~> 3.2'
+  s.add_dependency 'activerecord',  '~> 3.2'
+end

data/lib/ar-ondemand.rb

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

data/lib/ar-ondemand/fast_enumeration.rb

@@ -0,0 +1,38 @@
+module ActiveRecord
+  module OnDemand
+    class FastEnumeration
+
+      def initialize(model, result_set)
+        @result_set = result_set
+
+        result_set.columns.each_with_index do |name, index|
+          self.define_singleton_method(name) {
+            raise "Not accessible outside of enumeration" if @row.nil?
+            @row[index]
+          }
+        end
+      end
+
+      def each
+        @result_set.rows.each do |r|
+          @row = r
+          yield(self)
+          nil
+        end
+      ensure
+        @row = nil
+      end
+
+      def inject(inj)
+        @result_set.rows.each do |r|
+          @row = r
+          inj = yield(inj, self)
+        end
+        inj
+      ensure
+        @row = nil
+      end
+
+    end
+  end
+end

data/lib/ar-ondemand/for_enumeration_reading.rb

@@ -0,0 +1,27 @@
+require 'active_support/concern'
+require 'ar-ondemand/fast_enumeration'
+
+module ActiveRecord
+  module OnDemand
+    module EnumerationReading
+      extend ::ActiveSupport::Concern
+
+      module ClassMethods
+        def for_enumeration_reading
+          query_for_enumeration_reading self
+        end
+
+        private
+        def query_for_enumeration_reading(ar)
+          ar = ar.scoped unless ar.respond_to?(:to_sql)
+          ::ActiveRecord::OnDemand::FastEnumeration.new(ar.arel.engine, ::ActiveRecord::Base.connection.exec_query(ar.to_sql))
+        end
+
+      end
+    end
+  end
+end
+
+::ActiveRecord::Base.send     :include, ::ActiveRecord::OnDemand::EnumerationReading
+::ActiveRecord::Relation.send :include, ::ActiveRecord::OnDemand::EnumerationReading::ClassMethods
+

data/lib/ar-ondemand/on_demand.rb

@@ -19,7 +19,6 @@ module ActiveRecord
         @key_index = @col_indexes[@key_column]
         raise "Unknown index #{key_column}" if @key_index.nil?
 
-        @find_by_method = "find_or_initialize_by_#{(@defaults.keys + [@key_column]).join('_and_')}"
         @has_any_assets = !ids.empty? || @model.unscoped.where(@defaults).exists?
         @new_params = @defaults.dup
         @new_params[@key_column.to_sym] = nil
@@ -28,7 +27,7 @@ module ActiveRecord
           h[row[@key_index]] = row
           h
         end
-        
+
         self
       end
 
@@ -37,8 +36,9 @@ module ActiveRecord
         rec = @results_to_hash[key]
         if rec.nil?
           rec = if @has_any_assets
-                  args = @defaults.values + [key]
-                  @model.unscoped.send(@find_by_method, *args)
+                  @model.unscoped
+                    .where(@defaults.merge(@key_column => key))
+                    .first_or_initialize
                 else
                   @new_params[@key_column.to_sym] = key
                   @model.new @new_params

data/lib/ar-ondemand/version.rb

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

data/spec/lib/delete_all_by_pk_spec.rb

@@ -9,7 +9,7 @@ describe 'DeleteAllByPk' do
       end
 
       it 'should delete record' do
-        AuditRecord.delete_all_by_pk.should eq(1)
+        expect(AuditRecord.delete_all_by_pk).to be 1
       end
     end
 
@@ -19,8 +19,8 @@ describe 'DeleteAllByPk' do
       end
 
       it 'should delete record' do
-        AuditRecord.where('id > 0').delete_all_by_pk.should eq(1)
+        expect(AuditRecord.where('id > 0').delete_all_by_pk).to be 1
       end
     end
   end
-end
+end

data/spec/lib/for_enumeration_reading_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+require 'ar-ondemand'
+
+describe 'ForEnumerationReading' 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_reading.each do |r|
+          total += 1
+        end
+        expect(total).to be 25
+      end
+
+      it 'should support inject iterating' do
+        inj = AuditRecord.where(customer_id: 1).for_enumeration_reading.inject([]) do |i,r|
+          i << r.id
+        end
+        expect(inj.size).to be 25
+      end
+
+      it 'should produce same results as regular iterating' do
+        records_a = Set.new
+        AuditRecord.where(customer_id: 1).for_enumeration_reading.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_reading.each do |r|
+          obj = r
+        end
+        expect{obj.id}.to raise_error(RuntimeError)
+      end
+
+      it 'should not allow access outside each inject enumeration' do
+        cache = AuditRecord.where(customer_id: 1).for_enumeration_reading.inject({}) do |h,r|
+          h[r.id] = r
+          h
+        end
+        expect{cache.first[1].id}.to raise_error(RuntimeError)
+      end
+
+    end
+  end
+end

data/spec/lib/for_reading_spec.rb

@@ -9,11 +9,11 @@ describe 'ForReading' do
       end
 
       it 'should do persist' do
-        AuditRecord.all.length.should eq(1)
+        expect(AuditRecord.all.length).to be 1
       end
 
       it 'should do foo' do
-        AuditRecord.first.action.should eq('create')
+        expect(AuditRecord.first.action).to eq 'create'
       end
     end
 
@@ -29,7 +29,7 @@ describe 'ForReading' do
         AuditRecord.where(customer_id: 1).for_reading.each do |r|
           total += 1
         end
-        total.should eq(25)
+        expect(total).to be 25
       end
 
       it 'should support iterating' do
@@ -37,7 +37,7 @@ describe 'ForReading' do
         AuditRecord.for_reading.each do |r|
           total += 1
         end
-        total.should eq(25)
+        expect(total).to be 25
       end
 
       it 'should produce same results as regular iterating' do
@@ -51,9 +51,9 @@ describe 'ForReading' do
           records_b.add r.id
         end
 
-        records_a.should eq(records_b)
+        expect(records_a).to eq records_b
       end
 
     end
   end
-end
+end

data/spec/lib/for_streaming_spec.rb

@@ -14,11 +14,10 @@ describe 'ForStreaming' do
         it 'ClassMethod should support streaming' do
           total = 0
           AuditRecord.for_streaming.each do |r|
-            #r.is_a?(AuditRecord).should eq(true)
             expect(r).to be_an_instance_of(AuditRecord)
             total += 1
           end
-          total.should eq(25)
+          expect(total).to be 25
         end
 
         it 'Relation should support streaming' do
@@ -27,7 +26,7 @@ describe 'ForStreaming' do
             expect(r).to be_an_instance_of(AuditRecord)
             total += 1
           end
-          total.should eq(25)
+          expect(total).to be 25
         end
 
         it 'should support select' do
@@ -38,7 +37,7 @@ describe 'ForStreaming' do
             expect { r.model_type_id }.to raise_error(::ActiveModel::MissingAttributeError)
             total += 1
           end
-          total.should eq(25)
+          expect(total).to be 25
         end
       end
 
@@ -47,23 +46,23 @@ describe 'ForStreaming' do
           total = 0
           AuditRecord.for_streaming(for_reading: true).each do |r|
             expect(r).not_to be_an_instance_of(AuditRecord)
-            r.customer_id.should eq(1)
+            expect(r.customer_id).to be 1
             total += 1
           end
-          total.should eq(25)
+          expect(total).to be 25
         end
 
         it 'Relation should support streaming' do
           total = 0
           AuditRecord.where(customer_id: 1).for_streaming(for_reading: true).each do |r|
             expect(r).not_to be_an_instance_of(AuditRecord)
-            r.customer_id.should eq(1)
+            expect(r.customer_id).to be 1
             total += 1
           end
-          total.should eq(25)
+          expect(total).to be 25
         end
       end
 
     end
   end
-end
+end

data/spec/support/active_record.rb

@@ -5,9 +5,6 @@ ActiveRecord::Migration.suppress_messages do
   load 'spec/db/seeds.rb'
 end
 
-require 'shoulda'
-require 'shoulda/matchers/integrations/rspec'
-
 RSpec.configure do |config|
   config.around do |example|
     ActiveRecord::Base.transaction do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-ondemand
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Steve Frank
@@ -14,28 +14,28 @@ dependencies:
   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'
 description: Fast access to database results without the memory overhead of ActiveRecord
@@ -57,6 +57,8 @@ files:
 - ar-ondemand.gemspec
 - lib/ar-ondemand.rb
 - 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_reading.rb
 - lib/ar-ondemand/for_streaming.rb
 - lib/ar-ondemand/on_demand.rb
@@ -71,6 +73,7 @@ files:
 - spec/factories/audit_record.rb
 - spec/factories/widget.rb
 - spec/lib/delete_all_by_pk_spec.rb
+- spec/lib/for_enumeration_reading_spec.rb
 - spec/lib/for_reading_spec.rb
 - spec/lib/for_streaming_spec.rb
 - spec/lib/on_demand_spec.rb