activerecord-collections 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a957127ae2a21f3a1b1d86589127c32b61ea74ec
-  data.tar.gz: ea061b5fa0357a66cd1f93d63332b297d25ac8f9
+  metadata.gz: 22ce528f513350381a68417cd1b739ddca67c5c4
+  data.tar.gz: ec7a642f1a23c4dfc41cf1ae7f059c263be993c1
 SHA512:
-  metadata.gz: 9b05f147793bc3239373ef8c0ecc232650f6e8972d1ee7d98942f1259904e0b3451caf3c45422dae6167ecef2708968e06d7a80a0b8e5f7904aaf98a0c52038f
-  data.tar.gz: ea45a2d8364d10f0c1d9a998ca9a372db81ab7098fc39ceffc71cc2732491891bf673270cea2c8fb0358e9f7a8bc5b98bfcd36d742ea8f35ac21d865ab4c4e6e
+  metadata.gz: e3965879d213c235ddc447ec1a9d723736af7509aebf7fe4d4749e96a951a4213e1cedadf9dec7acc82035d7ec80b30088db75cc924f95eb91c14519d6d46b1b
+  data.tar.gz: 32445dbdd55347fe201dca00bc1effe2618356e6f3d616f15197d364c925414a34433b42e5d2bdb48934801e4350f52a6693f0423ee9226cc9d6673c486eaca3

data/lib/active_record/collection.rb

@@ -53,7 +53,7 @@ module ActiveRecord
     protected
 
     def initialize(*criteria)
-      if criteria.first.present? && criteria.first.ancestors.include?(ActiveRecord::Base)
+      if criteria.first.present? && criteria.first.respond_to?(:ancestors) && criteria.first.ancestors.include?(ActiveRecord::Base)
         @collectable = criteria.slice!(0)
       end
 

data/lib/active_record/collections/collectable.rb

@@ -8,7 +8,14 @@ module ActiveRecord
         end
 
         def kollektion
-          @collection_class || ActiveRecord::Collection.collections.to_a.select { |c| c.collectable == self }.first || ActiveRecord::Collection
+          plural_klass = begin
+            pklass = self.name.pluralize.constantize
+            raise "Not an ActiveRecord::Collection" unless pklass.ancestors.include?(ActiveRecord::Collection)
+            pklass
+          rescue
+            nil
+          end
+          @collection_class || ActiveRecord::Collection.collections.to_a.select { |c| c.collectable == self }.first || plural_klass || ActiveRecord::Collection
         end
 
         def collection(*criteria)

data/lib/active_record/collections/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Collections
-    VERSION = '0.0.9'
+    VERSION = '0.0.10'
   end
 end

metadata

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