activerecord-collections 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d8c2bbbd91158545724fa1361d374e189c81411
-  data.tar.gz: d9a9667c551a532fe1112eaf48bceb7e787b0dcd
+  metadata.gz: 1c788fe177f07965d7e9fb37df4da779206bd523
+  data.tar.gz: d37a31f2133132c15a808d1153cd4a312d73501b
 SHA512:
-  metadata.gz: ccfc65a4b4b05ab59d90579937cd461f71edd783da29c5562ae340dad2d0c53089ee355f8fbee68409dafd728bf91b8d0e960c6da8be7253b35fceffc49d7161
-  data.tar.gz: 121f1d0935db26f71bafc0994d22f632d066e421fa50aae716d30633f7db02f053ebf9e1656e5f1dbe135b3a4aedc85d311d3e4ba5079ef7e1eb00a1a0d2dda3
+  metadata.gz: 0a991e986d1738e97a4ff0dc74bd8dfde0a91161f2cd490931456b43b088f08dcb7f5f4c51fdd3cc9b0f22d8762beda65b09c8573d09b002e07f6aff14025d6f
+  data.tar.gz: 1f5dd876dff62b2ac00166134854162cadde85d05dab14a3634d9b18b765a19f88a2b05ba195055462d0b8819f5bff69d210010fa64d139ec81d946dcc5a29ab

data/lib/active_record/collection.rb

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

data/lib/active_record/collections/version.rb

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

metadata

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