mongoid 2.8.1 → 3.0.0.rc

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $pop
       # modification on a specific field.
@@ -21,10 +21,8 @@ module Mongoid #:nodoc:
             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
+              execute("$pop")
+              values
             end
           end
         end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $pull
       # modification on a specific field.
@@ -21,10 +21,8 @@ module Mongoid #:nodoc:
             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
+              execute("$pull")
+              values
             end
           end
         end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $pullAll
       # modification on a specific field.
@@ -21,10 +21,8 @@ module Mongoid #:nodoc:
             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
+              execute("$pullAll")
+              values
             end
           end
         end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $push modification
       # on a specific field.
@@ -17,13 +17,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0
         def persist
-          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
+          append_with("$push")
         end
       end
     end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides the ability to perform an explicit $pushAll modification
       # on a specific field.
@@ -17,13 +17,7 @@ module Mongoid #:nodoc:
         #
         # @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
+          append_with("$pushAll")
         end
       end
     end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # Performs an atomic rename operation.
       class Rename
@@ -19,10 +19,9 @@ module Mongoid #:nodoc:
           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
+            execute("$rename")
+            document.remove_change(value)
+            document[value]
           end
         end
       end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # This class provides atomic $set behaviour.
       class Sets
@@ -18,10 +18,8 @@ module Mongoid #:nodoc:
         def persist
           prepare do
             document[field] = value
-            document[field].tap do
-              collection.update(document.atomic_selector, operation("$set"), options)
-              document.remove_change(field)
-            end
+            execute("$set")
+            document[field]
           end
         end
       end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Atomic #:nodoc:
+module Mongoid
+  module Persistence
+    module Atomic
 
       # Performs atomic $unset operations.
       class Unset
@@ -18,8 +18,7 @@ module Mongoid #:nodoc:
         def persist
           prepare do
             document.attributes.delete(field)
-            collection.update(document.atomic_selector, operation("$unset"), options)
-            document.remove_change(value)
+            execute("$unset")
           end
         end
       end

data/lib/mongoid/persistence/deletion.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
+module Mongoid
+  module Persistence
 
     # Contains common logic for delete operations.
     module Deletion

data/lib/mongoid/persistence/insertion.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
+module Mongoid
+  module Persistence
 
     # Contains common logic for insertion operations.
     module Insertion
@@ -19,23 +19,17 @@ module Mongoid #:nodoc:
       #
       # @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
-                true
-              end
-            end
-
-            unless result == false
-              doc.reset_persisted_children
-              doc.move_changes
-              Threaded.clear_options!
+        unless validating? && document.invalid?(:create)
+          result = document.run_callbacks(:save) do
+            document.run_callbacks(:create) do
+              yield(document)
+              document.new_record = false
+              true
             end
           end
+          document.post_persist unless result == false
         end
+        document
       end
     end
   end

data/lib/mongoid/persistence/modification.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
+module Mongoid
+  module Persistence
 
     # Contains common logic for modification operations.
     module Modification
@@ -20,17 +20,13 @@ module Mongoid #:nodoc:
       # @since 2.1.0
       def prepare(&block)
         return false if validating? && document.invalid?(:update)
-        document.run_callbacks(:save) do
+        result = 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_options!
-          end
         end
+        document.post_persist unless result == false
+        result
       end
     end
   end

data/lib/mongoid/persistence/operations.rb

@@ -5,14 +5,14 @@ require "mongoid/persistence/operations/update"
 require "mongoid/persistence/operations/embedded/insert"
 require "mongoid/persistence/operations/embedded/remove"
 
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
+module Mongoid
+  module Persistence
 
     # Persistence operations include this module to get basic functionality
     # on initialization.
     module Operations
 
-      attr_reader :conflicts, :document
+      attr_reader :conflicts, :document, :options
 
       # Get the collection we should be persisting to.
       #
@@ -80,19 +80,6 @@ module Mongoid #:nodoc:
         @notifying_parent ||= !@options.delete(:suppress)
       end
 
-      # Get all the options that will be sent to the database. Right now this
-      # is only safe mode opts.
-      #
-      # @example Get the options hash.
-      #   operation.options
-      #
-      # @return [ Hash ] The options for the database.
-      #
-      # @since 2.1.0
-      def options
-        Safety.merge_safety_options(@options)
-      end
-
       # Get the parent of the provided document.
       #
       # @example Get the parent.
@@ -154,9 +141,9 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def init_updates
-        document.atomic_updates.tap do |updates|
-          @conflicts = updates.delete(:conflicts) || {}
-        end
+        updates = document.atomic_updates
+        @conflicts = updates.delete(:conflicts) || {}
+        updates
       end
 
       class << self

data/lib/mongoid/persistence/operations/embedded/insert.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Operations #:nodoc:
-      module Embedded #:nodoc:
+module Mongoid
+  module Persistence
+    module Operations
+      module Embedded
 
         # Insert is a persistence command responsible for taking a document that
         # has not been saved to the database and saving it. This specific class
@@ -28,10 +28,11 @@ module Mongoid #:nodoc:
           # @return [ Document ] The document to be inserted.
           def persist
             prepare do
-              if parent.new?
+              raise Errors::NoParent.new(document.class.name) unless parent
+              if parent.new_record?
                 parent.insert
               else
-                collection.update(parent.atomic_selector, inserts, options)
+                collection.find(parent.atomic_selector).update(inserts)
               end
             end
           end

data/lib/mongoid/persistence/operations/embedded/remove.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Operations #:nodoc:
-      module Embedded #:nodoc:
+module Mongoid
+  module Persistence
+    module Operations
+      module Embedded
 
         # Remove is a persistence command responsible for deleting a document from
         # the database.
@@ -29,7 +29,7 @@ module Mongoid #:nodoc:
             prepare do |doc|
               parent.remove_child(doc) if notifying_parent?
               if parent.persisted?
-                collection.update(parent.atomic_selector, deletes, options)
+                collection.find(parent.atomic_selector).update(deletes)
               end
             end
           end

data/lib/mongoid/persistence/operations/insert.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Operations #:nodoc:
+module Mongoid
+  module Persistence
+    module Operations
 
       # Insert is a persistence command responsible for taking a document that
       # has not been saved to the database and saving it.
@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
         # @return [ Document ] The document to be inserted.
         def persist
           prepare do |doc|
-            collection.insert(doc.as_document, options)
+            collection.insert(doc.as_document)
             IdentityMap.set(doc)
           end
         end

data/lib/mongoid/persistence/operations/remove.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Operations #:nodoc:
+module Mongoid
+  module Persistence
+    module Operations
 
       # Remove is a persistence command responsible for deleting a document from
       # the database.
@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
         # @return [ true ] Always true.
         def persist
           prepare do |doc|
-            collection.remove({ :_id => doc.id }, options)
+            collection.find({ _id: doc.id }).remove
           end
         end
       end

data/lib/mongoid/persistence/operations/update.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Persistence #:nodoc:
-    module Operations #:nodoc:
+module Mongoid
+  module Persistence
+    module Operations
 
       # Update is a persistence command responsible for taking a document that
       # has already been saved to the database and saving it, depending on
@@ -42,9 +42,9 @@ module Mongoid #:nodoc:
         def persist
           prepare do
             unless updates.empty?
-              collection.update(selector, updates, options)
+              collection.find(selector).update(updates)
               conflicts.each_pair do |key, value|
-                collection.update(selector, { key => value }, options)
+                collection.find(selector).update({ key => value })
               end
             end
           end

data/lib/mongoid/railtie.rb

@@ -1,14 +1,13 @@
 # encoding: utf-8
-require "singleton"
 require "mongoid"
 require "mongoid/config"
 require "mongoid/railties/document"
 require "rails"
 require "rails/mongoid"
 
-module Rails #:nodoc:
-  module Mongoid #:nodoc:
-    class Railtie < Rails::Railtie #:nodoc:
+module Rails
+  module Mongoid
+    class Railtie < Rails::Railtie
 
       # Determine which generator to use. app_generators was introduced after
       # 3.0.0.
@@ -23,7 +22,7 @@ module Rails #:nodoc:
         config.respond_to?(:app_generators) ? :app_generators : :generators
       end
 
-      # Maping of rescued exceptions to HTTP responses
+      # Mapping of rescued exceptions to HTTP responses
       #
       # @example
       #   railtie.rescue_responses
@@ -38,7 +37,7 @@ module Rails #:nodoc:
         }
       end
 
-      config.send(generator).orm :mongoid, :migration => false
+      config.send(generator).orm :mongoid, migration: false
 
       if config.action_dispatch.rescue_responses
         config.action_dispatch.rescue_responses.merge!(rescue_responses)
@@ -73,15 +72,22 @@ module Rails #:nodoc:
       #       # - host: localhost
       #         # port: 27019
       #     allow_dynamic_fields: false
-      #     parameterize_keys: false
       #     persist_in_safe_mode: false
       #
       initializer "setup database" do
         config_file = Rails.root.join("config", "mongoid.yml")
-        # @todo: Durran: Remove extra check when #1291 complete.
-        if config_file.file? &&
-          YAML.load(ERB.new(File.read(config_file)).result)[Rails.env].values.flatten.any?
-          ::Mongoid.load!(config_file)
+        if config_file.file?
+          begin
+            ::Mongoid.load!(config_file)
+          rescue ::Mongoid::Errors::NoSessionsConfig => e
+            handle_configuration_error(e)
+          rescue ::Mongoid::Errors::NoDefaultSession => e
+            handle_configuration_error(e)
+          rescue ::Mongoid::Errors::NoSessionDatabase => e
+            handle_configuration_error(e)
+          rescue ::Mongoid::Errors::NoSessionHosts => e
+            handle_configuration_error(e)
+          end
         end
       end
 
@@ -139,6 +145,15 @@ module Rails #:nodoc:
           end
         end
       end
+
+      # Rails runs all initializers first before getting into any generator
+      # code, so we have no way in the intitializer to know if we are
+      # generating a mongoid.yml. So instead of failing, we catch all the
+      # errors and print them out.
+      def handle_configuration_error(e)
+        puts "There is a configuration error with the current mongoid.yml."
+        puts e.message
+      end
     end
   end
 end