mongoid 3.1.7 → 4.0.0.alpha1

data/lib/mongoid/extensions/string.rb

@@ -11,7 +11,7 @@ module Mongoid
       # @example Evolve the string.
       #   "test".__evolve_object_id__
       #
-      # @return [ String, Moped::BSON::ObjectId ] The evolved string.
+      # @return [ String, BSON::ObjectId ] The evolved string.
       #
       # @since 3.0.0
       def __evolve_object_id__
@@ -23,7 +23,7 @@ module Mongoid
       # @example Evolve the string.
       #   "test".__mongoize_object_id__
       #
-      # @return [ String, Moped::BSON::ObjectId, nil ] The mongoized string.
+      # @return [ String, BSON::ObjectId, nil ] The mongoized string.
       #
       # @since 3.0.0
       def __mongoize_object_id__
@@ -96,18 +96,6 @@ module Mongoid
         delete("=").sub(/\_before\_type\_cast$/, '')
       end
 
-      # Convert the string to an array with the string in it.
-      #
-      # @example Convert the string to an array.
-      #   "Testing".to_a
-      #
-      # @return [ Array ] An array with only the string in it.
-      #
-      # @since 1.0.0
-      def to_a
-        [ self ]
-      end
-
       # Is this string a writer?
       #
       # @example Is the string a setter method?
@@ -129,7 +117,7 @@ module Mongoid
       #
       # @since 3.0.15
       def valid_method_name?
-        /[@$"]/ !~ to_sym.inspect
+        /[@$"]/ !~ self
       end
 
       # Does the string end with _before_type_cast?
@@ -165,11 +153,11 @@ module Mongoid
       # @example Convert to the object id.
       #   string.convert_to_object_id
       #
-      # @return [ String, Moped::BSON::ObjectId ] The string or the id.
+      # @return [ String, BSON::ObjectId ] The string or the id.
       #
       # @since 3.0.0
       def convert_to_object_id
-        Moped::BSON::ObjectId.legal?(self) ? Moped::BSON::ObjectId.from_string(self) : self
+        BSON::ObjectId.legal?(self) ? BSON::ObjectId.from_string(self) : self
       end
 
       module ClassMethods

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

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
 

data/lib/mongoid/fields.rb

@@ -25,15 +25,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 +262,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 +432,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 +471,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 +498,7 @@ module Mongoid
             end
             attributes[name] = value
           end
+          alias_method :"#{meth}_t=", :"#{meth}_translations="
         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/standard.rb

@@ -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,10 +50,18 @@ module Mongoid
         # @raise [ Errors::InvalidField ] If the name is not allowed.
         #
         # @since 3.0.0
-        def validate_name(klass, name)
+        def validate_name(klass, name, options)
           if Mongoid.destructive_fields.include?(name)
             raise Errors::InvalidField.new(klass, name)
           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
 
         # Validate that the field options are allowed.

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
@@ -31,6 +33,7 @@ module Mongoid
       :min,
       :pluck,
       :sum,
+      :text_search,
       :update,
       :update_all, to: :with_default_scope
 
@@ -76,7 +79,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.
     #
@@ -116,6 +119,7 @@ module Mongoid
     def first
       with_default_scope.first
     end
+    alias :one :first
 
     # Find the last +Document+ given the conditions.
     #

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

@@ -1,13 +1,19 @@
 # encoding: utf-8
-require "mongoid/indexes/validators/options"
+require "mongoid/indexable/specification"
+require "mongoid/indexable/validators/options"
+require "ostruct"
 
 module Mongoid
-  module Indexes
+
+  # Encapsulates behaviour around defining indexes.
+  #
+  # @since 4.0.0
+  module Indexable
     extend ActiveSupport::Concern
 
     included do
-      cattr_accessor :index_options
-      self.index_options = {}
+      cattr_accessor :index_specifications
+      self.index_specifications = []
     end
 
     module ClassMethods
@@ -21,13 +27,14 @@ module Mongoid
       #
       # @since 1.0.0
       def create_indexes
-        return unless index_options
-        index_options.each_pair do |spec, options|
+        return unless index_specifications
+        index_specifications.each do |spec|
+          key, options = spec.key, spec.options
           if database = options[:database]
-            with(consistency: :strong, database: database).
-              collection.indexes.create(spec, options.except(:database))
+            with(read: :primary, database: database).
+              collection.indexes.create(key, options.except(:database))
           else
-            with(consistency: :strong).collection.indexes.create(spec, options)
+            with(read: :primary).collection.indexes.create(key, options)
           end
         end and true
       end
@@ -43,7 +50,7 @@ module Mongoid
       # @since 3.0.0
       def remove_indexes
         indexed_database_names.each do |database|
-          collection = with(consistency: :strong, database: database).collection
+          collection = with(read: :primary, database: database).collection
           collection.indexes.each do |spec|
             unless spec["name"] == "_id_"
               collection.indexes.drop(spec["key"])
@@ -62,20 +69,18 @@ module Mongoid
       #
       # @since 1.0.0
       def add_indexes
-        if hereditary? && !index_options[{ _type: 1 }]
-          index({ _type: 1 }, { unique: false, background: true })
+        if hereditary? && !index_keys.include?(_type: 1)
+          index({ _type: 1 }, unique: false, background: true)
         end
         true
       end
 
-      # Adds an index on the field specified. Options can be :unique => true or
-      # :unique => false. It will default to the latter.
+      # Adds an index definition for the provided single or compound keys.
       #
       # @example Create a basic index.
       #   class Person
       #     include Mongoid::Document
       #     field :name, type: String
-
       #     index({ name: 1 }, { background: true })
       #   end
       #
@@ -86,53 +91,29 @@ module Mongoid
       #
       # @since 1.0.0
       def index(spec, options = nil)
-        Validators::Options.validate(self, spec, options || {})
-        index_options[normalize_spec(spec)] = normalize_index_options(options)
-      end
-
-      private
-
-      # Normalize the index options, if any are provided.
-      #
-      # @api private
-      #
-      # @example Normalize the index options.
-      #   Model.normalize_index_options(drop_dups: true)
-      #
-      # @param [ Hash ] options The index options.
-      #
-      # @return [ Hash ] The normalized options.
-      #
-      # @since 3.0.0
-      def normalize_index_options(options)
-        opts = options || {}
-        opts[:dropDups] = opts.delete(:drop_dups) if opts.has_key?(:drop_dups)
-        opts[:bucketSize] = opts.delete(:bucket_size) if opts.has_key?(:bucket_size)
-        if opts.has_key?(:expire_after_seconds)
-          opts[:expireAfterSeconds] = opts.delete(:expire_after_seconds)
+        specification = Specification.new(self, spec, options)
+        if !index_specifications.include?(specification)
+          index_specifications.push(specification)
         end
-        opts
       end
 
-      # Normalize the spec, in case aliased fields are provided.
-      #
-      # @api private
+      # Get an index specification for the provided key.
       #
-      # @example Normalize the spec.
-      #   Model.normalize_spec(name: 1)
+      # @example Get the index specification.
+      #   Model.index_specification(name: 1)
       #
-      # @param [ Hash ] spec The index specification.
+      # @param [ Hash ] key The index key/direction pair.
       #
-      # @return [ Hash ] The normalized specification.
+      # @return [ Specification ] The found specification.
       #
-      # @since 3.0.7
-      def normalize_spec(spec)
-        spec.inject({}) do |normalized, (name, direction)|
-          normalized[database_field_name(name).to_sym] = direction
-          normalized
-        end
+      # @since 4.0.0
+      def index_specification(index_hash)
+        index = OpenStruct.new(fields: index_hash.keys, key: index_hash)
+        index_specifications.detect { |spec| spec == index }
       end
 
+      private
+
       # Get the names of all databases for this model that have index
       # definitions.
       #
@@ -145,10 +126,24 @@ module Mongoid
       #
       # @since 3.1.0
       def indexed_database_names
-        index_options.values.map do |options|
-          options[:database] || database_name
+        index_specifications.map do |spec|
+          spec.options[:database] || database_name
         end.uniq
       end
+
+      # Gets a list of index specification keys.
+      #
+      # @api private
+      #
+      # @example Get the specification key list.
+      #   Model.index_keys
+      #
+      # @return [ Array<Hash> ] The specification keys.
+      #
+      # @since 4.0.0
+      def index_keys
+        index_specifications.map{ |spec| spec.key }
+      end
     end
   end
 end