mongoid 2.3.1 → 2.3.2

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

@@ -26,8 +26,8 @@ module Mongoid # :nodoc:
           def bind
             base.metadata = metadata.inverse_metadata(target)
             base.parentize(target)
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 if base.embedded_many?
                   target.do_or_do_not(metadata.inverse(target)).push(base)
                 else
@@ -51,8 +51,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 if base.embedded_many?
                   target.do_or_do_not(metadata.inverse(target)).delete(base)
                 else

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

@@ -42,8 +42,8 @@ module Mongoid # :nodoc:
           # @since 2.0.0.rc.1
           def bind_one(doc)
             doc.parentize(base)
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 unless metadata.versioned?
                   doc.do_or_do_not(metadata.inverse_setter(target), base)
                 end
@@ -80,8 +80,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc)
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 doc.do_or_do_not(metadata.inverse_setter(target), nil)
               end
             end

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

@@ -25,8 +25,8 @@ module Mongoid # :nodoc:
           # @since 2.0.0.rc.1
           def bind
             target.parentize(base)
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 target.do_or_do_not(metadata.inverse_setter(target), base)
               end
             end
@@ -47,8 +47,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 target.do_or_do_not(metadata.inverse_setter(target), nil)
               end
             end

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

@@ -19,8 +19,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 inverse = metadata.inverse(target)
                 base.you_must(metadata.foreign_key_setter, target.id)
                 if metadata.inverse_type
@@ -51,8 +51,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 inverse = metadata.inverse(target)
                 base.you_must(metadata.foreign_key_setter, nil)
                 if metadata.inverse_type

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

@@ -17,8 +17,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind_one(doc)
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 doc.you_must(metadata.foreign_key_setter, base.id)
                 if metadata.type
                   doc.you_must(metadata.type_setter, base.class.model_name)
@@ -37,8 +37,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc)
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 doc.you_must(metadata.foreign_key_setter, nil)
                 if metadata.type
                   doc.you_must(metadata.type_setter, nil)

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

@@ -17,8 +17,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind_one(doc)
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 inverse_keys = doc.you_must(metadata.inverse_foreign_key)
                 inverse_keys.push(base.id) if inverse_keys
                 base.synced[metadata.foreign_key] = true
@@ -34,8 +34,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc)
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 base.send(metadata.foreign_key).delete_one(doc.id)
                 inverse_keys = doc.you_must(metadata.inverse_foreign_key)
                 inverse_keys.delete_one(base.id) if inverse_keys

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

@@ -19,8 +19,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 target.you_must(metadata.foreign_key_setter, base.id)
                 target.send(metadata.inverse_setter, base)
                 if metadata.type
@@ -40,8 +40,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind
-            unless binding?
-              binding do
+            unless _binding?
+              _binding do
                 target.you_must(metadata.foreign_key_setter, nil)
                 target.send(metadata.inverse_setter, nil)
                 if metadata.type

data/lib/mongoid/relations/builder.rb

@@ -6,25 +6,39 @@ module Mongoid # :nodoc:
     # looking up a relation's target from the database, or creating them from a
     # supplied attributes hash.
     class Builder
+      include Threaded::Lifecycle
 
-      attr_reader :metadata, :object, :loading
+      attr_reader :base, :metadata, :object
 
       # Instantiate the new builder for a relation.
       #
       # @example Create the builder.
       #   Builder.new(metadata, { :field => "value })
       #
+      # @param [ Document ] base The base document.
       # @param [ Metdata ] metadata The metadata for the relation.
       # @param [ Hash, BSON::ObjectId ] object The attributes to build from or
       #   id to query with.
       #
       # @since 2.0.0.rc.1
-      def initialize(metadata, object, loading = false)
-        @metadata, @object = metadata, object
-        @loading = loading
+      def initialize(base, metadata, object)
+        @base, @metadata, @object = base, metadata, object
       end
 
       protected
+
+      # Get the class from the metadata.
+      #
+      # @example Get the class.
+      #   builder.klass
+      #
+      # @return [ Class ] The class from the metadata.
+      #
+      # @since 2.3.2
+      def klass
+        @klass ||= metadata.klass
+      end
+
       # Do we need to perform a database query? It will be so if the object we
       # have is not a document.
       #

data/lib/mongoid/relations/builders.rb

@@ -32,23 +32,6 @@ 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.begin_build
-        yield
-      ensure
-        Threaded.exit_build
-      end
-
       module ClassMethods #:nodoc:
 
         # Defines a builder method for an embeds_one relation. This is

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

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

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

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require "mongoid/relations/embedded/sort"
 
 module Mongoid # :nodoc:
@@ -8,6 +7,7 @@ module Mongoid # :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
@@ -24,10 +24,10 @@ module Mongoid # :nodoc:
             return object if object.first.is_a?(Document)
             [].tap do |docs|
               object.each do |attrs|
-                if loading
-                  docs << Mongoid::Factory.from_db(metadata.klass, attrs)
+                if _loading?
+                  docs << Factory.from_db(klass, attrs)
                 else
-                  docs << Mongoid::Factory.build(metadata.klass, attrs)
+                  docs << Factory.build(klass, attrs)
                 end
               end
               sort_documents!(docs, metadata) if metadata.order

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

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

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

@@ -91,7 +91,7 @@ module Mongoid # :nodoc:
           # @param [ Hash ] attrs The single document attributes to process.
           def process(parent, attrs)
             return if reject?(parent, attrs)
-            if id = attrs["id"] || attrs["_id"]
+            if id = attrs.extract_id
               doc = existing.find(convert_id(id))
               if destroyable?(attrs)
                 existing.delete(doc)

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

@@ -16,6 +16,7 @@ module Mongoid # :nodoc:
           # @return [ Document ] A single document.
           def build(type = nil)
             return object unless query?
+            return nil if base.new_record?
             metadata.criteria(Conversions.flag(object, metadata)).from_map_or_db
           end
         end

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

@@ -89,7 +89,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.1.0
         def persistable?
-          target.persisted? && !binding? && !_building?
+          target.persisted? && !_binding? && !_building?
         end
 
         class << self
@@ -100,14 +100,15 @@ module Mongoid # :nodoc:
           # @example Get the builder.
           #   Embedded::In.builder(meta, object, person)
           #
+          # @param [ Document ] base The base document.
           # @param [ Metadata ] meta The metadata of the relation.
           # @param [ Document, Hash ] object A document or attributes to build with.
           #
           # @return [ Builder ] A newly instantiated builder object.
           #
           # @since 2.0.0.rc.1
-          def builder(meta, object, loading = false)
-            Builders::Embedded::In.new(meta, object, loading)
+          def builder(base, meta, object)
+            Builders::Embedded::In.new(base, meta, object)
           end
 
           # Returns true if the relation is an embedded one. In this case

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

@@ -145,7 +145,7 @@ module Mongoid # :nodoc:
         # @since 2.0.0.rc.1
         def delete(document)
           target.delete_one(document).tap do |doc|
-            if doc && !binding?
+            if doc && !_binding?
               if _assigning?
                 base.add_atomic_pull(doc)
               else
@@ -261,7 +261,7 @@ module Mongoid # :nodoc:
             else
               atomically(:$set) do
                 if replacement.first.is_a?(Hash)
-                  replacement = Many.builder(metadata, replacement).build
+                  replacement = Many.builder(base, metadata, replacement).build
                 end
                 proxy.target = replacement.compact
                 if _assigning?
@@ -390,7 +390,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.1.0
         def persistable?
-          base.persisted? && !binding?
+          base.persisted? && !_binding?
         end
 
         # Reindex all the target elements. This is useful when performing
@@ -437,6 +437,7 @@ module Mongoid # :nodoc:
           # @example Get the builder.
           #   Embedded::Many.builder(meta, object)
           #
+          # @param [ Document ] base The base document.
           # @param [ Metadata ] meta The metadata of the relation.
           # @param [ Document, Hash ] object A document or attributes to build
           #   with.
@@ -444,8 +445,8 @@ module Mongoid # :nodoc:
           # @return [ Builder ] A newly instantiated builder object.
           #
           # @since 2.0.0.rc.1
-          def builder(meta, object, loading = false)
-            Builders::Embedded::Many.new(meta, object, loading)
+          def builder(base, meta, object)
+            Builders::Embedded::Many.new(base, meta, object)
           end
 
           # Returns true if the relation is an embedded one. In this case

data/lib/mongoid/relations/embedded/one.rb

@@ -73,7 +73,7 @@ module Mongoid # :nodoc:
         #
         # @since 2.1.0
         def persistable?
-          base.persisted? && !binding? && !_building? && !_assigning?
+          base.persisted? && !_binding? && !_building? && !_assigning?
         end
 
         class << self
@@ -84,14 +84,15 @@ module Mongoid # :nodoc:
           # @example Get the builder.
           #   Embedded::One.builder(meta, object, person)
           #
+          # @param [ Document ] base The base document.
           # @param [ Metadata ] meta The metadata of the relation.
           # @param [ Document, Hash ] object A document or attributes to build with.
           #
           # @return [ Builder ] A newly instantiated builder object.
           #
           # @since 2.0.0.rc.1
-          def builder(meta, object, loading = false)
-            Builders::Embedded::One.new(meta, object, loading)
+          def builder(base, meta, object)
+            Builders::Embedded::One.new(base, meta, object)
           end
 
           # Returns true if the relation is an embedded one. In this case

data/lib/mongoid/relations/metadata.rb

@@ -62,13 +62,14 @@ module Mongoid # :nodoc:
       # @example Get the builder.
       #   metadata.builder(document)
       #
+      # @param [ Document ] base The base document.
       # @param [ Object ] object A document or attributes to give the builder.
       #
       # @return [ Builder ] The builder for the relation.
       #
       # @since 2.0.0.rc.1
-      def builder(object, loading = false)
-        relation.builder(self, object, loading)
+      def builder(base, object)
+        relation.builder(base, self, object)
       end
 
       # Returns the name of the strategy used for handling dependent relations.
@@ -401,9 +402,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def inverse_foreign_key
-        @inverse_foreign_key ||=
-          ( inverse_of ? inverse_of.to_s.singularize : inverse_class_name.demodulize.underscore ) <<
-          relation.foreign_key_suffix
+        @inverse_foreign_key ||= determine_inverse_foreign_key
       end
 
       # Returns the inverse class of the proxied relation.
@@ -809,6 +808,22 @@ module Mongoid # :nodoc:
         end
       end
 
+      # Determine the inverse foreign key of the relation.
+      #
+      # @example Determine the inverse foreign key.
+      #   metadata.determine_inverse_foreign_key
+      #
+      # @return [ String ] The inverse.
+      #
+      # @since 2.3.2
+      def determine_inverse_foreign_key
+        if has_key?(:inverse_of)
+          inverse_of ? "#{inverse_of.to_s.singularize}#{relation.foreign_key_suffix}" : nil
+        else
+          "#{inverse_class_name.demodulize.underscore}#{relation.foreign_key_suffix}"
+        end
+      end
+
       # Determine the inverse relation. Memoizing #inverse_relation and adding
       # this method dropped 5 seconds off the test suite as a performance
       # improvement.