mongoid 2.3.5 → 2.4.0

data/lib/mongoid/fields/{serializable → internal}/set.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for set fields.
       class Set
@@ -22,6 +22,21 @@ module Mongoid #:nodoc:
           ::Set.new(object)
         end
 
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/{serializable → internal}/string.rb

@@ -1,12 +1,27 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for string fields.
       class String
         include Serializable
 
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/{serializable → internal}/symbol.rb

@@ -1,12 +1,27 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # Defines the behaviour for symbol fields.
       class Symbol
         include Serializable
 
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #
@@ -21,6 +36,7 @@ module Mongoid #:nodoc:
         def serialize(object)
           object.blank? ? nil : object.to_sym
         end
+        alias :deserialize :serialize
       end
     end
   end

data/lib/mongoid/fields/{serializable → internal}/time.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
       # Defines the behaviour for date fields.
       class Time
         include Serializable

data/lib/mongoid/fields/{serializable → internal}/time_with_zone.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
       # Defines the behaviour for time with zone fields.
       class TimeWithZone
         include Serializable

data/lib/mongoid/fields/{serializable → internal}/timekeeping.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
-    module Serializable #:nodoc:
+    module Internal #:nodoc:
 
       # This module contains shared behaviour for date conversions.
       module Timekeeping
@@ -38,6 +38,21 @@ module Mongoid #:nodoc:
           object
         end
 
+        # Special case to serialize the object.
+        #
+        # @example Convert to a selection.
+        #   field.selection(object)
+        #
+        # @param [ Object ] The object to convert.
+        #
+        # @return [ Object ] The converted object.
+        #
+        # @since 2.4.0
+        def selection(object)
+          return object if object.is_a?(::Hash)
+          serialize(object)
+        end
+
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/mappings.rb

@@ -7,7 +7,7 @@ module Mongoid #:nodoc
     module Mappings
       extend self
 
-      MODULE = "Mongoid::Fields::Serializable"
+      MODULE = "Mongoid::Fields::Internal"
 
       # Get the custom field type for the provided class used in the field
       # definition.
@@ -21,12 +21,17 @@ module Mongoid #:nodoc
       #
       # @since 2.1.0
       def for(klass, foreign_key = false)
-        return Serializable::Object unless klass
+        return Internal::Object unless klass
         if foreign_key
           return "#{MODULE}::ForeignKeys::#{klass.to_s.demodulize}".constantize
         end
         begin
-          "#{MODULE}::#{klass.to_s.demodulize}".constantize
+          modules = "#{ MODULE }::|BSON::|ActiveSupport::"
+          if match = klass.to_s.match(Regexp.new("^(#{ modules })?(\\w+)$"))
+            "#{MODULE}::#{ match[2] }".constantize
+          else
+            klass.to_s.constantize
+          end
         rescue NameError
           klass
         end

data/lib/mongoid/fields/serializable.rb

@@ -81,6 +81,18 @@ module Mongoid #:nodoc:
         end
       end
 
+      # Is this field a foreign key?
+      #
+      # @example Is the field a foreign key?
+      #   field.foreign_key?
+      #
+      # @return [ true, false ] If the field is a foreign key.
+      #
+      # @since 2.4.0
+      def foreign_key?
+        !!options[:identity]
+      end
+
       # Is the field localized or not?
       #
       # @example Is the field localized?
@@ -117,6 +129,16 @@ module Mongoid #:nodoc:
         @object_id_field ||= (type == BSON::ObjectId)
       end
 
+      # Can the field vary in size, similar to arrays.
+      #
+      # @example Is the field varying in size?
+      #   field.resizable?
+      #
+      # @return [ false ] false by default.
+      #
+      # @since 2.4.0
+      def resizable?; false; end
+
       # Serialize the object from the type defined in the model to a MongoDB
       # compatible object to store.
       #
@@ -130,6 +152,18 @@ module Mongoid #:nodoc:
       # @since 2.1.0
       def serialize(object); object; end
 
+      # Convert the provided object to a Mongoid criteria friendly value.
+      #
+      # @example Convert the field.
+      #   field.selection(object)
+      #
+      # @param [ Object ] The object to convert.
+      #
+      # @return [ Object ] The converted object.
+      #
+      # @since 2.4.0
+      def selection(object); object; end
+
       # Get the type of this field - inferred from the class name.
       #
       # @example Get the type.
@@ -175,9 +209,6 @@ module Mongoid #:nodoc:
             field.label = options[:label]
             field.localize = options[:localize]
             field.default_val = options[:default]
-            unless field.default_val
-              field.default_val = {} if field.localized?
-            end
           end
         end
 

data/lib/mongoid/hierarchy.rb

@@ -7,19 +7,6 @@ module Mongoid #:nodoc
       attr_accessor :_parent
     end
 
-    module ClassMethods #:nodoc:
-
-      # Determines if the document is a subclass of another document.
-      #
-      # @example Check if the document is a subclass.
-      #   Square.hereditary?
-      #
-      # @return [ true, false ] True if hereditary, false if not.
-      def hereditary?
-        Mongoid::Document > superclass
-      end
-    end
-
     # Get all child +Documents+ to this +Document+, going n levels deep if
     # necessary. This is used when calling update persistence operations from
     # the root document, where changes in the entire tree need to be
@@ -37,7 +24,7 @@ module Mongoid #:nodoc
           relations.each_pair do |name, metadata|
             if metadata.embedded?
               child = send(name)
-              child.to_a.each do |doc|
+              Array.wrap(child).each do |doc|
                 children.push(doc)
                 children.concat(doc._children) unless metadata.versioned?
               end if child
@@ -113,5 +100,18 @@ module Mongoid #:nodoc
       while (object._parent) do object = object._parent; end
       object || self
     end
+
+    module ClassMethods #:nodoc:
+
+      # Determines if the document is a subclass of another document.
+      #
+      # @example Check if the document is a subclass.
+      #   Square.hereditary?
+      #
+      # @return [ true, false ] True if hereditary, false if not.
+      def hereditary?
+        Mongoid::Document > superclass
+      end
+    end
   end
 end

data/lib/mongoid/identity_map.rb

@@ -16,7 +16,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.1.0
     def get(klass, identifier)
-      return nil unless Mongoid.identity_map_enabled?
+      return nil unless Mongoid.identity_map_enabled? && klass
       documents_for(klass)[identifier]
     end
 
@@ -93,7 +93,8 @@ module Mongoid #:nodoc:
     #
     # @since 2.1.0
     def documents_for(klass)
-      self[klass] ||= {}
+      return nil unless klass
+      self[klass.collection_name] ||= {}
     end
 
     class << self

data/lib/mongoid/logger.rb

@@ -4,13 +4,7 @@ module Mongoid #:nodoc:
   # The Mongoid logger which wraps some other ruby compliant logger class.
   class Logger
 
-    delegate \
-      :info,
-      :debug,
-      :error,
-      :fatal,
-      :level,
-      :unknown, :to => :logger, :allow_nil => true
+    delegate :info, :debug, :error, :fatal, :unknown, :to => :logger, :allow_nil => true
 
     # Emit a warning log message.
     #

data/lib/mongoid/named_scope.rb

@@ -24,8 +24,8 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0
       def criteria(embedded = false, scoped = true)
-        scope_stack.last || Criteria.new(self, embedded).tap do |crit|
-          return crit.fuse(default_scoping) if default_scoping && scoped
+        (scope_stack.last || Criteria.new(self, embedded)).tap do |crit|
+          return crit.apply_default_scope if scoped
         end
       end
 
@@ -56,7 +56,7 @@ module Mongoid #:nodoc:
         (class << self; self; end).class_eval <<-EOT
           def #{name}(*args)
             scope = scopes[:#{name}]
-            scope.extend(criteria.fuse(scope.conditions.scoped(*args)))
+            scope.extend(criteria.fuse(scope.conditions.as_conditions(*args)))
           end
         EOT
       end
@@ -73,7 +73,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0
       def scoped(embedded = false)
-        criteria(embedded, true)
+        criteria(embedded).scoped
       end
 
       # Initializes and returns the current scope stack.
@@ -99,7 +99,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0
       def unscoped(embedded = false)
-        criteria(embedded, false)
+        criteria(embedded).unscoped
       end
 
       # Pushes the provided criteria onto the scope stack, and removes it after the
@@ -125,19 +125,23 @@ module Mongoid #:nodoc:
 
       protected
 
-      # Warns if overriding another scope or method.
+      # Warns or raises exception if overriding another scope or method.
       #
-      # @example Warn if name exists.
+      # @example Warn or raise error if name exists.
       #   Model.valid_scope_name?("test")
       #
       # @param [ String, Symbol ] name The name of the scope.
       def valid_scope_name?(name)
         if scopes[name] || respond_to?(name, true)
-          if Mongoid.logger
-            Mongoid.logger.warn(
-              "Creating scope :#{name}. " +
-              "Overwriting existing method #{self.name}.#{name}."
-            )
+          if Mongoid.scope_overwrite_exception
+            raise Errors::ScopeOverwrite.new(self.name,name)
+          else
+            if Mongoid.logger
+              Mongoid.logger.warn(
+                "Creating scope :#{name}. " +
+                "Overwriting existing method #{self.name}.#{name}."
+              )
+            end
           end
         end
       end

data/lib/mongoid/observer.rb

@@ -159,7 +159,11 @@ module Mongoid #:nodoc:
           callback_meth = :"_notify_#{observer_name}_for_#{callback}"
           unless klass.respond_to?(callback_meth)
             klass.send(:define_method, callback_meth) do |&block|
-              observer.send(callback, self, &block)
+              if value = observer.update(callback, self, &block)
+                value
+              else
+                block.call if block
+              end
             end
             klass.send(callback, callback_meth)
           end

data/lib/mongoid/paranoia.rb

@@ -15,6 +15,7 @@ module Mongoid #:nodoc:
 
     included do
       field :deleted_at, :type => Time
+      self.paranoid = true
     end
 
     # Delete the paranoid +Document+ from the database completely. This will

data/lib/mongoid/persistence.rb

@@ -28,7 +28,12 @@ module Mongoid #:nodoc:
     #
     # @return [ true, false ] True if successful, false if not.
     def destroy(options = {})
-      run_callbacks(:destroy) { remove(options) }
+      self.flagged_for_destroy = true
+      run_callbacks(:destroy) do
+        remove(options)
+      end.tap do
+        self.flagged_for_destroy = false
+      end
     end
 
     # Insert a new document into the database. Will return the document
@@ -209,7 +214,8 @@ module Mongoid #:nodoc:
       #
       # @return [ Integer ] The number of documents deleted.
       def delete_all(conditions = nil)
-        selector = (conditions || {})[:conditions] || {}
+        conds = conditions || {}
+        selector = conds[:conditions] || conds
         selector.merge!(:_type => name) if hereditary?
         collection.find(selector).count.tap do
           collection.remove(selector, Safety.merge_safety_options)
@@ -230,8 +236,9 @@ module Mongoid #:nodoc:
       # @param [ Hash ] conditions Optional conditions to destroy by.
       #
       # @return [ Integer ] The number of documents destroyed.
-      def destroy_all(conditions = {})
-        documents = all(conditions)
+      def destroy_all(conditions = nil)
+        conds = conditions || {}
+        documents = where(conds[:conditions] || conds)
         documents.count.tap do
           documents.each { |doc| doc.destroy }
         end