mongo_mapper 0.13.0.beta2 → 0.15.0

data/lib/mongo_mapper/plugins/document.rb

@@ -19,7 +19,7 @@ module MongoMapper
       end
 
       def reload
-        if doc = collection.find_one(:_id => id)
+        if doc = collection.find({:_id => id},{limit: -1}).first
           self.class.associations.each_value do |association|
             get_proxy(association).reset
           end

data/lib/mongo_mapper/plugins/dynamic_querying.rb

@@ -29,16 +29,17 @@ module MongoMapper
           end
         end
 
-        protected
-          def method_missing(method, *args, &block)
-            finder = DynamicFinder.new(method)
-
-            if finder.found?
-              dynamic_find(finder, args)
-            else
-              super
-            end
+      private
+
+        def method_missing(method, *args, &block)
+          finder = DynamicFinder.new(method)
+
+          if finder.found?
+            dynamic_find(finder, args)
+          else
+            super
           end
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/dynamic_querying/dynamic_finder.rb

@@ -20,25 +20,26 @@ module MongoMapper
           bang == true
         end
 
-        protected
-          def match
-            case method.to_s
-              when /^find_(all_by|by)_([_a-zA-Z]\w*)$/
-                @finder = :all if $1 == 'all_by'
-                names = $2
-              when /^find_by_([_a-zA-Z]\w*)\!$/
-                @bang = true
-                names = $1
-              when /^find_or_(initialize|create)_by_([_a-zA-Z]\w*)$/
-                @instantiator = $1 == 'initialize' ? :new : :create
-                names = $2
-              else
-                @finder = nil
-            end
+      protected
 
-            @attributes = names && names.split('_and_')
+        def match
+          case method.to_s
+            when /^find_(all_by|by)_([_a-zA-Z]\w*)$/
+              @finder = :all if $1 == 'all_by'
+              names = $2
+            when /^find_by_([_a-zA-Z]\w*)\!$/
+              @bang = true
+              names = $1
+            when /^find_or_(initialize|create)_by_([_a-zA-Z]\w*)$/
+              @instantiator = $1 == 'initialize' ? :new : :create
+              names = $2
+            else
+              @finder = nil
           end
+
+          @attributes = names && names.split('_and_')
+        end
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/embedded_callbacks.rb

@@ -8,7 +8,7 @@ module MongoMapper
         extend  ::ActiveModel::Callbacks
 
         define_model_callbacks :save, :create, :update, :destroy, :only => [:before, :after]
-        define_model_callbacks :touch, :only => [:after]
+        define_model_callbacks :initialize, :find, :touch, :only => [:after]
 
         proxy_callbacks(
           :before => [:save, :create, :update, :destroy],
@@ -44,6 +44,7 @@ module MongoMapper
           definition.each do |prefix, suffixes|
             suffixes.each do |suffix|
               callback = "%s_%s" % [prefix, suffix]
+
               class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
                 class << self
                   alias_method :__original_#{callback}, :#{callback}

data/lib/mongo_mapper/plugins/embedded_document.rb

@@ -41,7 +41,7 @@ module MongoMapper
 
       def persist(options={})
         @_new = false
-        clear_changes if respond_to?(:clear_changes)
+        changes_applied if respond_to?(:changes_applied)
         save_to_collection(options)
       end
 

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -69,7 +69,7 @@ module MongoMapper
           end
         end
 
-        def load(attrs)
+        def load(attrs, with_cast = false)
           return super unless Thread.current[:mongo_mapper_identity_map_enabled]
           return nil unless attrs
           document = get_from_identity_map(attrs['_id'])

data/lib/mongo_mapper/plugins/indexes.rb

@@ -5,8 +5,43 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       module ClassMethods
-        extend Forwardable
-        def_delegators :collection, :ensure_index, :create_index, :drop_index, :drop_indexes
+        def ensure_index(spec, options = {})
+          #TODO: should we emulate the mongo 1.x behaviour of caching attempts to create indexes?
+          collection.indexes.create_one dealias_options(spec), options
+        end
+
+        def create_index(spec, options = {})
+          collection.indexes.create_one dealias_options(spec), options
+        end
+
+        def drop_index(name)
+          collection.indexes.drop_one name
+        end
+
+        def drop_indexes
+          collection.indexes.drop_all
+        end
+
+      private
+
+        def dealias_options(options)
+          case options
+          when Symbol, String
+            {abbr(options) => 1}
+          when Hash
+            dealias_keys(options)
+          when Array
+            if options.first.is_a?(Hash)
+              options.map {|o| dealias_options(o) }
+            elsif options.first.is_a?(Array) # [[:foo, 1], [:bar, 1]]
+              options.inject({}) {|acc, tuple| acc.merge(dealias_options(tuple))}
+            else
+              dealias_keys(Hash[*options])
+            end
+          else
+            options
+          end
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/keys.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'mongo_mapper/plugins/keys/key'
+require 'mongo_mapper/plugins/keys/static'
 
 module MongoMapper
   module Plugins
@@ -35,11 +36,29 @@ module MongoMapper
           @unaliased_keys ||= Hash[*keys.select {|k, v| k == v.name }.flatten(1)]
         end
 
+        def dealias_keys(hash)
+          out = {}
+          hash.each do |k, v|
+            key = keys[k.to_s]
+            name = key && key.abbr || k
+            out[name] = k.to_s.match(/^\$/) && v.is_a?(Hash) ? dealias_keys(v) : v
+          end
+          out
+        end
+
+        def dealias_key(name)
+          key = keys[name.to_s]
+          key && key.abbr || k
+        end
+
+        alias_method :dealias, :dealias_keys
+        alias_method :unalias, :dealias_keys
+
         def key(*args)
           Key.new(*args).tap do |key|
             keys[key.name] = key
             keys[key.abbr] = key if key.abbr
-            create_accessors_for(key) if key.valid_ruby_name?
+            create_accessors_for(key) if key.valid_ruby_name? && !key.reserved_name?
             create_key_in_descendants(*args)
             create_indexes_for(key)
             create_validations_for(key)
@@ -47,8 +66,26 @@ module MongoMapper
           end
         end
 
+        def remove_key(name)
+          if key = keys[name.to_s]
+            keys.delete key.name
+            keys.delete key.abbr
+            remove_method key.name if respond_to? "#{key.name}"
+            remove_method "#{key.name}=" if respond_to? "#{key.name}="
+            remove_method "#{key.name}?" if respond_to? "#{key.name}?"
+            remove_method "#{key.name}_before_type_cast" if respond_to? "#{key.name}_before_type_cast"
+            remove_key_in_descendants key.name
+            remove_validations_for key.name
+            @dynamic_keys = @defined_keys = @unaliased_keys = @object_id_keys = nil
+          end
+        end
+
         def persisted_name(name)
-          keys[name.to_s].persisted_name
+          if key = keys[name.to_s]
+            key.persisted_name
+          else
+            name
+          end
         end
         alias_method :abbr, :persisted_name
 
@@ -86,120 +123,144 @@ module MongoMapper
           end.allocate.initialize_from_database(attrs, with_cast)
         end
 
-        private
-          def key_accessors_module_defined?
-            # :nocov:
-            if IS_RUBY_1_9
-              const_defined?('MongoMapperKeys')
-            else
-              const_defined?('MongoMapperKeys', false)
-            end
-            # :nocov:
+      private
+
+        def key_accessors_module_defined?
+          # :nocov:
+          if IS_RUBY_1_9
+            const_defined?('MongoMapperKeys')
+          else
+            const_defined?('MongoMapperKeys', false)
           end
+          # :nocov:
+        end
 
-          def accessors_module
-            if key_accessors_module_defined?
-              const_get 'MongoMapperKeys'
-            else
-              const_set 'MongoMapperKeys', Module.new
-            end
+        def accessors_module
+          if key_accessors_module_defined?
+            const_get 'MongoMapperKeys'
+          else
+            const_set 'MongoMapperKeys', Module.new
           end
+        end
 
-          def create_accessors_for(key)
-            accessors = ""
-            if key.read_accessor?
-              accessors << <<-end_eval
-                def #{key.name}
-                  read_key(:#{key.name})
-                end
-
-                def #{key.name}_before_type_cast
-                  read_key_before_type_cast(:#{key.name})
-                end
-              end_eval
-            end
+        def create_accessors_for(key)
+          accessors = ""
+          if key.read_accessor?
+            accessors << <<-end_eval
+              def #{key.name}
+                read_key(:#{key.name})
+              end
 
-            if key.write_accessor?
-              accessors << <<-end_eval
-                def #{key.name}=(value)
-                  write_key(:#{key.name}, value)
-                end
-              end_eval
-            end
+              def #{key.name}_before_type_cast
+                read_key_before_type_cast(:#{key.name})
+              end
+            end_eval
+          end
 
-            if key.predicate_accessor?
-              accessors << <<-end_eval
-                def #{key.name}?
-                  read_key(:#{key.name}).present?
-                end
-              end_eval
-            end
+          if key.write_accessor?
+            accessors << <<-end_eval
+              def #{key.name}=(value)
+                write_key(:#{key.name}, value)
+              end
+            end_eval
+          end
 
-            if block_given?
-              accessors_module.module_eval do
-                yield
+          if key.predicate_accessor?
+            accessors << <<-end_eval
+              def #{key.name}?
+                read_key(:#{key.name}).present?
               end
-            end
+            end_eval
+          end
 
-            accessors_module.module_eval accessors
-            include accessors_module
+          if block_given?
+            accessors_module.module_eval do
+              yield
+            end
           end
 
-          def create_key_in_descendants(*args)
-            descendants.each { |descendant| descendant.key(*args) }
+          accessors_module.module_eval accessors
+          include accessors_module
+        end
+
+        def create_key_in_descendants(*args)
+          descendants.each { |descendant| descendant.key(*args) }
+        end
+
+        def remove_key_in_descendants(name)
+          descendants.each { |descendant| descendant.remove_key(name) }
+        end
+
+        def create_indexes_for(key)
+          if key.options[:index] && !key.embeddable?
+            warn "[DEPRECATION] :index option when defining key #{key.name.inspect} is deprecated. Put indexes in `db/indexes.rb`"
+            ensure_index key.name
           end
+        end
 
-          def create_indexes_for(key)
-            if key.options[:index] && !key.embeddable?
-              warn "[DEPRECATION] :index option when defining key #{key.name.inspect} is deprecated. Put indexes in `db/indexes.rb`"
-              ensure_index key.name
+        def create_validations_for(key)
+          attribute = key.name.to_sym
+
+          if key.options[:required]
+            if key.type == Boolean
+              validates_inclusion_of attribute, :in => [true, false]
+            else
+              validates_presence_of(attribute)
             end
           end
 
-          def create_validations_for(key)
-            attribute = key.name.to_sym
+          if key.options[:unique]
+            validates_uniqueness_of(attribute)
+          end
 
-            if key.options[:required]
-              if key.type == Boolean
-                validates_inclusion_of attribute, :in => [true, false]
-              else
-                validates_presence_of(attribute)
-              end
-            end
+          if key.options[:numeric]
+            number_options = key.type == Integer ? {:only_integer => true} : {}
+            validates_numericality_of(attribute, number_options)
+          end
 
-            if key.options[:unique]
-              validates_uniqueness_of(attribute)
-            end
+          if key.options[:format]
+            validates_format_of(attribute, :with => key.options[:format])
+          end
 
-            if key.options[:numeric]
-              number_options = key.type == Integer ? {:only_integer => true} : {}
-              validates_numericality_of(attribute, number_options)
-            end
+          if key.options[:in]
+            validates_inclusion_of(attribute, :in => key.options[:in])
+          end
 
-            if key.options[:format]
-              validates_format_of(attribute, :with => key.options[:format])
-            end
+          if key.options[:not_in]
+            validates_exclusion_of(attribute, :in => key.options[:not_in])
+          end
 
-            if key.options[:in]
-              validates_inclusion_of(attribute, :in => key.options[:in])
+          if key.options[:length]
+            length_options = case key.options[:length]
+            when Integer
+              {:minimum => 0, :maximum => key.options[:length]}
+            when Range
+              {:within => key.options[:length]}
+            when Hash
+              key.options[:length]
             end
+            validates_length_of(attribute, length_options)
+          end
+        end
 
-            if key.options[:not_in]
-              validates_exclusion_of(attribute, :in => key.options[:not_in])
-            end
+        def remove_validations_for(name)
+          name = name.to_sym
+          a_name = [name]
 
-            if key.options[:length]
-              length_options = case key.options[:length]
-              when Integer
-                {:minimum => 0, :maximum => key.options[:length]}
-              when Range
-                {:within => key.options[:length]}
-              when Hash
-                key.options[:length]
-              end
-              validates_length_of(attribute, length_options)
-            end
+          _validators.reject!{ |key, _| key == name }
+          remove_validate_callbacks a_name
+        end
+
+        def remove_validate_callbacks(a_name)
+          chain = _validate_callbacks.dup.reject do |callback|
+            f = callback.raw_filter
+            f.respond_to?(:attributes) && f.attributes == a_name
+          end
+          reset_callbacks(:validate)
+          chain.each do |callback|
+            set_callback 'validate', callback.raw_filter
           end
+        end
       end
 
       def initialize(attrs={})
@@ -235,7 +296,7 @@ module MongoMapper
       end
 
       def to_mongo(include_abbreviatons = true)
-        BSON::OrderedHash.new.tap do |attrs|
+        Hash.new.tap do |attrs|
           self.class.unaliased_keys.each do |name, key|
             value = self.read_key(key.name)
             if key.type == ObjectId || !value.nil?
@@ -245,7 +306,7 @@ module MongoMapper
 
           embedded_associations.each do |association|
             if documents = instance_variable_get(association.ivar)
-              if association.instance_of?(Associations::OneAssociation)
+              if association.is_a?(Associations::OneAssociation)
                 attrs[association.name] = documents.to_mongo
               else
                 attrs[association.name] = documents.map(&:to_mongo)
@@ -312,8 +373,8 @@ module MongoMapper
         end
       end
 
-      alias_method :[], :read_key
-      alias_method :attribute, :read_key
+      def [](key_name); read_key(key_name); end
+      def attribute(key_name); read_key(key_name); end
 
       def []=(name, value)
         write_key(name, value)
@@ -331,7 +392,7 @@ module MongoMapper
         @embedded_keys ||= keys.values.select(&:embeddable?)
       end
 
-      protected
+    protected
 
       def unalias_key(name)
         name = name.to_s
@@ -342,67 +403,66 @@ module MongoMapper
         end
       end
 
-      private
+    private
 
-        def init_ivars
-          @__mm_keys = self.class.keys                                # Not dumpable
-          @__mm_default_keys = @__mm_keys.values.select(&:default?)   # Not dumpable
-          @_dynamic_attributes = {}                                      # Dumpable
-        end
+      def init_ivars
+        @__mm_keys = self.class.keys                                # Not dumpable
+        @__mm_default_keys = @__mm_keys.values.select(&:default?)   # Not dumpable
+        @_dynamic_attributes = {}                                      # Dumpable
+      end
 
-        def load_from_database(attrs, with_cast = false)
-          return if attrs == nil || attrs.blank?
+      def load_from_database(attrs, with_cast = false)
+        return if attrs == nil || attrs.blank?
 
-          attrs.each do |key, value|
-            if !@__mm_keys.key?(key) && respond_to?(:"#{key}=")
-              self.send(:"#{key}=", value)
-            else
-              internal_write_key key, value, with_cast
-            end
+        attrs.each do |key, value|
+          if !@__mm_keys.key?(key) && respond_to?(:"#{key}=")
+            self.send(:"#{key}=", value)
+          else
+            internal_write_key key, value, with_cast
           end
         end
+      end
 
-        def set_parent_document(key, value)
-          if key.type and value.instance_of?(key.type) && key.embeddable? && value.respond_to?(:_parent_document)
-            value._parent_document = self
-          end
+      def set_parent_document(key, value)
+        if key.type and value.instance_of?(key.type) && key.embeddable? && value.respond_to?(:_parent_document)
+          value._parent_document = self
         end
+      end
 
-        # This exists to be patched over by plugins, while letting us still get to the undecorated
-        # version of the method.
-        def write_key(name, value)
-          init_ivars unless @__mm_keys
-          internal_write_key(name.to_s, value)
-        end
+      # This exists to be patched over by plugins, while letting us still get to the undecorated
+      # version of the method.
+      def write_key(name, value)
+        init_ivars unless @__mm_keys
+        internal_write_key(name.to_s, value)
+      end
 
-        def internal_write_key(name, value, cast = true)
-          key         = @__mm_keys[name] || dynamic_key(name)
-          as_mongo    = cast ? key.set(value) : value
-          as_typecast = key.get(as_mongo)
-          if key.ivar
-            if key.embeddable?
-              set_parent_document(key, value)
-              set_parent_document(key, as_typecast)
-            end
-            instance_variable_set key.ivar, as_typecast
-          else
-            @_dynamic_attributes[key.name.to_sym] = as_typecast
+      def internal_write_key(name, value, cast = true)
+        key         = @__mm_keys[name] || dynamic_key(name)
+        as_mongo    = cast ? key.set(value) : value
+        as_typecast = key.get(as_mongo)
+        if key.ivar
+          if key.embeddable?
+            set_parent_document(key, value)
+            set_parent_document(key, as_typecast)
           end
-          @attributes = nil
+          instance_variable_set key.ivar, as_typecast
+        else
+          @_dynamic_attributes[key.name.to_sym] = as_typecast
         end
+        value
+      end
 
-        def dynamic_key(name)
-          self.class.key(name, :__dynamic => true)
-        end
+      def dynamic_key(name)
+        self.class.key(name, :__dynamic => true)
+      end
 
-        def initialize_default_values(except = {})
-          @__mm_default_keys.each do |key|
-            if !(except && except.key?(key.name))
-              internal_write_key key.name, key.default_value, false
-            end
+      def initialize_default_values(except = {})
+        @__mm_default_keys.each do |key|
+          if !(except && except.key?(key.name))
+            internal_write_key key.name, key.default_value, false
           end
         end
-      #end private
+      end
     end
   end
 end