mongoid 2.4.10 → 3.0.0

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,8 +17,8 @@ module Mongoid # :nodoc:
           def build(type = nil)
             return object unless query?
             return [] if object.is_a?(Array)
-            crit = metadata.criteria(Conversions.flag(object, metadata))
-            IdentityMap.get(crit.klass, crit.selector) || crit
+            crit = metadata.criteria(Conversions.flag(object, metadata), base.class)
+            IdentityMap.get_many(crit.klass, crit.selector) || crit
           end
         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
@@ -32,9 +32,7 @@ module Mongoid # :nodoc:
         def cascade
           if relation
             if relation.cascades.empty?
-              safety = Threaded.safety_options
               relation.clear
-              Threaded.safety_options = safety
             else
               ::Array.wrap(relation).each { |doc| doc.delete }
             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.
@@ -26,14 +27,15 @@ module Mongoid # :nodoc:
       def cascade!
         cascades.each do |name|
           if !metadata || !metadata.versioned?
-            meta = relations[name]
-            strategy = meta.cascade_strategy
-            strategy.new(self, meta).cascade
+            if meta = relations[name]
+              strategy = meta.cascade_strategy
+              strategy.new(self, meta).cascade
+            end
           end
         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 +49,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? ? Moped::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
@@ -20,14 +20,13 @@ module Mongoid #:nodoc:
       # @since 2.3.0
       def flag(object, metadata)
         inverse = metadata.inverse_klass
-        if inverse.using_object_ids? || object.is_a?(BSON::ObjectId)
+        if inverse.using_object_ids? || object.is_a?(Moped::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