mongoid 3.1.7 → 4.0.0.alpha1

data/lib/mongoid/criteria.rb

@@ -1,9 +1,10 @@
 # encoding: utf-8
-require "mongoid/criterion/inspection"
-require "mongoid/criterion/findable"
-require "mongoid/criterion/marshalable"
-require "mongoid/criterion/modifiable"
-require "mongoid/criterion/scoping"
+require "mongoid/criteria/findable"
+require "mongoid/criteria/inspectable"
+require "mongoid/criteria/marshalable"
+require "mongoid/criteria/modifiable"
+require "mongoid/criteria/scopable"
+require "mongoid/sessions/options"
 
 module Mongoid
 
@@ -17,11 +18,12 @@ module Mongoid
     include Enumerable
     include Contextual
     include Origin::Queryable
-    include Criterion::Inspection
-    include Criterion::Findable
-    include Criterion::Marshalable
-    include Criterion::Modifiable
-    include Criterion::Scoping
+    include Findable
+    include Inspectable
+    include Marshalable
+    include Modifiable
+    include Scopable
+    include Sessions::Options
 
     # Static array used to check with method missing - we only need to ever
     # instantiate once.
@@ -197,9 +199,6 @@ module Mongoid
     # into the identity map who's ids match based on the extra query for the
     # ids.
     #
-    # @note This will only work if Mongoid's identity map is enabled. To do
-    #   so set identity_map_enabled: true in your mongoid.yml
-    #
     # @note This will work for embedded relations that reference another
     #   collection via belongs_to as well.
     #
@@ -396,25 +395,6 @@ module Mongoid
       super
     end
 
-    # Tell the next persistance operation to query from a specific collection,
-    # database or session.
-    #
-    # @example Send the criteria to another collection.
-    #   Band.where(name: "Depeche Mode").with(collection: "artists")
-    #
-    # @param [ Hash ] options The storage options.
-    #
-    # @option options [ String, Symbol ] :collection The collection name.
-    # @option options [ String, Symbol ] :database The database name.
-    # @option options [ String, Symbol ] :session The session name.
-    #
-    # @return [ Criteria ] The criteria.
-    #
-    # @since 3.0.0
-    def with(options)
-      Threaded.set_persistence_options(klass, options)
-      self
-    end
 
     # Get a version of this criteria without the options.
     #
@@ -445,7 +425,7 @@ module Mongoid
     #
     # @since 3.1.0
     def for_js(javascript, scope = {})
-      js_query(Moped::BSON::Code.new(javascript, scope))
+      js_query(BSON::CodeWithScope.new(javascript, scope))
     end
 
     private

data/lib/mongoid/criteria/{#findable.rb# → findable.rb}

@@ -37,8 +37,6 @@ module Mongoid
       def find(*args)
         ids = args.__find_args__
         raise_invalid if ids.any?(&:nil?)
-        p "YOOO"
-        p ids
         for_ids(ids).execute_or_raise(ids, args.multi_arged?)
       end
 

data/lib/mongoid/{criterion/inspection.rb → criteria/inspectable.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid
-  module Criterion
-    module Inspection
+  class Criteria
+    module Inspectable
 
       # Get a pretty string representation of the criteria, including the
       # selector, options, matching count and documents for inspection.

data/lib/mongoid/{criterion → criteria}/marshalable.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Criterion
+  class Criteria
     module Marshalable
 
       # Provides the data needed to Marshal.dump a criteria.
@@ -21,6 +21,8 @@ module Mongoid
       # @example Load the criteria.
       #   Marshal.load(criteria)
       #
+      # @param [ Array ] data The raw data.
+      #
       # @since 3.0.15
       def marshal_load(data)
         @scoping_options, raw_selector, raw_options = data.pop(3)

data/lib/mongoid/{criterion → criteria}/modifiable.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Criterion
+  class Criteria
     module Modifiable
 
       # Build a document given the selector and return it.

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,11 +1,29 @@
 # 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/state"
+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_reader :new_record
@@ -56,7 +74,7 @@ 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
@@ -73,25 +91,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
@@ -182,10 +199,11 @@ module Mongoid
         raise ArgumentError, "A class which includes Mongoid::Document is expected"
       end
 
-      became = klass.new(clone_document, without_protection: true)
+      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 +219,6 @@ module Mongoid
         end
       end
 
-      IdentityMap.set(became) unless became.new_record?
       became
     end
 
@@ -296,7 +313,6 @@ module Mongoid
         doc.criteria_instance_id = criteria_instance_id
         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

@@ -17,6 +17,7 @@ require "mongoid/errors/invalid_scope"
 require "mongoid/errors/invalid_set_polymorphic_relation"
 require "mongoid/errors/invalid_storage_options"
 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"
@@ -37,5 +38,4 @@ 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_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_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/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)

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__

data/lib/mongoid/extensions/boolean.rb

@@ -1,24 +1,21 @@
 # encoding: utf-8
 module Mongoid
-  module Extensions
-    module Boolean
-      module ClassMethods
+  class Boolean
 
-        # Turn the object from the ruby type we deal with to a Mongo friendly
-        # type.
-        #
-        # @example Mongoize the object.
-        #   Boolean.mongoize("123.11")
-        #
-        # @return [ String ] The object mongoized.
-        #
-        # @since 3.0.0
-        def mongoize(object)
-          evolve(object)
-        end
+    class << self
+
+      # Turn the object from the ruby type we deal with to a Mongo friendly
+      # type.
+      #
+      # @example Mongoize the object.
+      #   Boolean.mongoize("123.11")
+      #
+      # @return [ String ] The object mongoized.
+      #
+      # @since 3.0.0
+      def mongoize(object)
+        ::Boolean.evolve(object)
       end
     end
   end
 end
-
-::Boolean.__send__(:extend, Mongoid::Extensions::Boolean::ClassMethods)

data/lib/mongoid/extensions/float.rb

@@ -47,6 +47,7 @@ module Mongoid
             nil
           end
         end
+        alias :demongoize :mongoize
       end
     end
   end

data/lib/mongoid/extensions/hash.rb

@@ -170,7 +170,7 @@ module Mongoid
         field = klass.fields[key.to_s]
         if field
           val = field.mongoize(value)
-          if Mongoid::Persistence::LIST_OPERATIONS.include?(operator) && field.resizable?
+          if Mongoid::Persistable::LIST_OPERATIONS.include?(operator) && field.resizable?
             val = val.first if !value.is_a?(Array)
           end
           val

data/lib/mongoid/extensions/object.rb

@@ -115,8 +115,8 @@ module Mongoid
       #
       # @since 2.0.0.rc.1
       def ivar(name)
-        if instance_variable_defined?("@#{name}")
-          return instance_variable_get("@#{name}")
+        if instance_variable_defined?("@_#{name}")
+          return instance_variable_get("@_#{name}")
         else
           false
         end
@@ -170,8 +170,8 @@ module Mongoid
       #
       # @since 2.1.0
       def remove_ivar(name)
-        if instance_variable_defined?("@#{name}")
-          return remove_instance_variable("@#{name}")
+        if instance_variable_defined?("@_#{name}")
+          return remove_instance_variable("@_#{name}")
         else
           false
         end

data/lib/mongoid/extensions/object_id.rb

@@ -8,7 +8,7 @@ module Mongoid
       # @example Evolve the object id.
       #   object_id.__evolve_object_id__
       #
-      # @return [ Moped::BSON::ObjectId ] self.
+      # @return [ BSON::ObjectId ] self.
       #
       # @since 3.0.0
       def __evolve_object_id__
@@ -25,7 +25,7 @@ module Mongoid
         #
         # @param [ Object ] object The object to evolve.
         #
-        # @return [ Moped::BSON::ObjectId ] The object id.
+        # @return [ BSON::ObjectId ] The object id.
         #
         # @since 3.0.0
         def evolve(object)
@@ -39,7 +39,7 @@ module Mongoid
         #
         # @param [ Object ] object The object to convert.
         #
-        # @return [ Moped::BSON::ObjectId ] The object id.
+        # @return [ BSON::ObjectId ] The object id.
         #
         # @since 3.0.0
         def mongoize(object)
@@ -50,5 +50,5 @@ module Mongoid
   end
 end
 
-Moped::BSON::ObjectId.__send__(:include, Mongoid::Extensions::ObjectId)
-Moped::BSON::ObjectId.__send__(:extend, Mongoid::Extensions::ObjectId::ClassMethods)
+BSON::ObjectId.__send__(:include, Mongoid::Extensions::ObjectId)
+BSON::ObjectId.__send__(:extend, Mongoid::Extensions::ObjectId::ClassMethods)

data/lib/mongoid/extensions/range.rb

@@ -53,7 +53,7 @@ module Mongoid
         #
         # @since 3.0.0
         def demongoize(object)
-          object.nil? ? nil : ::Range.new(object["min"], object["max"])
+          object.nil? ? nil : ::Range.new(object["min"], object["max"], object["exclude_end"])
         end
 
         # Turn the object from the ruby type we deal with to a Mongo friendly
@@ -68,7 +68,13 @@ module Mongoid
         #
         # @since 3.0.0
         def mongoize(object)
-          object.nil? ? nil : { "min" => object.first, "max" => object.last }
+          return nil if object.nil?
+          return object if object.is_a?(::Hash)
+          hash = { "min" => object.first, "max" => object.last }
+          if object.respond_to?(:exclude_end?) && object.exclude_end?
+            hash.merge!("exclude_end" => true)
+          end
+          hash
         end
       end
     end