mongoid 3.1.7 → 4.0.2

data/lib/mongoid/extensions/time.rb

@@ -68,8 +68,8 @@ module Mongoid
           return nil if object.blank?
           begin
             time = object.__mongoize_time__
-            if time.respond_to?(:sec_fraction)
-              ::Time.at(time.to_i, time.sec_fraction * 10**6).utc
+            if object.respond_to?(:sec_fraction)
+              ::Time.at(time.to_i, object.sec_fraction * 10**6).utc
             elsif time.respond_to?(:subsec)
               ::Time.at(time.to_i, time.subsec * 10**6).utc
             else
@@ -85,4 +85,4 @@ module Mongoid
 end
 
 ::Time.__send__(:include, Mongoid::Extensions::Time)
-::Time.__send__(:extend, Mongoid::Extensions::Time::ClassMethods)
+::Time.extend(Mongoid::Extensions::Time::ClassMethods)

data/lib/mongoid/extensions/time_with_zone.rb

@@ -53,4 +53,4 @@ module Mongoid
 end
 
 ::ActiveSupport::TimeWithZone.__send__(:include, Mongoid::Extensions::TimeWithZone)
-::ActiveSupport::TimeWithZone.__send__(:extend, Mongoid::Extensions::TimeWithZone::ClassMethods)
+::ActiveSupport::TimeWithZone.extend(Mongoid::Extensions::TimeWithZone::ClassMethods)

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

@@ -15,12 +15,12 @@ module Mongoid
     # @param [ Hash ] options The mass assignment scoping options.
     #
     # @return [ Document ] The instantiated document.
-    def build(klass, attributes = nil, options = {})
+    def build(klass, attributes = nil)
       type = (attributes || {})["_type"]
       if type && klass._types.include?(type)
-        type.constantize.new(attributes, options)
+        type.constantize.new(attributes)
       else
-        klass.new(attributes, options)
+        klass.new(attributes)
       end
     end
 
@@ -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/foreign_key.rb

@@ -99,12 +99,12 @@ module Mongoid
         end
       end
 
-      # Is the field a Moped::BSON::ObjectId?
+      # Is the field a BSON::ObjectId?
       #
-      # @example Is the field a Moped::BSON::ObjectId?
+      # @example Is the field a BSON::ObjectId?
       #   field.object_id_field?
       #
-      # @return [ true, false ] If the field is a Moped::BSON::ObjectId.
+      # @return [ true, false ] If the field is a BSON::ObjectId.
       #
       # @since 2.2.0
       def object_id_field?

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)
@@ -131,16 +131,16 @@ module Mongoid
         @metadata ||= options[:metadata]
       end
 
-      # Is the field a Moped::BSON::ObjectId?
+      # Is the field a BSON::ObjectId?
       #
-      # @example Is the field a Moped::BSON::ObjectId?
+      # @example Is the field a BSON::ObjectId?
       #   field.object_id_field?
       #
-      # @return [ true, false ] If the field is a Moped::BSON::ObjectId.
+      # @return [ true, false ] If the field is a BSON::ObjectId.
       #
       # @since 2.2.0
       def object_id_field?
-        @object_id_field ||= (type == Moped::BSON::ObjectId)
+        @object_id_field ||= (type == BSON::ObjectId)
       end
 
       # Does the field pre-process its default value?
@@ -168,18 +168,6 @@ module Mongoid
         @type ||= options[:type] || Object
       end
 
-      # Is this field included in versioned attributes?
-      #
-      # @example Is the field versioned?
-      #   field.versioned?
-      #
-      # @return [ true, false ] If the field is included in versioning.
-      #
-      # @since 2.1.0
-      def versioned?
-        @versioned ||= (options[:versioned].nil? ? true : options[:versioned])
-      end
-
       private
 
       # Get the name of the default method for this field.

data/lib/mongoid/fields/validators/macro.rb

@@ -17,7 +17,7 @@ module Mongoid
           :pre_processed,
           :subtype,
           :type,
-          :versioned
+          :overwrite
         ]
 
         # Validate the field definition.
@@ -31,7 +31,7 @@ module Mongoid
         #
         # @since 3.0.0
         def validate(klass, name, options)
-          validate_name(klass, name)
+          validate_name(klass, name, options)
           validate_options(klass, name, options)
         end
 
@@ -50,9 +50,19 @@ module Mongoid
         # @raise [ Errors::InvalidField ] If the name is not allowed.
         #
         # @since 3.0.0
-        def validate_name(klass, name)
-          if Mongoid.destructive_fields.include?(name)
-            raise Errors::InvalidField.new(klass, name)
+        def validate_name(klass, name, options)
+          [name, "#{name}?".to_sym, "#{name}=".to_sym].each do |n|
+            if Mongoid.destructive_fields.include?(n)
+              raise Errors::InvalidField.new(klass, n)
+            end
+          end
+
+          if !options[:overwrite] && klass.fields.keys.include?(name.to_s)
+            if Mongoid.duplicate_fields_exception
+              raise Errors::InvalidField.new(klass, name)
+            else
+              Mongoid.logger.warn("Overwriting existing field #{name} in class #{klass.name}.") if Mongoid.logger
+            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
@@ -25,15 +47,13 @@ module Mongoid
 
       field(
         :_id,
-        default: ->{ Moped::BSON::ObjectId.new },
+        default: ->{ BSON::ObjectId.new },
         pre_processed: true,
-        type: Moped::BSON::ObjectId
+        type: BSON::ObjectId
       )
 
       alias :id :_id
       alias :id= :_id=
-
-      attr_protected(:id, :_id, :_type) if Mongoid.protect_sensitive_fields?
     end
 
     # Apply all default values to the document which are not procs.
@@ -264,13 +284,13 @@ module Mongoid
         add_field(name, fields[name].options.merge(type: type))
       end
 
-      # Convenience method for determining if we are using +Moped::BSON::ObjectIds+ as
+      # Convenience method for determining if we are using +BSON::ObjectIds+ as
       # our id.
       #
       # @example Does this class use object ids?
       #   person.using_object_ids?
       #
-      # @return [ true, false ] If the class uses Moped::BSON::ObjectIds for the id.
+      # @return [ true, false ] If the class uses BSON::ObjectIds for the id.
       #
       # @since 1.0.0
       def using_object_ids?
@@ -434,10 +454,11 @@ module Mongoid
       def create_field_setter(name, meth, field)
         generated_methods.module_eval do
           re_define_method("#{meth}=") do |value|
-            write_attribute(name, value)
+            val = write_attribute(name, value)
             if field.foreign_key?
               remove_ivar(field.metadata.name)
             end
+            val
           end
         end
       end
@@ -472,8 +493,9 @@ module Mongoid
       def create_translations_getter(name, meth)
         generated_methods.module_eval do
           re_define_method("#{meth}_translations") do
-            attributes[name] ||= {}
+            (attributes[name] ||= {}).with_indifferent_access
           end
+          alias_method :"#{meth}_t", :"#{meth}_translations"
         end
       end
 
@@ -498,6 +520,7 @@ module Mongoid
             end
             attributes[name] = value
           end
+          alias_method :"#{meth}_t=", :"#{meth}_translations="
         end
       end
 
@@ -532,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/{finders.rb → findable.rb}

@@ -3,7 +3,9 @@ module Mongoid
 
   # This module defines the finder methods that hang off the document at the
   # class level.
-  module Finders
+  #
+  # @since 4.0.0
+  module Findable
     extend Origin::Forwardable
 
     select_with :with_default_scope
@@ -19,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!,
@@ -29,8 +32,10 @@ module Mongoid
       :map_reduce,
       :max,
       :min,
+      :none,
       :pluck,
       :sum,
+      :text_search,
       :update,
       :update_all, to: :with_default_scope
 
@@ -76,7 +81,7 @@ module Mongoid
     # on the conditions provided and the first parameter.
     #
     # @example Find a single document by an id.
-    #   Person.find(Moped::BSON::ObjectId)
+    #   Person.find(BSON::ObjectId)
     #
     # @param [ Array ] args An assortment of finder options.
     #
@@ -85,21 +90,24 @@ module Mongoid
       with_default_scope.find(*args)
     end
 
-    # Find the first +Document+ given the conditions, or raises
-    # Mongoid::Errors::DocumentNotFound
+    # Find the first +Document+ given the conditions.
+    # If a matching Document is not found and
+    # Mongoid.raise_not_found_error is true it raises
+    # Mongoid::Errors::DocumentNotFound, return null nil elsewise.
     #
     # @example Find the document by attribute other than id
     #   Person.find_by(:username => "superuser")
     #
     # @param [ Hash ] attrs The attributes to check.
     #
-    # @raise [ Errors::DocumentNotFound ] If no document found.
+    # @raise [ Errors::DocumentNotFound ] If no document found
+    # and Mongoid.raise_not_found_error is true.
     #
-    # @return [ Document ] A matching document.
+    # @return [ Document, nil ] A matching document.
     #
     # @since 3.0.0
     def find_by(attrs = {})
-      result = where(attrs).first
+      result = where(attrs).find_first
       if result.nil? && Mongoid.raise_not_found_error
         raise(Errors::DocumentNotFound.new(self, attrs))
       end
@@ -107,6 +115,25 @@ module Mongoid
       result
     end
 
+    # Find the first +Document+ given the conditions, or raises
+    # Mongoid::Errors::DocumentNotFound
+    #
+    # @example Find the document by attribute other than id
+    #   Person.find_by(:username => "superuser")
+    #
+    # @param [ Hash ] attrs The attributes to check.
+    #
+    # @raise [ Errors::DocumentNotFound ] If no document found.
+    #
+    # @return [ Document ] A matching document.
+    #
+    def find_by!(attrs = {})
+      result = where(attrs).find_first
+      raise(Errors::DocumentNotFound.new(self, attrs)) unless result
+      yield(result) if result && block_given?
+      result
+    end
+
     # Find the first +Document+ given the conditions.
     #
     # @example Find the first document.
@@ -116,6 +143,7 @@ module Mongoid
     def first
       with_default_scope.first
     end
+    alias :one :first
 
     # Find the last +Document+ given the conditions.
     #

data/lib/mongoid/indexable/specification.rb

@@ -0,0 +1,104 @@
+# encoding: utf-8
+module Mongoid
+  module Indexable
+
+    # Encapsulates behaviour around an index specification.
+    #
+    # @since 4.0.0
+    class Specification
+
+      # The mappings of nice Ruby-style names to the corresponding MongoDB
+      # name.
+      #
+      # @since 4.0.0
+      MAPPINGS = {
+        bucket_size: :bucketSize,
+        drop_dups: :dropDups,
+        expire_after_seconds: :expireAfterSeconds
+      }
+
+      # @!attribute klass
+      #   @return [ Class ] The class the index is defined on.
+      # @!attribute key
+      #   @return [ Hash ] The index key.
+      # @!attribute options
+      #   @return [ Hash ] The index options.
+      attr_reader :klass, :key, :fields, :options
+
+      # Is this index specification equal to another?
+      #
+      # @example Check equality of the specifications.
+      #   specification == other
+      #
+      # @param [ Specification ] other The spec to compare against.
+      #
+      # @return [ true, false ] If the specs are equal.
+      #
+      # @since 4.0.0
+      def ==(other)
+        fields == other.fields && key == other.key
+      end
+
+      # Instantiate a new index specification.
+      #
+      # @example Create the new specification.
+      #   Specification.new(Band, { name: 1 }, background: true)
+      #
+      # @param [ Class ] klass The class the index is defined on.
+      # @param [ Hash ] key The hash of name/direction pairs.
+      # @param [ Hash ] opts the index options.
+      #
+      # @since 4.0.0
+      def initialize(klass, key, opts = nil)
+        options = opts || {}
+        Validators::Options.validate(klass, key, options)
+        @klass = klass
+        @key = normalize_key(key)
+        @fields = @key.keys
+        @options = normalize_options(options.dup)
+      end
+
+      private
+
+      # Normalize the spec, in case aliased fields are provided.
+      #
+      # @api private
+      #
+      # @example Normalize the spec.
+      #   specification.normalize_key(name: 1)
+      #
+      # @param [ Hash ] key The index key(s).
+      #
+      # @return [ Hash ] The normalized specification.
+      #
+      # @since 4.0.0
+      def normalize_key(key)
+        normalized = {}
+        key.each_pair do |name, direction|
+          normalized[klass.database_field_name(name).to_sym] = direction
+        end
+        normalized
+      end
+
+      # Normalize the index options, if any are provided.
+      #
+      # @api private
+      #
+      # @example Normalize the index options.
+      #   specification.normalize_options(drop_dups: true)
+      #
+      # @param [ Hash ] options The index options.
+      #
+      # @return [ Hash ] The normalized options.
+      #
+      # @since 4.0.0
+      def normalize_options(opts)
+        options = {}
+        opts.each_pair do |option, value|
+          options[MAPPINGS[option] || option] = value
+        end
+        options
+      end
+    end
+  end
+end

data/lib/mongoid/{indexes → indexable}/validators/options.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Indexes
+  module Indexable
     module Validators
 
       # Validates the options passed to the index macro.
@@ -10,6 +10,7 @@ module Mongoid
         VALID_OPTIONS = [
           :background,
           :database,
+          :default_language,
           :drop_dups,
           :name,
           :sparse,