mongoid 2.0.2 → 2.1.0

data/lib/mongoid/atomic/paths.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+require "mongoid/atomic/paths/embedded"
+require "mongoid/atomic/paths/root"

data/lib/mongoid/atomic/paths/embedded.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+require "mongoid/atomic/paths/embedded/one"
+require "mongoid/atomic/paths/embedded/many"
+
+module Mongoid #:nodoc:
+  module Atomic #:nodoc:
+    module Paths #:nodoc:
+
+      # Common functionality between the two different embedded paths.
+      module Embedded
+
+        attr_reader :delete_modifier, :document, :insert_modifier, :parent
+
+        # Get the path to the document in the hierarchy.
+        #
+        # @example Get the path.
+        #   many.path
+        #
+        # @return [ String ] The path to the document.
+        #
+        # @since 2.1.0
+        def path
+          position.sub(/\.\d+$/, "")
+        end
+
+        # Get the selector to use for the root document when performing atomic
+        # updates. When sharding this will include the shard key.
+        #
+        # @example Get the selector.
+        #   many.selector
+        #
+        # @return [ Hash ] The selector to identify the document with.
+        #
+        # @since 2.1.0
+        def selector
+          parent.atomic_selector.
+            merge!({ "#{path}._id" => document.identifier || document._id }).
+            merge!(document.shard_key_selector)
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/atomic/paths/embedded/many.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Atomic #:nodoc:
+    module Paths #:nodoc:
+      module Embedded #:nodoc:
+
+        # This class encapsulates behaviour for locating and updating
+        # documents that are defined as an embedded 1-n.
+        class Many
+          include Embedded
+
+          # Create the new path utility.
+          #
+          # @example Create the path util.
+          #   Many.new(document)
+          #
+          # @param [ Document ] document The document to generate the paths for.
+          #
+          # @since 2.1.0
+          def initialize(document)
+            @document, @parent = document, document._parent
+            @insert_modifier, @delete_modifier ="$push", "$pull"
+          end
+
+          # Get the position of the document in the hierarchy. This will
+          # include indexes of 1-n embedded relations that may sit above the
+          # embedded many.
+          #
+          # @example Get the position.
+          #   many.position
+          #
+          # @return [ String ] The position of the document.
+          #
+          # @since 2.1.0
+          def position
+            pos = parent.atomic_position
+            locator = document.new? ? "" : ".#{document._index}"
+            "#{pos}#{"." unless pos.blank?}#{document.metadata.name}#{locator}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/atomic/paths/embedded/one.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Atomic #:nodoc:
+    module Paths #:nodoc:
+      module Embedded #:nodoc:
+
+        # This class encapsulates behaviour for locating and updating
+        # documents that are defined as an embedded 1-1.
+        class One
+          include Embedded
+
+          # Create the new path utility.
+          #
+          # @example Create the path util.
+          #   One.new(document)
+          #
+          # @param [ Document ] document The document to generate the paths for.
+          #
+          # @since 2.1.0
+          def initialize(document)
+            @document, @parent = document, document._parent
+            @insert_modifier, @delete_modifier ="$set", "$unset"
+          end
+
+          # Get the position of the document in the hierarchy. This will
+          # include indexes of 1-n embedded relations that may sit above the
+          # embedded one.
+          #
+          # @example Get the position.
+          #   one.position
+          #
+          # @return [ String ] The position of the document.
+          #
+          # @since 2.1.0
+          def position
+            pos = parent.atomic_position
+            "#{pos}#{"." unless pos.blank?}#{document.metadata.name}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/atomic/paths/root.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Atomic #:nodoc:
+    module Paths #:nodoc:
+
+      # This class encapsulates behaviour for locating and updating root
+      # documents atomically.
+      class Root
+
+        attr_reader :document, :path, :position
+
+        # Create the new root path utility.
+        #
+        # @example Create the root path util.
+        #   Root.new(document)
+        #
+        # @param [ Document ] document The document to generate the paths for.
+        #
+        # @since 2.1.0
+        def initialize(document)
+          @document, @path, @position = document, "", ""
+        end
+
+        # Get the selector to use for the root document when performing atomic
+        # updates. When sharding this will include the shard key.
+        #
+        # @example Get the selector.
+        #   root.selector
+        #
+        # @return [ Hash ] The selector to identify the document with.
+        #
+        # @since 2.1.0
+        def selector
+          { "_id" => document.identifier || document._id }.
+            merge!(document.shard_key_selector)
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/attributes.rb

@@ -22,7 +22,8 @@ module Mongoid #:nodoc:
     #
     # @since 1.0.0
     def attribute_present?(name)
-      !read_attribute(name).blank?
+      attribute = read_attribute(name)
+      ! attribute.blank? || attribute == false
     end
 
     # Read a value from the document attributes. If the value does not exist
@@ -40,9 +41,7 @@ module Mongoid #:nodoc:
     #
     # @since 1.0.0
     def read_attribute(name)
-      access = name.to_s
-      value = attributes[access]
-      accessed(access, value)
+      attributes[name.to_s]
     end
     alias :[] :read_attribute
 
@@ -57,7 +56,8 @@ module Mongoid #:nodoc:
     # @since 1.0.0
     def remove_attribute(name)
       access = name.to_s
-      modify(access, attributes.delete(access), nil)
+      attribute_will_change!(access)
+      attributes.delete(access)
     end
 
     # Override respond_to? so it responds properly for dynamic attributes.
@@ -93,7 +93,10 @@ module Mongoid #:nodoc:
     # @since 1.0.0
     def write_attribute(name, value)
       access = name.to_s
-      modify(access, attributes[access], typed_value_for(access, value))
+      typed_value_for(access, value).tap do |value|
+        attribute_will_change!(access) unless attributes[access] == value || attribute_changed?(access)
+        attributes[access] = value
+      end
     end
     alias :[]= :write_attribute
 
@@ -120,21 +123,6 @@ module Mongoid #:nodoc:
 
     protected
 
-    # Get the default values for the attributes.
-    #
-    # @example Get the defaults.
-    #   person.default_attributes
-    #
-    # @return [ Hash ] The default values for each field.
-    #
-    # @since 1.0.0
-    #
-    # @raise [ RuntimeError ] Always
-    # @since 2.0.0.rc.8
-    def default_attributes
-      raise "default_attributes is no longer valid. Plase use: apply_default_attributes."
-    end
-
     # Set any missing default values in the attributes.
     #
     # @example Get the raw attributes after defaults have been applied.
@@ -147,7 +135,8 @@ module Mongoid #:nodoc:
       (@attributes ||= {}).tap do |h|
         defaults.each_pair do |key, val|
           unless h.has_key?(key)
-            h[key] = val.respond_to?(:call) ? typed_value_for(key, val.call) : val
+            h[key] = val.respond_to?(:call) ? typed_value_for(key, val.call) :
+              val.duplicable? ? val.dup : val
           end
         end
       end
@@ -179,7 +168,7 @@ module Mongoid #:nodoc:
     #
     # @since 1.0.0
     def typed_value_for(key, value)
-      fields.has_key?(key) ? fields[key].set(value) : value
+      fields.has_key?(key) ? fields[key].serialize(value) : value
     end
   end
 end

data/lib/mongoid/attributes/processing.rb

@@ -25,14 +25,14 @@ module Mongoid #:nodoc:
           process_attribute(key, value)
         end
         yield self if block_given?
-        process_pending and setup_modifications
+        process_pending
       end
 
       protected
 
-      # If the key provided a relation or a nested attribute, where we have to
-      # hold off on the setting of the attribute until everything else has been
-      # set?
+      # If the key provided is the name of a relation or a nested attribute, we
+      # need to wait until all other attributes are set before processing
+      # these.
       #
       # @example Is the attribute pending?
       #   document.pending_attribute?(:name, "Durran")
@@ -135,7 +135,7 @@ module Mongoid #:nodoc:
           if value.is_a?(Hash)
             metadata.nested_builder(value, {}).build(self)
           else
-            send("#{name}=", value, :binding => true)
+            send("#{name}=", value)
           end
         end
       end

data/lib/mongoid/callbacks.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
+
+  # This module contains all the callback hooks for Mongoid.
   module Callbacks
     extend ActiveSupport::Concern
 

data/lib/mongoid/collection.rb

@@ -1,9 +1,7 @@
 # encoding: utf-8
 require "mongoid/collections/retry"
 require "mongoid/collections/operations"
-require "mongoid/collections/cyclic_iterator"
 require "mongoid/collections/master"
-require "mongoid/collections/slaves"
 
 module Mongoid #:nodoc
 
@@ -17,28 +15,7 @@ module Mongoid #:nodoc
     #
     # @example Delegate the operation.
     #   collection.save({ :name => "Al" })
-    Collections::Operations::PROXIED.each do |name|
-      define_method(name) { |*args| master.send(name, *args) }
-    end
-
-    # Determines where to send the next read query. If the slaves are not
-    # defined then send to master. If the read counter is under the configured
-    # maximum then return the master. In any other case return the slaves.
-    #
-    # @example Send the operation to the master or slaves.
-    #   collection.directed
-    #
-    # @param [ Hash ] options The operation options.
-    #
-    # @option options [ true, false ] :cache Should the query cache in memory?
-    # @option options [ true, false ] :enslave Send the write to the slave?
-    #
-    # @return [ Master, Slaves ] The connection to use.
-    def directed(options = {})
-      options.delete(:cache)
-      enslave = options.delete(:enslave) || @klass.enslaved?
-      enslave ? master_or_slaves : master
-    end
+    delegate *(Collections::Operations::PROXIED.dup << {:to => :master})
 
     # Find documents from the database given a selector and options.
     #
@@ -50,7 +27,7 @@ module Mongoid #:nodoc
     #
     # @return [ Cursor ] The results.
     def find(selector = {}, options = {})
-      cursor = Mongoid::Cursor.new(@klass, self, directed(options).find(selector, options))
+      cursor = Mongoid::Cursor.new(@klass, self, master(options).find(selector, options))
       if block_given?
         yield cursor; cursor.close
       else
@@ -68,7 +45,7 @@ module Mongoid #:nodoc
     #
     # @return [ Document, nil ] A matching document or nil if none found.
     def find_one(selector = {}, options = {})
-      directed(options).find_one(selector, options)
+      master(options).find_one(selector, options)
     end
 
     # Initialize a new Mongoid::Collection, setting up the master, slave, and
@@ -96,11 +73,11 @@ module Mongoid #:nodoc
     #
     # @since 2.0.2, batch-relational-insert
     def insert(documents, options = {})
-      inserter = Thread.current[:mongoid_batch_insert]
-      if inserter
-        inserter.consume(documents, options)
+      consumer = Threaded.insert
+      if consumer
+        consumer.consume(documents, options)
       else
-        master.insert(documents, options)
+        master(options).insert(documents, options)
       end
     end
 
@@ -115,7 +92,7 @@ module Mongoid #:nodoc
     #
     # @return [ Cursor ] The results.
     def map_reduce(map, reduce, options = {})
-      directed(options).map_reduce(map, reduce, options)
+      master(options).map_reduce(map, reduce, options)
     end
     alias :mapreduce :map_reduce
 
@@ -126,24 +103,12 @@ module Mongoid #:nodoc
     #   collection.master
     #
     # @return [ Master ] The master connection.
-    def master
+    def master(options = {})
+      options.delete(:cache)
       db = Mongoid.databases[@klass.database] || Mongoid.master
       @master ||= Collections::Master.new(db, @name)
     end
 
-    # Return the object responsible for reading documents from the database.
-    # This is usually the slave databases, but in their absence the master will
-    # handle the task.
-    #
-    # @example Get the slaves array.
-    #   collection.slaves
-    #
-    # @return [ Slaves ] The pool of slave connections.
-    def slaves
-      slaves = Mongoid.databases["#{@klass.database}_slaves"] || Mongoid.slaves
-      @slaves ||= Collections::Slaves.new(slaves, @name)
-    end
-
     # Updates one or more documents in the collection.
     #
     # @example Update documents.
@@ -159,24 +124,12 @@ module Mongoid #:nodoc
     #
     # @since 2.0.0
     def update(selector, document, options = {})
-      updater = Thread.current[:mongoid_atomic_update]
+      updater = Threaded.update
       if updater
         updater.consume(selector, document, options)
       else
-        master.update(selector, document, options)
+        master(options).update(selector, document, options)
       end
     end
-
-    protected
-
-    # Determine if the read is going to the master or the slaves.
-    #
-    # @example Use the master or slaves?
-    #   collection.master_or_slaves
-    #
-    # @return [ Master, Slaves ] Master if not slaves exist, or slaves.
-    def master_or_slaves
-      slaves.empty? ? master : slaves
-    end
   end
 end

data/lib/mongoid/collections.rb

@@ -1,9 +1,11 @@
 # encoding: utf-8
 module Mongoid #:nodoc
+
   # The collections module is used for providing functionality around setting
   # up and updating collections.
   module Collections
     extend ActiveSupport::Concern
+
     included do
       cattr_accessor :_collection, :collection_name
       self.collection_name = self.name.collectionize
@@ -12,11 +14,15 @@ module Mongoid #:nodoc
     end
 
     module ClassMethods #:nodoc:
+
       # Returns the collection associated with this +Document+. If the
       # document is embedded, there will be no collection associated
-      # with it.
+      # with it unless it's in a cyclic relation.
       #
-      # Returns: <tt>Mongo::Collection</tt>
+      # @example Get the collection.
+      #   Model.collection
+      #
+      # @return [ Collection ] The Mongoid collection wrapper.
       def collection
         raise Errors::InvalidCollection.new(self) if embedded? && !cyclic
         self._collection || set_collection
@@ -25,44 +31,41 @@ module Mongoid #:nodoc
 
       # Return the database associated with this collection.
       #
-      # Example:
+      # @example Get the database object.
+      #   Model.db
       #
-      # <tt>Person.db</tt>
+      # @return [ Mongo::DB ] The Mongo daatabase object.
       def db
         collection.db
       end
 
       # Convenience method for getting index information from the collection.
       #
-      # Example:
+      # @example Get the index information from the collection.
+      #   Model.index_information
       #
-      # <tt>Person.index_information</tt>
+      # @return [ Array ] The collection index information.
       def index_information
         collection.index_information
       end
 
-      # The MongoDB logger is not exposed through the driver to be changed
-      # after initialization of the connection, this is a hacky way around that
-      # if logging needs to be changed at runtime.
-      #
-      # Example:
-      #
-      # <tt>Person.logger = Logger.new($stdout)</tt>
-      def logger=(logger)
-        db.connection.instance_variable_set(:@logger, logger)
-      end
-
       # Macro for setting the collection name to store in.
       #
-      # Example:
-      #
-      # <tt>Person.store_in :population</tt>
+      # @example Store in a separate collection than the default.
+      #   Model.store_in :population
       def store_in(name)
         self.collection_name = name.to_s
         set_collection
       end
 
       protected
+
+      # Set the collection on the class.
+      #
+      # @example Set the collection.
+      #   Model.set_collection
+      #
+      # @return [ Collection ] The Mongoid collection wrapper.
       def set_collection
         self._collection = Mongoid::Collection.new(self, self.collection_name)
       end