mongo_mapper 0.12.0 → 0.13.0.beta1

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

@@ -59,16 +59,18 @@ module MongoMapper
           @ivar ||= "@_#{name}"
         end
 
+        # :nocov:
         def proxy_class
           raise NotImplementedError
         end
 
-        def setup(model)
-        end
-
         def autosave?
           raise NotImplementedError
         end
+        # :nocov:
+
+        def setup(model)
+        end
 
         private
           def separate_options_and_conditions

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

@@ -18,16 +18,16 @@ module MongoMapper
           @target
         end
 
-        def build(attrs={})
-          instantiate_target(:new, attrs)
+        def build(attrs={}, &block)
+          instantiate_target(:new, attrs, &block)
         end
 
-        def create(attrs={})
-          instantiate_target(:create, attrs)
+        def create(attrs={}, &block)
+          instantiate_target(:create, attrs, &block)
         end
 
-        def create!(attrs={})
-          instantiate_target(:create!, attrs)
+        def create!(attrs={}, &block)
+          instantiate_target(:create!, attrs, &block)
         end
 
         def save_to_collection(options={})
@@ -40,8 +40,8 @@ module MongoMapper
             klass.find_by_id(proxy_owner[association.foreign_key])
           end
 
-          def instantiate_target(instantiator, attrs={})
-            @target = klass.send(instantiator, attrs)
+          def instantiate_target(instantiator, attrs={}, &block)
+            @target = klass.send(instantiator, attrs, &block)
             proxy_owner[association.foreign_key] = @target.id
             loaded
             @target

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

@@ -12,6 +12,8 @@ module MongoMapper
           end
         end
 
+        alias_method :to_a, :to_ary
+
         def include?(*args)
           load_target
           target.include?(*args)

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

@@ -5,11 +5,11 @@ module MongoMapper
       class ManyDocumentsProxy < Collection
         include DynamicQuerying::ClassMethods
 
-        def_delegators :query, *(Querying::Methods - [:to_a, :size, :empty?])
+        def_delegators :query, *(Querying::Methods - [:each, :to_a, :size, :empty?])
 
         def replace(docs)
           load_target
-          
+
           (target - docs).each do |t|
             case options[:dependent]
               when :destroy    then t.destroy
@@ -17,7 +17,7 @@ module MongoMapper
               else t.update_attributes(self.foreign_key => nil)
             end
           end
-          
+
           docs.each { |doc| prepare(doc).save }
           reset
         end
@@ -33,6 +33,7 @@ module MongoMapper
         def build(attrs={})
           doc = klass.new(attrs)
           apply_scope(doc)
+          yield doc if block_given?
           @target ||= [] unless loaded?
           @target << doc
           doc
@@ -40,14 +41,18 @@ module MongoMapper
 
         def create(attrs={})
           doc = klass.new(attrs)
-          apply_scope(doc).save
+          apply_scope(doc)
+          yield doc if block_given?
+          doc.save
           reset
           doc
         end
 
         def create!(attrs={})
           doc = klass.new(attrs)
-          apply_scope(doc).save!
+          apply_scope(doc)
+          yield doc if block_given?
+          doc.save!
           reset
           doc
         end
@@ -71,6 +76,10 @@ module MongoMapper
           @target.each { |doc| doc.save(options) } if @target
         end
 
+        def each(&block)
+          load_target.each(&block)
+        end
+
         protected
           def query(options={})
             klass.
@@ -81,8 +90,24 @@ module MongoMapper
           def method_missing(method, *args, &block)
             if klass.respond_to?(method)
               result = klass.send(method, *args, &block)
-              result.is_a?(Plucky::Query) ?
-                query.merge(result) : super
+              case result
+              when Plucky::Query
+                query.merge result
+
+              # If we got a single record of this classas a result, return it
+              when klass
+                result
+
+              # If we got an array of this class as a result, return it
+              when Array
+                if result[0].is_a? klass
+                  result
+                else
+                  super
+                end
+              else
+                super
+              end
             else
               super
             end

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

@@ -4,7 +4,7 @@ module MongoMapper
     module Associations
       class ManyEmbeddedProxy < EmbeddedCollection
         def replace(values)
-          @_values = (values || []).map do |v|
+          @_values = (values || []).compact.map do |v|
             v.respond_to?(:attributes) ? v.attributes : v
           end
           reset
@@ -12,7 +12,7 @@ module MongoMapper
 
         private
           def find_target
-            (@_values || []).map do |attrs|
+            (@_values ||= []).map do |attrs|
               klass.load(attrs).tap do |child|
                 assign_references(child)
               end

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

@@ -3,16 +3,16 @@ module MongoMapper
   module Plugins
     module Associations
       class OneProxy < Proxy
-        def build(attrs={})
-          instantiate_target(:new, attrs)
+        def build(attrs={}, &block)
+          instantiate_target(:new, attrs, &block)
         end
 
-        def create(attrs={})
-          instantiate_target(:create, attrs)
+        def create(attrs={}, &block)
+          instantiate_target(:create, attrs, &block)
         end
 
-        def create!(attrs={})
-          instantiate_target(:create!, attrs)
+        def create!(attrs={}, &block)
+          instantiate_target(:create!, attrs, &block)
         end
 
         def replace(doc)
@@ -29,7 +29,7 @@ module MongoMapper
               end
             end
           end
-          
+
           unless doc.nil?
             proxy_owner.save unless proxy_owner.persisted?
             doc = klass.new(doc) unless doc.is_a?(klass)
@@ -40,17 +40,17 @@ module MongoMapper
           loaded
           @target = doc
         end
-        
+
         def destroy
           target.destroy
           reset
         end
-        
+
         def delete
           target.delete
           reset
         end
-        
+
         def nullify
           nullify_scope(target)
           target.save
@@ -62,8 +62,8 @@ module MongoMapper
             target_class.first(association.query_options.merge(criteria))
           end
 
-          def instantiate_target(instantiator, attrs={})
-            @target = target_class.send(instantiator, attrs.update(criteria))
+          def instantiate_target(instantiator, attrs={}, &block)
+            @target = target_class.send(instantiator, attrs.update(criteria), &block)
             loaded
             @target
           end

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

@@ -76,9 +76,11 @@ module MongoMapper
           self unless target.nil?
         end
 
+        # :nocov:
         def replace(v)
           raise NotImplementedError
         end
+        # :nocov:
 
         def reset
           @loaded = false
@@ -90,7 +92,7 @@ module MongoMapper
         end
 
         def send(method, *args)
-          if proxy_respond_to?(method)
+          if proxy_respond_to?(method, true)
             super
           else
             load_target
@@ -119,9 +121,11 @@ module MongoMapper
             reset
           end
 
+          # :nocov:
           def find_target
             raise NotImplementedError
           end
+          # :nocov:
 
           def flatten_deeper(array)
             array.collect do |element|

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

@@ -27,16 +27,16 @@ module MongoMapper
               get_proxy(associations[#{name.inspect}]).present?
             end
 
-            def build_#{name}(attrs={})
-              get_proxy(associations[#{name.inspect}]).build(attrs)
+            def build_#{name}(attrs={}, &block)
+              get_proxy(associations[#{name.inspect}]).build(attrs, &block)
             end
 
-            def create_#{name}(attrs={})
-              get_proxy(associations[#{name.inspect}]).create(attrs)
+            def create_#{name}(attrs={}, &block)
+              get_proxy(associations[#{name.inspect}]).create(attrs, &block)
             end
 
-            def create_#{name}!(attrs={})
-              get_proxy(associations[#{name.inspect}]).create!(attrs)
+            def create_#{name}!(attrs={}, &block)
+              get_proxy(associations[#{name.inspect}]).create!(attrs, &block)
             end
           end_eval
         end

data/lib/mongo_mapper/plugins/clone.rb

@@ -7,7 +7,9 @@ module MongoMapper
       def initialize_copy(other)
         @_new       = true
         @_destroyed = false
-        @_id        = nil
+        remove_instance_variable :@_id if instance_variable_defined?(:@_id)
+        init_ivars
+
         associations.each do |name, association|
           instance_variable_set(association.ivar, nil)
         end
@@ -19,4 +21,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/dirty.rb

@@ -8,11 +8,9 @@ module MongoMapper
 
       def initialize(*)
         # never register initial id assignment as a change
-        super.tap { changed_attributes.delete('_id') }
-      end
-
-      def initialize_from_database(*)
-        super.tap { changed_attributes.clear }
+        # Chaining super into tap breaks implicit block passing in Ruby 1.8
+        doc = super
+        doc.tap { changed_attributes.delete('_id') }
       end
 
       def save(*)
@@ -20,16 +18,8 @@ module MongoMapper
       end
 
       def reload(*)
-        super.tap { clear_changes }
-      end
-
-      protected
-
-      def attribute_method?(attr)
-        # This overrides ::ActiveSupport::Dirty#attribute_method? to allow attributes to be any key
-        # in the attributes hash ( default ) or any key defined on the model that may not yet have
-        # had a value stored in the attributes collection.
-        super || key_names.include?(attr)
+        doc = super
+        doc.tap { clear_changes }
       end
 
       def clear_changes
@@ -42,19 +32,30 @@ module MongoMapper
         end
       end
 
+      protected
+
+      # 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?
+      end
+
       private
 
       def write_key(key, value)
-        key = key.to_s
-        attribute_will_change!(key) unless attribute_changed?(key)
-        super(key, value).tap do
-          changed_attributes.delete(key) unless attribute_value_changed?(key)
+        key = unalias_key(key)
+        if !keys.key?(key)
+          super
+        else
+          attribute_will_change!(key) unless attribute_changed?(key)
+          super.tap do
+            changed_attributes.delete(key) unless attribute_value_changed?(key)
+          end
         end
       end
 
       def attribute_value_changed?(key_name)
-        attribute_was(key_name) != read_key(key_name)
+        changed_attributes[key_name] != read_key(key_name)
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/document.rb

@@ -11,11 +11,11 @@ module MongoMapper
       end
 
       def new?
-        @_new
+        !!(@_new ||= false)
       end
 
       def destroyed?
-        @_destroyed == true
+        !!(@_destroyed ||= false)
       end
 
       def reload
@@ -23,8 +23,8 @@ module MongoMapper
           self.class.associations.each_value do |association|
             get_proxy(association).reset
           end
-          instance_variables.each { |ivar| instance_variable_set(ivar, nil) }
-          load_from_database(doc)
+          instance_variables.each { |ivar| remove_instance_variable(ivar) }
+          initialize_from_database(doc)
           self
         else
           raise DocumentNotFound, "Document match #{_id.inspect} does not exist in #{collection.name} collection"

data/lib/mongo_mapper/plugins/dumpable.rb

@@ -0,0 +1,22 @@
+require 'set'
+
+module MongoMapper
+  module Plugins
+    module Dumpable
+      DUMP_BLACKLIST = Set.new([:@errors])
+
+      def marshal_dump
+        instance_variables.map(&:to_sym).inject({}) do |h, var|
+          h[var] = instance_variable_get(var) unless DUMP_BLACKLIST.include?(var) or var.to_s.start_with?("@__")
+          h
+        end
+      end
+
+      def marshal_load(data)
+        data.each do |k, v|
+          instance_variable_set(k, v)
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/embedded_callbacks.rb

@@ -9,22 +9,71 @@ module MongoMapper
 
         define_model_callbacks :save, :create, :update, :destroy, :only => [:before, :after]
         define_model_callbacks :touch, :only => [:after]
+
+        proxy_callbacks(
+          :before => [:save, :create, :update, :destroy],
+          :after  => [:save, :create, :update, :destroy, :touch]
+        )
+
+        @embedded_callbacks_status = nil
       end
 
-      def run_callbacks(callback, *args, &block)
-        embedded_docs = []
+      module ClassMethods
+        def define_callbacks(*args)
+          embedded_callbacks_on if @embedded_callbacks_status.nil?
+          super
+        end
+
+        def embedded_callbacks_on
+          @embedded_callbacks_status = true
+        end
+
+        def embedded_callbacks_off
+          @embedded_callbacks_status = false
+        end
+
+        def embedded_callbacks_on?
+          !!@embedded_callbacks_status
+        end
 
-        embedded_associations.each do |association|
-          embedded_docs += Array(get_proxy(association).send(:load_target))
+        def embedded_callbacks_off?
+          !@embedded_callbacks_status
         end
 
-        block = embedded_docs.inject(block) do |chain, doc|
-          if doc.class.respond_to?("_#{callback}_callbacks")
-            lambda { doc.run_callbacks(callback, *args, &chain) }
-          else
-            chain
+        def proxy_callbacks(definition)
+          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}
+
+                  def #{callback}(*args, &block)
+                    embedded_callbacks_on if @embedded_callbacks_status.nil?
+                    __original_#{callback}(*args, &block)
+                  end
+                end
+              CALLBACK
+            end
           end
         end
+      end
+
+      def run_callbacks(callback, *args, &block)
+        if self.class.embedded_callbacks_on? and embedded_associations.length > 0
+          embedded_docs = embedded_associations.map do |association|
+            Array(get_proxy(association).send(:load_target))
+          end.flatten(1)
+
+          block = embedded_docs.inject(block) do |chain, doc|
+            if doc.class.respond_to?("_#{callback}_callbacks")
+              lambda { doc.run_callbacks(callback, *args, &chain) }
+            else
+              chain
+            end
+          end
+        end
+
         super callback, *args, &block
       end
     end