mongoid 2.4.9 → 3.0.0.rc

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Bindings #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Bindings
+      module Referenced
 
         # Binding class for all references_and_referenced_in_many relations.
         class ManyToMany < Binding
@@ -17,13 +17,11 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind_one(doc)
-            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
-                doc.synced[metadata.inverse_foreign_key] = true
-              end
+            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
+              doc.synced[metadata.inverse_foreign_key] = true
             end
           end
 
@@ -34,14 +32,12 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc)
-            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
-                base.synced[metadata.foreign_key] = true
-                doc.synced[metadata.inverse_foreign_key] = true
-              end
+            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
+              base.synced[metadata.foreign_key] = true
+              doc.synced[metadata.inverse_foreign_key] = true
             end
           end
         end

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Bindings #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Bindings
+      module Referenced
 
         # Binding class for references_one relations.
         class One < Binding
@@ -18,18 +18,11 @@ module Mongoid # :nodoc:
           #   person.game = Game.new
           #
           # @since 2.0.0.rc.1
-          def bind
-            target.you_must(metadata.foreign_key_setter, base.id)
-            if metadata.type
-              target.you_must(metadata.type_setter, base.class.model_name)
-            end
-            unless _binding?
-              _binding do
-                target.send(metadata.inverse_setter, base)
-              end
+          def bind_one
+            binding do
+              bind_from_relational_parent(target)
             end
           end
-          alias :bind_one :bind
 
           # Unbinds the base object and the inverse, caused by setting the
           # reference to nil.
@@ -39,18 +32,11 @@ module Mongoid # :nodoc:
           #   person.game = nil
           #
           # @since 2.0.0.rc.1
-          def unbind
-            target.you_must(metadata.foreign_key_setter, nil)
-            if metadata.type
-              target.you_must(metadata.type_setter, nil)
-            end
-            unless _binding?
-              _binding do
-                target.send(metadata.inverse_setter, nil)
-              end
+          def unbind_one
+            binding do
+              unbind_from_relational_parent(target)
             end
           end
-          alias :unbind_one :unbind
         end
       end
     end

data/lib/mongoid/relations/builder.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
+module Mongoid
+  module Relations
 
     # Superclass for all builder objects. Builders are responsible for either
     # looking up a relation's target from the database, or creating them from a
@@ -49,7 +49,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def query?
-        obj = Array(object).first
+        obj = object.__array__.first
         !obj.is_a?(Mongoid::Document) && !obj.nil?
       end
     end

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Embedded #:nodoc:
-        class In < Builder #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Embedded
+        class In < Builder
 
           # This builder doesn't actually build anything, just returns the
           # parent since it should already be instantiated.

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Embedded #:nodoc:
-        class Many < Builder #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Embedded
+        class Many < Builder
 
           # Builds the document out of the attributes using the provided
           # metadata on the relation. Instantiates through the factory in order
@@ -19,15 +19,15 @@ module Mongoid # :nodoc:
           def build(type = nil)
             return [] if object.blank?
             return object if object.first.is_a?(Document)
-            [].tap do |docs|
-              object.each do |attrs|
-                if _loading?
-                  docs.push(Factory.from_db(klass, attrs))
-                else
-                  docs.push(Factory.build(klass, attrs))
-                end
+            docs = []
+            object.each do |attrs|
+              if _loading? && base.persisted?
+                docs.push(Factory.from_db(klass, attrs))
+              else
+                docs.push(Factory.build(klass, attrs))
               end
             end
+            docs
           end
         end
       end

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Embedded #:nodoc:
-        class One < Builder #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Embedded
+        class One < Builder
 
           # Builds the document out of the attributes using the provided
           # metadata on the relation. Instantiates through the factory in order
@@ -17,7 +17,7 @@ module Mongoid # :nodoc:
           # @return [ Document ] A single document.
           def build(type = nil)
             return object unless object.is_a?(Hash)
-            if _loading?
+            if _loading? && base.persisted?
               Factory.from_db(klass, object)
             else
               Factory.build(klass, object)

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module NestedAttributes #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module NestedAttributes
         class Many < NestedBuilder
 
           # Builds the relation depending on the attributes and the options
@@ -25,9 +25,9 @@ module Mongoid # :nodoc:
             end
             attributes.each do |attrs|
               if attrs.respond_to?(:with_indifferent_access)
-                process(parent, attrs)
+                process_attributes(parent, attrs)
               else
-                process(parent, attrs[1])
+                process_attributes(parent, attrs[1])
               end
             end
           end
@@ -86,10 +86,10 @@ module Mongoid # :nodoc:
           # new, existing, or ignored document.
           #
           # @example Process the attributes
-          #   builder.process({ "id" => 1, "street" => "Bond" })
+          #   builder.process_attributes({ "id" => 1, "street" => "Bond" })
           #
           # @param [ Hash ] attrs The single document attributes to process.
-          def process(parent, attrs)
+          def process_attributes(parent, attrs)
             return if reject?(parent, attrs)
             if id = attrs.extract_id
               first = existing.first

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module NestedAttributes #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module NestedAttributes
         class One < NestedBuilder
 
           attr_accessor :destroy

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Referenced
         class In < Builder
 
           # This builder either takes a foreign key and queries for the

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Referenced
         class Many < Builder
 
           # This builder either takes a hash and queries for the
@@ -17,7 +17,7 @@ module Mongoid # :nodoc:
           def build(type = nil)
             return object unless query?
             return [] if object.is_a?(Array)
-            crit = metadata.criteria(Conversions.flag(object, metadata))
+            crit = metadata.criteria(Conversions.flag(object, metadata), base.class)
             IdentityMap.get(crit.klass, crit.selector) || crit
           end
         end

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Referenced
         class ManyToMany < Builder
 
           # This builder either takes a hash and queries for the
@@ -16,7 +16,9 @@ module Mongoid # :nodoc:
           # @return [ Array<Document> ] The documents.
           def build(type = nil)
             return object.try(:dup) unless query?
-            metadata.criteria(object || [])
+            ids = object || []
+            crit = metadata.criteria(ids, base.class)
+            IdentityMap.get(crit.klass, ids) || crit
           end
 
           # Do we need to perform a database query? It will be so if the object we

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Referenced
         class One < Builder
 
           # This builder either takes an _id or an object and queries for the
@@ -17,7 +17,7 @@ module Mongoid # :nodoc:
           def build(type = nil)
             return object unless query?
             return nil if base.new_record?
-            metadata.criteria(Conversions.flag(object, metadata)).from_map_or_db
+            metadata.criteria(Conversions.flag(object, metadata), base.class).from_map_or_db
           end
         end
       end

data/lib/mongoid/relations/builders.rb

@@ -11,8 +11,8 @@ require "mongoid/relations/builders/referenced/many"
 require "mongoid/relations/builders/referenced/many_to_many"
 require "mongoid/relations/builders/referenced/one"
 
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
+module Mongoid
+  module Relations
 
     # This module is responsible for defining the build and create methods used
     # in one to one relations.
@@ -49,7 +49,7 @@ module Mongoid # :nodoc:
         [ args.first || {}, args.size > 1 ? args[1] : {} ]
       end
 
-      module ClassMethods #:nodoc:
+      module ClassMethods
 
         # Defines a builder method for an embeds_one relation. This is
         # defined as #build_name.
@@ -63,15 +63,16 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def builder(name, metadata)
-          tap do
-            define_method("build_#{name}") do |*args|
-              attributes, options = parse_args(*args)
-              document = Factory.build(metadata.klass, attributes, options)
-              _building do
-                send("#{name}=", document).tap {|child| child.run_callbacks(:build) }
-              end
+          re_define_method("build_#{name}") do |*args|
+            attributes, options = parse_args(*args)
+            document = Factory.build(metadata.klass, attributes, options)
+            _building do
+              child = send("#{name}=", document)
+              child.run_callbacks(:build)
+              child
             end
           end
+          self
         end
 
         # Defines a creator method for an embeds_one relation. This is
@@ -87,13 +88,15 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def creator(name, metadata)
-          tap do
-            define_method("create_#{name}") do |*args|
-              attributes, options = parse_args(*args)
-              document = Factory.build(metadata.klass, attributes, options)
-              send("#{name}=", document).tap { |doc| doc.save }
-            end
+          re_define_method("create_#{name}") do |*args|
+            attributes, options = parse_args(*args)
+            document = Factory.build(metadata.klass, attributes, options)
+            doc = send("#{name}=", document)
+            doc.save
+            save if new_record? && metadata.stores_foreign_key?
+            doc
           end
+          self
         end
       end
     end

data/lib/mongoid/relations/cascading/delete.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Cascading #:nodoc:
+module Mongoid
+  module Relations
+    module Cascading
       class Delete
 
         attr_accessor :document, :relation, :metadata
@@ -27,8 +27,16 @@ module Mongoid # :nodoc:
         #
         # @example Perform the cascading delete.
         #   strategy.cascade
+        #
+        # @since 2.0.0
         def cascade
-          Array.wrap(relation).each { |doc| doc.delete } if relation
+          if relation
+            if relation.cascades.empty?
+              relation.clear
+            else
+              ::Array.wrap(relation).each { |doc| doc.delete }
+            end
+          end
         end
       end
     end

data/lib/mongoid/relations/cascading/destroy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Cascading #:nodoc:
+module Mongoid
+  module Relations
+    module Cascading
       class Destroy
 
         attr_accessor :document, :relation, :metadata

data/lib/mongoid/relations/cascading/nullify.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Cascading #:nodoc:
+module Mongoid
+  module Relations
+    module Cascading
       class Nullify
 
         attr_accessor :document, :relation, :metadata

data/lib/mongoid/relations/cascading/restrict.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+module Mongoid
+  module Relations
+    module Cascading
+      class Restrict
+
+        attr_accessor :document, :relation, :metadata
+
+        # Initialize the new cascade strategy, which will set up the relation
+        # and the metadata.
+        #
+        # @example Instantiate the strategy
+        #   Strategy.new(document, metadata)
+        #
+        # @param [ Document ] document The document to cascade from.
+        # @param [ Metadata ] metadata The relation's metadata.
+        #
+        # @return [ Strategy ] The new strategy.
+        def initialize(document, metadata)
+          @document, @metadata = document, metadata
+          @relation = document.send(metadata.name)
+        end
+
+        # Execute the cascading deletion for the relation if it already exists.
+        # This should be optimized in the future potentially not to load all
+        # objects from the db.
+        #
+        # @example Perform the cascading delete.
+        #   strategy.cascade
+        def cascade
+          raise Errors::DeleteRestriction.new(document, metadata.name) unless relation.blank?
+        end
+      end
+    end
+  end
+end
+

data/lib/mongoid/relations/cascading.rb

@@ -2,9 +2,10 @@
 require "mongoid/relations/cascading/delete"
 require "mongoid/relations/cascading/destroy"
 require "mongoid/relations/cascading/nullify"
+require "mongoid/relations/cascading/restrict"
 
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
+module Mongoid
+  module Relations
 
     # This module defines the behaviour for setting up cascading deletes and
     # nullifies for relations, and how to delegate to the approriate strategy.
@@ -33,7 +34,7 @@ module Mongoid # :nodoc:
         end
       end
 
-      module ClassMethods #:nodoc:
+      module ClassMethods
 
         # Attempt to add the cascading information for the document to know how
         # to handle associated documents on a removal.
@@ -47,7 +48,8 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def cascade(metadata)
-          tap { self.cascades += [ metadata.name.to_s ] if metadata.dependent? }
+          cascades.push(metadata.name.to_s) if metadata.dependent?
+          self
         end
       end
     end

data/lib/mongoid/relations/constraint.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
+module Mongoid
+  module Relations
 
     # Used for converting foreign key values to the correct type based on the
     # types of ids that the document stores.
@@ -35,7 +35,8 @@ module Mongoid # :nodoc:
       # @since 2.0.0.rc.7
       def convert(object)
         return object if metadata.polymorphic?
-        BSON::ObjectId.convert(metadata.klass, object)
+        klass = metadata.klass
+        klass.using_object_ids? ? BSON::ObjectId.mongoize(object) : object
       end
     end
   end

data/lib/mongoid/relations/conversions.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Relations #:nodoc:
+module Mongoid
+  module Relations
 
     # Contains utility methods for object id conversion.
     module Conversions
@@ -23,11 +23,10 @@ module Mongoid #:nodoc:
         if inverse.using_object_ids? || object.is_a?(BSON::ObjectId)
           object
         else
-          object.tap do |obj|
-            if obj.is_a?(String)
-              obj.unconvertable_to_bson = true
-            end
+          if object.is_a?(String)
+            object.unconvertable_to_bson = true
           end
+          object
         end
       end
     end

data/lib/mongoid/relations/cyclic.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
+module Mongoid
+  module Relations
 
     # This module provides convenience macros for using cyclic embedded
     # relations.
@@ -11,7 +11,7 @@ module Mongoid # :nodoc:
         class_attribute :cyclic
       end
 
-      module ClassMethods #:nodoc:
+      module ClassMethods
 
         # Create a cyclic embedded relation that creates a tree hierarchy for
         # the document and many embedded child documents.
@@ -38,9 +38,9 @@ module Mongoid # :nodoc:
         def recursively_embeds_many(options = {})
           embeds_many(
             cyclic_child_name,
-            options.merge(:class_name => self.name, :cyclic => true)
+            options.merge(class_name: self.name, cyclic: true)
           )
-          embedded_in cyclic_parent_name, :class_name => self.name, :cyclic => true
+          embedded_in cyclic_parent_name, class_name: self.name, cyclic: true
         end
 
         # Create a cyclic embedded relation that creates a single self
@@ -68,9 +68,9 @@ module Mongoid # :nodoc:
         def recursively_embeds_one(options = {})
           embeds_one(
             cyclic_child_name(false),
-            options.merge(:class_name => self.name, :cyclic => true)
+            options.merge(class_name: self.name, cyclic: true)
           )
-          embedded_in cyclic_parent_name, :class_name => self.name, :cyclic => true
+          embedded_in cyclic_parent_name, class_name: self.name, cyclic: true
         end
 
         private