mongo_mapper 0.7.3 → 0.7.4

data/Rakefile

@@ -13,9 +13,10 @@ Jeweler::Tasks.new do |gem|
   gem.version     = MongoMapper::Version
 
   gem.add_dependency('activesupport', '>= 2.3.4')
-  gem.add_dependency('mongo', '0.19.3')
-  gem.add_dependency('jnunemaker-validatable', '1.8.3')
+  gem.add_dependency('mongo', '0.20.1')
+  gem.add_dependency('jnunemaker-validatable', '1.8.4')
 
+  gem.add_development_dependency('json', '>= 1.2.3')
   gem.add_development_dependency('jnunemaker-matchy', '0.4.0')
   gem.add_development_dependency('shoulda', '2.10.2')
   gem.add_development_dependency('timecop', '0.3.1')

data/lib/mongo_mapper.rb

@@ -1,8 +1,7 @@
 # Make sure you have the following libs in your load path or you could have issues:
 #   gem 'activesupport', '>= 2.3.4'
-#   gem 'mongo', '0.19.3'
-#   gem 'jnunemaker-validatable', '1.8.3'
-# gem 'activesupport', '= 2.3.4'
+#   gem 'mongo', '0.20.1'
+#   gem 'jnunemaker-validatable', '1.8.4'
 require 'set'
 require 'uri'
 require 'mongo'

data/lib/mongo_mapper/plugins/associations.rb

@@ -84,6 +84,14 @@ module MongoMapper
 
           proxy
         end
+        
+        def save_to_collection(options = {})
+          super
+          associations.each do |association_name, association|
+            proxy = get_proxy(association)
+            proxy.save_to_collection(options) if proxy.proxy_respond_to?(:save_to_collection)
+          end
+        end
       end
 
       autoload :Base,                         'mongo_mapper/plugins/associations/base'
@@ -97,9 +105,10 @@ module MongoMapper
       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 :OneEmbeddedProxy,             'mongo_mapper/plugins/associations/one_embedded_proxy'
       autoload :InArrayProxy,                 'mongo_mapper/plugins/associations/in_array_proxy'
     end
   end
 end
 
-require 'mongo_mapper/plugins/associations/proxy'
+require 'mongo_mapper/plugins/associations/proxy'

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

@@ -56,7 +56,7 @@ module MongoMapper
         end
 
         def embeddable?
-          many? && klass.embeddable?
+          (one? || many?) && klass.embeddable?
         end
 
         def type_key_name
@@ -95,7 +95,7 @@ module MongoMapper
                 end
               end
             elsif one?
-              OneProxy
+              klass.embeddable? ? OneEmbeddedProxy : OneProxy
             else
               polymorphic? ? BelongsToPolymorphicProxy : BelongsToProxy
             end

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

@@ -37,13 +37,13 @@ module MongoMapper
         def replace(docs)
           load_target
           target.map(&:destroy)
-          docs.each { |doc| apply_scope(doc).save }
+          docs.each { |doc| prepare(doc).save }
           reset
         end
 
         def <<(*docs)
           ensure_owner_saved
-          flatten_deeper(docs).each { |doc| apply_scope(doc).save }
+          flatten_deeper(docs).each { |doc| prepare(doc).save }
           reset
         end
         alias_method :push, :<<
@@ -52,7 +52,8 @@ module MongoMapper
         def build(attrs={})
           doc = klass.new(attrs)
           apply_scope(doc)
-          reset
+          @target ||= [] unless loaded?
+          @target << doc
           doc
         end
 
@@ -87,6 +88,10 @@ module MongoMapper
           end
           reset
         end
+        
+        def save_to_collection(options = {})
+          @target.each { |doc| doc.save(options) } if @target
+        end
 
         protected
           def scoped_conditions
@@ -105,6 +110,10 @@ module MongoMapper
             owner.save if owner.new?
           end
 
+          def prepare(doc)
+            klass === doc ? apply_scope(doc) : build(doc)
+          end
+
           def apply_scope(doc)
             ensure_owner_saved
             doc[foreign_key] = owner.id

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

@@ -0,0 +1,41 @@
+module MongoMapper
+  module Plugins
+    module Associations
+      class OneEmbeddedProxy < Proxy
+        undef_method :object_id
+
+        def build(attributes={})
+          @target = klass.new(attributes)
+          assign_references(@target)
+          loaded
+          @target
+        end
+
+        def replace(doc)
+          if doc.respond_to?(:attributes)
+            @target = klass.load(doc.attributes)
+          else
+            @target = klass.load(doc)
+          end
+          assign_references(@target)
+          loaded
+          @target
+        end
+
+        protected
+
+          def find_target
+            if @value
+              klass.load(@value).tap do |child|
+                assign_references(child)
+              end
+            end
+          end
+
+          def assign_references(doc)
+            doc._parent_document = owner
+          end
+      end
+    end
+  end
+end

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

@@ -37,6 +37,7 @@ module MongoMapper
 
           unless doc.nil?
             owner.save if owner.new?
+            doc = klass.new(doc) unless klass === doc
             doc[foreign_key] = owner.id
             doc.save if doc.new?
             loaded

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

@@ -96,8 +96,14 @@ module MongoMapper
           end
 
           def load_target
-            @target = find_target unless loaded?
-            loaded
+            unless loaded?
+              if @target.is_a?(Array) && @target.any?
+                @target = find_target + @target.find_all { |record| record.new? }
+              else
+                @target = find_target
+              end
+              loaded
+            end
             @target
           rescue MongoMapper::DocumentNotFound
             reset

data/lib/mongo_mapper/plugins/callbacks.rb

@@ -81,8 +81,12 @@ module MongoMapper
           return unless self.class.respond_to?(callback_chain_method)
           self.class.send(callback_chain_method).run(self, options, &block)
           self.embedded_associations.each do |association|
-            self.send(association.name).each do |document|
-              document.run_callbacks(kind, options, &block)
+            if association.one?
+              self.send(association.name).run_callbacks(kind, options, &block)
+            else
+              self.send(association.name).each do |document|
+                document.run_callbacks(kind, options, &block)
+              end
             end
           end
         end
@@ -233,4 +237,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/descendants.rb

@@ -3,12 +3,12 @@ module MongoMapper
     module Descendants
       module ClassMethods
         def inherited(descendant)
-          (@descendants ||= []) << descendant
+          descendants << descendant
           super
         end
 
         def descendants
-          @descendants
+          @descendants ||= []
         end
       end
     end

data/lib/mongo_mapper/plugins/keys.rb

@@ -95,7 +95,6 @@ module MongoMapper
           end
 
           def create_key_in_descendants(*args)
-            return if descendants.blank?
             descendants.each { |descendant| descendant.key(*args) }
           end
 
@@ -188,7 +187,11 @@ module MongoMapper
 
           embedded_associations.each do |association|
             if documents = instance_variable_get(association.ivar)
-              attrs[association.name] = documents.map { |document| document.to_mongo }
+              if association.one?
+                attrs[association.name] = documents.to_mongo
+              else
+                attrs[association.name] = documents.map { |document| document.to_mongo }
+              end
             end
           end
 
@@ -252,7 +255,7 @@ module MongoMapper
             unless attrs.nil?
               provided_keys = attrs.keys.map { |k| k.to_s }
               unless provided_keys.include?('_id') || provided_keys.include?('id')
-                write_key :_id, Mongo::ObjectID.new
+                write_key :_id, BSON::ObjectID.new
               end
             end
           end
@@ -265,10 +268,17 @@ module MongoMapper
             self.class.key(name) unless respond_to?("#{name}=")
           end
 
+          def set_parent_document(key, value)
+            if key.embeddable? && value.is_a?(key.type)
+              value._parent_document = self
+            end
+          end
+
           def read_key(name)
             if key = keys[name]
               var_name = "@#{name}"
               value = key.get(instance_variable_get(var_name))
+              set_parent_document(key, value)
               instance_variable_set(var_name, value)
             else
               raise KeyNotFound, "Could not find key: #{name.inspect}"
@@ -282,10 +292,7 @@ module MongoMapper
           def write_key(name, value)
             key = keys[name]
 
-            if key.embeddable? && value.is_a?(key.type)
-              value._parent_document = self
-            end
-
+            set_parent_document(key, value)
             instance_variable_set "@#{name}_before_typecast", value
             instance_variable_set "@#{name}", key.set(value)
           end

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -17,6 +17,19 @@ module MongoMapper
           modifier_update('$set', args)
         end
 
+        def unset(*args)
+          if args[0].is_a?(Hash)
+            criteria, keys = args.shift, args
+          else
+            keys, ids = args.partition { |arg| arg.is_a?(Symbol) }
+            criteria = {:id => ids}
+          end
+
+          criteria  = to_criteria(criteria)
+          modifiers = keys.inject({}) { |hash, key| hash[key] = 1; hash }
+          collection.update(criteria, {'$unset' => modifiers}, :multi => true)
+        end
+
         def push(*args)
           modifier_update('$push', args)
         end
@@ -25,11 +38,10 @@ module MongoMapper
           modifier_update('$pushAll', args)
         end
 
-        def push_uniq(*args)
-          criteria, keys = criteria_and_keys_from_args(args)
-          keys.each { |key, value | criteria[key] = {'$ne' => value} }
-          collection.update(criteria, {'$push' => keys}, :multi => true)
+        def add_to_set(*args)
+          modifier_update('$addToSet', args)
         end
+        alias push_uniq add_to_set
 
         def pull(*args)
           modifier_update('$pull', args)
@@ -46,8 +58,7 @@ module MongoMapper
         private
           def modifier_update(modifier, args)
             criteria, keys = criteria_and_keys_from_args(args)
-            modifiers = {modifier => keys}
-            collection.update(criteria, modifiers, :multi => true)
+            collection.update(criteria, {modifier => keys}, :multi => true)
           end
 
           def criteria_and_keys_from_args(args)
@@ -58,32 +69,37 @@ module MongoMapper
       end
 
       module InstanceMethods
+        def unset(*keys)
+          self.class.unset(id, *keys)
+        end
+
         def increment(hash)
-          self.class.increment({:_id => id}, hash)
+          self.class.increment(id, hash)
         end
 
         def decrement(hash)
-          self.class.decrement({:_id => id}, hash)
+          self.class.decrement(id, hash)
         end
 
         def set(hash)
-          self.class.set({:_id => id}, hash)
+          self.class.set(id, hash)
         end
 
         def push(hash)
-          self.class.push({:_id => id}, hash)
+          self.class.push(id, hash)
         end
 
         def pull(hash)
-          self.class.pull({:_id => id}, hash)
+          self.class.pull(id, hash)
         end
 
-        def push_uniq(hash)
-          self.class.push_uniq({:_id => id}, hash)
+        def add_to_set(hash)
+          self.class.push_uniq(id, hash)
         end
+        alias push_uniq add_to_set
 
         def pop(hash)
-          self.class.pop({:_id => id}, hash)
+          self.class.pop(id, hash)
         end
       end
     end

data/lib/mongo_mapper/plugins/protected.rb

@@ -36,7 +36,7 @@ module MongoMapper
 
         protected
           def filter_protected_attrs(attrs)
-            return attrs if protected_attributes.blank?
+            return attrs if protected_attributes.blank? || attrs.blank?
             attrs.dup.delete_if { |key, val| protected_attributes.include?(key.to_sym) }
           end
       end

data/lib/mongo_mapper/plugins/serialization.rb

@@ -51,7 +51,7 @@ module MongoMapper
               hash[key] = value.map do |item|
                 item.respond_to?(:as_json) ? item.as_json(options) : item
               end
-            elsif value.is_a? Mongo::ObjectID
+            elsif value.is_a? BSON::ObjectID
               hash[key] = value.to_s
             elsif value.respond_to?(:as_json)
               hash[key] = value.as_json(options)

data/lib/mongo_mapper/query.rb

@@ -68,49 +68,52 @@ module MongoMapper
           if model.object_id_key?(key)
             case value
               when String
-                value = Mongo::ObjectID.from_string(value)
+                value = ObjectId.to_mongo(value)
               when Array
                 value.map! { |id| ObjectId.to_mongo(id) }
             end
           end
 
           if symbol_operator?(key)
-            value = {"$#{key.operator}" => value}
-            key = normalized_key(key.field)
+            key, value = normalized_key(key.field), {"$#{key.operator}" => value}
           end
 
-          criteria[key] = normalized_value(key, value)
+          criteria[key] = normalized_value(criteria, key, value)
         end
 
         criteria
       end
 
-      def to_fields(fields)
-        return if fields.blank?
+      def to_fields(keys)
+        return keys if keys.is_a?(Hash)
+        return nil  if keys.blank?
 
-        if fields.respond_to?(:flatten, :compact)
-          fields.flatten.compact
+        if keys.respond_to?(:flatten, :compact)
+          keys.flatten.compact
         else
-          fields.split(',').map { |field| field.strip }
+          keys.split(',').map { |key| key.strip }
         end
       end
 
-      def to_order(field, direction=nil)
-        direction ||= 'ASC'
-        direction = direction.upcase == 'ASC' ? 1 : -1
-        [normalized_key(field).to_s, direction]
+      def to_order(key, direction=nil)
+        [normalized_key(key).to_s, normalized_direction(direction)]
       end
 
-      def normalized_key(field)
-        field.to_s == 'id' ? :_id : field
+      def normalized_key(key)
+        key.to_s == 'id' ? :_id : key
       end
 
-      def normalized_value(field, value)
+      # TODO: this is getting heavy enough to move to a class
+      def normalized_value(criteria, key, value)
         case value
           when Array, Set
-            modifier?(field) ? value.to_a : {'$in' => value.to_a}
+            modifier?(key) ? value.to_a : {'$in' => value.to_a}
           when Hash
-            to_criteria(value, field)
+            if criteria[key].kind_of?(Hash)
+              criteria[key].dup.merge(to_criteria(value, key))
+            else
+              to_criteria(value, key)
+            end
           when Time
             value.utc
           else
@@ -118,6 +121,11 @@ module MongoMapper
         end
       end
 
+      def normalized_direction(direction)
+        direction ||= 'asc'
+        direction.downcase == 'asc' ? Mongo::ASCENDING : Mongo::DESCENDING
+      end
+
       def normalized_sort(sort)
         return if sort.blank?
 
@@ -132,4 +140,4 @@ module MongoMapper
         end
       end
   end
-end
+end