mongo_mapper 0.15.3 → 0.15.6

data/lib/mongo_mapper/plugins.rb

@@ -1,7 +1,15 @@
 # encoding: UTF-8
 module MongoMapper
   module Plugins
-    include ActiveSupport::DescendantsTracker
+    if defined?(ActiveSupport::DescendantsTracker::DescendantsArray)
+      DescendantsArray = ::ActiveSupport::DescendantsTracker::DescendantsArray
+    else
+      DescendantsArray = ::Array
+    end
+
+    def self.direct_descendants_hash
+      @direct_descendants_hash ||= Hash.new { |h,k| h[k] = DescendantsArray.new }
+    end
 
     def plugins
       @plugins ||= []
@@ -14,9 +22,18 @@ module MongoMapper
       plugins << mod
     end
 
+    def direct_descendants
+      Plugins.direct_descendants_hash[self]
+    end
+
     def included(base = nil)
       direct_descendants << base if base
       super
     end
+
+    def inherited(subclass)
+      direct_descendants << subclass
+      super
+    end
   end
 end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.15.3'
+  Version = '0.15.6'
 end

data/lib/mongo_mapper.rb

@@ -60,6 +60,7 @@ module MongoMapper
     autoload :Safe,               'mongo_mapper/plugins/safe'
     autoload :Sci,                'mongo_mapper/plugins/sci'
     autoload :Scopes,             'mongo_mapper/plugins/scopes'
+    autoload :Shardable,          'mongo_mapper/plugins/shardable'
     autoload :Serialization,      'mongo_mapper/plugins/serialization'
     autoload :Stats,              'mongo_mapper/plugins/stats'
     autoload :StrongParameters,   'mongo_mapper/plugins/strong_parameters'
@@ -70,25 +71,27 @@ module MongoMapper
 
     module Associations
       autoload :Base,                         'mongo_mapper/plugins/associations/base'
-      autoload :Collection,                   'mongo_mapper/plugins/associations/collection'
-      autoload :EmbeddedCollection,           'mongo_mapper/plugins/associations/embedded_collection'
       autoload :ManyAssociation,              'mongo_mapper/plugins/associations/many_association'
       autoload :SingleAssociation,            'mongo_mapper/plugins/associations/single_association'
       autoload :BelongsToAssociation,         'mongo_mapper/plugins/associations/belongs_to_association'
       autoload :OneAssociation,               'mongo_mapper/plugins/associations/one_association'
-      autoload :ManyDocumentsProxy,           'mongo_mapper/plugins/associations/many_documents_proxy'
-      autoload :BelongsToProxy,               'mongo_mapper/plugins/associations/belongs_to_proxy'
-      autoload :BelongsToPolymorphicProxy,    'mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy'
-      autoload :ManyPolymorphicProxy,         'mongo_mapper/plugins/associations/many_polymorphic_proxy'
-      autoload :ManyEmbeddedProxy,            'mongo_mapper/plugins/associations/many_embedded_proxy'
-      autoload :ManyEmbeddedPolymorphicProxy, 'mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy'
-      autoload :ManyDocumentsAsProxy,         'mongo_mapper/plugins/associations/many_documents_as_proxy'
-      autoload :OneProxy,                     'mongo_mapper/plugins/associations/one_proxy'
-      autoload :OneAsProxy,                   'mongo_mapper/plugins/associations/one_as_proxy'
-      autoload :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/one_embedded_proxy'
-      autoload :OneEmbeddedPolymorphicProxy,  'mongo_mapper/plugins/associations/one_embedded_polymorphic_proxy'
-      autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
-      autoload :InForeignArrayProxy,          'mongo_mapper/plugins/associations/in_foreign_array_proxy'
+
+      autoload :Proxy,                        'mongo_mapper/plugins/associations/proxy/proxy'
+      autoload :Collection,                   'mongo_mapper/plugins/associations/proxy/collection'
+      autoload :EmbeddedCollection,           'mongo_mapper/plugins/associations/proxy/embedded_collection'
+      autoload :ManyDocumentsProxy,           'mongo_mapper/plugins/associations/proxy/many_documents_proxy'
+      autoload :BelongsToProxy,               'mongo_mapper/plugins/associations/proxy/belongs_to_proxy'
+      autoload :BelongsToPolymorphicProxy,    'mongo_mapper/plugins/associations/proxy/belongs_to_polymorphic_proxy'
+      autoload :ManyPolymorphicProxy,         'mongo_mapper/plugins/associations/proxy/many_polymorphic_proxy'
+      autoload :ManyEmbeddedProxy,            'mongo_mapper/plugins/associations/proxy/many_embedded_proxy'
+      autoload :ManyEmbeddedPolymorphicProxy, 'mongo_mapper/plugins/associations/proxy/many_embedded_polymorphic_proxy'
+      autoload :ManyDocumentsAsProxy,         'mongo_mapper/plugins/associations/proxy/many_documents_as_proxy'
+      autoload :OneProxy,                     'mongo_mapper/plugins/associations/proxy/one_proxy'
+      autoload :OneAsProxy,                   'mongo_mapper/plugins/associations/proxy/one_as_proxy'
+      autoload :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/proxy/one_embedded_proxy'
+      autoload :OneEmbeddedPolymorphicProxy,  'mongo_mapper/plugins/associations/proxy/one_embedded_polymorphic_proxy'
+      autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/proxy/in_array_proxy'
+      autoload :InForeignArrayProxy,          'mongo_mapper/plugins/associations/proxy/in_foreign_array_proxy'
     end
   end
 
@@ -99,7 +102,4 @@ Dir[File.join(File.dirname(__FILE__), 'mongo_mapper', 'extensions', '*.rb')].eac
   require extension
 end
 
-# FIXME: autoload with proxy is failing, need to investigate
-require 'mongo_mapper/plugins/associations/proxy'
-
 ActiveSupport.run_load_hooks(:mongo_mapper, MongoMapper)