mongoid 2.3.0 → 2.3.1

data/lib/mongoid/errors.rb

@@ -8,6 +8,7 @@ require "mongoid/errors/invalid_database"
 require "mongoid/errors/invalid_field"
 require "mongoid/errors/invalid_find"
 require "mongoid/errors/invalid_options"
+require "mongoid/errors/invalid_time"
 require "mongoid/errors/invalid_type"
 require "mongoid/errors/mixed_relations"
 require "mongoid/errors/too_many_nested_attribute_records"

data/lib/mongoid/errors/invalid_time.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Errors #:nodoc
+
+    # This exception is raised when a bad value is attempted to be converted to
+    # a date or time.
+    class InvalidTime < MongoidError
+
+      attr_reader :klass, :value
+
+      # Create the new invalid date error.
+      #
+      # @example Create the new invalid date error.
+      #   InvalidTime.new("this is not a time")
+      #
+      # @param [ Object ] value The value that was attempted.
+      #
+      # @since 2.3.1
+      def initialize(value)
+        @value = value
+        super(translate("invalid_time", { :value => value }))
+      end
+    end
+  end
+end

data/lib/mongoid/extensions.rb

@@ -13,6 +13,7 @@ require "mongoid/extensions/proc/scoping"
 require "mongoid/extensions/string/checks"
 require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
+require "mongoid/extensions/symbol/checks"
 require "mongoid/extensions/symbol/inflections"
 require "mongoid/extensions/true_class/equality"
 require "mongoid/extensions/object_id/conversions"
@@ -62,6 +63,7 @@ end
 
 class Symbol #:nodoc
   remove_method :size if instance_methods.include? :size # temporal fix for ruby 1.9
+  include Mongoid::Extensions::Symbol::Checks
   include Mongoid::Extensions::Symbol::Inflections
 end
 

data/lib/mongoid/extensions/hash/criteria_helpers.rb

@@ -17,8 +17,7 @@ module Mongoid #:nodoc:
         def expand_complex_criteria
           {}.tap do |hsh|
             each_pair do |k,v|
-              case k
-              when Mongoid::Criterion::Complex
+              if k.respond_to?(:key) && k.respond_to?(:to_mongo_query)
                 hsh[k.key] ||= {}
                 hsh[k.key].merge!(k.to_mongo_query(v))
               else

data/lib/mongoid/extensions/object_id/conversions.rb

@@ -38,7 +38,7 @@ module Mongoid #:nodoc:
             if args.unconvertable_to_bson?
               args
             else
-              BSON::ObjectId.from_string(args)
+              BSON::ObjectId.legal?(args) ? BSON::ObjectId.from_string(args) : args
             end
           when ::Array
             args.delete_if { |arg| arg.blank? } if reject_blank
@@ -47,9 +47,7 @@ module Mongoid #:nodoc:
             args.tap do |hash|
               hash.each_pair do |key, value|
                 next unless klass.object_id_field?(key)
-                begin
-                  hash[key] = convert(klass, value, reject_blank)
-                rescue BSON::InvalidObjectId; end
+                hash[key] = convert(klass, value, reject_blank)
               end
             end
           else

data/lib/mongoid/extensions/string/checks.rb

@@ -7,6 +7,18 @@ module Mongoid #:nodoc:
       module Checks #:nodoc:
         attr_accessor :unconvertable_to_bson
 
+        # Is the string a valid value for a Mongoid id?
+        #
+        # @example Is the string an id value?
+        #   "_id".mongoid_id?
+        #
+        # @return [ true, false ] If the string is id or _id.
+        #
+        # @since 2.3.1
+        def mongoid_id?
+          self =~ /^(|_)id$/
+        end
+
         # Is the object not to be converted to bson on criteria creation?
         #
         # @example Is the object unconvertable?

data/lib/mongoid/extensions/symbol/checks.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Symbol #:nodoc:
+
+      # This module has object checks in it.
+      module Checks #:nodoc:
+
+        # Is the symbol a valid value for a Mongoid id?
+        #
+        # @example Is the string an id value?
+        #   :_id.mongoid_id?
+        #
+        # @return [ true, false ] If the symbol is :id or :_id.
+        #
+        # @since 2.3.1
+        def mongoid_id?
+          to_s =~ /^(|_)id$/
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extras.rb

@@ -10,18 +10,6 @@ module Mongoid #:nodoc:
       self.cached = false
     end
 
-    # Is the class cached?
-    #
-    # @note Refactored from using delegate for class load performance.
-    #
-    # @example Is the class cached?
-    #   person.cached?
-    #
-    # @return [ true, false ] If the class is cached.
-    def cached?
-      self.class.cached?
-    end
-
     module ClassMethods #:nodoc
 
       # Sets caching on for this class. This class level configuration will
@@ -38,16 +26,6 @@ module Mongoid #:nodoc:
       def cache
         self.cached = true
       end
-
-      # Determines if the class is cached or not.
-      #
-      # @example Are class reads cached?
-      #   Document.cached?
-      #
-      # @return [ true, false ] If the reads are cached.
-      def cached?
-        !!self.cached
-      end
     end
   end
 end

data/lib/mongoid/fields.rb

@@ -231,7 +231,7 @@ module Mongoid #:nodoc
         type = options[:localize] ? Fields::Serializable::Localized : options[:type]
         Mappings.for(type, options[:identity]).instantiate(name, options).tap do |field|
           fields[name] = field
-          defaults << name unless field.default.nil?
+          defaults << name unless field.default_val.nil?
           create_accessors(name, meth, options)
           process_options(field)
           define_attribute_method(name)

data/lib/mongoid/fields/serializable.rb

@@ -25,8 +25,15 @@ module Mongoid #:nodoc:
     module Serializable
       extend ActiveSupport::Concern
 
+      included do
+        # @todo: Durran: Pull out in 3.0.0
+        unless method_defined?(:default)
+          alias :default :default_val
+        end
+      end
+
       # Set readers for the instance variables.
-      attr_accessor :default, :label, :localize, :name, :options
+      attr_accessor :default_val, :label, :localize, :name, :options
 
       # When reading the field do we need to cast the value? This holds true when
       # times are stored or for big decimals which are stored as strings.
@@ -82,10 +89,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.8
       def eval_default(doc)
-        if default.respond_to?(:call)
-          serialize(doc.instance_exec(&default))
+        if default_val.respond_to?(:call)
+          serialize(doc.instance_exec(&default_val))
         else
-          serialize(default.duplicable? ? default.dup : default)
+          serialize(default_val.duplicable? ? default_val.dup : default_val)
         end
       end
 
@@ -182,9 +189,9 @@ module Mongoid #:nodoc:
             field.options = options
             field.label = options[:label]
             field.localize = options[:localize]
-            field.default = options[:default]
-            unless field.default
-              field.default = {} if field.localized?
+            field.default_val = options[:default]
+            unless field.default_val
+              field.default_val = {} if field.localized?
             end
           end
         end

data/lib/mongoid/fields/serializable/timekeeping.rb

@@ -51,8 +51,12 @@ module Mongoid #:nodoc:
         # @since 2.1.0
         def serialize(object)
           return nil if object.blank?
-          time = convert_to_time(object)
-          strip_milliseconds(time).utc
+          begin
+            time = convert_to_time(object)
+            strip_milliseconds(time).utc
+          rescue ArgumentError
+            raise Errors::InvalidTime.new(object)
+          end
         end
 
         # Convert the provided object to a UTC time to store in the database.

data/lib/mongoid/named_scope.rb

@@ -123,12 +123,16 @@ module Mongoid #:nodoc:
         end
       end
 
-    protected
+      protected
 
       def valid_scope_name?(name)
         if !scopes[name] && respond_to?(name, true)
-          Mongoid.logger.warn "Creating scope :#{name}. " \
-                                    "Overwriting existing method #{self.name}.#{name}." if Mongoid.logger
+          if Mongoid.logger
+            Mongoid.logger.warn(
+              "Creating scope :#{name}. " +
+              "Overwriting existing method #{self.name}.#{name}."
+            )
+          end
         end
       end
     end

data/lib/mongoid/nested_attributes.rb

@@ -10,18 +10,6 @@ module Mongoid #:nodoc:
       self.nested_attributes = []
     end
 
-    # Get the nested attributes.
-    #
-    # @note Refactored from using delegate for class load performance.
-    #
-    # @example Get the nested attributes.
-    #   model.nested_attributes
-    #
-    # @return [ Array<String> ] The nested attributes methods.
-    def nested_attributes
-      self.class.nested_attributes
-    end
-
     module ClassMethods #:nodoc:
 
       REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |_, value| value.blank? } }

data/lib/mongoid/paranoia.rb

@@ -22,6 +22,10 @@ module Mongoid #:nodoc:
     #
     # @example Hard destroy the document.
     #   document.destroy!
+    #
+    # @return [ true, false ] If the operation succeeded.
+    #
+    # @since 1.0.0
     def destroy!
       run_callbacks(:destroy) { delete! }
     end
@@ -30,8 +34,11 @@ module Mongoid #:nodoc:
     #
     # @example Hard delete the document.
     #   document.delete!
+    #
+    # @return [ true, false ] If the operation succeeded.
+    #
+    # @since 1.0.0
     def delete!
-      @destroyed = true
       Persistence::Operations.remove(self).persist
     end
 
@@ -44,10 +51,19 @@ module Mongoid #:nodoc:
     # @param [ Hash ] options The database options.
     #
     # @return [ true ] True.
+    #
+    # @since 1.0.0
     def remove(options = {})
-      now = Time.now
-      collection.update({ :_id => id }, { '$set' => { :deleted_at => now } })
-      @attributes["deleted_at"] = now
+      time = self.deleted_at = Time.now
+      paranoid_collection.update(
+        atomic_selector,
+        { "$set" => { paranoid_field => time }},
+        Safety.merge_safety_options(options)
+      )
+      cascade!
+      @destroyed = true
+      IdentityMap.remove(self)
+      Threaded.clear_options!
       true
     end
     alias :delete :remove
@@ -56,9 +72,10 @@ module Mongoid #:nodoc:
     #
     # @example Is the document destroyed?
     #   person.destroyed?
-
     #
     # @return [ true, false ] If the document is destroyed.
+    #
+    # @since 1.0.0
     def destroyed?
       @destroyed || !!deleted_at
     end
@@ -68,9 +85,42 @@ module Mongoid #:nodoc:
     #
     # @example Restore the document from deleted state.
     #   document.restore
+    #
+    # @return [ Time ] The time the document had been deleted.
+    #
+    # @since 1.0.0
     def restore
-      collection.update({ :_id => id }, { '$unset' => { :deleted_at => true } })
-      @attributes.delete("deleted_at")
+      paranoid_collection.update(
+        atomic_selector,
+        { "$unset" => { paranoid_field => true }}
+      )
+      attributes.delete("deleted_at")
+    end
+
+    private
+
+    # Get the collection to be used for paranoid operations.
+    #
+    # @example Get the paranoid collection.
+    #   document.paranoid_collection
+    #
+    # @return [ Collection ] The root collection.
+    #
+    # @since 2.3.1
+    def paranoid_collection
+      embedded? ? _root.collection : self.collection
+    end
+
+    # Get the field to be used for paranoid operations.
+    #
+    # @example Get the paranoid field.
+    #   document.paranoid_field
+    #
+    # @return [ String ] The deleted at field.
+    #
+    # @since 2.3.1
+    def paranoid_field
+      embedded? ? "#{atomic_position}.deleted_at" : "deleted_at"
     end
 
     module ClassMethods #:nodoc:
@@ -84,8 +134,10 @@ module Mongoid #:nodoc:
       # @param [ Array ] args The arguments.
       #
       # @return [ Criteria ] The paranoid compliant criteria.
+      #
+      # @since 1.0.0
       def criteria(embedded = false, scoped = true)
-        scoped ? super.merge({ :conditions => { :deleted_at => nil } }) : super
+        scoped ? super.where(:deleted_at => nil) : super
       end
 
       # Find deleted documents
@@ -96,6 +148,8 @@ module Mongoid #:nodoc:
       #   Person.deleted.find("4c188dea7b17235a2a000001").first
       #
       # @return [ Criteria ] The deleted criteria.
+      #
+      # @since 1.0.0
       def deleted
         where(:deleted_at.ne => nil)
       end

data/lib/mongoid/railties/database.rake

@@ -2,9 +2,7 @@ namespace :db do
 
   unless Rake::Task.task_defined?("db:drop")
     desc 'Drops all the collections for the database for the current Rails.env'
-    task :drop => :environment do
-      Mongoid.master.collections.select {|c| c.name !~ /system/ }.each { |c| c.drop }
-    end
+    task :drop => "mongoid:drop"
   end
 
   unless Rake::Task.task_defined?("db:seed")
@@ -171,6 +169,11 @@ namespace :db do
       end
     end
 
+    desc "Drops the database for the current Rails.env"
+    task :drop => :environment do
+      Mongoid.master.collections.select {|c| c.name !~ /system/ }.each { |c| c.drop }
+    end
+
     ########
     # TODO: lots more useful db tasks can be added here. stuff like copyDatabase, etc
     ########

data/lib/mongoid/relations.rb

@@ -125,5 +125,20 @@ module Mongoid # :nodoc:
         end
       end
     end
+
+    module ClassMethods #:nodoc:
+
+      # This is convenience for librarys still on the old API.
+      #
+      # @example Get the associations.
+      #   Person.associations
+      #
+      # @return [ Hash ] The relations.
+      #
+      # @since 2.3.1
+      def associations
+        self.relations
+      end
+    end
   end
 end

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

@@ -31,7 +31,7 @@ module Mongoid # :nodoc:
                   if inverse_metadata != metadata && !inverse_metadata.nil?
                     base.metadata = inverse_metadata
                     if base.referenced_many?
-                      target.send(inverse).push(base)
+                      target.send(inverse).push(base) unless Mongoid.identity_map_enabled?
                     else
                       target.do_or_do_not(metadata.inverse_setter(target), base)
                     end