mongoid 2.0.2 → 2.1.0

data/lib/mongoid/relations/bindings/referenced/in.rb

@@ -17,31 +17,22 @@ module Mongoid # :nodoc:
           #   game.person.bind(:continue => true)
           #   game.person = Person.new
           #
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
           # @since 2.0.0.rc.1
-          def bind(options = {})
-            inverse = metadata.inverse(target)
-            base.send(metadata.foreign_key_setter, target.id)
-            if metadata.inverse_type
-              base.send(metadata.inverse_type_setter, target.class.name)
-            end
-            if inverse
-              base.metadata = target.reflect_on_association(inverse)
-              if options[:continue]
-                if base.referenced_many?
-                  target.do_or_do_not(
-                    inverse, false, OPTIONS
-                  ).push(base, :binding => true, :continue => false)
-                else
-                  target.do_or_do_not(
-                    metadata.inverse_setter(target),
-                    base,
-                    OPTIONS
-                  )
+          def bind
+            unless binding?
+              binding do
+                inverse = metadata.inverse(target)
+                base.send(metadata.foreign_key_setter, target.id)
+                if metadata.inverse_type
+                  base.send(metadata.inverse_type_setter, target.class.model_name)
+                end
+                if inverse
+                  base.metadata = metadata.inverse_metadata(target)
+                  if base.referenced_many?
+                    target.send(inverse).push(base)
+                  else
+                    target.do_or_do_not(metadata.inverse_setter(target), base)
+                  end
                 end
               end
             end
@@ -55,15 +46,23 @@ module Mongoid # :nodoc:
           #   game.person.unbind(:continue => true)
           #   game.person = nil
           #
-          # @param [ Hash ] options The options to pass through.
-          #
-          # @option options [ true, false ] :continue Do we continue unbinding?
-          #
           # @since 2.0.0.rc.1
-          def unbind(options = {})
-            base.do_or_do_not(metadata.foreign_key_setter, nil)
-            if options[:continue]
-              target.do_or_do_not(metadata.inverse_setter(target), nil, OPTIONS)
+          def unbind
+            unless binding?
+              binding do
+                inverse = metadata.inverse(target)
+                base.send(metadata.foreign_key_setter, nil)
+                if metadata.inverse_type
+                  base.send(metadata.inverse_type_setter, nil)
+                end
+                if inverse
+                  if base.referenced_many?
+                    target.send(inverse).delete(base)
+                  else
+                    target.send(metadata.inverse_setter(target), nil)
+                  end
+                end
+              end
             end
           end
           alias :unbind_one :unbind

data/lib/mongoid/relations/bindings/referenced/many.rb

@@ -7,26 +7,6 @@ module Mongoid # :nodoc:
         # Binding class for references_many relations.
         class Many < Binding
 
-          # Binds the base object to the inverse of the relation. This is so we
-          # are referenced to the actual objects themselves on both sides.
-          #
-          # This case sets the metadata on the inverse object as well as the
-          # document itself.
-          #
-          # @example Bind all the documents.
-          #   person.posts.bind
-          #   person.posts = [ Post.new ]
-          #
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
-          # @since 2.0.0.rc.1
-          def bind(options = {})
-            target.each { |doc| bind_one(doc, options) }
-          end
-
           # Binds a single document with the inverse relation. Used
           # specifically when appending to the proxy.
           #
@@ -34,59 +14,37 @@ module Mongoid # :nodoc:
           #   person.posts.bind_one(post)
           #
           # @param [ Document ] doc The single document to bind.
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def bind_one(doc, options = {})
-            if options[:continue]
-              doc.do_or_do_not(metadata.foreign_key_setter, base.id)
-              doc.do_or_do_not(
-                metadata.inverse_setter,
-                base,
-                OPTIONS
-              )
+          def bind_one(doc)
+            unless binding?
+              binding do
+                doc.send(metadata.foreign_key_setter, base.id)
+                if metadata.type
+                  doc.send(metadata.type_setter, base.class.model_name)
+                end
+                doc.send(metadata.inverse_setter, base)
+              end
             end
           end
 
-          # Unbinds the base object and the inverse, caused by setting the
-          # reference to nil.
-          #
-          # @example Unbind the documents.
-          #   person.posts.unbind
-          #   person.posts = nil
-          #
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
-          # @since 2.0.0.rc.1
-          def unbind(options = {})
-            target.each { |doc| unbind_one(doc, options) }
-          end
-
           # Unbind a single document.
           #
           # @example Unbind the document.
           #   person.posts.unbind_one(document)
           #
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
+          # @param [ Document ] document The document to unbind.
           #
           # @since 2.0.0.rc.1
-          def unbind_one(doc, options = {})
-            if options[:continue]
-              doc.do_or_do_not(metadata.foreign_key_setter, nil)
-              doc.do_or_do_not(
-                metadata.inverse_setter,
-                nil,
-                OPTIONS
-              )
+          def unbind_one(doc)
+            unless binding?
+              binding do
+                doc.send(metadata.foreign_key_setter, nil)
+                if metadata.type
+                  doc.send(metadata.type_setter, nil)
+                end
+                doc.send(metadata.inverse_setter, nil)
+              end
             end
           end
         end

data/lib/mongoid/relations/bindings/referenced/many_to_many.rb

@@ -7,26 +7,6 @@ module Mongoid # :nodoc:
         # Binding class for all references_and_referenced_in_many relations.
         class ManyToMany < Binding
 
-          # Binds the base object to the inverse of the relation. This is so we
-          # are referenced to the actual objects themselves on both sides.
-          #
-          # This case sets the metadata on the inverse object as well as the
-          # document itself.
-          #
-          # @example Bind all the documents.
-          #   person.preferences.bind
-          #   person.preferences = [ Preference.new ]
-          #
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
-          # @since 2.0.0.rc.1
-          def bind(options = {})
-            target.each { |doc| bind_one(doc, options) }
-          end
-
           # Binds a single document with the inverse relation. Used
           # specifically when appending to the proxy.
           #
@@ -34,61 +14,33 @@ module Mongoid # :nodoc:
           #   person.preferences.bind_one(preference)
           #
           # @param [ Document ] doc The single document to bind.
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def bind_one(doc, options = {})
-            if options[:continue]
-              inverse = metadata.inverse(target)
-              if inverse
-                doc.do_or_do_not(
-                  inverse,
-                  false,
-                  OPTIONS
-                ).push(base, :binding => true, :continue => false)
+          def bind_one(doc)
+            unless binding?
+              binding do
+                inverse_keys = doc.do_or_do_not(metadata.inverse_foreign_key)
+                inverse_keys.push(base.id) if inverse_keys
+                base.synced[metadata.foreign_key] = true
+                doc.synced[metadata.inverse_foreign_key] = true
               end
             end
           end
 
-          # Unbinds the base object and the inverse, caused by setting the
-          # reference to nil.
-          #
-          # @example Unbind the documents.
-          #   person.preferences.unbind
-          #   person.preferences = nil
-          #
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
-          # @since 2.0.0.rc.1
-          def unbind(options = {})
-            target.each { |doc| unbind_one(doc, options) }
-          end
-
           # Unbind a single document.
           #
           # @example Unbind the document.
           #   person.preferences.unbind_one(document)
           #
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
           # @since 2.0.0.rc.1
-          def unbind_one(doc, options = {})
-            base.do_or_do_not(metadata.foreign_key).delete(doc.id)
-            if options[:continue]
-              inverse = metadata.inverse(target)
-              if inverse
-                doc.do_or_do_not(
-                  inverse, false, OPTIONS
-                ).delete(base, :binding => true, :continue => false)
+          def unbind_one(doc)
+            unless binding?
+              binding do
+                base.send(metadata.foreign_key).delete_one(doc.id)
+                inverse_keys = doc.do_or_do_not(metadata.inverse_foreign_key)
+                inverse_keys.delete_one(base.id) if inverse_keys
+                base.synced[metadata.foreign_key] = true
+                doc.synced[metadata.inverse_foreign_key] = true
               end
             end
           end

data/lib/mongoid/relations/bindings/referenced/one.rb

@@ -17,20 +17,16 @@ module Mongoid # :nodoc:
           #   person.game.bind(:continue => true)
           #   person.game = Game.new
           #
-          # @param [ Hash ] options The options to pass through.
-          #
-          # @option options [ true, false ] :continue Do we continue binding?
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
           # @since 2.0.0.rc.1
-          def bind(options = {})
-            if options[:continue]
-              target.do_or_do_not(metadata.foreign_key_setter, base.id)
-              target.do_or_do_not(
-                metadata.inverse_setter,
-                base,
-                OPTIONS
-              )
+          def bind
+            unless binding?
+              binding do
+                target.send(metadata.foreign_key_setter, base.id)
+                target.send(metadata.inverse_setter, base)
+                if metadata.type
+                  target.send(metadata.type_setter, base.class.model_name)
+                end
+              end
             end
           end
           alias :bind_one :bind
@@ -42,20 +38,16 @@ module Mongoid # :nodoc:
           #   person.game.unbind(:continue => true)
           #   person.game = nil
           #
-          # @param [ Hash ] options The options to pass through.
-          #
-          # @option options [ true, false ] :continue Do we continue unbinding?
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
           # @since 2.0.0.rc.1
-          def unbind(options = {})
-            if options[:continue]
-              target.do_or_do_not(metadata.foreign_key_setter, nil)
-              target.do_or_do_not(
-                metadata.inverse_setter,
-                nil,
-                OPTIONS
-              )
+          def unbind
+            unless binding?
+              binding do
+                target.send(metadata.foreign_key_setter, nil)
+                target.send(metadata.inverse_setter, nil)
+                if metadata.type
+                  target.send(metadata.type_setter, nil)
+                end
+              end
             end
           end
           alias :unbind_one :unbind

data/lib/mongoid/relations/builder.rb

@@ -7,7 +7,8 @@ module Mongoid # :nodoc:
     # supplied attributes hash.
     class Builder
 
-      attr_reader :metadata, :object
+      attr_reader :metadata, :object, :loading
+
       # Instantiate the new builder for a relation.
       #
       # @example Create the builder.
@@ -18,8 +19,9 @@ module Mongoid # :nodoc:
       #   id to query with.
       #
       # @since 2.0.0.rc.1
-      def initialize(metadata, object)
+      def initialize(metadata, object, loading = false)
         @metadata, @object = metadata, object
+        @loading = loading
       end
 
       protected

data/lib/mongoid/relations/builders.rb

@@ -32,6 +32,23 @@ module Mongoid # :nodoc:
     module Builders
       extend ActiveSupport::Concern
 
+      # Execute a block in building mode.
+      #
+      # @example Execute in building mode.
+      #   building do
+      #     relation.push(doc)
+      #   end
+      #
+      # @return [ Object ] The return value of the block.
+      #
+      # @since 2.1.0
+      def building
+        Threaded.building = true
+        yield
+      ensure
+        Threaded.building = false
+      end
+
       module ClassMethods #:nodoc:
 
         # Defines a builder method for an embeds_one relation. This is
@@ -49,7 +66,9 @@ module Mongoid # :nodoc:
           tap do
             define_method("build_#{name}") do |*args|
               document = Factory.build(metadata.klass, args.first || {})
-              send("#{name}=", document, :binding => true)
+              building do
+                send("#{name}=", document)
+              end
             end
           end
         end
@@ -69,7 +88,7 @@ module Mongoid # :nodoc:
         def creator(name)
           tap do
             define_method("create_#{name}") do |*args|
-              send("build_#{name}", *args).tap(&:save)
+              send("build_#{name}", *args).tap { |doc| doc.save }
             end
           end
         end

data/lib/mongoid/relations/builders/embedded/in.rb

@@ -16,7 +16,11 @@ module Mongoid # :nodoc:
           # @return [ Document ] A single document.
           def build(type = nil)
             return object unless object.is_a?(Hash)
-            Mongoid::Factory.from_db(metadata.klass, object)
+            if loading
+              Mongoid::Factory.from_db(metadata.klass, object)
+            else
+              Mongoid::Factory.build(metadata.klass, object)
+            end
           end
         end
       end

data/lib/mongoid/relations/builders/embedded/many.rb

@@ -1,10 +1,13 @@
 # encoding: utf-8
+
+require "mongoid/relations/embedded/sort"
+
 module Mongoid # :nodoc:
   module Relations #:nodoc:
     module Builders #:nodoc:
       module Embedded #:nodoc:
         class Many < Builder #:nodoc:
-
+          include Relations::Embedded::Sort
           # Builds the document out of the attributes using the provided
           # metadata on the relation. Instantiates through the factory in order
           # to make sure subclasses and allocation are used if fitting. This
@@ -19,10 +22,15 @@ module Mongoid # :nodoc:
           def build(type = nil)
             return [] if object.blank?
             return object if object.first.is_a?(Document)
-            object.inject([]) do |documents, attrs|
-              documents.tap do |docs|
-                docs << Mongoid::Factory.from_db(metadata.klass, attrs)
+            [].tap do |docs|
+              object.each do |attrs|
+                if loading
+                  docs << Mongoid::Factory.from_db(metadata.klass, attrs)
+                else
+                  docs << Mongoid::Factory.build(metadata.klass, attrs)
+                end
               end
+              sort_documents!(docs, metadata) if metadata.order
             end
           end
         end