mongoid 3.1.6 → 4.0.2

data/lib/mongoid/criteria/permission.rb

@@ -0,0 +1,70 @@
+# encoding: utf-8
+module Mongoid
+  class Criteria
+    module Permission
+
+      [:all,
+       :all_in,
+       :and,
+       :all_of,
+       :between,
+       :elem_match,
+       :exists,
+       :gt,
+       :gte,
+       :in,
+       :any_in,
+       :lt,
+       :lte,
+       :max_distance,
+       :mod,
+       :ne,
+       :excludes,
+       :near,
+       :near_sphere,
+       :nin,
+       :not_in,
+       :nor,
+       :negating?,
+       :not,
+       :or,
+       :any_of,
+       :with_size,
+       :with_type,
+       :where,
+       :within_box,
+       :within_circle,
+       :within_polygon,
+       :within_spherical_circle
+      ].each do |method|
+        define_method(method) do |*criteria|
+          raise Errors::CriteriaNotPermitted.new(klass, method, criteria) unless should_permit?(criteria)
+          super(*criteria)
+        end
+      end
+
+      private
+
+      # Ensure that the criteria are permitted.
+      #
+      # @example Ignoring ActionController::Parameters
+      #   should_permit?({_id: ActionController::Parameters.new("$size" => 1)})
+      #
+      # @api private
+      #
+      # @param [ Object ] criteria
+      # @return [ Boolean ] if should permit
+      def should_permit?(criteria)
+        if criteria.respond_to?(:permitted?)
+          return criteria.permitted?
+        elsif criteria.respond_to?(:each)
+          criteria.each do |criterion|
+            return false unless should_permit?(criterion)
+          end
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/mongoid/{criterion/scoping.rb → criteria/scopable.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid
-  module Criterion
-    module Scoping
+  class Criteria
+    module Scopable
 
       # Applies the default scope to the criteria.
       #

data/lib/mongoid/document.rb

@@ -1,13 +1,30 @@
 # encoding: utf-8
+require "mongoid/positional"
+require "mongoid/evolvable"
+require "mongoid/extensions"
+require "mongoid/errors"
+require "mongoid/threaded"
+require "mongoid/relations"
+require "mongoid/atomic"
+require "mongoid/attributes"
+require "mongoid/contextual"
+require "mongoid/copyable"
+require "mongoid/equality"
+require "mongoid/criteria"
+require "mongoid/factory"
+require "mongoid/fields"
+require "mongoid/timestamps"
+require "mongoid/composable"
+
 module Mongoid
 
   # This is the base module for all domain objects that need to be persisted to
   # the database as documents.
   module Document
     extend ActiveSupport::Concern
-    include Mongoid::Components
+    include Composable
 
-    attr_accessor :criteria_instance_id
+    attr_accessor :__selected_fields
     attr_reader :new_record
 
     included do
@@ -56,16 +73,16 @@ module Mongoid
 
     # A Document's is identified absolutely by its class and database id:
     #
-    # Person.first.identity #=> [Person, Moped::BSON::ObjectId('4f775130a04745933a000003')]
+    # Person.first.identity #=> [Person, BSON::ObjectId('4f775130a04745933a000003')]
     #
     # @example Get the identity
     #   document.identity
     #
-    # @return [ Array ] An array containing [document.class, document.id]
+    # @return [ Array ] An array containing [document.class, document._id]
     #
     # @since 3.0.0
     def identity
-      [ self.class, self.id ]
+      [ self.class, self._id ]
     end
 
     # Instantiate a new +Document+, setting the Document's attributes if
@@ -73,25 +90,24 @@ module Mongoid
     # an empty +Hash+.
     #
     # If a primary key is defined, the document's id will be set to that key,
-    # otherwise it will be set to a fresh +Moped::BSON::ObjectId+ string.
+    # otherwise it will be set to a fresh +BSON::ObjectId+ string.
     #
     # @example Create a new document.
     #   Person.new(:title => "Sir")
     #
     # @param [ Hash ] attrs The attributes to set up the document with.
-    # @param [ Hash ] options A mass-assignment protection options. Supports
-    #   :as and :without_protection
     #
     # @return [ Document ] A new document.
     #
     # @since 1.0.0
-    def initialize(attrs = nil, options = nil)
+    def initialize(attrs = nil)
       _building do
         @new_record = true
         @attributes ||= {}
-        options ||= {}
+        with(self.class.persistence_options)
         apply_pre_processed_defaults
-        process_attributes(attrs, options[:as] || :default, !options[:without_protection]) do
+        apply_default_scoping
+        process_attributes(attrs) do
           yield(self) if block_given?
         end
         apply_post_processed_defaults
@@ -118,11 +134,11 @@ module Mongoid
     # @example Return the key.
     #   document.to_key
     #
-    # @return [ Object ] The id of the document or nil if new.
+    # @return [ String ] The id of the document or nil if new.
     #
     # @since 2.4.0
     def to_key
-      (persisted? || destroyed?) ? [ id ] : nil
+      (persisted? || destroyed?) ? [ id.to_s ] : nil
     end
 
     # Return an array with this +Document+ only in it.
@@ -182,10 +198,11 @@ module Mongoid
         raise ArgumentError, "A class which includes Mongoid::Document is expected"
       end
 
-      became = klass.new(clone_document, without_protection: true)
-      became.id = id
+      became = klass.new(clone_document)
+      became._id = _id
       became.instance_variable_set(:@changed_attributes, changed_attributes)
-      became.instance_variable_set(:@errors, errors)
+      became.instance_variable_set(:@errors, ActiveModel::Errors.new(became))
+      became.errors.instance_variable_set(:@messages, errors.instance_variable_get(:@messages))
       became.instance_variable_set(:@new_record, new_record?)
       became.instance_variable_set(:@destroyed, destroyed?)
       became.changed_attributes["_type"] = self.class.to_s
@@ -201,7 +218,6 @@ module Mongoid
         end
       end
 
-      IdentityMap.set(became) unless became.new_record?
       became
     end
 
@@ -209,7 +225,7 @@ module Mongoid
     # plural model name.
     #
     # If new_record?     - will append /new
-    # If not             - will append /id-updated_at.to_s(:number)
+    # If not             - will append /id-updated_at.to_s(:nsec)
     # Without updated_at - will append /id
     #
     # This is usually called insode a cache() block
@@ -222,7 +238,7 @@ module Mongoid
     # @since 2.4.0
     def cache_key
       return "#{model_key}/new" if new_record?
-      return "#{model_key}/#{id}-#{updated_at.utc.to_s(:number)}" if do_or_do_not(:updated_at)
+      return "#{model_key}/#{id}-#{updated_at.utc.to_s(:nsec)}" if do_or_do_not(:updated_at)
       "#{model_key}/#{id}"
     end
 
@@ -284,19 +300,18 @@ module Mongoid
       #   Person.instantiate(:title => "Sir", :age => 30)
       #
       # @param [ Hash ] attrs The hash of attributes to instantiate with.
-      # @param [ Integer ] criteria_instance_id The criteria id that
-      #   instantiated the document.
+      # @param [ Integer ] selected_fields The selected fields from the
+      #   criteria.
       #
       # @return [ Document ] A new document.
       #
       # @since 1.0.0
-      def instantiate(attrs = nil, criteria_instance_id = nil)
+      def instantiate(attrs = nil, selected_fields = nil)
         attributes = attrs || {}
         doc = allocate
-        doc.criteria_instance_id = criteria_instance_id
+        doc.__selected_fields = selected_fields
         doc.instance_variable_set(:@attributes, attributes)
         doc.apply_defaults
-        IdentityMap.set(doc) unless _loading_revision?
         yield(doc) if block_given?
         doc.run_callbacks(:find) unless doc._find_callbacks.empty?
         doc.run_callbacks(:initialize) unless doc._initialize_callbacks.empty?

data/lib/mongoid/errors.rb

@@ -2,6 +2,7 @@
 require "mongoid/errors/mongoid_error"
 require "mongoid/errors/ambiguous_relationship"
 require "mongoid/errors/callback"
+require "mongoid/errors/document_not_destroyed"
 require "mongoid/errors/document_not_found"
 require "mongoid/errors/eager_load"
 require "mongoid/errors/invalid_collection"
@@ -16,7 +17,9 @@ require "mongoid/errors/invalid_path"
 require "mongoid/errors/invalid_scope"
 require "mongoid/errors/invalid_set_polymorphic_relation"
 require "mongoid/errors/invalid_storage_options"
+require "mongoid/errors/invalid_storage_parent"
 require "mongoid/errors/invalid_time"
+require "mongoid/errors/invalid_value"
 require "mongoid/errors/inverse_not_found"
 require "mongoid/errors/mixed_relations"
 require "mongoid/errors/mixed_session_configuration"
@@ -31,11 +34,11 @@ require "mongoid/errors/no_sessions_config"
 require "mongoid/errors/no_session_database"
 require "mongoid/errors/no_session_hosts"
 require "mongoid/errors/readonly_attribute"
+require "mongoid/errors/readonly_document"
 require "mongoid/errors/scope_overwrite"
 require "mongoid/errors/too_many_nested_attribute_records"
 require "mongoid/errors/unknown_attribute"
 require "mongoid/errors/unsaved_document"
 require "mongoid/errors/unsupported_javascript"
 require "mongoid/errors/validations"
-require "mongoid/errors/versioning_not_on_root"
 require "mongoid/errors/delete_restriction"

data/lib/mongoid/errors/document_not_destroyed.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # Raised when attempting to destroy a document that had destory callbacks
+    # return false.
+    #
+    # @since 4.0.0
+    class DocumentNotDestroyed < MongoidError
+
+      # Instnatiate the exception.
+      #
+      # @example Create the error.
+      #   DocumentNotDestroyed.new(Band)
+      #
+      # @param [ Object ] id The document id.
+      # @param [ Class ] klass The document class.
+      #
+      # @since 4.0.0
+      def initialize(id, klass)
+        super(compose_message("document_not_destroyed", { id: id.inspect, klass: klass }))
+      end
+    end
+  end
+end

data/lib/mongoid/errors/document_not_found.rb

@@ -22,8 +22,9 @@ module Mongoid
       # @param [ Array ] unmatched The unmatched ids, if appropriate
       def initialize(klass, params, unmatched = nil)
         if !unmatched && !params.is_a?(Hash)
-          raise ArgumentError, 'please also supply the unmatched ids'
+          unmatched = Array(params)
         end
+
         @klass, @params = klass, params
         super(
           compose_message(

data/lib/mongoid/errors/invalid_storage_options.rb

@@ -8,7 +8,7 @@ module Mongoid
       # Create the new error.
       #
       # @example Create the new error.
-      #   InvalidStorageOptions.new(:collection_name)
+      #   InvalidStorageOptions.new(Person, invalid_option: 'name')
       #
       # @param [ Class ] klass The model class.
       # @param [ Hash, String, Symbol ] options The provided options.

data/lib/mongoid/errors/invalid_storage_parent.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # Raised when calling store_in in a sub-class of Mongoid::Document
+    class InvalidStorageParent < MongoidError
+
+      # Create the new error.
+      #
+      # @example Create the new error.
+      #    InvalidStorageParent.new(Person)
+      #
+      # @param [ Class ] klass The model class.
+      #
+      # @since 4.0.0
+      def initialize(klass)
+        super(
+          compose_message(
+            "invalid_storage_parent",
+            { klass: klass }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/invalid_value.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # This error is raised when trying to set an attribute with an invalid value.
+    # For example when try to set an Array value to a Hash attribute.
+    #
+    class InvalidValue < MongoidError
+      def initialize(field_class, value_class)
+        super(
+          compose_message("invalid_value", { value_class: value_class, field_class: field_class  })
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/mongoid_error.rb

@@ -40,7 +40,7 @@ module Mongoid
       #
       # @return [ String ] A localized error message string.
       def translate(key, options)
-        ::I18n.translate("#{BASE_KEY}.#{key}", { locale: :en }.merge(options))
+        ::I18n.translate("#{BASE_KEY}.#{key}", options)
       end
 
       # Create the problem.

data/lib/mongoid/errors/readonly_document.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # Raised when attempting to persist a document that was loaded from the
+    # database with partial fields.
+    #
+    # @since 4.0.0
+    class ReadonlyDocument < MongoidError
+
+      # Instnatiate the exception.
+      #
+      # @example Create the error.
+      #   ReadonlyDocument.new(Band)
+      #
+      # @param [ Class ] klass The document class.
+      #
+      # @since 4.0.0
+      def initialize(klass)
+        super(compose_message("readonly_document", { klass: klass }))
+      end
+    end
+  end
+end

data/lib/mongoid/extensions.rb

@@ -1,12 +1,7 @@
 # encoding: utf-8
-unless defined?(Boolean)
-  class Boolean; end
-end
-
-class Moped::BSON::ObjectId
-  undef :as_json
+class BSON::ObjectId
   def as_json(options = nil)
-    to_s
+    { "$oid" => to_s }
   end
   def to_xml(options = nil)
     ActiveSupport::XmlMini.to_tag(options[:root], self.to_s, options)
@@ -17,6 +12,19 @@ class Symbol
   remove_method :size if instance_methods.include? :size # temporal fix for ruby 1.9
 end
 
+class BSON::Document
+  # We need to override this as ActiveSupport creates a new Object, instead of a new Hash
+  # see https://github.com/rails/rails/commit/f1bad130d0c9bd77c94e43b696adca56c46a66aa
+  def transform_keys
+    return enum_for(:transform_keys) unless block_given?
+    result = {}
+    each_key do |key|
+      result[yield(key)] = self[key]
+    end
+    result
+  end
+end
+
 require "mongoid/extensions/array"
 require "mongoid/extensions/big_decimal"
 require "mongoid/extensions/boolean"

data/lib/mongoid/extensions/array.rb

@@ -8,7 +8,7 @@ module Mongoid
       # @example Evolve the array to object ids.
       #   [ id ].__evolve_object_id__
       #
-      # @return [ Array<Moped::BSON::ObjectId> ] The converted array.
+      # @return [ Array<BSON::ObjectId> ] The converted array.
       #
       # @since 3.0.0
       def __evolve_object_id__
@@ -33,7 +33,7 @@ module Mongoid
       # @example Evolve the array to object ids.
       #   [ id ].__mongoize_object_id__
       #
-      # @return [ Array<Moped::BSON::ObjectId> ] The converted array.
+      # @return [ Array<BSON::ObjectId> ] The converted array.
       #
       # @since 3.0.0
       def __mongoize_object_id__
@@ -177,4 +177,4 @@ module Mongoid
 end
 
 ::Array.__send__(:include, Mongoid::Extensions::Array)
-::Array.__send__(:extend, Mongoid::Extensions::Array::ClassMethods)
+::Array.extend(Mongoid::Extensions::Array::ClassMethods)