mongoid 4.0.0.alpha2 → 4.0.0.beta1

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/document.rb

@@ -13,7 +13,6 @@ require "mongoid/equality"
 require "mongoid/criteria"
 require "mongoid/factory"
 require "mongoid/fields"
-require "mongoid/state"
 require "mongoid/timestamps"
 require "mongoid/composable"
 
@@ -25,7 +24,7 @@ module Mongoid
     extend ActiveSupport::Concern
     include Composable
 
-    attr_accessor :criteria_instance_id
+    attr_accessor :__selected_fields
     attr_reader :new_record
 
     included do
@@ -301,16 +300,16 @@ 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
         yield(doc) if block_given?

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"
@@ -32,6 +33,7 @@ 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"

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/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/boolean.rb

@@ -16,6 +16,7 @@ module Mongoid
       def mongoize(object)
         ::Boolean.evolve(object)
       end
+      alias :evolve :mongoize
     end
   end
 end

data/lib/mongoid/extensions/hash.rb

@@ -40,7 +40,7 @@ module Mongoid
         each_pair do |key, value|
           if key =~ /\$/
             value.each_pair do |_key, _value|
-              value[_key] = mongoize_for(key, klass, _key, _value)
+              value[_key] = (key == "$rename") ? _value.to_s : mongoize_for(key, klass, _key, _value)
             end
             (consolidated[key] ||= {}).merge!(value)
           else

data/lib/mongoid/factory.rb

@@ -32,14 +32,16 @@ module Mongoid
     #
     # @param [ Class ] klass The class to instantiate from if _type is not present.
     # @param [ Hash ] attributes The document attributes.
+    # @param [ Array ] selected_fields If instantiated from a criteria using
+    #   #only we give the document a list of the selected fields.
     #
     # @return [ Document ] The instantiated document.
-    def from_db(klass, attributes = nil, criteria_instance_id = nil)
+    def from_db(klass, attributes = nil, selected_fields = nil)
       type = (attributes || {})["_type"]
       if type.blank?
-        klass.instantiate(attributes, criteria_instance_id)
+        klass.instantiate(attributes, selected_fields)
       else
-        type.camelize.constantize.instantiate(attributes, criteria_instance_id)
+        type.camelize.constantize.instantiate(attributes, selected_fields)
       end
     end
   end

data/lib/mongoid/fields.rb

@@ -10,6 +10,28 @@ module Mongoid
   module Fields
     extend ActiveSupport::Concern
 
+    # For fields defined with symbols use the correct class.
+    #
+    # @since 4.0.0
+    TYPE_MAPPINGS = {
+      array: Array,
+      big_decimal: BigDecimal,
+      binary: BSON::Binary,
+      boolean: Mongoid::Boolean,
+      date: Date,
+      date_time: DateTime,
+      float: Float,
+      hash: Hash,
+      integer: Integer,
+      object_id: BSON::ObjectId,
+      range: Range,
+      regexp: Regexp,
+      set: Set,
+      string: String,
+      symbol: Symbol,
+      time: Time
+    }.with_indifferent_access
+
     included do
       class_attribute :aliased_fields
       class_attribute :localized_fields
@@ -533,10 +555,20 @@ module Mongoid
 
       def field_for(name, options)
         opts = options.merge(klass: self)
+        type_mapping = TYPE_MAPPINGS[options[:type]]
+        opts[:type] = type_mapping || unmapped_type(options)
         return Fields::Localized.new(name, opts) if options[:localize]
         return Fields::ForeignKey.new(name, opts) if options[:identity]
         Fields::Standard.new(name, opts)
       end
+
+      def unmapped_type(options)
+        if "Boolean" == options[:type].to_s
+          Mongoid::Boolean
+        else
+          options[:type] || Object
+        end
+      end
     end
   end
 end

data/lib/mongoid/fields/localized.rb

@@ -63,7 +63,7 @@ module Mongoid
       def lookup(object)
         locale = ::I18n.locale
         if ::I18n.respond_to?(:fallbacks)
-          object[::I18n.fallbacks[locale].map(&:to_s).find{ |loc| object[loc] }]
+          object[::I18n.fallbacks[locale].map(&:to_s).find{ |loc| object.has_key?(loc) }]
         else
           object[locale.to_s]
         end

data/lib/mongoid/fields/standard.rb

@@ -50,7 +50,7 @@ module Mongoid
       #
       # @since 2.1.8
       def eval_default(doc)
-        if fields = Threaded.selection(doc.criteria_instance_id)
+        if fields = doc.__selected_fields
           evaluated_default(doc) if included?(fields)
         else
           evaluated_default(doc)

data/lib/mongoid/findable.rb

@@ -21,6 +21,7 @@ module Mongoid
       :extras,
       :find_and_modify,
       :find_or_create_by,
+      :find_or_create_by!,
       :find_or_initialize_by,
       :first_or_create,
       :first_or_create!,

data/lib/mongoid/interceptable.rb

@@ -125,7 +125,13 @@ module Mongoid
     # @since 2.3.0
     def run_callbacks(kind, *args, &block)
       cascadable_children(kind).each do |child|
-        unless child.run_callbacks(child_callback_type(kind, child), *args)
+        # This is returning false for some destroy tests on 4.1.0.beta1,
+        # causing them to fail since 4.1.0 expects a block to be passed if the
+        # callbacks for the type are empty. If no block is passed then the nil
+        # return value gets interpreted as false and halts the chain.
+        #
+        # @see https://github.com/rails/rails/blob/master/activesupport/lib/active_support/callbacks.rb#L79
+        if child.run_callbacks(child_callback_type(kind, child), *args) == false
           return false
         end
       end
@@ -170,7 +176,7 @@ module Mongoid
           relation = send(name)
           Array.wrap(relation).each do |child|
             next if children.include?(child)
-            children.add(child) if cascadable_child?(kind, child)
+            children.add(child) if cascadable_child?(kind, child, metadata)
             child.send(:cascadable_children, kind, children)
           end
         end
@@ -189,10 +195,9 @@ module Mongoid
     # @return [ true, false ] If the child should fire the callback.
     #
     # @since 2.3.0
-    def cascadable_child?(kind, child)
-      if kind == :initialize || kind == :find
-        return false
-      end
+    def cascadable_child?(kind, child, metadata)
+      return false if kind == :initialize || kind == :find
+      return false if kind == :validate && metadata.validate?
       child.callback_executable?(kind) ? child.in_callback_state?(kind) : false
     end
 

data/lib/mongoid/log_subscriber.rb

@@ -1,6 +1,13 @@
+# encoding: utf-8
 module Mongoid
-
+  # A Log subscriber to the moped queries
+  #
+  # @since 4.0.0
   class LogSubscriber < ActiveSupport::LogSubscriber
+
+    # Log the query operation on moped
+    #
+    # @since 4.0.0
     def query(event)
       return unless logger.debug?
 
@@ -9,10 +16,35 @@ module Mongoid
       debug(payload[:prefix], payload[:ops], runtime)
     end
 
+    def query_cache(event)
+      return unless logger.debug?
+
+      database, collection, selector = event.payload[:key]
+      operation = "%-12s database=%s collection=%s selector=%s" % ["QUERY CACHE", database, collection, selector.inspect]
+      logger.debug operation
+    end
+    # Log the provided operations.
+    #
+    # @example Delegates the operation to moped so it can log it.
+    #   subscriber.debug("MOPED", {}, 30)
+    #
+    # @param [ String ] prefix The prefix for all operations in the log.
+    # @param [ Array ] ops The operations.
+    # @param [ String ] runtime The runtime in formatted ms.
+    #
+    # @since 4.0.0
     def debug(prefix, operations, runtime)
       Moped::Loggable.log_operations(prefix, operations, runtime)
     end
 
+    # Get the logger.
+    #
+    # @example Get the logger.
+    #   subscriber.logger
+    #
+    # @return [ Logger ] The logger.
+    #
+    # @since 4.0.0
     def logger
       Moped.logger
     end
@@ -20,3 +52,4 @@ module Mongoid
 end
 
 Mongoid::LogSubscriber.attach_to :moped
+Mongoid::LogSubscriber.attach_to :mongoid

data/lib/mongoid/persistable/deletable.rb

@@ -19,6 +19,7 @@ module Mongoid
       #
       # @since 1.0.0
       def delete(options = {})
+        raise Errors::ReadonlyDocument.new(self.class) if readonly?
         prepare_delete do
           if embedded?
             delete_as_embedded(options)

data/lib/mongoid/persistable/destroyable.rb

@@ -18,13 +18,18 @@ module Mongoid
       # @return [ true, false ] True if successful, false if not.
       #
       # @since 1.0.0
-      def destroy(options = {})
+      def destroy(options = nil)
+        raise Errors::ReadonlyDocument.new(self.class) if readonly?
         self.flagged_for_destroy = true
-        result = run_callbacks(:destroy) { delete(options) }
+        result = run_callbacks(:destroy) { delete(options || {}) }
         self.flagged_for_destroy = false
         result
       end
 
+      def destroy!(options = {})
+        destroy || raise(Errors::DocumentNotDestroyed.new(id, self.class))
+      end
+
       module ClassMethods
 
         # Delete all documents given the supplied conditions. If no conditions

data/lib/mongoid/persistable/updatable.rb

@@ -8,32 +8,6 @@ module Mongoid
     # @since 4.0.0
     module Updatable
 
-      # Update the document in the database.
-      #
-      # @example Update an existing document.
-      #   document.update
-      #
-      # @param [ Hash ] options Options to pass to update.
-      #
-      # @option options [ true, false ] :validate Whether or not to validate.
-      #
-      # @return [ true, false ] True if succeeded, false if not.
-      #
-      # @since 1.0.0
-      def update_document(options = {})
-        prepare_update(options) do
-          updates, conflicts = init_atomic_updates
-          unless updates.empty?
-            coll = _root.collection
-            selector = atomic_selector
-            coll.find(selector).update(positionally(selector, updates))
-            conflicts.each_pair do |key, value|
-              coll.find(selector).update(positionally(selector, { key => value }))
-            end
-          end
-        end
-      end
-
       # Update a single attribute and persist the entire document.
       # This skips validation but fires the callbacks.
       #
@@ -146,6 +120,33 @@ module Mongoid
         end
         post_process_persist(result, options) and result
       end
+
+      # Update the document in the database.
+      #
+      # @example Update an existing document.
+      #   document.update
+      #
+      # @param [ Hash ] options Options to pass to update.
+      #
+      # @option options [ true, false ] :validate Whether or not to validate.
+      #
+      # @return [ true, false ] True if succeeded, false if not.
+      #
+      # @since 1.0.0
+      def update_document(options = {})
+        raise Errors::ReadonlyDocument.new(self.class) if readonly?
+        prepare_update(options) do
+          updates, conflicts = init_atomic_updates
+          unless updates.empty?
+            coll = _root.collection
+            selector = atomic_selector
+            coll.find(selector).update(positionally(selector, updates))
+            conflicts.each_pair do |key, value|
+              coll.find(selector).update(positionally(selector, { key => value }))
+            end
+          end
+        end
+      end
     end
   end
 end