mongoid 3.0.0.rc → 3.0.0

data/CHANGELOG.md

@@ -3,10 +3,41 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 3.0.0 (branch: master)
+## 3.0.0
 
 ### New Features
 
+* \#2151 When asking for metadata before persistence, Mongoid will now
+  raise a `Mongoid::Errors::NoMetadata` error if the metadata is not
+  present.
+
+* \#2147 `Model#becomes` now copies over the embedded documents.
+
+* A new callback has been introduced: `upsert`, which runs when calling
+  `document.upsert` since Mongoid does not know if the document is to be
+  treated as new or persisted. With this come the model callbacks:
+
+        before_upsert
+        after_upsert
+        around_upsert
+
+* \#2080/\#2087 The database or session that Mongoid persists to can now be
+  overridden on a global level for cases where `Model#with` is not a viable
+  option.
+
+        Mongoid.override_database(:secondary)
+        Mongoid.override_session(:secondary)
+
+        Band.create(name: "Placebo") #=> Persists to secondary.
+        band.albums.create #=> Persists to secondary.
+
+    Note that this option is global and overrides for all models on the current
+    thread. It is the developer's responsibility to remember to set this back
+    to nil if you no longer want the override to happen.
+
+        Mongoid.override_database(nil)
+        Mongoid.override_session(nil)
+
 * \#1989 Criteria `count`, `size` and `length` now behave as Active Record
   with regards to database access.
 
@@ -529,6 +560,13 @@ For instructions on upgrading to newer versions, visit
 
 ### Major Changes (Backwards Incompatible)
 
+* Polymorphic relations can not have ids other than object ids. This is
+  because Mongoid cannot properly figure out in an optimized way what the
+  various classes on the other side of the relation store their ids as, as
+  they could potentially all be different.
+
+  This was not allowed before, but nowhere was it explicitly stated.
+
 * \#2039 Validating presence of a relation now checks both the relation and
   the foreign key value.
 
@@ -645,8 +683,8 @@ For instructions on upgrading to newer versions, visit
 * Custom application exceptions in various languages has been removed,
   along with the `Mongoid.add_language` feature.
 
-* Mongoid no longer supports 1.8 syntax. 1.9.x or other vms running in
-  1.9 mode is now only supported.
+* Mongoid no longer supports 1.8. MRI 1.9.3 and higher, or JRuby 1.6 and
+  higher in 1.9 mode are only supported.
 
 * \#1734 When searching for documents via `Model.find` with multiple ids,
   Mongoid will raise an error if not *all* ids are found, and tell you
@@ -769,8 +807,58 @@ For instructions on upgrading to newer versions, visit
 
         Band.scoped(skip: 10, limit: 20)
 
+* \#463 `Document#upsert` is no longer aliased to `Document#save` and now
+  actually performs a proper MongoDB upsert command when called. If you
+  were using this method before and want the same behaviour, please switch
+  to `save`.
+
+        band = Band.new(name: "Tool")
+        band.upsert #=> Inserts the document in the database.
+        band.name = "Placebo"
+        band.upsert #=> Updates the existing document.
+
 ### Resolved Issues
 
+* \#2166 `Criteria#from_map_or_db` strips type selection when eager loading
+  since it will check if the type is correct after.
+
+* \#2129 Fixed sorting for all fields on embeds many relations.
+
+* \#2124 Fixed default scope and deleted scope on paranoid documents.
+
+* \#2122 Allow embedded documents to sort on boolean fields.
+
+* \#2119 Allow `Criteria#update_all` to accept atomic ops and normal sets.
+
+* \#2118 Don't strip any precision during `DateTime` -> `Time` conversions.
+
+* \#2117 Ensure embeds one relations have callbacks run when using nested
+  attributes.
+
+* \#2110 `Model#touch` now works properly on embedded documents.
+
+* \#2100 Allow atomic operations to properly execute on paranoid documents
+  that have a deleted_at set.
+
+* \#2089 Allow proper separation of mongoization and evolving with respect to
+  foreign keys.
+
+* \#2088 Allow finds by string ids to pull from the identity map if the ids
+  are stored as object ids.
+
+* \#2085 Allow demongoization of floats and ints to big decimals.
+
+* \#2084 Don't cascade if metadata does not exist.
+
+* \#2078 Calling `Model#clone` or `Model#dup` now properly sets attributes
+  as dirty.
+
+* \#2070 Allow for updated_at to be overridden manually for new documents that
+  also have a created_at.
+
+* \#2041 Don't hit the database multiple times on relation access after an
+  eager load returned zero documents.
+
 * \#1997 Cascading callbacks should be able to halt the callback chain when
   terminating.
 
@@ -824,10 +912,25 @@ For instructions on upgrading to newer versions, visit
 * \#685 Attempting to use versioning with embedded documents will now
   raise a proper error alerting the developer this is not allowed.
 
-## 2.4.11 (branch: 2.4.0-stable)
+## 2.4.12 (branch: 2.4.0-stable)
 
 ### Resolved Issues
 
+* \#2144 Uniqueness validation on paranoid documents now properly scopes.
+
+* \#2127 Don't unbind parents of embedded documents mid nested
+  attributes deletion.
+
+## 2.4.11
+
+### Resolved Issues
+
+* This release forces a cap on the mongo driver version at 1.6.2 due to
+  changes in the `Mongo::Connection.from_uri` API not allowing valid
+  connection options anymore.
+
+* \#2040 Fixed bad interpolation for locale presence validation.
+
 * \#2038 Allow inverse relations to be determined by foreign keys alone
   if defined on both sides, not just an inverse_of declaration.
 
@@ -837,6 +940,8 @@ For instructions on upgrading to newer versions, visit
 * \#2008 Presence validation should hit the db to check validity if the
   relation in memory is blank.
 
+* \#2006 Allow excluding only the _id field post execution of an #only call.
+
 ## 2.4.10
 
 ### Resolved Issues

data/README.md

@@ -12,7 +12,7 @@ Project Tracking
 Compatibility
 -------------
 
-Mongoid is tested against MRI 1.9.2, 1.9.3, 2.0.0, and JRuby (1.9).
+Mongoid is tested against MRI 1.9.3, 2.0.0, and JRuby (1.9).
 
 Documentation
 -------------

data/Rakefile

@@ -20,6 +20,7 @@ task :release => :build do
   system "git tag -a v#{Mongoid::VERSION} -m 'Tagging #{Mongoid::VERSION}'"
   system "git push --tags"
   system "gem push mongoid-#{Mongoid::VERSION}.gem"
+  system "rm mongoid-#{Mongoid::VERSION}.gem"
 end
 
 RSpec::Core::RakeTask.new("spec") do |spec|

data/lib/config/locales/en.yml

@@ -67,7 +67,7 @@ en:
         document_with_attributes_not_found:
           message: "Document not found for class %{klass} with attributes %{attributes}."
           summary: "When calling %{klass}.find_by with a hash of attributes, all
-            attributes provided must match a document in the database of this error
+            attributes provided must match a document in the database or this error
             will be raised."
           resolution: "Search for attributes that are in the database or set
             the Mongoid.raise_not_found_error configuration option to false,
@@ -303,6 +303,20 @@ en:
             \_\_merge:   'collection-name'\n
             \_\_replace: 'collection-name'\n
             \_\_reduce:  'collection-name'\n\n"
+        no_metadata:
+          message: "Metadata not found for document of type %{klass}."
+          summary: "Mongoid sets the metadata of a relation on the document
+            when it is either loaded from within the relation, or added to
+            one. The presence of the metadata is required in order to
+            provide various functionality around relations. Most likely you
+            are getting this error because the document is embedded and was
+            attempted to be persisted without being associated with a parent,
+            or the relation was not properly defined."
+          resolution: "Ensure that your relations on the %{klass} model
+            are all properly defined, and that the inverse relations
+            are also properly defined. Embedded relations must have both the
+            parent (embeds_one/embeds_many) and the inverse (embedded_in)
+            present in order to work properly."
         no_parent:
           message: "Cannot persist embedded document %{klass} without a
             parent document."

data/lib/mongoid.rb

@@ -32,7 +32,6 @@ require "active_model"
 
 require "origin"
 require "moped"
-BSON = Moped::BSON
 
 require "mongoid/extensions"
 require "mongoid/errors"
@@ -46,6 +45,7 @@ require "mongoid/contextual"
 require "mongoid/copyable"
 require "mongoid/criteria"
 require "mongoid/dirty"
+require "mongoid/evolvable"
 require "mongoid/factory"
 require "mongoid/fields"
 require "mongoid/finders"
@@ -53,7 +53,6 @@ require "mongoid/hierarchy"
 require "mongoid/identity_map"
 require "mongoid/indexes"
 require "mongoid/inspection"
-require "mongoid/javascript"
 require "mongoid/json"
 require "mongoid/loggable"
 require "mongoid/matchers"
@@ -113,10 +112,26 @@ module Mongoid
     block_given? ? yield(Config) : Config
   end
 
+  # Convenience method for getting the default session.
+  #
+  # @example Get the default session.
+  #   Mongoid.default_session
+  #
+  # @return [ Moped::Session ] The default session.
+  #
+  # @since 3.0.0
   def default_session
     Sessions.default
   end
 
+  # Convenience method for getting a named session.
+  #
+  # @example Get a named session.
+  #   Mongoid.session(:default)
+  #
+  # @return [ Moped::Session ] The named session.
+  #
+  # @since 3.0.0
   def session(name)
     Sessions.with_name(name)
   end

data/lib/mongoid/atomic.rb

@@ -14,9 +14,9 @@ module Mongoid
       :atomic_array_pulls,
       :atomic_array_add_to_sets,
       :atomic_pulls,
-      :atomic_unsets,
       :delayed_atomic_sets,
-      :delayed_atomic_pulls
+      :delayed_atomic_pulls,
+      :delayed_atomic_unsets
     ]
 
     included do
@@ -36,7 +36,22 @@ module Mongoid
     # @since 2.2.0
     def add_atomic_pull(document)
       document.flagged_for_destroy = true
-      (delayed_atomic_pulls[document.metadata.name.to_s] ||= []).push(document)
+      (delayed_atomic_pulls[document.metadata_name.to_s] ||= []).push(document)
+    end
+
+    # Add an atomic unset for the document.
+    #
+    # @example Add an atomic unset.
+    #   document.add_atomic_unset(doc)
+    #
+    # @param [ Document ] document The child document.
+    #
+    # @return [ Array<Document> ] The children.
+    #
+    # @since 3.0.0
+    def add_atomic_unset(document)
+      document.flagged_for_destroy = true
+      (delayed_atomic_unsets[document.metadata_name.to_s] ||= []).push(document)
     end
 
     # For array fields these are the pushes that need to happen.
@@ -174,9 +189,7 @@ module Mongoid
       delayed_atomic_pulls.each_pair do |_, docs|
         path = nil
         ids = docs.map do |doc|
-          path ||= doc.atomic_path
-          doc.destroyed = true
-          doc.flagged_for_destroy = false
+          path ||= doc.flag_as_destroyed
           doc.id
         end
         pulls[path] = { "_id" => { "$in" => ids }} and path = nil
@@ -228,7 +241,15 @@ module Mongoid
     #
     # @since 2.2.0
     def atomic_unsets
-      @atomic_unsets ||= []
+      unsets = []
+      delayed_atomic_unsets.each_pair do |name, docs|
+        path = nil
+        docs.each do |doc|
+          path ||= doc.flag_as_destroyed
+        end
+        unsets.push(path || name)
+      end
+      unsets
     end
 
     # Get all the atomic sets that have had their saves delayed.
@@ -255,6 +276,32 @@ module Mongoid
       @delayed_atomic_pulls ||= {}
     end
 
+    # Get the delayed atomic unsets.
+    #
+    # @example Get the delayed atomic unsets.
+    #   document.delayed_atomic_unsets
+    #
+    # @return [ Hash ] The atomic unsets
+    #
+    # @since 3.0.0
+    def delayed_atomic_unsets
+      @delayed_atomic_unsets ||= {}
+    end
+
+    # Flag the document as destroyed and return the atomic path.
+    #
+    # @example Flag destroyed and return path.
+    #   document.flag_as_destroyed
+    #
+    # @return [ String ] The atomic path.
+    #
+    # @since 3.0.0
+    def flag_as_destroyed
+      self.destroyed = true
+      self.flagged_for_destroy = false
+      atomic_path
+    end
+
     private
 
     # Get the atomic paths utility for this document.

data/lib/mongoid/attributes.rb

@@ -81,7 +81,7 @@ module Mongoid
       end
       _assigning do
         attribute_will_change!(access)
-        atomic_unsets.push(atomic_attribute_name(access))
+        delayed_atomic_unsets[atomic_attribute_name(access)] = []
         attributes.delete(access)
       end
     end

data/lib/mongoid/attributes/processing.rb

@@ -20,7 +20,7 @@ module Mongoid
       # @since 2.0.0.rc.7
       def process_attributes(attrs = nil, role = :default, guard_protected_attributes = true)
         attrs ||= {}
-        if attrs.any?
+        if !attrs.empty?
           attrs = sanitize_for_mass_assignment(attrs, role) if guard_protected_attributes
           attrs.each_pair do |key, value|
             next if pending_attribute?(key, value)

data/lib/mongoid/callbacks.rb

@@ -12,15 +12,18 @@ module Mongoid
       :after_initialize,
       :after_save,
       :after_update,
+      :after_upsert,
       :after_validation,
       :around_create,
       :around_destroy,
       :around_save,
       :around_update,
+      :around_upsert,
       :before_create,
       :before_destroy,
       :before_save,
       :before_update,
+      :before_upsert,
       :before_validation
     ]
 
@@ -30,7 +33,7 @@ module Mongoid
 
       define_model_callbacks :initialize, only: :after
       define_model_callbacks :build, only: :after
-      define_model_callbacks :create, :destroy, :save, :update
+      define_model_callbacks :create, :destroy, :save, :update, :upsert
     end
 
     # Run only the after callbacks for the specific event.
@@ -112,7 +115,9 @@ module Mongoid
         next unless metadata.cascading_callbacks?
         without_autobuild do
           delayed_pulls = delayed_atomic_pulls[name]
+          delayed_unsets = delayed_atomic_unsets[name]
           children.merge(delayed_pulls) if delayed_pulls
+          children.merge(delayed_unsets) if delayed_unsets
           relation = send(name)
           Array.wrap(relation).each do |child|
             next if children.include?(child)

data/lib/mongoid/components.rb

@@ -21,7 +21,7 @@ module Mongoid
     include Mongoid::Atomic
     include Mongoid::Dirty
     include Mongoid::Attributes
-    include Mongoid::Copyable
+    include Mongoid::Evolvable
     include Mongoid::Fields
     include Mongoid::Hierarchy
     include Mongoid::Indexes
@@ -41,6 +41,7 @@ module Mongoid
     include Mongoid::Timestamps::Timeless
     include Mongoid::Validations
     include Mongoid::Callbacks
+    include Mongoid::Copyable
 
     MODULES = [
       Mongoid::Atomic,

data/lib/mongoid/config.rb

@@ -25,6 +25,25 @@ module Mongoid
     option :use_activesupport_time_zone, default: true
     option :use_utc, default: false
 
+    # Connect to the provided database name on the default session.
+    #
+    # @note Use only in development or test environments for convenience.
+    #
+    # @example Set the database to connect to.
+    #   config.connect_to("mongoid_test")
+    #
+    # @param [ String ] name The database name.
+    #
+    # @since 3.0.0
+    def connect_to(name)
+      self.sessions = {
+        default: {
+          database: name,
+          hosts: [ "localhost:27017" ]
+        }
+      }
+    end
+
     # Return field names that could cause destructive things to happen if
     # defined in a Mongoid::Document.
     #
@@ -52,23 +71,32 @@ module Mongoid
       settings
     end
 
-    # Connect to the provided database name on the default session.
+    # Override the database to use globally.
     #
-    # @note Use only in development or test environments for convenience.
+    # @example Override the database globally.
+    #   config.override_database(:optional)
     #
-    # @example Set the database to connect to.
-    #   config.connect_to("mongoid_test")
+    # @param [ String, Symbol ] name The name of the database.
     #
-    # @param [ String ] name The database name.
+    # @return [ String, Symbol ] The global override.
     #
     # @since 3.0.0
-    def connect_to(name)
-      self.sessions = {
-        default: {
-          database: name,
-          hosts: [ "localhost:27017" ]
-        }
-      }
+    def override_database(name)
+      Threaded.database_override = name
+    end
+
+    # Override the session to use globally.
+    #
+    # @example Override the session globally.
+    #   config.override_session(:optional)
+    #
+    # @param [ String, Symbol ] name The name of the session.
+    #
+    # @return [ String, Symbol ] The global override.
+    #
+    # @since 3.0.0
+    def override_session(name)
+      Threaded.session_override = name ? name.to_s : nil
     end
 
     # Purge all data in all collections, including indexes.
@@ -80,11 +108,8 @@ module Mongoid
     #
     # @since 2.0.2
     def purge!
-      session = Sessions.default
-      collections = session["system.namespaces"].find(name: { "$not" => /system|\$/ }).to_a
-      collections.each do |collection|
-        _, name = collection["name"].split(".", 2)
-        session[name].drop
+      Sessions.default.collections.each do |collection|
+        collection.drop
       end and true
     end