mongoid 2.0.0.rc.6 → 2.0.0.rc.7

data/Rakefile

@@ -32,8 +32,8 @@ Rspec::Core::RakeTask.new("spec:unit") do |spec|
   spec.pattern = "spec/unit/**/*_spec.rb"
 end
 
-Rspec::Core::RakeTask.new("spec:integration") do |spec|
-  spec.pattern = "spec/integration/**/*_spec.rb"
+Rspec::Core::RakeTask.new("spec:functional") do |spec|
+  spec.pattern = "spec/functional/**/*_spec.rb"
 end
 
 Rspec::Core::RakeTask.new('spec:progress') do |spec|

data/lib/config/locales/bg.yml

@@ -1,12 +1,9 @@
 bg:
-  activemodel:
-    errors:
-      messages:
-        taken: е вече заето
-
   mongoid:
     errors:
       messages:
+        taken:
+          е вече заето
         document_not_found:
           Не е намерен документ %{klass} с id(та) %{identifiers}.
         invalid_database:
@@ -29,7 +26,7 @@ bg:
           Присвояването на вложини атрибути за %{association}  е
           ограничено до %{limit} записа
         embedded_in_must_have_inverse_of:
-          Опциите на embedded_in асоциацията трябва да съдържат invers_of.
+          Опциите на embedded_in асоциацията трябва да съдържат inverse_of.
         dependent_only_references_one_or_many:
           Опцията dependent => destroy|delete, която е посочена е
           валидна само за references_one или references_many връзки

data/lib/config/locales/de.yml

@@ -1,12 +1,9 @@
 de:
-  activemodel:
-    errors:
-      messages:
-        taken: ist bereits vergeben
-
   mongoid:
     errors:
       messages:
+        taken:
+          ist bereits vergeben
         document_not_found:
           Dokument für Klasse %{klass} mit ID(s) %{identifiers} nicht gefunden.
         invalid_database:

data/lib/config/locales/en.yml

@@ -1,12 +1,9 @@
 en:
-  activemodel:
-    errors:
-      messages:
-        taken: is already taken
-
   mongoid:
     errors:
       messages:
+        taken:
+          is already taken
         document_not_found:
           Document not found for class %{klass} with id(s) %{identifiers}.
         invalid_database:

data/lib/config/locales/es.yml

@@ -1,12 +1,9 @@
 es:
-  activemodel:
-    errors:
-      messages:
-        taken: ya está en uso
-
   mongoid:
     errors:
       messages:
+        taken:
+          ya está en uso
         document_not_found:
           No se encontró ningún documento para la clase %{klass} con los id(s) %{identifiers}.
         invalid_database:

data/lib/config/locales/fr.yml

@@ -1,12 +1,9 @@
 fr:
-  activemodel:
-    errors:
-      messages:
-        taken: est déjà pris.
-
   mongoid:
     errors:
       messages:
+        taken:
+          est déjà pris.
         document_not_found:
           Document introuvable pour la classe %{klass} avec les ids %{identifiers}.
         invalid_database:

data/lib/config/locales/hu.yml

@@ -1,12 +1,9 @@
 hu:
-  activemodel:
-    errors:
-      messages:
-        taken: már foglalt
-
   mongoid:
     errors:
       messages:
+        taken:
+          már foglalt
         document_not_found:
           %{klass} osztályban, %{identifiers} id(k)-el nem található dokumentum.
         invalid_database:

data/lib/config/locales/it.yml

@@ -1,12 +1,9 @@
 it:
-  activemodel:
-    errors:
-      messages:
-        taken: è già utilizzato
-
   mongoid:
     errors:
       messages:
+        taken:
+          è già utilizzato
         document_not_found:
           Documento non trovato per la classe %{klass} con id(s) %{identifiers}.
         invalid_database:

data/lib/config/locales/kr.yml

@@ -1,12 +1,9 @@
 kr:
-  activemodel:
-    errors:
-      messages:
-        taken: 이미 사용하고있습니다 #is already taken
-
   mongoid:
     errors:
       messages:
+        taken:
+          이미 사용하고있습니다 #is already taken
         document_not_found:
           클라스 %{klass}와 id를 %{identifiers} 위한 문서를 찾을수 없습니다.
           #Document not found for class %{klass} with id(s) %{identifiers}.

data/lib/config/locales/nl.yml

@@ -1,12 +1,9 @@
 nl:
-  activemodel:
-    errors:
-      messages:
-        taken: al in gebruik
-
   mongoid:
     errors:
       messages:
+        taken:
+          al in gebruik
         document_not_found:
           Document niet gevonden voor class %{klass} met de id(s) %{identifiers}.
         invalid_database:

data/lib/config/locales/pl.yml

@@ -1,12 +1,9 @@
 pl:
-  activemodel:
-    errors:
-      messages:
-        taken: jest już zajęte
-
   mongoid:
     errors:
       messages:
+        taken:
+          jest już zajęte
         document_not_found:
           Nie znaleziono dokumentu dla klasy %{klass} o id %{identifiers}.
         invalid_database:

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

@@ -1,12 +1,9 @@
 pt-br:
-  activemodel:
-    errors:
-      messages:
-        taken: já está utilizada
-
   mongoid:
     errors:
       messages:
+        taken:
+          já está utilizada
         document_not_found:
           Nenhum documento encontrado para a classe %{klass} com os id(s) %{identifiers}.
         invalid_database:

data/lib/config/locales/pt.yml

@@ -1,12 +1,9 @@
 pt:
-  activemodel:
-    errors:
-      messages:
-        taken: já está utilizada
-
   mongoid:
     errors:
       messages:
+        taken:
+          já está utilizada
         document_not_found:
           Nenhum documento encontrado para a classe %{klass} com os id(s) %{identifiers}.
         invalid_database:

data/lib/config/locales/ro.yml

@@ -1,12 +1,9 @@
 ro:
-  activemodel:
-    errors:
-      messages:
-        taken: este deja folosit
-
   mongoid:
     errors:
       messages:
+        taken:
+          este deja folosit
         document_not_found:
           Nu există document în clasa %{klass} cu id %{identifiers}.
         invalid_database:

data/lib/config/locales/ru.yml

@@ -0,0 +1,41 @@
+ru:
+  mongoid:
+    errors:
+      messages:
+        taken:
+          уже занят
+        document_not_found:
+          Документ класса %{klass} с id %{identifiers} не найден.
+        invalid_database:
+          База данных должная быть Mongo::DB, а не %{name}.
+        invalid_type:
+          Поле уже было определено в классе %{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:
+          Accepting nested attributes для %{association} ограничено
+          %{limit} записями.
+        embedded_in_must_have_inverse_of:
+          Указание опции inverse_of для embedded_in ассоциации обязательно.
+        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 запрещён
+        unsaved_document:
+          Вызов методов create или create! запрещён у реляционной ассоциации
+          (%{document}), у которой родитель (%{base}) не сохранён.

data/lib/config/locales/sv.yml

@@ -1,12 +1,9 @@
 sv:
-  activemodel:
-    errors:
-      messages:
-        taken: har redan använts
-
   mongoid:
     errors:
       messages:
+        taken:
+          har redan använts
         document_not_found:
           Inget dokument kunde hittas för klass %{klass} med id %{identifiers}.
         invalid_database:

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

@@ -1,12 +1,9 @@
-en:
-  activemodel:
-    errors:
-      messages:
-        taken: 已占用
-
+zh-CN:
   mongoid:
     errors:
       messages:
+        taken:
+          已占用
         document_not_found:
           没有发现类是%{klass}id(s)是%{identifiers}的文档
         invalid_database:

data/lib/mongoid/atomicity.rb

@@ -81,7 +81,7 @@ module Mongoid #:nodoc:
     #
     # @return [ Hash ] The $pushAll operations.
     def _pushes
-      pushable? ? { _path => to_hash } : {}
+      pushable? ? { _path => as_document } : {}
     end
 
     # Determine if the document can be pushed.
@@ -104,7 +104,7 @@ module Mongoid #:nodoc:
       if changed? && !new_record?
         setters
       else
-        embedded_one? && new_record? ? { _path => to_hash } : {}
+        embedded_one? && new_record? ? { _path => as_document } : {}
       end
     end
   end

data/lib/mongoid/attributes.rb

@@ -1,9 +1,12 @@
 # encoding: utf-8
+require "mongoid/attributes/processing"
+
 module Mongoid #:nodoc:
 
   # This module contains the logic for handling the internal attributes hash,
   # and how to get and set values.
   module Attributes
+    include Processing
 
     # Returns the object type. This corresponds to the name of the class that
     # this document is, which is used in determining the class to
@@ -13,6 +16,8 @@ module Mongoid #:nodoc:
     #   person._type
     #
     # @return [ String ] The name of the class the document is.
+    #
+    # @since 1.0.0
     def _type
       @attributes["_type"]
     end
@@ -25,6 +30,8 @@ module Mongoid #:nodoc:
     # @param [ String ] new_type The name of the class.
     #
     # @return [ String ] the new type.
+    #
+    # @since 1.0.0
     def _type=(new_type)
       @attributes["_type"] = new_type
     end
@@ -37,6 +44,8 @@ module Mongoid #:nodoc:
     # @param [ String, Symbol ] name The name of the attribute.
     #
     # @return [ true, false ] True if present, false if not.
+    #
+    # @since 1.0.0
     def attribute_present?(name)
       !read_attribute(name).blank?
     end
@@ -48,6 +57,8 @@ module Mongoid #:nodoc:
     #   person.id
     #
     # @return [ BSON::ObjectId, String ] The id of the document.
+    #
+    # @since 1.0.0
     def id
       @attributes["_id"]
     end
@@ -61,50 +72,13 @@ module Mongoid #:nodoc:
     # @param [ BSON::ObjectId, String ] new_id The new id.
     #
     # @return [ BSON::ObjectId, String ] The new id.
+    #
+    # @since 1.0.0
     def id=(new_id)
       @attributes["_id"] = _id_type.set(new_id)
     end
     alias :_id= :id=
 
-    # Used for allowing accessor methods for dynamic attributes.
-    #
-    # @param [ String, Symbol ] name The name of the method.
-    # @param [ Array ] *args The arguments to the method.
-    def method_missing(name, *args)
-      attr = name.to_s
-      return super unless @attributes.has_key?(attr.reader)
-      if attr.writer?
-        # "args.size > 1" allows to simulate 1.8 behavior of "*args"
-        write_attribute(attr.reader, (args.size > 1) ? args : args.first)
-      else
-        read_attribute(attr.reader)
-      end
-    end
-
-    # Process the provided attributes casting them to their proper values if a
-    # field exists for them on the document. This will be limited to only the
-    # attributes provided in the suppied +Hash+ so that no extra nil values get
-    # put into the document's attributes.
-    #
-    # @example Process the attributes.
-    #   person.process(:title => "sir", :age => 40)
-    #
-    # @param [ Hash ] attrs The attributes to set.
-    def process(attrs = nil)
-      pending = {}
-      sanitize_for_mass_assignment(attrs || {}).each_pair do |key, value|
-        if set_allowed?(key)
-          write_attribute(key, value)
-        else
-          pending[key.to_s] = value and next if relations.has_key?(key.to_s)
-          send("#{key}=", value)
-        end
-      end
-      yield self if block_given?
-      process_relations(pending)
-      setup_modifications
-    end
-
     # Read a value from the document attributes. If the value does not exist
     # it will return nil.
     #
@@ -117,6 +91,8 @@ module Mongoid #:nodoc:
     # @param [ String, Symbol ] name The name of the attribute to get.
     #
     # @return [ Object ] The value of the attribute.
+    #
+    # @since 1.0.0
     def read_attribute(name)
       access = name.to_s
       value = @attributes[access]
@@ -132,6 +108,8 @@ module Mongoid #:nodoc:
     #   person.remove_attribute(:title)
     #
     # @param [ String, Symbol ] name The name of the attribute to remove.
+    #
+    # @since 1.0.0
     def remove_attribute(name)
       access = name.to_s
       modify(access, @attributes.delete(name.to_s), nil)
@@ -145,6 +123,8 @@ module Mongoid #:nodoc:
     # @param [ Array ] *args The name of the method.
     #
     # @return [ true, false ] True if it does, false if not.
+    #
+    # @since 1.0.0
     def respond_to?(*args)
       (Mongoid.allow_dynamic_fields &&
         @attributes &&
@@ -164,6 +144,8 @@ module Mongoid #:nodoc:
     #
     # @param [ String, Symbol ] name The name of the attribute to update.
     # @param [ Object ] value The value to set for the attribute.
+    #
+    # @since 1.0.0
     def write_attribute(name, value)
       access = name.to_s
       modify(access, @attributes[access], typed_value_for(access, value))
@@ -181,10 +163,11 @@ module Mongoid #:nodoc:
     #   person.attributes = { :title => "Mr." }
     #
     # @param [ Hash ] attrs The new attributes to set.
+    #
+    # @since 1.0.0
     def write_attributes(attrs = nil)
-      process(attrs || {})
-      if new_record? && id.blank?
-        identify
+      process(attrs) do |document|
+        document.identify if new? && id.blank?
       end
     end
     alias :attributes= :write_attributes
@@ -197,6 +180,8 @@ module Mongoid #:nodoc:
     #   person.default_attributes
     #
     # @return [ Hash ] The default values for each field.
+    #
+    # @since 1.0.0
     def default_attributes
       default_values = defaults
       default_values.each_pair do |key, val|
@@ -205,34 +190,18 @@ module Mongoid #:nodoc:
       default_values || {}
     end
 
-    # Process all the pending relations that needed to wait until ids were set
-    # to fire off.
-    #
-    # @example Process the relations.
-    #   document.process_relations({ "addressable" => person })
-    #
-    # @param [ Hash ] pending The pending relation values.
-    def process_relations(pending)
-      pending.each_pair do |name, value|
-        metadata = relations[name]
-        if value.is_a?(Hash)
-          metadata.nested_builder(value, {}).build(self)
-        else
-          send("#{name}=", value, :binding => true)
-        end
-      end
-    end
-
-    # Return true if dynamic field setting is enabled.
-    #
-    # @example Is a set allowed for this name?
-    #   person.set_allowed?(:title)
-    #
-    # @param [ String, Symbol ] key The name of the field.
+    # Used for allowing accessor methods for dynamic attributes.
     #
-    # @return [ true, false ] True if allowed, false if not.
-    def set_allowed?(key)
-      Mongoid.allow_dynamic_fields && !respond_to?("#{key}=")
+    # @param [ String, Symbol ] name The name of the method.
+    # @param [ Array ] *args The arguments to the method.
+    def method_missing(name, *args)
+      attr = name.to_s
+      return super unless @attributes.has_key?(attr.reader)
+      if attr.writer?
+        write_attribute(attr.reader, (args.size > 1) ? args : args.first)
+      else
+        read_attribute(attr.reader)
+      end
     end
 
     # Return the typecasted value for a field.
@@ -244,6 +213,8 @@ module Mongoid #:nodoc:
     # @param [ Object ] value The uncast value.
     #
     # @return [ Object ] The cast value.
+    #
+    # @since 1.0.0
     def typed_value_for(key, value)
       fields.has_key?(key) ? fields[key].set(value) : value
     end