mongoid 2.3.0 → 2.3.1

data/CHANGELOG.md

@@ -1,13 +1,65 @@
 # Overview
 
-For instructions on upgrading to newer versions, visit [mongoid.org](http://mongoid.org/docs/upgrading.html).
+For instructions on upgrading to newer versions, visit
+[mongoid.org](http://mongoid.org/docs/upgrading.html).
+
+## 2.4.0 \[ In Development \] \[ Branch: master \]
+
+* Ranges can now be passed to #where criteria to create a $gte/$lte query under the
+  covers. `Person.where(dob: start_date...end_date)`
+
+## 2.3.1 \[ In Development \] \[ Branch: 2.3.0-stable \]
+
+### Resolved Issues
+
+* \#1338 Calling #find on a scope or relation checks that the document in the
+  identity map actually matches other scope parameters.
+
+* \#1321 HABTM no longer allows duplicate entries or keys, instead of the previous
+  inconsistencies.
+
+* \#1320 Fixed errors in perf benchmark.
+
+* \#1316 Added a separate Rake task "db:mongoid:drop" so Mongoid and AR can coexist.
+  (Daniel Vartanov)
+
+* \#1311 Fix issue with custom field serialization inheriting from hash.
+
+* \#1310 The referenced many enumerable target no longer duplicates loaded and
+  added documents when the identity map is enabled.
+
+* \#1295 Fixed having multiple includes only execute the eager loading of the first.
+
+* \#1287 Fixed max versions limitation with versioning.
+
+* \#1277 attribute_will_change! properly flags the attribute even if no change occured.
+
+* \#1063 Paranoid documents properly run destroy callbacks on soft destroy.
+
+* \#1061 Raise `Mongoid::Errors::InvalidTime` when time serialization fails.
+
+* \#1002 Check for legal bson ids when attempting conversion.
+
+* \#920 Allow relations to be named target.
+
+* \#905 Return normalized class name in metadata if string was defined with a
+  prefixed ::.
+
+* \#861 accepts_nested_attributes_for is no longer needed to set embedded documents
+  via a hash or array of hashes directly.
+
+* \#857 Fixed cascading of dependent relations when base document is paranoid.
+
+* \#768 Fixed class_attribute definitions module wide.
+
+* \#408 Embedded documents can now be soft deleted via `Mongoid::Paranoia`.
 
 ## 2.3.0
 
 ### New Features
 
 * Mongoid now supports basic localized fields, storing them under the covers as a
-  hash of locale => value pairs. `field :name, localized: true`
+  hash of locale => value pairs. `field :name, localize: true`
 
 * \#1275 For applications that default safe mode to true, you can now tell a
   single operation to persist without safe mode via #unsafely:
@@ -88,6 +140,8 @@ For instructions on upgrading to newer versions, visit [mongoid.org](http://mong
 * Deleting versions created with `Mongoid::Versioning` no longer fires off
   dependent cascading on relations.
 
+## 2.2.3 \[ In Development \] \[ Branch: 2.2.0-stable \]
+
 ## 2.2.2
 
 * This release removes the restriction of a dependency on 1.3.x of the mongo

data/lib/config/locales/bg.yml

@@ -13,6 +13,8 @@ bg:
           or polymorphic belongs_to relation."
         invalid_database:
           Базата данни трябва да е от тип Mnogo:DB, а не  %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           Полето е дефинирано като a(n) %{klass}, но се присвоява %{other}
           със стойност %{value}.

data/lib/config/locales/de.yml

@@ -13,6 +13,8 @@ de:
           or polymorphic belongs_to relation."
         invalid_database:
           Datenbank sollte eine Mongo::DB sein, nicht %{name}.
+        invalid_time:
+          "'%{value}' ist keine berechtigte Zeit."
         invalid_type:
           Feld wurde als a(n) %{klass} definiert, doch der Wert %{value} vom Typ
           %{other} wurde übergeben.

data/lib/config/locales/en-GB.yml

@@ -16,6 +16,8 @@ en-GB:
         invalid_options:
           "Invalid option :%{invalid} provided to relation :%{name}. Valid options
           are: %{valid}."
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           Field was defined as a(n) %{klass}, but received a %{other} with
           the value %{value}.

data/lib/config/locales/en.yml

@@ -13,6 +13,8 @@ en:
           or polymorphic belongs_to relation."
         invalid_database:
           "Database should be a Mongo::DB, not %{name}."
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_options:
           "Invalid option :%{invalid} provided to relation :%{name}. Valid options
           are: %{valid}."

data/lib/config/locales/es.yml

@@ -11,6 +11,8 @@ es:
           or polymorphic belongs_to relation."
         invalid_database:
           La base de datos debería ser una instancia de Mongo::DB, en lugar de %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           El campo se definió como %{klass}, pero recibió una instancia de %{other}
           con el valor %{value}.

data/lib/config/locales/fr.yml

@@ -11,6 +11,8 @@ fr:
         eager_load:
           "Eager loading :%{name} is not supported due to it being a many-to-many
           or polymorphic belongs_to relation."
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_database:
           La base de données doit être une Mongo::DB, pas %{name}.
         invalid_type:

data/lib/config/locales/hi.yml

@@ -11,6 +11,8 @@ en:
         eager_load:
           "Eager loading :%{name} is not supported due to it being a many-to-many
           or polymorphic belongs_to relation."
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_database:
           "डेटाबेस Mongo::DB होना चाहिए, %{name} नहीं."
         invalid_options:

data/lib/config/locales/hu.yml

@@ -11,6 +11,8 @@ hu:
         eager_load:
           "Eager loading :%{name} is not supported due to it being a many-to-many
           or polymorphic belongs_to relation."
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_database:
           Az adatbázisnak Mongo::DB-nek kellene lennie, nem %{name}.
         invalid_type:

data/lib/config/locales/id.yml

@@ -11,6 +11,8 @@ id:
         eager_load:
           "Eager loading :%{name} is not supported due to it being a many-to-many
           or polymorphic belongs_to relation."
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_database:
           Database harus Mongo::DB, bukan %{name}.
         invalid_type:

data/lib/config/locales/it.yml

@@ -13,6 +13,8 @@ it:
           or polymorphic belongs_to relation."
         invalid_database:
           Il database dovrebbe essere un Mongo::DB, non %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           Il campo è stato definito come %{klass} ma ha ricevuto
           un %{other} con valore %{value}.

data/lib/config/locales/ja.yml

@@ -13,6 +13,8 @@ ja:
           or polymorphic belongs_to relation."
         invalid_database:
           次のDatabaseは利用できませんでした。%{name}
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           このフィールドは %{klass} で定義されていますが、%{other}に対し %{value} という値が送信されました。
         invalid_options:

data/lib/config/locales/kr.yml

@@ -13,6 +13,8 @@ kr:
           or polymorphic belongs_to relation."
         invalid_database:
           데이타베이스가 Mongo::DB이어야 합니다, %{name}이면 안됩니다.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           데이터 필드가 %{klass} 처럼 정의를 내립니다. 하지만 그것은  %{other}를 %{value} 으로 산출되어  받습니다
         invalid_options:

data/lib/config/locales/nl.yml

@@ -13,6 +13,8 @@ nl:
           or polymorphic belongs_to relation."
         invalid_database:
           Database moet een Mongo::DB zijn, niet een %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           Veld was gedefinieerd als een %{klass}, maar ontvangen als %{other} met
           de waarde %{value}.

data/lib/config/locales/pl.yml

@@ -13,6 +13,8 @@ pl:
           or polymorphic belongs_to relation."
         invalid_database:
           Baza danych powinna być typu Mongo::DB, a nie %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           Pole zostało zdefiniowane jako %{klass}, ale otrzymano %{other}
           z wartością %{value}.

data/lib/config/locales/pt-BR.yml

@@ -13,6 +13,8 @@ pt-BR:
           or polymorphic belongs_to relation."
         invalid_database:
           A base de dados deverá ser uma Mongo::DB, em vez de %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           O campo foi definido como %{klass}, mas recebeu uma instância de %{other} com
           o valor %{value}.

data/lib/config/locales/pt.yml

@@ -13,6 +13,8 @@ pt:
           or polymorphic belongs_to relation."
         invalid_database:
           A base de dados deverá ser uma Mongo::DB, em vez de %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           O campo foi definido como %{klass}, mas recebeu uma instância de %{other} com
           o valor %{value}.

data/lib/config/locales/ro.yml

@@ -13,6 +13,8 @@ ro:
           or polymorphic belongs_to relation."
         invalid_database:
           Baza de date ar trebui să fie de tipul Mongo::DB, nu %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           Câmpul a fost definit ca şi un(o) %{klass}, dar valoarea
           recepţionată %{value} este de clasa %{other}.

data/lib/config/locales/ru.yml

@@ -13,6 +13,8 @@ ru:
           or polymorphic belongs_to relation."
         invalid_database:
           База данных должна быть Mongo::DB, а не %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           Поле уже было определено в классе %{klass}, но получено как %{other}
           со значением %{value}.

data/lib/config/locales/sv.yml

@@ -13,6 +13,8 @@ sv:
           or polymorphic belongs_to relation."
         invalid_database:
           Databasen bör vara Mongo::DB, inte %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           Fältet var definerat som %{klass}, men fick %{other} med
           värdet %{value}.

data/lib/config/locales/vi.yml

@@ -13,6 +13,8 @@ vi:
           or polymorphic belongs_to relation."
         invalid_database:
           Cơ sở dữ liệu nên là Mongo::DB, không phải %{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           Trường được định nghĩa là một %{klass}, nhưng nhận được %{other} với 
           giá trị %{value}.

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

@@ -15,6 +15,8 @@ zh-CN:
           or polymorphic belongs_to relation."
         invalid_database:
           数据库应该是Mongo::DB,而不是%{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
         invalid_type:
           在类%{klass}中定义了字段,实际值是%{value}的%{other}.
         invalid_options:

data/lib/mongoid/contexts/mongo.rb

@@ -371,7 +371,7 @@ module Mongoid #:nodoc:
           :reduce => reduce.gsub("[field]", field)
         )
         value = collection.empty? ? nil : collection.first[start.to_s]
-        value && value.try(:nan?) ? nil : value
+        value && value.do_or_do_not(:nan?) ? nil : value
       end
 
       # Filters the field list. If no fields have been supplied, then it will be

data/lib/mongoid/criterion/inclusion.rb

@@ -124,12 +124,49 @@ module Mongoid #:nodoc:
         case type
         when :first then crit.one
         when :last then crit.last
-        when :ids then execute_or_raise(args, crit)
+        when :ids then crit.execute_or_raise(args)
         else
           crit
         end
       end
 
+      # Execute the criteria or raise an error if no documents found.
+      #
+      # @example Execute or raise
+      #   criteria.execute_or_raise(id, criteria)
+      #
+      # @param [ Object ] args The arguments passed.
+      # @param [ Criteria ] criteria The criteria to execute.
+      #
+      # @raise [ Errors::DocumentNotFound ] If nothing returned.
+      #
+      # @return [ Document, Array<Document> ] The document(s).
+      #
+      # @since 2.0.0
+      def execute_or_raise(args)
+        (args[0].is_a?(Array) ? entries : from_map_or_db).tap do |result|
+          if Mongoid.raise_not_found_error && !args.flatten.blank?
+            raise Errors::DocumentNotFound.new(klass, args) if result._vacant?
+          end
+        end
+      end
+
+      # Get the document from the identity map, and if not found hit the
+      # database.
+      #
+      # @example Get the document from the map or criteria.
+      #   criteria.from_map_or_db(criteria)
+      #
+      # @param [ Criteria ] The cloned criteria.
+      #
+      # @return [ Document ] The found document.
+      #
+      # @since 2.2.1
+      def from_map_or_db
+        doc = IdentityMap.get(klass, extract_id)
+        doc && doc.matches?(selector) ? doc : first
+      end
+
       # Adds a criterion to the +Criteria+ that specifies values where any can
       # be matched in order to return results. This is similar to an SQL "IN"
       # clause. The MongoDB conditional operator that will be used is "$in".
@@ -241,7 +278,7 @@ module Mongoid #:nodoc:
           # to clean this funkiness up.
           selector.each_pair do |key, value|
             if crit.selector.has_key?(key)
-              if key.to_s =~ /^(|_)id$/
+              if key.mongoid_id?
                 if crit.selector.has_key?("$and")
                   crit.selector["$and"] << { key => value }
                 else
@@ -261,44 +298,6 @@ module Mongoid #:nodoc:
           end
         end
       end
-
-      private
-
-      # Execute the criteria or raise an error if no documents found.
-      #
-      # @example Execute or raise
-      #   criteria.execute_or_raise(id, criteria)
-      #
-      # @param [ Object ] args The arguments passed.
-      # @param [ Criteria ] criteria The criteria to execute.
-      #
-      # @raise [ Errors::DocumentNotFound ] If nothing returned.
-      #
-      # @return [ Document, Array<Document> ] The document(s).
-      #
-      # @since 2.0.0
-      def execute_or_raise(args, criteria)
-        (args[0].is_a?(Array) ? criteria.entries : from_map_or_db(criteria)).tap do |result|
-          if Mongoid.raise_not_found_error && !args.flatten.blank?
-            raise Errors::DocumentNotFound.new(klass, args) if result._vacant?
-          end
-        end
-      end
-
-      # Get the document from the identity map, and if not found hit the
-      # database.
-      #
-      # @example Get the document from the map or criteria.
-      #   criteria.from_map_or_db(criteria)
-      #
-      # @param [ Criteria ] The cloned criteria.
-      #
-      # @return [ Document ] The found document.
-      #
-      # @since 2.2.1
-      def from_map_or_db(criteria)
-        IdentityMap.get(klass, criteria.extract_id) || criteria.one
-      end
     end
   end
 end

data/lib/mongoid/criterion/selector.rb

@@ -112,6 +112,11 @@ module Mongoid #:nodoc:
           value.map { |v| typecast_value_for(field, v) }
         when Regexp
           value
+        when Range
+          {
+            "$gte" => typecast_value_for(field, value.first),
+            "$lte" => typecast_value_for(field, value.last)
+          }
         else
           if field.type == Array
             Serialization.mongoize(value, value.class)

data/lib/mongoid/dirty.rb

@@ -4,30 +4,6 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
     include ActiveModel::Dirty
 
-    # Get the changed values for the document. This is a hash with the name of
-    # the field as the keys, and the values being an array of previous and
-    # current pairs.
-    #
-    # @example Get the changes.
-    #   document.changes
-    #
-    # @note This is overriding the AM::Dirty implementation to handle
-    #   enumerable fields being in the hash when not actually changed.
-    #
-    # @return [ Hash ] The changed values.
-    #
-    # @since 2.1.0
-    def changes
-      {}.tap do |hash|
-        changed.each do |name|
-          change = attribute_change(name)
-          if change
-            hash[name] = change if change[0] != change[1]
-          end
-        end
-      end
-    end
-
     # Call this method after save, so the changes can be properly switched.
     #
     # This will unset the memoized children array, set new record to
@@ -71,8 +47,10 @@ module Mongoid #:nodoc:
     def setters
       {}.tap do |modifications|
         changes.each_pair do |field, changes|
-          key = embedded? ? "#{atomic_position}.#{field}" : field
-          modifications[key] = changes[1]
+          if changes
+            key = embedded? ? "#{atomic_position}.#{field}" : field
+            modifications[key] = changes[1]
+          end
         end
       end
     end