activerecord-collections 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c788fe177f07965d7e9fb37df4da779206bd523
-  data.tar.gz: d37a31f2133132c15a808d1153cd4a312d73501b
+  metadata.gz: 192790cbc51085d35ee324b7c2e61936c56285ed
+  data.tar.gz: 500efab14683ba051367ea4bcfa72757e8ba4761
 SHA512:
-  metadata.gz: 0a991e986d1738e97a4ff0dc74bd8dfde0a91161f2cd490931456b43b088f08dcb7f5f4c51fdd3cc9b0f22d8762beda65b09c8573d09b002e07f6aff14025d6f
-  data.tar.gz: 1f5dd876dff62b2ac00166134854162cadde85d05dab14a3634d9b18b765a19f88a2b05ba195055462d0b8819f5bff69d210010fa64d139ec81d946dcc5a29ab
+  metadata.gz: 8cc2ca473a2f4d6ccee65824c69940ace08445dfdb4ff36b174f3fbbd591f153d5d3eebe72ec6bf3cb532aa51fcaac2522034342b313d00ea1a5c30d6a615076
+  data.tar.gz: 1f71fdfa21ecc5ab76419307eb2a23301d26cef231fbe08618c5d29e36f8bb09035eb27877b8b8ab637b120f7142d7e1611814c3cd5bfe99a6fdf32c64009b06

data/lib/active_record/collection.rb

@@ -8,35 +8,32 @@ module ActiveRecord
     include ActiveRecord::Collections::Pagination
     attr_reader :relation, :options
 
-    @@lock = Mutex.new
+    COLLECTABLES = {}
+    COLLECTIONS = []
 
     class << self
       attr_reader :collections
       def inherited(subclass)
-        @@lock.synchronize do
-          (@collections ||= []) << subclass
-        end
+        ActiveRecord::Collection::COLLECTIONS << subclass
       end
 
       def collectable(klass=nil)
-        @@lock.synchronize do
-          unless klass.nil?
-            raise ArgumentError, "The collection model must inherit from ActiveRecord::Base" unless klass.ancestors.include?(ActiveRecord::Base)
-            @collectable = klass
-          end
+        unless klass.nil?
+          raise ArgumentError, "The collection model must inherit from ActiveRecord::Base" unless klass.ancestors.include?(ActiveRecord::Base)
+          ActiveRecord::Collection::COLLECTABLES[name] ||= klass
+        end
 
-          if @collectable.nil?
-            begin
-              klass = self.name.demodulize.singularize.constantize
-              @collectable = klass if !klass.nil? && klass.ancestors.include?(ActiveRecord::Base)
-            rescue
-              # singularized class doesn't exist
-            end
+        if ActiveRecord::Collection::COLLECTABLES[name].nil?
+          begin
+            klass = self.name.demodulize.singularize.constantize
+            ActiveRecord::Collection::COLLECTABLES[name] = klass if !klass.nil? && klass.ancestors.include?(ActiveRecord::Base)
+          rescue
+            # singularized class doesn't exist
           end
-
-          raise "Unable to determine a model to use for your collection, please set one with the `collectable` class method" if @collectable.nil? # TODO implement real exceptions
-          @collectable
         end
+
+        raise "Unable to determine a model to use for your collection, please set one with the `collectable` class method" if ActiveRecord::Collection::COLLECTABLES[name].nil? # TODO implement real exceptions
+        ActiveRecord::Collection::COLLECTABLES[name]
       end
       alias_method :model, :collectable
     end

data/lib/active_record/collections/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Collections
-    VERSION = '0.0.22'
+    VERSION = '0.0.23'
   end
 end

data/spec/active_record/collection_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe ActiveRecord::Collection do
 
   context 'batching' do
     describe 'default_batch_size' do
-      it 'should default to 2000' do
-        expect(ActiveRecord::Collection.default_batch_size).to eql(2000)
+      it 'should default to 500' do
+        expect(ActiveRecord::Collection.default_batch_size).to eql(500)
       end
 
       it 'should be overridable by extending classes' do
@@ -25,8 +25,8 @@ RSpec.describe ActiveRecord::Collection do
     end
 
     describe 'batching_threshold' do
-      it 'should default to 10000' do
-        expect(ActiveRecord::Collection.batching_threshold).to eql(10000)
+      it 'should default to 0' do
+        expect(ActiveRecord::Collection.batching_threshold).to eql(0)
       end
 
       it 'should be overridable by extending classes' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-collections
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Mark Rebec