mongoid 2.0.0.beta.18 → 2.0.0.beta.19

data/lib/config/locales/bg.yml

@@ -0,0 +1,42 @@
+bg:
+  activemodel:
+    errors:
+      messages:
+        taken: е вече заето
+
+  mongoid:
+    errors:
+      messages:
+        document_not_found:
+          Не е намерен документ %{klass} с id(та) %{identifiers}.
+        invalid_database:
+          Базата данни трябва да е от тип Mnogo:DB, а не  %{name}.
+        invalid_type:
+          Полето е дефинирано като a(n) %{klass}, но се присвоява %{other}
+          със стойност %{value}.
+        unsupported_version:
+          MongoDB %{version} не се подържа, моля ползвайте версия след %{mongo_version}.
+        validations:
+          Неуспешна валидация - %{errors} грешки.
+        invalid_collection:
+          Достъпа до колекцията за %{klass} не е разрешена, тъй като
+          тя е вложен документ, можете да я достъпите през главният документ
+        invalid_field:
+          Дефинирането на поле с име %{name} не е разрешено. Не дефинирайте
+          полета, които са в конфликт с Mongoid вътрешните атрибути.
+          Можете да ги видите с Document#instance_methods
+        too_many_nested_attribute_records:
+          Присвояването на вложини атрибути за %{association}  е
+          ограничено до %{limit} записа
+        embedded_in_must_have_inverse_of:
+          Опциите на embedded_in асоциацията трябва да съдържат invers_of.
+        dependent_only_references_one_or_many:
+          Опцията dependent => destroy|delete, която е посочена е
+          валидна само за references_one или references_many връзки
+        association_cant_have_inverse_of:
+          Дефинирането на inverse_of за тази асоциация не е позволено.
+          Използвайте тази опция само за  embedded_in  или
+          references_many като масив.
+        calling_document_find_with_nil_is_invalid:
+          Извикването на Document#find със nil е невалидно
+

data/lib/config/locales/de.yml

@@ -0,0 +1,41 @@
+de:
+  activemodel:
+    errors:
+      messages:
+        taken: ist bereits vergeben
+
+  mongoid:
+    errors:
+      messages:
+        document_not_found:
+          Dokument für Klasse %{klass} mit ID(s) %{identifiers} nicht gefunden.
+        invalid_database:
+          Datenbank sollte eine Mongo::DB sein, nicht %{name}.
+        invalid_type:
+          Feld wurde als a(n) %{klass} definiert, doch der Wert %{value} vom Typ
+          %{other} wurde übergeben.
+        unsupported_version:
+          MongoDB %{version} wird nicht unterstützt, bitte auf Version
+          %{mongo_version} aktualisieren.
+        validations:
+          Validierung fehlgeschlagen - %{errors}.
+        invalid_collection:
+          Zugriff auf die Collection von %{klass} ist nicht erlaubt,
+          da es sich um ein eingebettetes Dokument handelt. Auf die Collection
+          kann vom Wurzeldokument aus zugegriffen werden.
+        invalid_field:
+          Das Feld %{name} kann nicht definiert werden, da sein Name mit
+          einem internen Mongoid-Attribut oder Methodennamen kollidiert.
+          Siehe Document#instance_methods für eine Auflistung dieser Namen.
+        too_many_nested_attribute_records:
+          Verschachtelte Attribute für %{association} sind auf %{limit} Einträge
+          beschränkt.
+        embedded_in_must_have_inverse_of:
+          Die Optionen für eine embedded_in-Beziehung müssen inverse_of beinhalten.
+        dependent_only_references_one_or_many:
+          Die dependent => destroy|delete-Option ist nur für
+          references_one oder references_many-Beziehungen gültig.
+        association_cant_have_inverse_of:
+          Es ist nicht erlaubt, inverse_of für diese Beziehung zu definieren.
+          Diese Option kann nur für embedded_in oder references_many als Array
+          verwendet werden.

data/lib/config/locales/en.yml

@@ -38,3 +38,5 @@ en:
         association_cant_have_inverse_of:
           Defining an inverse_of on this association is not allowed. Only
           use this option on embedded_in or references_many as array.
+        calling_document_find_with_nil_is_invalid:
+          Calling Document#find with nil is invalid

data/lib/config/locales/hu.yml

@@ -0,0 +1,45 @@
+hu:
+  activemodel:
+    errors:
+      messages:
+        taken: már foglalt
+
+  mongoid:
+    errors:
+      messages:
+        document_not_found:
+          %{klass} osztályban, %{identifiers} id(k)-el nem található dokumentum.
+        invalid_database:
+          Az adatbázisnak Mongo::DB-nek kellene lennie, nem %{name}.
+        invalid_type:
+          A mező %{klass} -ként volt meghatározva, de a kapott érték %{value}
+          egy %{other}.
+        unsupported_version:
+          MongoDB %{version} nem támogatott, kérjük frissítsen
+          a %{mongo_version} verzióra.
+        validations:
+          Érvénytelen - %{errors}.
+        invalid_collection:
+          %{klass} osztálybeli kollekcióhoz való hozzáférés nem engedélyezett,
+          mivel egy beágyazott dokumentum. A kollekció a gyökér dokumentumból
+          érhető el.
+        invalid_field:
+          %{name} mező név nem engedélyezett, mivel a Mongoid által használt
+          belső tulajdonság vagy eljárás névvel eggyezik. Használja a
+          Document#instance_methods parancsot ezen nevek lekérdezéséhez.
+        too_many_nested_attribute_records:
+          %{association} esetében a beágyazott tulajdonságok %{limit} számú
+          bejegyzésre elfogadhatóak.
+        embedded_in_must_have_inverse_of:
+          Az embedded_in tipusú kapcsolat esetében kötelező az inverse_of
+          opció használata.
+        dependent_only_references_one_or_many:
+          A dependent => destroy|delete opció csak a references_one vagy
+          references_many kapcsolatok esetében érvényes.
+        association_cant_have_inverse_of:
+          Ezen a tipusú kapcsolaton az inverse_of opció érvénytelen, csak
+          az embedded_in vagy references_many as array tipusú kapcsolatok
+          esetében használható.
+        calling_document_find_with_nil_is_invalid:
+          Document#find parancs nil érték esetében érvénytelen.
+

data/lib/config/locales/ro.yml

@@ -0,0 +1,47 @@
+en:
+  activemodel:
+    errors:
+      messages:
+        taken: este deja folosit
+
+  mongoid:
+    errors:
+      messages:
+        document_not_found:
+          Nu există document în clasa %{klass} cu id %{identifiers}.
+        invalid_database:
+          Baza de date ar trebui să fie de tipul Mongo::DB, nu %{name}.
+        invalid_type:
+          Câmpul a fost definit ca şi un(o) %{klass}, dar valoarea
+          recepţionată %{value} este de clasa %{other}.
+        unsupported_version:
+          Versiunea MongoDB %{version} nu este suportată.
+          Vă rugăm să folosiţi versiunea %{mongo_version}.
+        validations:
+          Validare nereuşită - %{errors}.
+        invalid_collection:
+          Accesul la colecţie din clasa %{klass} este interzisă, fiindcă
+          este un document încorporat. Vă rugăm accesaţi colecţia din
+          documentul rădăcină.
+        invalid_field:
+          Folosirea denumirii %{name} ptr. un câmp este interzisă. Vă
+          rugăm să evitaţi utilizarea acelor cuvinte care intră în conflict
+          cu denumirile folosite de proprietăţile sau metodele Mongoid-lui.
+          Folosiţi comanda Document#instance_methods pentru a afla care
+          sunt acestea.
+        too_many_nested_attribute_records:
+          În cazul %{association} folosirea atributelor îmbricate este
+          limitat la %{limit} înregistrări.
+        embedded_in_must_have_inverse_of:
+          Folosirea opţiunii  inverse_of este obligatorie în cazul
+          asociaţiilor de tip  embedded_in.
+        dependent_only_references_one_or_many:
+          Opţiunea dependent => destroy|delete poate fi folosită doar în
+          cazul asociaţiilor de tip references_one sau references_many.
+        association_cant_have_inverse_of:
+          Folosire opţiunii inverse_of la acest tip de asociaţie este
+          interzisă. Aceasta poate fi folosită doar la asociaţiile de
+          tip embedded_in sau references_many as array.
+        calling_document_find_with_nil_is_invalid:
+          Folosirea metodei Document#find cu valoarea nil este invalidă.
+

data/lib/config/locales/zh-CN.yml

@@ -0,0 +1,31 @@
+en:
+  activemodel:
+    errors:
+      messages:
+        taken: 已占用
+
+  mongoid:
+    errors:
+      messages:
+        document_not_found:
+          没有发现类是%{klass}id(s)是%{identifiers}的文档
+        invalid_database:
+          数据库应该是Mongo::DB,而不是%{name}.
+        invalid_type:
+          在类%{klass}中定义了字段,实际值是%{value}的%{other}.
+        unsupported_version:
+          MongoDB %{version} 版本已过期，请升级到 %{mongo_version}.
+        validations:
+          校验失败 - %{errors}.
+        invalid_collection:
+          不允许直接访问嵌入式的集合%{klass} , 请从文档的根访问集合.
+        invalid_field:
+          字段的名字不允许为 %{name}. 你不应该定义跟Mongoid内部属性或者方法相同的名字，详细请看Use Document#instance_methods.
+        too_many_nested_attribute_records:
+          被关联的%{association} 嵌入式属性不能超过 %{limit}.
+        embedded_in_must_have_inverse_of:
+          embedded_in的关联属性必须包含inverse_of.
+        dependent_only_references_one_or_many:
+          dependent => destroy|delete 选项只有在references_one或者references_many时候有效.
+        association_cant_have_inverse_of:
+          在当前的关联中，不允许定义inverse_of去,其只有在embedded_in或者references_many是数组的情况下使用

data/lib/mongoid.rb

@@ -70,6 +70,7 @@ require "mongoid/logger"
 require "mongoid/matchers"
 require "mongoid/memoization"
 require "mongoid/modifiers"
+require "mongoid/multi_parameter_attributes"
 require "mongoid/named_scope"
 require "mongoid/paths"
 require "mongoid/persistence"

data/lib/mongoid/collections/operations.rb

@@ -15,6 +15,7 @@ module Mongoid #:nodoc:
         :index_information,
         :map_reduce,
         :mapreduce,
+        :stats,
         :options
       ]
 

data/lib/mongoid/components.rb

@@ -25,6 +25,7 @@ module Mongoid #:nodoc
       include Mongoid::Matchers
       include Mongoid::Memoization
       include Mongoid::Modifiers
+      include Mongoid::MultiParameterAttributes
       include Mongoid::Paths
       include Mongoid::Persistence
       include Mongoid::Safety

data/lib/mongoid/config.rb

@@ -48,6 +48,35 @@ module Mongoid #:nodoc
     attr_reader :use_utc
     alias_method :use_utc?, :use_utc
 
+    # Sets whether the times returned from the database use the ruby or
+    # the ActiveSupport time zone.
+    # If you omit this setting, then times will use the ruby time zone.
+    #
+    # Example:
+    #
+    # <tt>Config.use_activesupport_time_zone = true</tt>
+    #
+    # Returns:
+    #
+    # A boolean
+    def use_activesupport_time_zone=(value)
+      @use_activesupport_time_zone = value || false
+    end
+
+    # Sets whether the times returned from the database use the ruby or
+    # the ActiveSupport time zone.
+    # If the setting is false, then times will use the ruby time zone.
+    #
+    # Example:
+    #
+    # <tt>Config.use_activesupport_time_zone</tt>
+    #
+    # Returns:
+    #
+    # A boolean
+    attr_reader :use_activesupport_time_zone
+    alias_method :use_activesupport_time_zone?, :use_activesupport_time_zone
+
     # Sets the Mongo::DB master database to be used. If the object trying to be
     # set is not a valid +Mongo::DB+, then an error will be raised.
     #

data/lib/mongoid/criteria.rb

@@ -235,8 +235,14 @@ module Mongoid #:nodoc:
         unless @selector[key]
           @selector[key] = { operator => value }
         else
-          new_value = @selector[key].values.first + value
-          @selector[key] = { operator => new_value }
+          if @selector[key].has_key?(operator)
+            # add the value to the current operator
+            new_value = @selector[key].values.first + value
+            @selector[key] = { operator => new_value }
+          else
+            # create a new operator on this key
+            @selector[key][operator] = value
+          end        
         end
       end; self
     end

data/lib/mongoid/criterion/optional.rb

@@ -91,7 +91,7 @@ module Mongoid #:nodoc:
       #
       # Options:
       #
-      # object_id: A single id or an array of ids in +String+ or <tt>BSON::ObjectID</tt> format
+      # object_id: A single id or an array of ids in +String+ or <tt>BSON::ObjectId</tt> format
       #
       # Example:
       #
@@ -103,11 +103,11 @@ module Mongoid #:nodoc:
         ids.flatten!
         if ids.size > 1
           self.in(
-            :_id => ::BSON::ObjectID.cast!(@klass, ids, @klass.primary_key.nil?)
+            :_id => ::BSON::ObjectId.cast!(@klass, ids, @klass.primary_key.nil?)
           )
         else
           @selector[:_id] =
-            ::BSON::ObjectID.cast!(@klass, ids.first, @klass.primary_key.nil?)
+            ::BSON::ObjectId.cast!(@klass, ids.first, @klass.primary_key.nil?)
         end
         self
       end

data/lib/mongoid/document.rb

@@ -100,9 +100,9 @@ module Mongoid #:nodoc:
     #
     # attrs: The attributes +Hash+ to set up the document with.
     def initialize(attrs = nil)
+      @new_record = true
       @attributes = default_attributes
       process(attrs)
-      @new_record = true
       document = yield self if block_given?
       identify
       run_callbacks(:initialize) do

data/lib/mongoid/errors/validations.rb

@@ -9,7 +9,9 @@ module Mongoid #:nodoc
     #
     # <tt>Validations.new(person.errors)</tt>
     class Validations < MongoidError
+      attr_reader :document
       def initialize(document)
+        @document = document
         super(
           translate(
             "validations",

data/lib/mongoid/extensions.rb

@@ -26,7 +26,7 @@ require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
 require "mongoid/extensions/symbol/conversions"
 require "mongoid/extensions/true_class/equality"
-require "mongoid/extensions/objectid/conversions"
+require "mongoid/extensions/object_id/conversions"
 
 class Array #:nodoc
   include Mongoid::Extensions::Array::Accessors
@@ -112,8 +112,8 @@ class TrueClass #:nodoc
   include Mongoid::Extensions::TrueClass::Equality
 end
 
-class BSON::ObjectID #:nodoc
-  extend Mongoid::Extensions::ObjectID::Conversions
+class BSON::ObjectId #:nodoc
+  extend Mongoid::Extensions::ObjectId::Conversions
 
   def as_json(options = nil)
     to_s

data/lib/mongoid/extensions/date/conversions.rb

@@ -16,6 +16,7 @@ module Mongoid #:nodoc:
 
         def convert_to_time(value)
           value = ::Date.parse(value) if value.is_a?(::String)
+          value = ::Date.civil(*value) if value.is_a?(::Array)
           ::Time.utc(value.year, value.month, value.day)
         end
       end

data/lib/mongoid/extensions/{objectid → object_id}/conversions.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
-    module ObjectID #:nodoc:
+    module ObjectId #:nodoc:
       module Conversions #:nodoc:
 
         def set(value)
           if value.is_a?(::String)
-            BSON::ObjectID.from_string(value) unless value.blank?
+            BSON::ObjectId.from_string(value) unless value.blank?
           else
             value
           end
@@ -16,13 +16,13 @@ module Mongoid #:nodoc:
           value
         end
 
-        # If the document is using BSON::ObjectIDs the convert the argument to
+        # If the document is using BSON::ObjectIds the convert the argument to
         # either an object id or an array of them if the supplied argument is an
         # Array. Otherwise just return.
         #
         # Options:
-        #  args: A +String+ or an +Array+ convert to +BSON::ObjectID+
-        #  cast: A +Boolean+ define if we can or not cast to BSON::ObjectID.
+        #  args: A +String+ or an +Array+ convert to +BSON::ObjectId+
+        #  cast: A +Boolean+ define if we can or not cast to BSON::ObjectId.
         #        If false, we use the default type of args
         #
         # Example:
@@ -33,19 +33,19 @@ module Mongoid #:nodoc:
         # Returns:
         #
         # If using object ids:
-        #   An +Array+ of +BSON::ObjectID+ of each element if params is an +Array+
-        #   A +BSON::ObjectID+ from params if params is +String+
+        #   An +Array+ of +BSON::ObjectId+ of each element if params is an +Array+
+        #   A +BSON::ObjectId+ from params if params is +String+
         # Otherwise:
         #   <tt>args</tt>
         def cast!(klass, args, cast = true)
-          if !klass.using_object_ids? || args.is_a?(::BSON::ObjectID) || !cast
+          if !klass.using_object_ids? || args.is_a?(::BSON::ObjectId) || !cast
             return args
           end
           if args.is_a?(::String)
-            ::BSON::ObjectID(args)
+            ::BSON::ObjectId(args)
           elsif args.is_a?(::Array)
             args.map{ |a|
-              a.is_a?(::BSON::ObjectID) ? a : ::BSON::ObjectID(a)
+              a.is_a?(::BSON::ObjectId) ? a : ::BSON::ObjectId(a)
             }
           else
             args

data/lib/mongoid/extensions/time_conversions.rb

@@ -9,11 +9,12 @@ module Mongoid #:nodoc:
 
       def get(value)
         return nil if value.blank?
-        if Mongoid::Config.instance.use_utc?
-          value
-        else
-          value.getlocal
+        value = value.getlocal unless Mongoid::Config.instance.use_utc?
+        if Mongoid::Config.instance.use_activesupport_time_zone?
+          time_zone = Mongoid::Config.instance.use_utc? ? 'UTC' : Time.zone
+          value = value.in_time_zone(time_zone)
         end
+        value
       end
 
       protected
@@ -23,13 +24,15 @@ module Mongoid #:nodoc:
       end
 
       def convert_to_time(value)
+        time = Mongoid::Config.instance.use_activesupport_time_zone? ? ::Time.zone : ::Time
         case value
-          when ::String then ::Time.parse(value)
-          when ::DateTime then ::Time.utc(value.year, value.month, value.day, value.hour, value.min, value.sec)
-          when ::Date then ::Time.utc(value.year, value.month, value.day)
+          when ::String then time.parse(value)
+          when ::DateTime then time.local(value.year, value.month, value.day, value.hour, value.min, value.sec)
+          when ::Date then time.local(value.year, value.month, value.day)
+          when ::Array then time.local(*value)
           else value
         end
       end
     end
   end
-end
+end

data/lib/mongoid/field.rb

@@ -48,7 +48,7 @@ module Mongoid #:nodoc:
         type.set(object)
       else
         inverse = @options[:inverse_class_name].constantize
-        object.blank? ? type.set(object) : BSON::ObjectID.cast!(inverse, object)
+        object.blank? ? type.set(object) : BSON::ObjectId.cast!(inverse, object)
       end
     end
 

data/lib/mongoid/finders.rb

@@ -63,7 +63,7 @@ module Mongoid #:nodoc:
     #
     # <tt>Person.find(Mongo::ObjectID.new.to_s)</tt>
     def find(*args)
-      raise Errors::InvalidOptions.new("Calling Document#find with nil is invalid") if args[0].nil?
+      raise Errors::InvalidOptions.new(:calling_document_find_with_nil_is_invalid, {}) if args[0].nil?
       type = args.delete_at(0) if args[0].is_a?(Symbol)
       criteria = Criteria.translate(self, *args)
       case type

data/lib/mongoid/identity.rb

@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
     protected
     # Return the proper id for the document.
     def generate_id
-      id = BSON::ObjectID.new
+      id = BSON::ObjectId.new
       @document.using_object_ids? ? id : id.to_s
     end
 

data/lib/mongoid/keys.rb

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
     included do
       cattr_accessor :primary_key, :_identity
-      self._identity = { :type => BSON::ObjectID }
+      self._identity = { :type => BSON::ObjectId }
 
       delegate \
         :_id_type,
@@ -28,9 +28,9 @@ module Mongoid #:nodoc:
       end
 
       # Used for telling Mongoid on a per model basis whether to override the
-      # default +BSON::ObjectID+ and use a different type. This will be
+      # default +BSON::ObjectId+ and use a different type. This will be
       # expanded in the future for requiring a PkFactory if the type is not a
-      # +BSON::ObjectID+ or +String+.
+      # +BSON::ObjectId+ or +String+.
       #
       # Example:
       #
@@ -59,7 +59,7 @@ module Mongoid #:nodoc:
         set_callback :save, :before, :identify
       end
 
-      # Convenience method for determining if we are using +BSON::ObjectIDs+ as
+      # Convenience method for determining if we are using +BSON::ObjectIds+ as
       # our id.
       #
       # Example:
@@ -68,9 +68,9 @@ module Mongoid #:nodoc:
       #
       # Returns:
       #
-      # true if we are using BSON::ObjectIDs
+      # true if we are using BSON::ObjectIds
       def using_object_ids?
-        _id_type == BSON::ObjectID
+        _id_type == BSON::ObjectId
       end
     end
   end

data/lib/mongoid/multi_parameter_attributes.rb

@@ -0,0 +1,80 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module MultiParameterAttributes
+    module Errors
+      # Raised when an error occurred while doing a mass assignment to an attribute through the
+      # <tt>attributes=</tt> method. The exception has an +attribute+ property that is the name of the
+      # offending attribute.
+      class AttributeAssignmentError < Mongoid::Errors::MongoidError
+        attr_reader :exception, :attribute
+        def initialize(message, exception, attribute)
+          @exception = exception
+          @attribute = attribute
+          @message = message
+        end
+      end
+
+      # Raised when there are multiple errors while doing a mass assignment through the +attributes+
+      # method. The exception has an +errors+ property that contains an array of AttributeAssignmentError
+      # objects, each corresponding to the error while assigning to an attribute.
+      class MultiparameterAssignmentErrors < Mongoid::Errors::MongoidError
+        attr_reader :errors
+        def initialize(errors)
+          @errors = errors
+        end
+      end
+    end
+
+    def process(attrs = nil)
+      if attrs
+        errors = []
+        attributes = {}
+        multi_parameter_attributes = {}
+
+        attrs.each_pair do |key, value|
+          if key =~ /^([^\(]+)\((\d+)([if])\)$/
+            key, index = $1, $2.to_i
+            (multi_parameter_attributes[key] ||= {})[index] = value.empty? ? nil : value.send("to_#{$3}")
+          else
+            attributes[key] = value
+          end
+        end
+
+        multi_parameter_attributes.each_pair do |key, values|
+          begin
+            values = (values.keys.min..values.keys.max).map { |i| values[i] }
+            klass = self.class.fields[key].try(:type)
+            attributes[key] = instantiate_object(klass, values)
+          rescue => e
+            errors << Errors::AttributeAssignmentError.new("error on assignment #{values.inspect} to #{key}", e, key)
+          end
+        end
+
+        unless errors.empty?
+          raise Errors::MultiparameterAssignmentErrors.new(errors), "#{errors.size} error(s) on assignment of multiparameter attributes"
+        end
+
+        super attributes
+      else
+        super
+      end
+    end
+
+  protected
+
+    def instantiate_object(klass, values_with_empty_parameters)
+      return nil if values_with_empty_parameters.all? { |v| v.nil? }
+      
+      values = values_with_empty_parameters.collect { |v| v.nil? ? 1 : v }
+      
+      if klass == DateTime || klass == Date || klass == Time
+        klass.send(:convert_to_time, values)
+      elsif klass
+        klass.new *values
+      else
+        values
+      end
+    end
+
+  end
+end

data/lib/mongoid/railties/database.rake

@@ -84,7 +84,7 @@ namespace :db do
 
     def convert_ids(obj)
       if obj.is_a?(String) && obj =~ /^[a-f0-9]{24}$/
-        BSON::ObjectID(obj)
+        BSON::ObjectId(obj)
       elsif obj.is_a?(Array)
         obj.map do |v|
           convert_ids(v)

data/lib/mongoid/validations/uniqueness.rb

@@ -24,9 +24,9 @@ module Mongoid #:nodoc:
           criteria = document._parent.send(document.association_name)
           # If the parent document embeds_one, no need to validate uniqueness
           return if criteria.is_a?(Mongoid::Document)
-          criteria = criteria.where(attribute => value, :_id => {'$ne' => document._id})
+          criteria = criteria.where(attribute => unique_search_value(value), :_id => {'$ne' => document._id})
         else
-          criteria = @klass.where(attribute => value)
+          criteria = @klass.where(attribute => unique_search_value(value))
           unless document.new_record?
             criteria = criteria.where(:_id => {'$ne' => document._id})
           end
@@ -50,6 +50,15 @@ module Mongoid #:nodoc:
           return true if document.send("#{key}_changed?")
         end; false
       end
+
+      # ensure :case_sensitive is true by default
+      def unique_search_value(value)
+        if options[:case_sensitive] == false
+          value ? /^#{value}$/i : nil
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.0.beta.18"
+  VERSION = "2.0.0.beta.19"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -16,7 +16,6 @@ test:
 
 # set these environment variables on your prod server
 production:
-  <<: *defaults
   host: <%%= ENV['MONGOID_HOST'] %>
   port: <%%= ENV['MONGOID_PORT'] %>
   username: <%%= ENV['MONGOID_USERNAME'] %>

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
+  hash: 62196421
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 18
-  version: 2.0.0.beta.18
+  - 19
+  version: 2.0.0.beta.19
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,121 +17,111 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -04:00
+date: 2010-09-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activemodel
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        version: "3.0"
+  requirement: *id001
   type: :runtime
+  name: activemodel
   prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: tzinfo
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 3
         - 22
         version: 0.3.22
+  requirement: *id002
   type: :runtime
+  name: tzinfo
   prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 961915916
         segments: 
         - 3
         - 0
         - pre
         version: 3.0.pre
+  requirement: *id003
   type: :runtime
+  name: will_paginate
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mongo
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 7
-        version: 1.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bson
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 9
+        version: 1.0.9
+  requirement: *id004
   type: :runtime
+  name: mongo
   prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 9
+        version: 1.0.9
+  requirement: *id005
   type: :development
+  name: bson_ext
   prerelease: false
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
         - 8
         version: 0.9.8
+  requirement: *id006
   type: :development
+  name: mocha
   prerelease: false
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 62196431
         segments: 
         - 2
         - 0
@@ -138,38 +129,41 @@ dependencies:
         - beta
         - 22
         version: 2.0.0.beta.22
+  requirement: *id007
   type: :development
+  name: rspec
   prerelease: false
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: watchr
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
         version: "0.6"
+  requirement: *id008
   type: :development
+  name: watchr
   prerelease: false
-  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug-wrapper
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 0
         - 1
         version: 0.0.1
+  requirement: *id009
   type: :development
+  name: ruby-debug-wrapper
   prerelease: false
-  version_requirements: *id010
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written in Ruby.
 email: 
 - durran@gmail.com
@@ -180,15 +174,20 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/config/locales/bg.yml
+- lib/config/locales/de.yml
 - lib/config/locales/en.yml
 - lib/config/locales/es.yml
 - lib/config/locales/fr.yml
+- lib/config/locales/hu.yml
 - lib/config/locales/it.yml
 - lib/config/locales/kr.yml
 - lib/config/locales/pl.yml
 - lib/config/locales/pt-br.yml
 - lib/config/locales/pt.yml
+- lib/config/locales/ro.yml
 - lib/config/locales/sv.yml
+- lib/config/locales/zh-CN.yml
 - lib/mongoid/associations/embedded_in.rb
 - lib/mongoid/associations/embeds_many.rb
 - lib/mongoid/associations/embeds_one.rb
@@ -258,7 +257,7 @@ files:
 - lib/mongoid/extensions/integer/conversions.rb
 - lib/mongoid/extensions/nil/assimilation.rb
 - lib/mongoid/extensions/object/conversions.rb
-- lib/mongoid/extensions/objectid/conversions.rb
+- lib/mongoid/extensions/object_id/conversions.rb
 - lib/mongoid/extensions/proc/scoping.rb
 - lib/mongoid/extensions/set/conversions.rb
 - lib/mongoid/extensions/string/conversions.rb
@@ -297,6 +296,7 @@ files:
 - lib/mongoid/modifiers/command.rb
 - lib/mongoid/modifiers/inc.rb
 - lib/mongoid/modifiers.rb
+- lib/mongoid/multi_parameter_attributes.rb
 - lib/mongoid/named_scope.rb
 - lib/mongoid/paranoia.rb
 - lib/mongoid/paths.rb
@@ -344,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -407375290619395717
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -353,6 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3