mongoid 3.0.23 → 3.1.0

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

@@ -20,7 +20,7 @@ module Mongoid
         #
         # @since 2.1.0
         def path
-          position.sub(/\.\d+$/, "")
+          @path ||= position.sub(/\.\d+$/, "")
         end
 
         # Get the selector to use for the root document when performing atomic
@@ -33,10 +33,24 @@ module Mongoid
         #
         # @since 2.1.0
         def selector
-          parent.atomic_selector
-          # @todo: Durran: Bring this back once MongoDB, if ever, goes to fix
-          # this issue: https://jira.mongodb.org/browse/SERVER-831
-          # merge!({ "#{path}._id" => document._id }).merge!(document.shard_key_selector)
+          @selector ||= generate_selector
+        end
+
+        private
+
+        def generate_selector
+          if only_root_selector?
+            parent.atomic_selector
+          else
+            parent.
+              atomic_selector.
+              merge("#{path}._id" => document._id).
+              merge(document.shard_key_selector)
+          end
+        end
+
+        def only_root_selector?
+          document.persisted? && document._id_changed?
         end
       end
     end

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

@@ -44,7 +44,7 @@ module Mongoid
         #
         # @since 2.1.0
         def selector
-          { "_id" => document._id }.merge!(document.shard_key_selector)
+          @selector ||= { "_id" => document._id }.merge!(document.shard_key_selector)
         end
       end
     end

data/lib/mongoid/atomic/positionable.rb

@@ -0,0 +1,73 @@
+# encoding: utf-8
+module Mongoid
+  module Atomic
+
+    # This module is responsible for taking update selectors and switching out
+    # the indexes for the $ positional operator where appropriate.
+    #
+    # @since 3.1.0
+    module Positionable
+
+      # Takes the provided selector and atomic operations and replaces the
+      # indexes of the embedded documents with the positional operator when
+      # needed.
+      #
+      # @note The only time we can accurately know when to use the positional
+      #   operator is at the exact time we are going to persist something. So
+      #   we can tell by the selector that we are sending if it is actually
+      #   possible to use the positional operator at all. For example, if the
+      #   selector is: { "_id" => 1 }, then we could not use the positional
+      #   operator for updating embedded documents since there would never be a
+      #   match - we base whether we can based on the number of levels deep the
+      #   selector goes, and if the id values are not nil.
+      #
+      # @example Process the operations.
+      #   positionally(
+      #     { "_id" => 1, "addresses._id" => 2 },
+      #     { "$set" => { "addresses.0.street" => "hobrecht" }}
+      #   )
+      #
+      # @param [ Hash ] selector The selector.
+      # @param [ Hash ] operations The update operations.
+      # @param [ Hash ] processed The processed update operations.
+      #
+      # @return [ Hash ] The new operations.
+      #
+      # @since 3.1.0
+      def positionally(selector, operations, processed = {})
+        if selector.size == 1 || selector.values.any? { |val| val.nil? }
+          return operations
+        end
+        keys = selector.keys.map{ |m| m.sub('._id','') } - ['_id']
+        keys = keys.sort_by { |s| s.length*-1 }
+        process_operations(keys, operations, processed)
+      end
+
+      private
+
+      def process_operations(keys, operations, processed)
+        operations.each_pair do |operation, update|
+          processed[operation] = process_updates(keys, update)
+        end
+        processed
+      end
+
+      def process_updates(keys, update, updates = {})
+        update.each_pair do |position, value|
+          updates[replace_index(keys, position)] = value
+        end
+        updates
+      end
+
+      def replace_index(keys, position)
+        # replace to $ only if that key is on the selector
+        keys.each do |kk|
+          if position =~ /^#{kk}\.\d+\.(.*)/
+            return "#{kk}.$.#{$1}"
+          end
+        end
+        position
+      end
+    end
+  end
+end

data/lib/mongoid/attributes.rb

@@ -12,6 +12,7 @@ module Mongoid
     include Readonly
 
     attr_reader :attributes
+    attr_reader :attributes_before_type_cast
     alias :raw_attributes :attributes
 
     # Determine if an attribute is present.
@@ -43,6 +44,22 @@ module Mongoid
       attributes.has_key?(name.to_s)
     end
 
+    # Does the document have the provided attribute before it was assigned
+    # and type cast?
+    #
+    # @example Does the document have the attribute before it was assigned?
+    #   model.has_attribute_before_type_cast?(:name)
+    #
+    # @param [ String, Symbol ] name The name of the attribute.
+    #
+    # @return [ true, false ] If the key is present in the
+    #   attributes_before_type_cast.
+    #
+    # @since 3.1.0
+    def has_attribute_before_type_cast?(name)
+      attributes_before_type_cast.has_key?(name.to_s)
+    end
+
     # Read a value from the document attributes. If the value does not exist
     # it will return nil.
     #
@@ -67,6 +84,28 @@ module Mongoid
     end
     alias :[] :read_attribute
 
+    # Read a value from the attributes before type cast. If the value has not
+    # yet been assigned then this will return the attribute's existing value
+    # using read_attribute.
+    #
+    # @example Read an attribute before type cast.
+    #   person.read_attribute_before_type_cast(:price)
+    #
+    # @param [ String, Symbol ] name The name of the attribute to get.
+    #
+    # @return [ Object ] The value of the attribute before type cast, if
+    #   available. Otherwise, the value of the attribute.
+    #
+    # @since 3.1.0
+    def read_attribute_before_type_cast(name)
+      attr = name.to_s
+      if attributes_before_type_cast.has_key?(attr)
+        attributes_before_type_cast[attr]
+      else
+        read_attribute(attr)
+      end
+    end
+
     # Remove a value from the +Document+ attributes. If the value does not exist
     # it will fail gracefully.
     #
@@ -129,6 +168,7 @@ module Mongoid
       if attribute_writable?(access)
         _assigning do
           localized = fields[access].try(:localized?)
+          attributes_before_type_cast[name.to_s] = value
           typed_value = typed_value_for(access, value)
           unless attributes[access] == typed_value || attribute_changed?(access)
             attribute_will_change!(access)
@@ -206,6 +246,24 @@ module Mongoid
       READER
     end
 
+    # Define a reader method for a dynamic attribute before type cast.
+    #
+    # @api private
+    #
+    # @example Define a reader method for an attribute.
+    #   model.define_dynamic_before_type_cast_reader(:field)
+    #
+    # @param [ String ] name The name of the field.
+    #
+    # @since 3.1.0
+    def define_dynamic_before_type_cast_reader(name)
+      class_eval <<-READER
+        def #{name}_before_type_cast
+          read_attribute_before_type_cast(#{name.inspect})
+        end
+      READER
+    end
+
     # Define a writer method for a dynamic attribute.
     #
     # @api private
@@ -251,6 +309,9 @@ module Mongoid
         getter = attr.reader
         define_dynamic_writer(getter)
         write_attribute(getter, args.first)
+      elsif attr.before_type_cast?
+        define_dynamic_before_type_cast_reader(attr.reader)
+        read_attribute_before_type_cast(attr.reader)
       else
         getter = attr.reader
         define_dynamic_reader(getter)
@@ -270,7 +331,7 @@ module Mongoid
     #
     # @since 1.0.0
     def typed_value_for(key, value)
-      fields.has_key?(key) ? fields[key].mongoize(value) : value.mongoize
+      fields.has_key?(key) ? fields[key].mongoize(value) : value
     end
 
     module ClassMethods
@@ -300,6 +361,7 @@ module Mongoid
           alias reset_#{name}!   reset_#{original}!
           alias #{name}_was      #{original}_was
           alias #{name}_will_change! #{original}_will_change!
+          alias #{name}_before_type_cast #{original}_before_type_cast
         RUBY
       end
     end

data/lib/mongoid/callbacks.rb

@@ -9,8 +9,10 @@ module Mongoid
       :after_build,
       :after_create,
       :after_destroy,
+      :after_find,
       :after_initialize,
       :after_save,
+      :after_touch,
       :after_update,
       :after_upsert,
       :after_validation,
@@ -25,14 +27,13 @@ module Mongoid
       :before_update,
       :before_upsert,
       :before_validation
-    ]
+    ].freeze
 
     included do
       extend ActiveModel::Callbacks
       include ActiveModel::Validations::Callbacks
 
-      define_model_callbacks :initialize, only: :after
-      define_model_callbacks :build, only: :after
+      define_model_callbacks :build, :find, :initialize, :touch, only: :after
       define_model_callbacks :create, :destroy, :save, :update, :upsert
 
       attr_accessor :before_callback_halted
@@ -187,7 +188,9 @@ module Mongoid
     #
     # @since 2.3.0
     def cascadable_child?(kind, child)
-      return false if kind == :initialize
+      if kind == :initialize || kind == :find
+        return false
+      end
       child.callback_executable?(kind) ? child.in_callback_state?(kind) : false
     end
 
@@ -256,5 +259,56 @@ module Mongoid
       end
       send(name)
     end
+
+    class << self
+
+      # Get all callbacks that can be observed.
+      #
+      # @example Get the observables.
+      #   Callbacks.observables
+      #
+      # @return [ Array<Symbol> ] The names of the observables.
+      #
+      # @since 3.1.0
+      def observables
+        CALLBACKS + registered_observables
+      end
+
+      # Get all registered callbacks that can be observed, not included in
+      # Mongoid's defaults.
+      #
+      # @example Get the observables.
+      #   Callbacks.registered_observables
+      #
+      # @return [ Array<Symbol> ] The names of the registered observables.
+      #
+      # @since 3.1.0
+      def registered_observables
+        @registered_observables ||= []
+      end
+    end
+
+    module ClassMethods
+
+      # Set a custom callback as able to be observed.
+      #
+      # @example Set a custom callback as observable.
+      #   class Band
+      #     include Mongoid::Document
+      #
+      #     define_model_callbacks :notification
+      #     observable :notification
+      #   end
+      #
+      # @param [ Array<Symbol> ] args The names of the observable callbacks.
+      #
+      # @since 3.0.1
+      def observable(*args)
+        observables = args.flat_map do |name|
+          [ :"before_#{name}", :"after_#{name}", :"around_#{name}" ]
+        end
+        Callbacks.registered_observables.concat(observables).uniq
+      end
+    end
   end
 end

data/lib/mongoid/components.rb

@@ -42,29 +42,34 @@ module Mongoid
     include Mongoid::Validations
     include Mongoid::Callbacks
     include Mongoid::Copyable
+    include Mongoid::Equality
 
     MODULES = [
       Mongoid::Atomic,
       Mongoid::Attributes,
+      Mongoid::Callbacks,
       Mongoid::Copyable,
       Mongoid::Dirty,
+      Mongoid::Evolvable,
       Mongoid::Fields,
       Mongoid::Hierarchy,
       Mongoid::Indexes,
       Mongoid::Inspection,
       Mongoid::JSON,
-      Mongoid::Loggable,
       Mongoid::Matchers,
       Mongoid::NestedAttributes,
       Mongoid::Persistence,
       Mongoid::Relations,
-      Mongoid::Relations::Proxy,
+      Mongoid::Reloading,
       Mongoid::Scoping,
       Mongoid::Serialization,
+      Mongoid::Sessions,
       Mongoid::Sharding,
       Mongoid::State,
+      Mongoid::Threaded::Lifecycle,
+      Mongoid::Timestamps::Timeless,
       Mongoid::Validations,
-      Mongoid::Callbacks
+      Mongoid::Equality
     ]
 
     class << self

data/lib/mongoid/config.rb

@@ -13,6 +13,11 @@ module Mongoid
     extend Options
     include ActiveModel::Observing
 
+    delegate :logger=, to: ::Mongoid
+    delegate :logger, to: ::Mongoid
+
+    LOCK = Mutex.new
+
     option :allow_dynamic_fields, default: true
     option :identity_map_enabled, default: false
     option :include_root_in_json, default: false
@@ -86,6 +91,47 @@ module Mongoid
       settings
     end
 
+    # Get all the models in the application - this is everything that includes
+    # Mongoid::Document.
+    #
+    # @example Get all the models.
+    #   config.models
+    #
+    # @return [ Array<Class> ] All the models in the application.
+    #
+    # @since 3.1.0
+    def models
+      @models ||= []
+    end
+
+    # Register a model in the application with Mongoid.
+    #
+    # @example Register a model.
+    #   config.register_model(Band)
+    #
+    # @param [ Class ] klass The model to register.
+    #
+    # @since 3.1.0
+    def register_model(klass)
+      LOCK.synchronize do
+        models.push(klass) unless models.include?(klass)
+      end
+    end
+
+    # From a hash of settings, load all the configuration.
+    #
+    # @example Load the configuration.
+    #   config.load_configuration(settings)
+    #
+    # @param [ Hash ] settings The configuration settings.
+    #
+    # @since 3.1.0
+    def load_configuration(settings)
+      configuration = settings.with_indifferent_access
+      self.options = configuration[:options]
+      self.sessions = configuration[:sessions]
+    end
+
     # Override the database to use globally.
     #
     # @example Override the database globally.
@@ -119,6 +165,8 @@ module Mongoid
     # @example Purge all data.
     #   Mongoid::Config.purge!
     #
+    # @note This is the fastest way to drop all data.
+    #
     # @return [ true ] true.
     #
     # @since 2.0.2
@@ -128,6 +176,22 @@ module Mongoid
       end and true
     end
 
+    # Truncate all data in all collections, but not the indexes.
+    #
+    # @example Truncate all collection data.
+    #   Mongoid::Config.truncate!
+    #
+    # @note This will be slower than purge!
+    #
+    # @return [ true ] true.
+    #
+    # @since 2.0.2
+    def truncate!
+      Sessions.default.collections.each do |collection|
+        collection.find.remove_all
+      end and true
+    end
+
     # Set the configuration options. Will validate each one individually.
     #
     # @example Set the options.
@@ -145,18 +209,6 @@ module Mongoid
       end
     end
 
-    # Is the application running under passenger?
-    #
-    # @example Is the application using passenger?
-    #   config.running_with_passenger?
-    #
-    # @return [ true, false ] If the app is deployed on Passenger.
-    #
-    # @since 3.0.11
-    def running_with_passenger?
-      @running_with_passenger ||= defined?(PhusionPassenger)
-    end
-
     # Get the session configuration or an empty hash.
     #
     # @example Get the sessions configuration.
@@ -197,20 +249,16 @@ module Mongoid
       use_utc? ? "UTC" : ::Time.zone
     end
 
-    private
-
-    # From a hash of settings, load all the configuration.
+    # Is the application running under passenger?
     #
-    # @example Load the configuration.
-    #   config.load_configuration(settings)
+    # @example Is the application using passenger?
+    #   config.running_with_passenger?
     #
-    # @param [ Hash ] settings The configuration settings.
+    # @return [ true, false ] If the app is deployed on Passenger.
     #
-    # @since 3.0.0
-    def load_configuration(settings)
-      configuration = settings.with_indifferent_access
-      self.options = configuration[:options]
-      self.sessions = configuration[:sessions]
+    # @since 3.0.11
+    def running_with_passenger?
+      @running_with_passenger ||= defined?(PhusionPassenger)
     end
   end
 end