mongo_mapper 0.14.0 → 0.15.4

data/lib/mongo_mapper/plugins/associations/single_association.rb

@@ -5,22 +5,14 @@ module MongoMapper
       class SingleAssociation < Base
         def setup(model)
           @model = model
-          model.associations_module.module_eval <<-end_eval
+
+          model.associations_module.module_eval(<<-end_eval, __FILE__, __LINE__ + 1)
             def #{name}
-              proxy = get_proxy(associations[#{name.inspect}])
-              proxy.nil? ? nil : proxy
+              get_proxy(associations[#{name.inspect}]).read
             end
 
             def #{name}=(value)
-              association = associations[#{name.inspect}]
-              proxy = get_proxy(association)
-
-              if proxy.nil? || proxy.target != value
-                proxy = build_proxy(association)
-              end
-
-              proxy.replace(value)
-              value
+              get_proxy(associations[#{name.inspect}]).write(value)
             end
 
             def #{name}?
@@ -43,4 +35,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/dirty.rb

@@ -3,58 +3,50 @@ module MongoMapper
   module Plugins
     module Dirty
       extend ActiveSupport::Concern
-
       include ::ActiveModel::Dirty
 
-      def initialize(*)
-        # never register initial id assignment as a change
-        # Chaining super into tap breaks implicit block passing in Ruby 1.8
-        doc = super
-        doc.tap { changed_attributes.delete('_id') }
-      end
-
-      def save(*)
-        clear_changes { super }
-      end
-
-      def reload(*)
-        doc = super
-        doc.tap { clear_changes }
-      end
-
-      def clear_changes
-        previous = changes
-        (block_given? ? yield : true).tap do |result|
-          unless result == false #failed validation; nil is OK.
-            @previously_changed = previous
-            changed_attributes.clear
+      module ClassMethods
+        def create_accessors_for(key)
+          super.tap do
+            define_attribute_methods([key.name])
           end
         end
       end
 
-    protected
+      def save_to_collection(*)
+        super.tap do
+          changes_applied
+        end
+      end
 
-      # We don't call super here to avoid invoking #attributes, which builds a whole new hash per call.
-      def attribute_method?(attr_name)
-        keys.key?(attr_name) || !embedded_associations.detect {|a| a.name == attr_name }.nil?
+      def reload!
+        super.tap do
+          clear_changes_information
+        end
       end
 
     private
 
-      def write_key(key, value)
-        key = unalias_key(key)
-        if !keys.key?(key)
+      def write_key(key_name, value)
+        key_name = unalias_key(key_name)
+
+        if !keys.key?(key_name)
           super
         else
-          attribute_will_change!(key) unless attribute_changed?(key)
-          super.tap do
-            changed_attributes.delete(key) unless attribute_value_changed?(key)
+          # find the MongoMapper::Plugins::Keys::Key
+          _, key = keys.detect { |n, v| n == key_name }
+
+          # typecast to the new value
+          old_value = read_key(key_name)
+          new_value = key.set(value)
+
+          # only mark changed if really changed value (after typecasting)
+          unless old_value == new_value
+            attribute_will_change!(key_name)
           end
-        end
-      end
 
-      def attribute_value_changed?(key_name)
-        changed_attributes[key_name] != read_key(key_name)
+          super
+        end
       end
     end
   end

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/dynamic_finder.rb

@@ -42,4 +42,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/embedded_callbacks.rb

@@ -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,12 +41,12 @@ 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
 
       def _root_document
-        @_root_document ||= _parent_document.try(:_root_document)
+        _parent_document.try(:_root_document)
       end
     end
   end

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -133,10 +133,12 @@ module PluckyMethods
     end
 
     def find_each(opts={})
+      return super if !block_given?
+
       query = clone.amend(opts)
       super(opts) do |doc|
         doc.remove_from_identity_map if doc && query.fields?
-        yield doc if block_given?
+        yield doc
       end
     end
   end

data/lib/mongo_mapper/plugins/indexes.rb

@@ -6,19 +6,20 @@ module MongoMapper
 
       module ClassMethods
         def ensure_index(spec, options = {})
-          collection.ensure_index dealias_options(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.create_index dealias_options(spec), options
+          collection.indexes.create_one dealias_options(spec), options
         end
 
         def drop_index(name)
-          collection.drop_index name
+          collection.indexes.drop_one name
         end
 
         def drop_indexes
-          collection.drop_indexes
+          collection.indexes.drop_all
         end
 
       private
@@ -26,11 +27,17 @@ module MongoMapper
         def dealias_options(options)
           case options
           when Symbol, String
-             abbr(options)
+            {abbr(options) => 1}
           when Hash
             dealias_keys(options)
           when Array
-            options.map {|o| dealias_options(o) }
+            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

data/lib/mongo_mapper/plugins/keys.rb

@@ -144,9 +144,8 @@ module MongoMapper
         end
 
         def create_accessors_for(key)
-          accessors = ""
           if key.read_accessor?
-            accessors << <<-end_eval
+            accessors_module.module_eval(<<-end_eval, __FILE__, __LINE__+1)
               def #{key.name}
                 read_key(:#{key.name})
               end
@@ -158,7 +157,7 @@ module MongoMapper
           end
 
           if key.write_accessor?
-            accessors << <<-end_eval
+            accessors_module.module_eval(<<-end_eval, __FILE__, __LINE__+1)
               def #{key.name}=(value)
                 write_key(:#{key.name}, value)
               end
@@ -166,7 +165,7 @@ module MongoMapper
           end
 
           if key.predicate_accessor?
-            accessors << <<-end_eval
+            accessors_module.module_eval(<<-end_eval, __FILE__, __LINE__+1)
               def #{key.name}?
                 read_key(:#{key.name}).present?
               end
@@ -179,7 +178,6 @@ module MongoMapper
             end
           end
 
-          accessors_module.module_eval accessors
           include accessors_module
         end
 
@@ -295,8 +293,16 @@ module MongoMapper
         end
       end
 
+      # NOTE: We can't use alias_method here as we need the #attributes=
+      # superclass method to get called (for example:
+      # MongoMapper::Plugins::Accessible filters non-permitted parameters
+      # through `attributes=`
+      def assign_attributes(new_attributes)
+        self.attributes = new_attributes
+      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?
@@ -449,7 +455,6 @@ module MongoMapper
         else
           @_dynamic_attributes[key.name.to_sym] = as_typecast
         end
-        @attributes = nil
         value
       end
 

data/lib/mongo_mapper/plugins/keys/key.rb

@@ -3,10 +3,11 @@ module MongoMapper
   module Plugins
     module Keys
       class Key
-        attr_accessor :name, :type, :options, :default, :ivar, :abbr, :accessors
-
+        RESERVED_KEYS = %w( id class object_id attributes )
         ID_STR = '_id'
 
+        attr_accessor :name, :type, :options, :default, :ivar, :abbr, :accessors
+
         def initialize(*args)
           options_from_args = args.extract_options!
           @name, @type = args.shift.to_s, args.shift
@@ -60,32 +61,40 @@ module MongoMapper
           # Special Case: Generate default _id on access
           value = default_value if @is_id and !value
 
+          value = type ? type.from_mongo(value) : value
+
           if @typecast
-            klass = typecast_class  # Don't make this lookup on every call
-            type.from_mongo(value).map { |v| klass.from_mongo(v) }
-          else
-            type.from_mongo(value)
+            klass = typecast_class # Don't make this lookup on every call
+            # typecast assumes array-ish object.
+            value = value.map { |v| klass.from_mongo(v) }
+            # recast it in the original type
+            value = type.from_mongo(value)
           end
+
+          value
         end
 
         def set(value)
           # Avoid tap here so we don't have to create a block binding.
-          values = type.to_mongo(value)
+          value = type ? type.to_mongo(value) : value.to_mongo
+
           if @typecast
-            values.map { |v| typecast_class.to_mongo(v) }
+            klass = typecast_class  # Don't make this lookup on every call
+            value.map { |v| klass.to_mongo(v) }
           else
-            values
+            value
           end
         end
 
         def default_value
           return unless default?
+
           if default.instance_of? Proc
-            type.to_mongo default.call
+            default.call
           else
             # Using Marshal is easiest way to get a copy of mutable objects
             # without getting an error on immutable objects
-            type.to_mongo Marshal.load(Marshal.dump(default))
+            Marshal.load(Marshal.dump(default))
           end
         end
 
@@ -93,7 +102,6 @@ module MongoMapper
           !!@name.match(/\A[a-z_][a-z0-9_]*\z/i)
         end
 
-        RESERVED_KEYS = %w( id class object_id )
         def reserved_name?
           RESERVED_KEYS.include?(@name)
         end
@@ -124,7 +132,7 @@ module MongoMapper
 
         def validate_key_name!
           if reserved_name?
-            raise MongoMapper::InvalidKey.new("`#{@name}` is a reserved key name (did you mean to use _id?)")
+            raise MongoMapper::InvalidKey.new("`#{@name}` is a reserved key name")
           elsif !valid_ruby_name?
             raise MongoMapper::InvalidKey.new("`#{@name}` is not a valid key name. Keys must match [a-z][a-z0-9_]*")
           end

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -13,7 +13,7 @@ module MongoMapper
           criteria, keys, options = criteria_and_keys_from_args(args)
           values, to_decrement = keys.values, {}
           keys.keys.each_with_index { |k, i| to_decrement[k] = -values[i].abs }
-          collection.update(criteria, {'$inc' => to_decrement}, :multi => true)
+          collection.update_many(criteria, {'$inc' => to_decrement}, options || {})
         end
 
         def set(*args)
@@ -44,7 +44,16 @@ module MongoMapper
         end
 
         def push_all(*args)
-          modifier_update('$pushAll', args)
+          Kernel.warn "push_all no longer supported. use $push with $each"
+
+          hash = args.pop
+          ids = args
+
+          push_values = hash.inject({}) do |hsh, (key, values)|
+            { key => { '$each' => values } }
+          end
+
+          modifier_update('$addToSet', [ids, push_values].flatten)
         end
 
         def add_to_set(*args)
@@ -64,16 +73,18 @@ module MongoMapper
           modifier_update('$pop', args)
         end
 
-        def find_and_modify(args)
-          args[:query]  = dealias_keys(args[:query])  if args.key? :query
-          args[:update] = dealias_keys(args[:update]) if args.key? :update
-          collection.find_and_modify(args)
+        def find_one_and_update(args)
+          args = args.dup
+          args[:query]  = dealias_keys(args.delete :query)  if args.key? :query
+          args[:update] = dealias_keys(args.delete :update) if args.key? :update
+          collection.find_one_and_update(args[:query], args[:update], args)
         end
+        alias_method :find_and_modify, :find_one_and_update
 
         def upsert(selector, updates, args = {})
           criteria = dealias_keys(selector)
           updates  = dealias_keys(updates)
-          collection.update(criteria, updates, args)
+          collection.update_one(criteria, updates, args.merge(upsert: true))
         end
 
       private
@@ -81,9 +92,9 @@ module MongoMapper
         def modifier_update(modifier, args)
           criteria, updates, options = criteria_and_keys_from_args(args)
           if options
-            collection.update(criteria, {modifier => updates}, options.merge(:multi => true))
+            collection.update_many(criteria, {modifier => updates}, options)
           else
-            collection.update(criteria, {modifier => updates}, :multi => true)
+            collection.update_many(criteria, {modifier => updates})
           end
         end
 
@@ -114,12 +125,12 @@ module MongoMapper
         self.class.unset({:_id => id}, *args)
       end
 
-      def increment(hash, options=nil)
-        self.class.increment({:_id => id}, hash, options)
+      def increment(args, options=nil)
+        self.class.increment({:_id => id}, _args_for_counter(args), options)
       end
 
-      def decrement(hash, options=nil)
-        self.class.decrement({:_id => id}, hash, options)
+      def decrement(args, options=nil)
+        self.class.decrement({:_id => id}, _args_for_counter(args), options)
       end
 
       def set(hash, options=nil)
@@ -131,7 +142,13 @@ module MongoMapper
       end
 
       def push_all(hash, options=nil)
-        self.class.push_all({:_id => id}, hash, options)
+        Kernel.warn "push_all no longer supported. use $push with $each"
+
+        push_values = hash.inject({}) do |hsh, (key, values)|
+          { key => { '$each' => values } }
+        end
+
+        self.class.push({:_id => id}, push_values, options)
       end
 
       def pull(hash, options=nil)
@@ -150,6 +167,14 @@ module MongoMapper
       def pop(hash, options=nil)
         self.class.pop({:_id => id}, hash, options)
       end
+
+    private
+
+      def _args_for_counter(args)
+        args.kind_of?(String) || args.kind_of?(Symbol) ?
+          { args => 1 } :
+          args
+      end
     end
   end
 end