mongoid 2.0.2 → 2.1.0

data/lib/mongoid/persistence/atomic/operation.rb

@@ -3,11 +3,22 @@ module Mongoid #:nodoc:
   module Persistence #:nodoc:
     module Atomic #:nodoc:
 
-      # This is the superclass for all atomic operation objects.
-      class Operation
-        include Mongoid::Safe
+      # This is the included module for all atomic operation objects.
+      module Operation
 
-        attr_reader :document, :field, :value, :options
+        attr_accessor :document, :field, :value, :options
+
+        # Get the collection to be used for persistence.
+        #
+        # @example Get the collection.
+        #   operation.collection
+        #
+        # @return [ Collection ] The root collection.
+        #
+        # @since 2.1.0
+        def collection
+          document._root.collection
+        end
 
         # Initialize the new pullAll operation.
         #
@@ -21,8 +32,8 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0
         def initialize(document, field, value, options = {})
-          @document, @field, @value = document, field, value
-          @options = { :safe => safe_mode?(options) }
+          @document, @field, @value = document, field.to_s, value
+          @options = Safety.merge_safety_options(options)
         end
 
         # Get the atomic operation to perform.
@@ -36,7 +47,37 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0
         def operation(modifier)
-          { modifier => { field => value } }
+          { modifier => { path => value } }
+        end
+
+        # Get the path to the field that is getting atomically updated.
+        #
+        # @example Get the path.
+        #   operation.path
+        #
+        # @return [ String, Symbol ] The path to the field.
+        #
+        # @since 2.1.0
+        def path
+          position = document.atomic_position
+          position.blank? ? field : "#{position}.#{field}"
+        end
+
+        # All atomic operations use this with a block to ensure saftey options
+        # clear out after the execution.
+        #
+        # @example Prepare the operation.
+        #   prepare do
+        #     collection.update
+        #   end
+        #
+        # @return [ Object ] The yielded value.
+        #
+        # @since 2.1.0
+        def prepare
+          yield(document).tap do
+            Threaded.clear_safety_options!
+          end
         end
       end
     end

data/lib/mongoid/persistence/atomic/pop.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    module Atomic #:nodoc:
+
+      # This class provides the ability to perform an explicit $pop
+      # modification on a specific field.
+      class Pop
+        include Operation
+
+        # Sends the atomic $pop operation to the database.
+        #
+        # @example Persist the new values.
+        #   pop.persist
+        #
+        # @return [ Object ] The new array value.
+        #
+        # @since 2.1.0
+        def persist
+          prepare do
+            if document[field]
+              values = document.send(field)
+              value > 0 ? values.pop : values.shift
+              values.tap do
+                collection.update(document.atomic_selector, operation("$pop"), options)
+                document.remove_change(field) if document.persisted?
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/atomic/pull.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    module Atomic #:nodoc:
+
+      # This class provides the ability to perform an explicit $pull
+      # modification on a specific field.
+      class Pull
+        include Operation
+
+        # Sends the atomic $pull operation to the database.
+        #
+        # @example Persist the new values.
+        #   pull.persist
+        #
+        # @return [ Object ] The new array value.
+        #
+        # @since 2.1.0
+        def persist
+          prepare do
+            if document[field]
+              values = document.send(field)
+              values.delete(value)
+              values.tap do
+                collection.update(document.atomic_selector, operation("$pull"), options)
+                document.remove_change(field) if document.persisted?
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/atomic/pull_all.rb

@@ -5,7 +5,8 @@ module Mongoid #:nodoc:
 
       # This class provides the ability to perform an explicit $pullAll
       # modification on a specific field.
-      class PullAll < Operation
+      class PullAll
+        include Operation
 
         # Sends the atomic $pullAll operation to the database.
         #
@@ -16,15 +17,15 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0
         def persist
-          if document[field]
-            values = document.send(field)
-            values.delete_if { |val| value.include?(val) }
-            values.tap do
-              document.collection.update(document._selector, operation("$pullAll"), options)
-              document.changes.delete(field.to_s) if document.persisted?
+          prepare do
+            if document[field]
+              values = document.send(field)
+              values.delete_if { |val| value.include?(val) }
+              values.tap do
+                collection.update(document.atomic_selector, operation("$pullAll"), options)
+                document.remove_change(field) if document.persisted?
+              end
             end
-          else
-            return nil
           end
         end
       end

data/lib/mongoid/persistence/atomic/push.rb

@@ -5,7 +5,8 @@ module Mongoid #:nodoc:
 
       # This class provides the ability to perform an explicit $push modification
       # on a specific field.
-      class Push < Operation
+      class Push
+        include Operation
 
         # Sends the atomic $push operation to the database.
         #
@@ -16,10 +17,12 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0
         def persist
-          document[field] = [] unless document[field]
-          document.send(field).push(value).tap do |value|
-            document.collection.update(document._selector, operation("$push"), options)
-            document.changes.delete(field.to_s)
+          prepare do
+            document[field] = [] unless document[field]
+            document.send(field).push(value).tap do |value|
+              collection.update(document.atomic_selector, operation("$push"), options)
+              document.remove_change(field)
+            end
           end
         end
       end

data/lib/mongoid/persistence/atomic/push_all.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    module Atomic #:nodoc:
+
+      # This class provides the ability to perform an explicit $pushAll modification
+      # on a specific field.
+      class PushAll
+        include Operation
+
+        # Sends the atomic $pushAll operation to the database.
+        #
+        # @example Persist the new values.
+        #   pushAll.persist
+        #
+        # @return [ Object ] The new array value.
+        #
+        # @since 2.1.0
+        def persist
+          prepare do
+            document[field] = [] unless document[field]
+            document.send(field).concat(value).tap do |value|
+              collection.update(document.atomic_selector, operation("$pushAll"), options)
+              document.remove_change(field)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/atomic/rename.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    module Atomic #:nodoc:
+
+      # Performs an atomic rename operation.
+      class Rename
+        include Operation
+
+        # Sends the atomic $inc operation to the database.
+        #
+        # @example Persist the new values.
+        #   inc.persist
+        #
+        # @return [ Object ] The new integer value.
+        #
+        # @since 2.1.0
+        def persist
+          prepare do
+            @value = value.to_s
+            document[value] = document.attributes.delete(field)
+            document[value].tap do
+              collection.update(document.atomic_selector, operation("$rename"), options)
+              document.remove_change(value)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/atomic/set.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    module Atomic #:nodoc:
+
+      # This class provides atomic $set behaviour.
+      class Set
+        include Operation
+
+        # Sends the atomic $set operation to the database.
+        #
+        # @example Persist the new values.
+        #   set.persist
+        #
+        # @return [ Object ] The new field value.
+        #
+        # @ssete 2.0.0
+        def persist
+          prepare do
+            value ? document[field] = value : @value = document[field]
+            document[field].tap do
+              collection.update(document.atomic_selector, operation("$set"), options)
+              document.remove_change(field)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/atomic/unset.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+    module Atomic #:nodoc:
+
+      # Performs atomic $unset operations.
+      class Unset
+        include Operation
+
+        # Sends the atomic $unset operation to the database.
+        #
+        # @example Persist the new values.
+        #   unset.persist
+        #
+        # @return [ nil ] The new value.
+        #
+        # @since 2.1.0
+        def persist
+          prepare do
+            document.attributes.delete(field)
+            collection.update(document.atomic_selector, operation("$unset"), options)
+            document.remove_change(value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/deletion.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+
+    # Contains common logic for delete operations.
+    module Deletion
+
+      # Wrap all the common delete logic for both root and embedded
+      # documents and then yield to the block.
+      #
+      # @example Execute common delete logic.
+      #   prepare do |doc|
+      #     collection.remove({ :_id => "value })
+      #   end
+      #
+      # @param [ Proc ] block The block to call.
+      #
+      # @return [ true ] Always true.
+      #
+      # @since 2.1.0
+      def prepare(&block)
+        yield(document)
+        document.freeze
+        document.destroyed = true
+        document.cascade!
+        IdentityMap.remove(document)
+        Threaded.clear_safety_options!
+        true
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/insertion.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+
+    # Contains common logic for insertion operations.
+    module Insertion
+
+      # Wrap all the common insertion logic for both root and embedded
+      # documents and then yield to the block.
+      #
+      # @example Execute common insertion logic.
+      #   prepare do |doc|
+      #     collection.insert({ :field => "value })
+      #   end
+      #
+      # @param [ Proc ] block The block to call.
+      #
+      # @return [ Document ] The inserted document.
+      #
+      # @since 2.1.0
+      def prepare(&block)
+        document.tap do |doc|
+          unless validating? && document.invalid?(:create)
+            result = doc.run_callbacks(:save) do
+              doc.run_callbacks(:create) do
+                yield(doc)
+                doc.new_record = false
+                doc.reset_persisted_children and true
+              end
+            end
+
+            unless result == false
+              doc.move_changes
+              Threaded.clear_safety_options!
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/persistence/modification.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Persistence #:nodoc:
+
+    # Contains common logic for modification operations.
+    module Modification
+
+      # Wrap all the common modification logic for both root and embedded
+      # documents and then yield to the block.
+      #
+      # @example Execute common modification logic.
+      #   prepare do |doc|
+      #     collection.update({ :_id => 1 }, { :field => "value })
+      #   end
+      #
+      # @param [ Proc ] block The block to call.
+      #
+      # @return [ true, false ] If the save passed or not.
+      #
+      # @since 2.1.0
+      def prepare(&block)
+        return false if validating? && document.invalid?(:update)
+        document.run_callbacks(:save) do
+          document.run_callbacks(:update) do
+            yield(document); true
+          end
+        end.tap do |result|
+          unless result == false
+            document.reset_persisted_children
+            document.move_changes
+            Threaded.clear_safety_options!
+          end
+        end
+      end
+    end
+  end
+end