mongo_mapper 0.15.1 → 0.15.5

data/lib/mongo_mapper/plugins/scopes.rb

@@ -10,6 +10,14 @@ module MongoMapper
 
       module ClassMethods
         def scope(name, scope={})
+          if dangerous_class_method?(name)
+            raise ArgumentError, <<~end_message
+              You tried to define a scope named "#{name}"
+              on the model "#{self.name}", but MongoMapper::Document already defined
+              a class method with the same name.
+            end_message
+          end
+
           # Assign to _scopes instead of using []= to avoid mixing subclass scopes
           self._scopes = scopes.merge(name => scope)
 
@@ -23,7 +31,7 @@ module MongoMapper
         end
 
         def active_scopes
-          @active_scopes ||= []
+          Thread.current["mongo_mapper_#{name}_active_scopes"] ||= []
         end
 
         def default_scopes
@@ -70,12 +78,12 @@ module MongoMapper
           old_active_scopes = active_scopes.dup
 
           @default_scopes = []
-          @active_scopes = []
+          active_scopes.clear
 
           yield
         ensure
           @default_scopes = old_default_scopes
-          @active_scopes = old_active_scopes
+          active_scopes.concat(old_active_scopes)
         end
 
       private
@@ -93,6 +101,14 @@ module MongoMapper
         def all_anonymous_scopes
           [default_scopes + active_scopes].flatten
         end
+
+        RESTRICTED_CLASS_METHODS = %w(private public protected allocate new name parent superclass)
+        private_constant :RESTRICTED_CLASS_METHODS
+
+        def dangerous_class_method?(method_name)
+          return true if RESTRICTED_CLASS_METHODS.include?(method_name.to_s)
+          Document.method_defined?(method_name)
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/shardable.rb

@@ -0,0 +1,30 @@
+module MongoMapper
+  module Plugins
+    module Shardable
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :shard_key_fields
+        self.shard_key_fields = []
+      end
+
+      def shard_key_filter
+        filter = {}
+        shard_key_fields.each do |field|
+          filter[field] = if new_record?
+            send(field)
+          else
+            changed_attributes.key?(field) ? changed_attributes[field] : send(field)
+          end
+        end
+        filter
+      end
+
+      module ClassMethods
+        def shard_key(*fields)
+          self.shard_key_fields = fields.map(&:to_s).freeze
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/validations.rb

@@ -54,7 +54,7 @@ module MongoMapper
           conditions[:_id.ne] = record._id if record._id
 
           if @klass.exists?(conditions)
-            record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
+            record.errors.add(attribute, :taken, **options.except(:case_sensitive, :scope).merge(:value => value))
           end
         end
 

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.15.1'
+  Version = '0.15.5'
 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)