activerecord-collections 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90413291270816c9e336b6bd84f6186cf4cbf4d8
-  data.tar.gz: 14211182826f221348fe208ab53309d14dcba7b4
+  metadata.gz: 402158ead8c85144c6a63d76b088b59751600cf3
+  data.tar.gz: c44bda53b2d6b4d1958d9cb25cce62ef852e7964
 SHA512:
-  metadata.gz: accb3a04fb6d89895211cb10e9e8cf98e4d622091b2ec5e080dbee1356f710f467472ca39d2ccdfcaf9a98af7ee8c5fd1e23d3bcdca86b3b90c5f63d367c4d3d
-  data.tar.gz: f80335585daaccd9d94b74b128d4de923f9b9af9466ea1aa6497fba397064107c0fa5dd9e8ef3e067377d3aab389e90bba08d937afb53be8ae02694720eb2689
+  metadata.gz: b1942ebc7a10b5d8b7534070f52fc72e9bc453531955de1e0c8e292595475408627ba34a6b54f670f279dd7932ce5466bad11fe00e591a613771fbd44607ac67
+  data.tar.gz: d9aacdb70cdc964d569cd968d862c6b3a669f5c258df054e361e5697180ba5261eb2a27f5e9c4dc0f8dccc85565a654408ab286d16ca22d6dc036eaa1c72dc5d

data/lib/active_record/collection.rb

@@ -14,47 +14,51 @@ module ActiveRecord
     class << self
       def inherited(subclass)
         ActiveRecord::Collection::COLLECTIONS << subclass.name unless ActiveRecord::Collection::COLLECTIONS.include?(subclass.name)
-        # if parent class is not Collection, register the collectable on the class as the closest parent's collectable
+        subclass.collectable rescue nil #noop
       end
 
       def collections
         ActiveRecord::Collection::COLLECTIONS.map(&:constantize)
       end
 
-      def collectable(klass=nil)
-        unless klass.nil?
-          raise ArgumentError, "The collection model must inherit from ActiveRecord::Base" unless klass.ancestors.include?(ActiveRecord::Base)
-          ActiveRecord::Collection::COLLECTABLES[name] ||= klass.name
-        end
+      def kollektable
+        ActiveRecord::Collection::COLLECTABLES[name]
+      end
 
-        if ActiveRecord::Collection::COLLECTABLES[name].nil?
-          klass = infer_collectable
-          ActiveRecord::Collection::COLLECTABLES[name] = klass.name if !klass.nil? && klass.ancestors.include?(ActiveRecord::Base)
-        end
+      def collectable=(klass)
+        raise ArgumentError, "The collection model must inherit from ActiveRecord::Base" unless !klass.nil? && klass < ActiveRecord::Base
+        ActiveRecord::Collection::COLLECTABLES[name] = klass.name
+      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
+      def collectable(klass=nil)
+        if klass.nil?
+          self.collectable = infer_collectable if kollektable.nil?
+          raise "Unable to determine a model to use for your collection, please set one with the `collectable` class method" if kollektable.nil?
+        else
+          self.collectable = klass
+        end
 
-        ActiveRecord::Collection::COLLECTABLES[name].constantize
+        kollektable.constantize
       end
       alias_method :model, :collectable
 
-      def infer_collectable(klass=self)
-        singular = klass.name.demodulize.singularize
-        raise "Cannot infer collectable from singular collection" if singular == klass.name.demodulize
+      def infer_collectable
+        singular = name.demodulize.singularize
+        raise "Cannot infer collectable name from collection name" if singular == name.demodulize
         singular.constantize
       rescue
-        parent = klass.ancestors[1]
-        return nil if parent.name == 'ActiveRecord::Collection'
-        if ActiveRecord::Collection::COLLECTABLES.has_key?(parent.name)
-          ActiveRecord::Collection::COLLECTABLES[parent.name].constantize
-        else
-          infer_collectable(parent)
+        parent = ancestors[1]
+        return nil unless parent < ActiveRecord::Collection
+        begin
+          parent.collectable
+        rescue
+          nil
         end
       end
     end
 
     def collectable
-      @collectable ||= self.class.collectable
+      @collectable# ||= self.class.collectable
     end
     alias_method :model, :collectable
 
@@ -75,6 +79,8 @@ module ActiveRecord
 
       if criteria.first.present? && criteria.first.respond_to?(:ancestors) && criteria.first < ActiveRecord::Base
         @collectable = criteria.slice!(0)
+      else
+        @collectable = self.class.collectable
       end
 
       plural_name = collectable.name.demodulize.pluralize.underscore
@@ -102,7 +108,7 @@ module ActiveRecord
     end
 
     def initialize_copy(old)
-      @collectable = old.collectable
+      @collectable = old.collectable.name.constantize
       @options = old.options.dup
       @records = @relation = old.relation.dup
       @total_count = old.instance_variable_get(:@total_count)

data/lib/active_record/collections/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Collections
-    VERSION = '0.0.25'
+    VERSION = '0.0.26'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-collections
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord