mongoid 2.1.9 → 2.2.0

data/lib/config/locales/hu.yml

@@ -4,8 +4,13 @@ hu:
       messages:
         taken:
           már foglalt
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           "%{klass} osztályban, %{identifiers} id(k)-el nem található dokumentum."
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           Az adatbázisnak Mongo::DB-nek kellene lennie, nem %{name}.
         invalid_type:

data/lib/config/locales/id.yml

@@ -4,8 +4,13 @@ id:
       messages:
         taken:
           telah digunakan
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           Dokumen tidak ditemukan untuk kelas %{klass} dengan id %{identifiers}.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           Database harus Mongo::DB, bukan %{name}.
         invalid_type:

data/lib/config/locales/it.yml

@@ -4,8 +4,13 @@ it:
       messages:
         taken:
           è già utilizzato
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           Documento non trovato per la classe %{klass} con id(s) %{identifiers}.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           Il database dovrebbe essere un Mongo::DB, non %{name}.
         invalid_type:

data/lib/config/locales/ja.yml

@@ -4,8 +4,13 @@ ja:
       messages:
         taken:
           はすでに使用されています
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           次のDocumentは見つかりませんでした。class %{klass} with id(s) %{identifiers}
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           次のDatabaseは利用できませんでした。%{name}
         invalid_type:

data/lib/config/locales/kr.yml

@@ -4,8 +4,13 @@ kr:
       messages:
         taken:
           이미 사용하고있습니다
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           클라스 %{klass}와 id를 %{identifiers} 위한 문서를 찾을수 없습니다.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           데이타베이스가 Mongo::DB이어야 합니다, %{name}이면 안됩니다.
         invalid_type:

data/lib/config/locales/nl.yml

@@ -4,8 +4,13 @@ nl:
       messages:
         taken:
           al in gebruik
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           Document niet gevonden voor class %{klass} met de id(s) %{identifiers}.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           Database moet een Mongo::DB zijn, niet een %{name}.
         invalid_type:

data/lib/config/locales/pl.yml

@@ -4,8 +4,13 @@ pl:
       messages:
         taken:
           jest już zajęte
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           Nie znaleziono dokumentu dla klasy %{klass} o id %{identifiers}.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           Baza danych powinna być typu Mongo::DB, a nie %{name}.
         invalid_type:

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

@@ -4,8 +4,13 @@ pt-BR:
       messages:
         taken:
           já está utilizada
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           Nenhum documento encontrado para a classe %{klass} com os id(s) %{identifiers}.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           A base de dados deverá ser uma Mongo::DB, em vez de %{name}.
         invalid_type:

data/lib/config/locales/pt.yml

@@ -4,8 +4,13 @@ pt:
       messages:
         taken:
           já está utilizada
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           Nenhum documento encontrado para a classe %{klass} com os id(s) %{identifiers}.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           A base de dados deverá ser uma Mongo::DB, em vez de %{name}.
         invalid_type:

data/lib/config/locales/ro.yml

@@ -4,8 +4,13 @@ ro:
       messages:
         taken:
           este deja folosit
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           Nu există document în clasa %{klass} cu id %{identifiers}.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           Baza de date ar trebui să fie de tipul Mongo::DB, nu %{name}.
         invalid_type:

data/lib/config/locales/ru.yml

@@ -4,8 +4,13 @@ ru:
       messages:
         taken:
           уже занят
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           Документ класса %{klass} с id %{identifiers} не найден.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           База данных должна быть Mongo::DB, а не %{name}.
         invalid_type:

data/lib/config/locales/sv.yml

@@ -4,8 +4,13 @@ sv:
       messages:
         taken:
           har redan använts
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           Inget dokument kunde hittas för klass %{klass} med id %{identifiers}.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           Databasen bör vara Mongo::DB, inte %{name}.
         invalid_type:

data/lib/config/locales/vi.yml

@@ -4,8 +4,13 @@ vi:
       messages:
         taken:
           đã bị lấy
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         document_not_found:
           Không tìm thấy văn bản cho lớp %{klass} với định danh %{identifiers}.
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           Cơ sở dữ liệu nên là Mongo::DB, không phải %{name}.
         invalid_type:

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

@@ -4,10 +4,15 @@ zh-CN:
       messages:
         blank:
           不能为空
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
         taken:
           已占用
         document_not_found:
           没有发现类是%{klass}id(s)是%{identifiers}的文档
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
         invalid_database:
           数据库应该是Mongo::DB,而不是%{name}.
         invalid_type:

data/lib/mongoid/atomic.rb

@@ -41,10 +41,9 @@ module Mongoid #:nodoc:
     # @since 2.1.0
     def atomic_updates
       Modifiers.new.tap do |mods|
-        mods.set(atomic_sets)
+        generate_atomic_updates(mods, self)
         _children.each do |child|
-          mods.set(child.atomic_sets)
-          mods.push(child.atomic_pushes)
+          generate_atomic_updates(mods, child)
         end
       end
     end
@@ -54,7 +53,7 @@ module Mongoid #:nodoc:
     # documents, $unset on embeds_one, $set on embeds_many.
     #
     # @example Get the removal operator.
-    #   name.remover
+    #   name.atomic_delete_modifier
     #
     # @return [ String ] The pull or unset operation.
     def atomic_delete_modifier
@@ -65,7 +64,7 @@ module Mongoid #:nodoc:
     # documents, $set on embeds_one, $push on embeds_many.
     #
     # @example Get the insert operation.
-    #   name.inserter
+    #   name.atomic_insert_modifier
     #
     # @return [ String ] The pull or set operator.
     def atomic_insert_modifier
@@ -76,7 +75,7 @@ module Mongoid #:nodoc:
     # updates via $set in MongoDB.
     #
     # @example Get the path to this document.
-    #   address.path
+    #   address.atomic_path
     #
     # @return [ String ] The path to the document in the database.
     def atomic_path
@@ -86,17 +85,41 @@ module Mongoid #:nodoc:
     # Returns the positional operator of this document for modification.
     #
     # @example Get the positional operator.
-    #   address.position
+    #   address.atomic_position
     #
     # @return [ String ] The positional operator with indexes.
     def atomic_position
       atomic_paths.position
     end
 
+    # Get all the attributes that need to be pulled.
+    #
+    # @example Get the pulls.
+    #   person.atomic_pulls
+    #
+    # @return [ Array<Hash> ] The $pullAll operations.
+    #
+    # @since 2.2.0
+    def atomic_pulls
+      @atomic_pulls ||= {}
+    end
+
+    # Add the document as an atomic pull.
+    #
+    # @example Add the atomic pull.
+    #   person.add_atomic_pull(address)
+    #
+    # @param [ Document ] The embedded document to pull.
+    #
+    # @since 2.2.0
+    def add_atomic_pull(document)
+      (atomic_pulls[document.atomic_path] ||= []).push(document.as_document)
+    end
+
     # Get all the push attributes that need to occur.
     #
     # @example Get the pushes.
-    #   person._pushes
+    #   person.atomic_pushes
     #
     # @return [ Hash ] The $pushAll operations.
     #
@@ -109,7 +132,7 @@ module Mongoid #:nodoc:
     # with MongoDB's $ operator.
     #
     # @example Get the selector.
-    #   address.selector
+    #   address.atomic_selector
     #
     # @return [ String ] The exact selector for this document.
     def atomic_selector
@@ -119,7 +142,7 @@ module Mongoid #:nodoc:
     # Get all the attributes that need to be set.
     #
     # @example Get the sets.
-    #   person._sets
+    #   person.atomic_sets
     #
     # @return [ Hash ] The $set operations.
     #
@@ -128,6 +151,18 @@ module Mongoid #:nodoc:
       updateable? ? setters : settable? ? { atomic_path => as_document } : {}
     end
 
+    # Get all the attributes that need to be unset.
+    #
+    # @example Get the unsets.
+    #   person.atomic_unsets
+    #
+    # @return [ Array<Hash> ] The $unset operations.
+    #
+    # @since 2.2.0
+    def atomic_unsets
+      @atomic_unsets ||= []
+    end
+
     private
 
     # Get the atomic paths utility for this document.
@@ -141,5 +176,21 @@ module Mongoid #:nodoc:
     def atomic_paths
       @atomic_paths ||= metadata ? metadata.path(self) : Atomic::Paths::Root.new(self)
     end
+
+    # Generates the atomic updates in the correct order.
+    #
+    # @example Generate the updates.
+    #   model.generate_atomic_updates(mods, doc)
+    #
+    # @param [ Modifiers ] mods The atomic modifications.
+    # @param [ Document ] doc The document to update for.
+    #
+    # @since 2.2.0
+    def generate_atomic_updates(mods, doc)
+      mods.unset(doc.atomic_unsets)
+      mods.pull(doc.atomic_pulls)
+      mods.set(doc.atomic_sets)
+      mods.push(doc.atomic_pushes)
+    end
   end
 end

data/lib/mongoid/atomic/modifiers.rb

@@ -6,6 +6,21 @@ module Mongoid #:nodoc:
     # database.
     class Modifiers < Hash
 
+      # Adds pull modifiers to the modifiers hash.
+      #
+      # @example Add pull operations.
+      #   modifiers.pull({ "addresses" => { "street" => "Bond" }})
+      #
+      # @param [ Hash ] modifications The pull modifiers.
+      #
+      # @since 2.2.0
+      def pull(modifications)
+        modifications.each_pair do |field, value|
+          add_operation(pulls, field, value)
+          pull_fields << field.split(".", 2)[0]
+        end
+      end
+
       # Adds push modifiers to the modifiers hash.
       #
       # @example Add push operations.
@@ -16,12 +31,8 @@ module Mongoid #:nodoc:
       # @since 2.1.0
       def push(modifications)
         modifications.each_pair do |field, value|
-          mods = conflicting?(field) ? conflicts : pushes
-          if mods.has_key?(field)
-            mods[field].push(value)
-          else
-            mods[field] = [ value ]
-          end
+          mods = push_conflict?(field) ? conflicting_pushes : pushes
+          add_operation(mods, field, Array.wrap(value))
         end
       end
 
@@ -36,26 +47,111 @@ module Mongoid #:nodoc:
       def set(modifications)
         modifications.each_pair do |field, value|
           next if field == "_id"
-          sets.update(field => value)
-          fields << field.split(".", 2)[0]
+          mods = set_conflict?(field) ? conflicting_sets : sets
+          add_operation(mods, field, value)
+          set_fields << field.split(".", 2)[0]
+        end
+      end
+
+      # Adds unset operations to the modifiers hash.
+      #
+      # @example Add unset operations.
+      #   modifiers.unset([ "addresses" ])
+      #
+      # @param [ Array<String> ] modifications The unset relation names.
+      #
+      # @since 2.2.0
+      def unset(modifications)
+        modifications.each do |field|
+          unsets.update(field => true)
         end
       end
 
       private
 
-      # Determines whether or not the provided field has a conflicting
-      # modification with an already added $set operation.
+      # Add the operation to the modifications, either appending or creating a
+      # new one.
       #
-      # @example Does the field conflict?
-      #   modifiers.conflicting?("addresses")
+      # @example Add the operation.
+      #   modifications.add_operation(mods, field, value)
       #
-      # @param [ String ] field The name of the field.
+      # @param [ Hash ] mods The modifications.
+      # @param [ String ] field The field.
+      # @param [ Hash ] value The atomic op.
       #
-      # @return [ true, false ] If the field conflicts.
+      # @since 2.2.0
+      def add_operation(mods, field, value)
+        if mods.has_key?(field)
+          value.each do |val|
+            mods[field].push(val)
+          end
+        else
+          mods[field] = value
+        end
+      end
+
+      # Is the operation going to be a conflict for a $set?
       #
-      # @since 2.1.0
-      def conflicting?(field)
-        fields.include?(field.split(".", 2)[0])
+      # @example Is this a conflict for a set?
+      #   modifiers.set_conflict?(field)
+      #
+      # @param [ String ] field The field.
+      #
+      # @return [ true, false ] If this field is a conflict.
+      #
+      # @since 2.2.0
+      def set_conflict?(field)
+        pull_fields.include?(field.split(".", 2)[0])
+      end
+
+      # Is the operation going to be a conflict for a $push?
+      #
+      # @example Is this a conflict for a push?
+      #   modifiers.push_conflict?(field)
+      #
+      # @param [ String ] field The field.
+      #
+      # @return [ true, false ] If this field is a conflict.
+      #
+      # @since 2.2.0
+      def push_conflict?(field)
+        set_fields.include?(field.split(".", 2)[0])
+      end
+
+      # Get the conflicting pull modifications.
+      #
+      # @example Get the conflicting pulls.
+      #   modifiers.conflicting_pulls
+      #
+      # @return [ Hash ] The conflicting pull operations.
+      #
+      # @since 2.2.0
+      def conflicting_pulls
+        conflicts["$pullAll"] ||= {}
+      end
+
+      # Get the conflicting push modifications.
+      #
+      # @example Get the conflicting pushs.
+      #   modifiers.conflicting_pushs
+      #
+      # @return [ Hash ] The conflicting push operations.
+      #
+      # @since 2.2.0
+      def conflicting_pushes
+        conflicts["$pushAll"] ||= {}
+      end
+
+      # Get the conflicting set modifications.
+      #
+      # @example Get the conflicting sets.
+      #   modifiers.conflicting_sets
+      #
+      # @return [ Hash ] The conflicting set operations.
+      #
+      # @since 2.2.0
+      def conflicting_sets
+        conflicts["$set"] ||= {}
       end
 
       # Get the push operations that would have conflicted with the sets.
@@ -67,19 +163,43 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def conflicts
-        self[:other] ||= {}
+        self[:conflicts] ||= {}
       end
 
-      # Get the list of stripped fields that are being updated.
+      # Get the names of the fields that need to be pulled.
       #
-      # @example Get the fields.
-      #   modifiers.fields
+      # @example Get the pull fields.
+      #   modifiers.pull_fields
       #
-      # @return [ Array ] The stripped field names.
+      # @return [ Array<String> ] The pull fields.
+      #
+      # @since 2.2.0
+      def pull_fields
+        @pull_fields ||= []
+      end
+
+      # Get the names of the fields that need to be set.
+      #
+      # @example Get the set fields.
+      #   modifiers.set_fields
+      #
+      # @return [ Array<String> ] The set fields.
+      #
+      # @since 2.2.0
+      def set_fields
+        @set_fields ||= []
+      end
+
+      # Get the $pullAll operations or intialize a new one.
+      #
+      # @example Get the $pullAll operations.
+      #   modifiers.pulles
+      #
+      # @return [ Hash ] The $pullAll operations.
       #
       # @since 2.1.0
-      def fields
-        @fields ||= []
+      def pulls
+        self["$pullAll"] ||= {}
       end
 
       # Get the $pushAll operations or intialize a new one.
@@ -105,6 +225,18 @@ module Mongoid #:nodoc:
       def sets
         self["$set"] ||= {}
       end
+
+      # Get the $unset operations or initialize a new one.
+      #
+      # @example Get the $unset operations.
+      #   modifiers.unsets
+      #
+      # @return [ Hash ] The $unset operations.
+      #
+      # @since 2.2.0
+      def unsets
+        self["$unset"] ||= {}
+      end
     end
   end
 end