mongoid 2.0.0.rc.7 → 2.0.0.rc.8

data/lib/config/locales/en.yml

@@ -40,3 +40,6 @@ en:
         unsaved_document:
           You cannot call create or create! through a relational association
           relation (%{document}) who's parent (%{base}) is not already saved.
+        mixed_relations:
+          Referencing a(n) %{embedded} document from the %{root} document via a
+          relational association is not allowed since the %{embedded} is embedded.

data/lib/config/locales/id.yml

@@ -0,0 +1,46 @@
+id:
+  mongoid:
+    errors:
+      messages:
+        taken:
+          telah digunakan
+        document_not_found:
+          Dokumen tidak ditemukan untuk kelas %{klass} dengan id %{identifiers}.
+        invalid_database:
+          Database harus Mongo::DB, bukan %{name}.
+        invalid_type:
+          Field didefinisikan sebagai %{klass}, tetapi menerima %{other} dengan
+          value %{value}.
+        unsupported_version:
+          MongoDB %{version} tidak di support, silakan upgrade
+          ke %{mongo_version}.
+        validations:
+          Validasi gagal - %{errors}.
+        invalid_collection:
+          Akses terhadap koleksi %{klass} tidak diperbolehkan karena merupakan
+          embedded document, silakan akses dokumen melalui root document.
+        invalid_field:
+          Mendefinisikan field dengan nama %{name} tidak diperbolehkan. Jangan
+          mendefinisikan field yang konflik dengan nama atribut atau method
+          internal Mongoid. Gunakan Document#instance_methods untuk melihat nama
+          yang termasuk.
+        too_many_nested_attribute_records:
+          Penerimaan nested attribut untuk %{association} dibatasi %{limit}
+          record.
+        embedded_in_must_have_inverse_of:
+          Opsi untuk asosiasi embedded_in harus memiliki inverse_of.
+        dependent_only_references_one_or_many:
+          Opsi dependent => destroy|delete yang diberikan hanya valid untuk
+          asosiasi references_one atau references_many.
+        association_cant_have_inverse_of:
+          Mendefinisikan inverse_of pada asosiasi ini tidak diperbolehkan. Hanya
+          gunakan opsi ini pada embedded_in atau references_many sebagai array.
+        calling_document_find_with_nil_is_invalid:
+          Memanggil Document#find dengan nil adalah tidak valid
+        unsaved_document:
+          Anda tidak dapat memanggil create atau create! melalui asosiasi
+          relational (%{document}) yang parent-nya (%{base}) belum disimpan.
+        mixed_relations:
+          Mereferensi sebuah %{embedded} document dari %{root} dokumen melalui
+          asosiasi relasional tidak diperbolehkan karena %{embedded}
+          adalah dokumen embedded.

data/lib/config/locales/ja.yml

@@ -0,0 +1,40 @@
+ja:
+  mongoid:
+    errors:
+      messages:
+        taken:
+          はすでに使用されています
+        document_not_found:
+          次のDocumentは見つかりませんでした。class %{klass} with id(s) %{identifiers}
+        invalid_database:
+          次のDatabaseは利用できませんでした。%{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:
+          次のネストされた属性は、 %{limit} 以下に制限されています。{%association}
+        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 のみで利用できます。
+        calling_document_find_with_nil_is_invalid:
+          Document#find を nil で呼び出すことは出来ません
+        unsaved_document:
+          リレーションを通して create もしくは create! を呼び出すことが出来ませんでした。
+          %{document} の 親ドキュメント (%{base}) は保存されていません。
+        mixed_relations:
+          %{embedded} ドキュメント に対して %{root} ドキュメントからリレーション関係を用いて、参照することはできません。

data/lib/config/locales/vi.yml

@@ -0,0 +1,45 @@
+vi:
+  mongoid:
+    errors:
+      messages:
+        taken:
+          đã bị lấy
+        document_not_found:
+          Không tìm thấy văn bản cho lớp %{klass} với định danh %{identifiers}.
+        invalid_database:
+          Cơ sở dữ liệu nên là Mongo::DB, không phải %{name}.
+        invalid_type:
+          Trường được định nghĩa là một %{klass}, nhưng nhận được %{other} với 
+          giá trị %{value}.
+        unsupported_version:
+          MongoDB %{version} không được hỗ trợ, xin vui lòng nâng cấp
+          lên %{mongo_version}.
+        validations:
+          Kiểm định không thành công - %{errors}.
+        invalid_collection:
+          Không được phép truy cập tập văn bản cuả %{klass} vì đây 
+          là một văn bản nhúng, xin vui lòng truy cập tập văn bản từ 
+          văn bản gốc.
+        invalid_field:
+          Không được phép định nghĩa tên trường là %{name}. Không định nghĩa 
+          tên trường trùng với các thuộc tính có sẵn hoặc các tên hàm cuả Mongoid.
+          Sử dụng Use Document#instance_methods để xem danh sách tên đã được dùng.
+        too_many_nested_attribute_records:
+          Số lượng các thuộc tính lồng cho %{association} bị giới hạn 
+          ở %{limit} bản ghi.
+        embedded_in_must_have_inverse_of:
+          Phải cho thêm inverse_of vào lực chọn cuả kết hợp embedded_in.
+        dependent_only_references_one_or_many:
+          Lựa chọn dependent => destroy|delete
+          chỉ có hiệu lực với kết hợp references_one hoặc references_many.
+        association_cant_have_inverse_of:
+          Không được phép định nghĩa inverse_of cho kết hợp này. Chỉ 
+          sử dụng lựa chọn này cho embedded_in or references_many as array.
+        calling_document_find_with_nil_is_invalid:
+          Không được phép gọi Document#find với giá trị nil
+        unsaved_document:
+          Bạn không được gọi create hoặc create! thông qua một quan hệ kết hợp 
+          mà văn bản gốc (%{base}) chưa được lưu.
+        mixed_relations:
+          Không được phép tham chiếu một văn bản %{embedded} từ văn bản %{root} thông qua một 
+          quan hệ kết hợp vì %{embedded} là kiểu nhúng.

data/lib/mongoid.rb

@@ -42,6 +42,7 @@ require "mongo"
 require "mongoid/errors"
 require "mongoid/extensions"
 require "mongoid/safe"
+require "mongoid/relations"
 require "mongoid/atomicity"
 require "mongoid/attributes"
 require "mongoid/callbacks"
@@ -68,17 +69,17 @@ require "mongoid/json"
 require "mongoid/keys"
 require "mongoid/logger"
 require "mongoid/matchers"
-require "mongoid/modifiers"
 require "mongoid/multi_parameter_attributes"
 require "mongoid/multi_database"
 require "mongoid/named_scope"
 require "mongoid/nested_attributes"
+require "mongoid/observer"
 require "mongoid/paths"
 require "mongoid/persistence"
-require "mongoid/relations"
 require "mongoid/safety"
 require "mongoid/scope"
 require "mongoid/serialization"
+require "mongoid/sharding"
 require "mongoid/state"
 require "mongoid/timestamps"
 require "mongoid/validations"
@@ -129,7 +130,8 @@ module Mongoid #:nodoc
   #
   # @example Delegate the configuration methods.
   #   Mongoid.database = Mongo::Connection.new.db("test")
-  Mongoid::Config.public_instance_methods(false).each do |name|
+  (Mongoid::Config.public_instance_methods(false) +
+    ActiveModel::Observing::ClassMethods.public_instance_methods(false)).each do |name|
     (class << self; self; end).class_eval <<-EOT
       def #{name}(*args)
         configure.send("#{name}", *args)

data/lib/mongoid/attributes.rb

@@ -8,34 +8,6 @@ module Mongoid #:nodoc:
   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
-    # instantiate in various cases.
-    #
-    # @example Get the type.
-    #   person._type
-    #
-    # @return [ String ] The name of the class the document is.
-    #
-    # @since 1.0.0
-    def _type
-      @attributes["_type"]
-    end
-
-    # Set the type of the document. This should be the name of the class.
-    #
-    # @example Set the type
-    #   person._type = "Person"
-    #
-    # @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
-
     # Determine if an attribute is present.
     #
     # @example Is the attribute present?
@@ -50,35 +22,6 @@ module Mongoid #:nodoc:
       !read_attribute(name).blank?
     end
 
-    # Get the id associated with this object. This will pull the _id value out
-    # of the attributes.
-    #
-    # @example Get the id.
-    #   person.id
-    #
-    # @return [ BSON::ObjectId, String ] The id of the document.
-    #
-    # @since 1.0.0
-    def id
-      @attributes["_id"]
-    end
-    alias :_id :id
-
-    # Set the id of the document to a new one.
-    #
-    # @example Set the id.
-    #   person.id = BSON::ObjectId.new
-    #
-    # @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=
-
     # Read a value from the document attributes. If the value does not exist
     # it will return nil.
     #
@@ -163,10 +106,11 @@ module Mongoid #:nodoc:
     #   person.attributes = { :title => "Mr." }
     #
     # @param [ Hash ] attrs The new attributes to set.
+    # @param [ Boolean ] guard_protected_attributes False to skip mass assignment protection.
     #
     # @since 1.0.0
-    def write_attributes(attrs = nil)
-      process(attrs) do |document|
+    def write_attributes(attrs = nil, guard_protected_attributes = true)
+      process(attrs, guard_protected_attributes) do |document|
         document.identify if new? && id.blank?
       end
     end
@@ -182,12 +126,29 @@ module Mongoid #:nodoc:
     # @return [ Hash ] The default values for each field.
     #
     # @since 1.0.0
+    #
+    # @raise [ RuntimeError ] Always
+    # @since 2.0.0.rc.8
     def default_attributes
-      default_values = defaults
-      default_values.each_pair do |key, val|
-        default_values[key] = typed_value_for(key, val.call) if val.respond_to?(:call)
+      raise "default_attributes is no longer valid. Plase use: apply_default_attributes."
+    end
+
+    # Set any missing default values in the attributes.
+    #
+    # @example Get the raw attributes after defaults have been applied.
+    #   person.apply_default_attributes
+    #
+    # @return [ Hash ] The raw attributes.
+    #
+    # @since 2.0.0.rc.8
+    def apply_default_attributes
+      (@attributes ||= {}).tap do |h|
+        defaults.each_pair do |key, val|
+          unless h.has_key?(key)
+            h[key] = val.respond_to?(:call) ? typed_value_for(key, val.call) : val
+          end
+        end
       end
-      default_values || {}
     end
 
     # Used for allowing accessor methods for dynamic attributes.

data/lib/mongoid/attributes/processing.rb

@@ -14,10 +14,13 @@ module Mongoid #:nodoc:
       #   person.process(:title => "sir", :age => 40)
       #
       # @param [ Hash ] attrs The attributes to set.
+      # @param [ Boolean ] guard_protected_attributes False to skip mass assignment protection.
       #
       # @since 2.0.0.rc.7
-      def process(attrs = nil)
-        sanitize_for_mass_assignment(attrs || {}).each_pair do |key, value|
+      def process(attrs = nil, guard_protected_attributes = true)
+        attrs ||= {}
+        attrs = sanitize_for_mass_assignment(attrs) if guard_protected_attributes
+        attrs.each_pair do |key, value|
           next if pending_attribute?(key, value)
           process_attribute(key, value)
         end

data/lib/mongoid/callbacks.rb

@@ -2,6 +2,16 @@
 module Mongoid #:nodoc:
   module Callbacks
     extend ActiveSupport::Concern
+
+    CALLBACKS = [
+      :before_validation, :after_validation,
+      :after_initialize,
+      :before_create, :around_create, :after_create,
+      :before_destroy, :around_destroy, :after_destroy,
+      :before_save, :around_save, :after_save,
+      :before_update, :around_update, :after_update,
+    ]
+
     included do
       extend ActiveModel::Callbacks
       include ActiveModel::Validations::Callbacks

data/lib/mongoid/collection.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "mongoid/collections/retry"
 require "mongoid/collections/operations"
 require "mongoid/collections/cyclic_iterator"
 require "mongoid/collections/master"
@@ -122,6 +123,29 @@ module Mongoid #:nodoc
       @slaves ||= Collections::Slaves.new(slaves, @name)
     end
 
+    # Updates one or more documents in the collection.
+    #
+    # @example Update documents.
+    #   collection.update(
+    #     { "_id" => BSON::OjectId.new },
+    #     { "$push" => { "addresses" => { "_id" => "street" } } },
+    #     :safe => true
+    #   )
+    #
+    # @param [ Hash ] selector The document selector.
+    # @param [ Hash ] document The modifier.
+    # @param [ Hash ] options The options.
+    #
+    # @since 2.0.0
+    def update(selector, document, options = {})
+      updater = Thread.current[:mongoid_atomic_update]
+      if updater
+        updater.consume(selector, document, options)
+      else
+        master.update(selector, document, options)
+      end
+    end
+
     protected
 
     # Determine if the read is going to the master or the slaves.

data/lib/mongoid/collections/master.rb

@@ -1,26 +1,34 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Collections #:nodoc:
+
+    # This class wraps the MongoDB master database.
     class Master
+      include Mongoid::Collections::Retry
 
       attr_reader :collection
 
       # All read and write operations should delegate to the master connection.
       # These operations mimic the methods on a Mongo:Collection.
       #
-      # Example:
-      #
-      # <tt>collection.save({ :name => "Al" })</tt>
+      # @example Proxy the driver save.
+      #   collection.save({ :name => "Al" })
       Operations::ALL.each do |name|
-        define_method(name) { |*args| collection.send(name, *args) }
+        define_method(name) do |*args|
+          retry_on_connection_failure do
+            collection.send(name, *args)
+          end
+        end
       end
 
       # Create the new database writer. Will create a collection from the
       # master database.
       #
-      # Example:
+      # @example Create a new wrapped master.
+      #   Master.new(db, "testing")
       #
-      # <tt>Master.new(master, "mongoid_people")</tt>
+      # @param [ Mongo::DB ] master The master database.
+      # @param [ String ] name The name of the database.
       def initialize(master, name)
         @collection = master.collection(name)
       end

data/lib/mongoid/collections/operations.rb

@@ -36,7 +36,7 @@ module Mongoid #:nodoc:
 
       # Convenience constant for getting back all collection operations.
       ALL = (READ + WRITE)
-      PROXIED = ALL - [ :find, :find_one, :map_reduce, :mapreduce ]
+      PROXIED = ALL - [ :find, :find_one, :map_reduce, :mapreduce, :update ]
     end
   end
 end

data/lib/mongoid/collections/retry.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Collections #:nodoc:
+
+    # Provides behaviour for retrying commands on connection failure.
+    module Retry
+
+      # Retries command on connection failures.
+      #
+      # This is useful when using replica sets. When a primary server wents
+      # down and a command is issued, the driver will raise a
+      # Mongo::ConnectionFailure. We wait a little bit, because nodes are
+      # electing themselves, and then retry the given command.
+      #
+      # By setting Mongoid.max_retries_on_connection_failure to a value of 0,
+      # no attempt will be made, immediately raising connection failure.
+      # Otherwise it will attempt to make the specified number of retries
+      # and then raising the exception to clients.
+      #
+      # @example Retry the command.
+      #   retry_on_connection_failure do
+      #     collection.send(name, *args)
+      #   end
+      #
+      # @since 2.0.0
+      def retry_on_connection_failure
+        retries = 0
+        begin
+          yield
+        rescue Mongo::ConnectionFailure => ex
+          retries += 1
+          raise ex if retries > Mongoid.max_retries_on_connection_failure
+          Kernel.sleep(0.5)
+          retry
+        end
+      end
+    end
+  end
+end