mongoid 3.0.19 → 3.0.20

data/CHANGELOG.md

@@ -3,17 +3,44 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
 
+## 3.0.20
+
+### Resolved Issues
+
+* \#2774 Ensure validations macros for uniqueness, presence, and associated
+  are also available at the instance level.
+
+* \#2772 Localized fields are now properly handled when cloning a document.
+
+* \#2758 `Mongoid.create_indexes` does not fail when cannot constantize class.
+  (Arthur Neves)
+
+* \#2743 Persistence options are no longer cleared when loading revisions.
+  (Arthur Neves)
+
+* \#2741 Fix time mongoization usec rounding errors on MRI and JRuby.
+
+* \#2740 Support integer keys in hash fields when using `read_attribute` with
+  dot notation.
+
+* \#2739 Ensure integer deserialization properly casts to integers.
+
+* \#2733 Many to many relations with `inverse_of: nil` do not persist the
+  inverse relation on `<<` or `push` if the document is already persisted.
+
+* \#2705 Fixed logic around when children can be added to the cascading
+  callbacks list.
+
 ## 3.0.19
 
+### Resolved Issues
+
 * Released to revert the changes in \#2703.
 
 ## 3.0.18
 
 ### Resolved Issues
 
-* \#2703 Validations on associated documents on fire if the document is
-  changed. (Regression)
-
 * \#2707 Calling `find_or_create_by` or `find_by_initialize_by` off a relation
   with a chained criteria or scope now properly keeps the relations intact on
   the new or found document.

data/lib/mongoid/callbacks.rb

@@ -173,7 +173,7 @@ module Mongoid
     # @since 2.3.0
     def cascadable_child?(kind, child)
       return false if kind == :initialize || !child.callback_executable?(kind)
-      [ :create, :destroy ].include?(kind) || child.changed? || child.new_record?
+      child.changed? || child.new_record? || child.flagged_for_destroy?
     end
 
     # Get the name of the callback that the child should fire. This changes

data/lib/mongoid/copyable.rb

@@ -22,8 +22,30 @@ module Mongoid
       if attrs.delete("versions")
         attrs["version"] = 1
       end
+      process_localized_attributes(attrs)
       self.class.new(attrs, without_protection: true)
     end
     alias :dup :clone
+
+    private
+
+    # When cloning, if the document has localized fields we need to ensure they
+    # are properly processed in the clone.
+    #
+    # @api private
+    #
+    # @example Process localized attributes.
+    #   model.process_localized_attributes(attributes)
+    #
+    # @param [ Hash ] attrs The attributes.
+    #
+    # @since 3.0.20
+    def process_localized_attributes(attrs)
+      localized_fields.keys.each do |name|
+        if value = attrs.delete(name)
+          attrs["#{name}_translations"] = value
+        end
+      end
+    end
   end
 end

data/lib/mongoid/extensions/hash.rb

@@ -86,7 +86,8 @@ module Mongoid
         keys = string.split(".")
         value = self
         keys.each do |key|
-          value = value[key]
+          nested = value[key] || value[key.to_i]
+          value = nested
         end
         value
       end

data/lib/mongoid/extensions/integer.rb

@@ -57,6 +57,7 @@ module Mongoid
             nil
           end
         end
+        alias :demongoize :mongoize
       end
     end
   end

data/lib/mongoid/extensions/time.rb

@@ -64,9 +64,10 @@ module Mongoid
         def mongoize(object)
           return nil if object.blank?
           begin
-            t = object.__mongoize_time__
-            usec = t.strftime("%9N").to_i / 10**3.0
-            ::Time.at(t.to_i, usec).utc
+            time = object.__mongoize_time__
+            return time.utc if time.is_a?(::Time)
+            usec = time.sec_fraction * 10**6
+            ::Time.at(time.to_i, usec).utc
           rescue ArgumentError
             raise Errors::InvalidTime.new(object)
           end

data/lib/mongoid/fields.rb

@@ -12,12 +12,14 @@ module Mongoid
 
     included do
       class_attribute :aliased_fields
+      class_attribute :localized_fields
       class_attribute :fields
       class_attribute :pre_processed_defaults
       class_attribute :post_processed_defaults
 
       self.aliased_fields = { "id" => "_id" }
       self.fields = {}
+      self.localized_fields = {}
       self.pre_processed_defaults = []
       self.post_processed_defaults = []
 
@@ -350,6 +352,7 @@ module Mongoid
         if options[:localize]
           create_translations_getter(name, meth)
           create_translations_setter(name, meth, field)
+          localized_fields[name] = field
         end
       end
 

data/lib/mongoid/paranoia.rb

@@ -99,6 +99,11 @@ module Mongoid
       true
     end
 
+    # Returns a string representing the documents's key suitable for use in URLs.
+    def to_param
+      new_record? ? nil : to_key.join('-')
+    end
+
     private
 
     # Get the collection to be used for paranoid operations.

data/lib/mongoid/relations/referenced/many_to_many.rb

@@ -30,7 +30,7 @@ module Mongoid
           if doc = docs.first
             append(doc)
             base.add_to_set(foreign_key, doc.id)
-            if persistable? || _creating?
+            if child_persistable?(doc)
               doc.save
             end
           end
@@ -220,6 +220,23 @@ module Mongoid
           Bindings::Referenced::ManyToMany.new(base, target, metadata)
         end
 
+        # Determine if the child document should be persisted.
+        #
+        # @api private
+        #
+        # @example Is the child persistable?
+        #   relation.child_persistable?(doc)
+        #
+        # @param [ Document ] doc The document.
+        #
+        # @return [ true, false ] If the document can be persisted.
+        #
+        # @since 3.0.20
+        def child_persistable?(doc)
+          (persistable? || _creating?) &&
+            !(doc.persisted? && metadata.forced_nil_inverse?)
+        end
+
         # Returns the criteria object for the target class with its documents set
         # to target.
         #

data/lib/mongoid/relations/targets/enumerable.rb

@@ -444,8 +444,8 @@ module Mongoid
 
         def matching_document(location)
           _loaded.try(:values).try(location) ||
-            _added[_unloaded.try(location).try(:id)] ||
-            _unloaded.try(location) ||
+            _added[(ul = _unloaded.try(location)).try(:id)] ||
+            ul ||
             _added.values.try(location)
         end
       end

data/lib/mongoid/sessions.rb

@@ -151,7 +151,7 @@ module Mongoid
       def collection
         if opts = persistence_options
           coll = mongo_session.with(opts)[opts[:collection] || collection_name]
-          clear_persistence_options unless validating_with_query?
+          clear_persistence_options unless validating_with_query? || _loading_revision?
           coll
         else
           mongo_session[collection_name]

data/lib/mongoid/validations.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "mongoid/validations/macros"
 require "mongoid/validations/localizable"
 require "mongoid/validations/associated"
 require "mongoid/validations/format"
@@ -15,6 +16,11 @@ module Mongoid
     extend ActiveSupport::Concern
     include ActiveModel::Validations
 
+    included do
+      extend Macros
+      include Macros
+    end
+
     # Begin the associated validation.
     #
     # @example Begin validation.
@@ -104,90 +110,19 @@ module Mongoid
 
     module ClassMethods
 
-      # Validates whether or not an association is valid or not. Will correctly
-      # handle has one and has many associations.
-      #
-      # @example
-      #
-      #   class Person
-      #     include Mongoid::Document
-      #     embeds_one :name
-      #     embeds_many :addresses
-      #
-      #     validates_associated :name, :addresses
-      #   end
-      #
-      # @param [ Array ] *args The arguments to pass to the validator.
-      def validates_associated(*args)
-        validates_with(AssociatedValidator, _merge_attributes(args))
-      end
-
-      # Validates whether or not a field is unique against the documents in the
-      # database.
-      #
-      # @example
-      #
-      #   class Person
-      #     include Mongoid::Document
-      #     field :title
-      #
-      #     validates_uniqueness_of :title
-      #   end
-      #
-      # @param [ Array ] *args The arguments to pass to the validator.
-      def validates_uniqueness_of(*args)
-        validates_with(UniquenessValidator, _merge_attributes(args))
-      end
-
-      # Validates the format of a field.
-      #
-      # @example
-      #   class Person
-      #     include Mongoid::Document
-      #     field :title
-      #
-      #     validates_format_of :title, with: /^[a-z0-9 \-_]*$/i
-      #   end
-      #
-      # @param [ Array ] args The names of the fields to validate.
-      #
-      # @since 2.4.0
-      def validates_format_of(*args)
-        validates_with(Mongoid::Validations::FormatValidator, _merge_attributes(args))
-      end
-
-      # Validates the length of a field.
-      #
-      # @example
-      #   class Person
-      #     include Mongoid::Document
-      #     field :title
-      #
-      #     validates_length_of :title, minimum: 100
-      #   end
-      #
-      # @param [ Array ] args The names of the fields to validate.
-      #
-      # @since 2.4.0
-      def validates_length_of(*args)
-        validates_with(Mongoid::Validations::LengthValidator, _merge_attributes(args))
-      end
-
-      # Validates whether or not a field is present - meaning nil or empty.
-      #
-      # @example
-      #   class Person
-      #     include Mongoid::Document
-      #     field :title
+      # Adds an associated validator for the relation if the validate option
+      # was not provided or set to true.
       #
-      #     validates_presence_of :title
-      #   end
+      # @example Set up validation.
+      #   Person.validates_relation(metadata)
       #
-      # @param [ Array ] args The names of the fields to validate.
+      # @param [ Metadata ] metadata The relation metadata.
       #
-      # @since 2.4.0
-      def validates_presence_of(*args)
-        validates_with(PresenceValidator, _merge_attributes(args))
+      # @since 2.0.0.rc.1
+      def validates_relation(metadata)
+        if metadata.validate?
+          validates_associated(metadata.name)
+        end
       end
 
       # Add validation with the supplied validators forthe provided fields
@@ -215,23 +150,6 @@ module Mongoid
         super
       end
 
-      private
-
-      # Adds an associated validator for the relation if the validate option
-      # was not provided or set to true.
-      #
-      # @example Set up validation.
-      #   Person.validates_relation(metadata)
-      #
-      # @param [ Metadata ] metadata The relation metadata.
-      #
-      # @since 2.0.0.rc.1
-      def validates_relation(metadata)
-        if metadata.validate?
-          validates_associated(metadata.name)
-        end
-      end
-
       # Are we currently performing a validation that has a query?
       #
       # @example Are we validating with a query?

data/lib/mongoid/validations/macros.rb

@@ -0,0 +1,93 @@
+module Mongoid
+  module Validations
+    module Macros
+      extend ActiveSupport::Concern
+
+      # Validates whether or not an association is valid or not. Will correctly
+      # handle has one and has many associations.
+      #
+      # @example
+      #
+      #   class Person
+      #     include Mongoid::Document
+      #     embeds_one :name
+      #     embeds_many :addresses
+      #
+      #     validates_associated :name, :addresses
+      #   end
+      #
+      # @param [ Array ] *args The arguments to pass to the validator.
+      def validates_associated(*args)
+        validates_with(AssociatedValidator, _merge_attributes(args))
+      end
+
+      # Validates whether or not a field is unique against the documents in the
+      # database.
+      #
+      # @example
+      #
+      #   class Person
+      #     include Mongoid::Document
+      #     field :title
+      #
+      #     validates_uniqueness_of :title
+      #   end
+      #
+      # @param [ Array ] *args The arguments to pass to the validator.
+      def validates_uniqueness_of(*args)
+        validates_with(UniquenessValidator, _merge_attributes(args))
+      end
+
+      # Validates the format of a field.
+      #
+      # @example
+      #   class Person
+      #     include Mongoid::Document
+      #     field :title
+      #
+      #     validates_format_of :title, with: /^[a-z0-9 \-_]*$/i
+      #   end
+      #
+      # @param [ Array ] args The names of the fields to validate.
+      #
+      # @since 2.4.0
+      def validates_format_of(*args)
+        validates_with(Mongoid::Validations::FormatValidator, _merge_attributes(args))
+      end
+
+      # Validates the length of a field.
+      #
+      # @example
+      #   class Person
+      #     include Mongoid::Document
+      #     field :title
+      #
+      #     validates_length_of :title, minimum: 100
+      #   end
+      #
+      # @param [ Array ] args The names of the fields to validate.
+      #
+      # @since 2.4.0
+      def validates_length_of(*args)
+        validates_with(Mongoid::Validations::LengthValidator, _merge_attributes(args))
+      end
+
+      # Validates whether or not a field is present - meaning nil or empty.
+      #
+      # @example
+      #   class Person
+      #     include Mongoid::Document
+      #     field :title
+      #
+      #     validates_presence_of :title
+      #   end
+      #
+      # @param [ Array ] args The names of the fields to validate.
+      #
+      # @since 2.4.0
+      def validates_presence_of(*args)
+        validates_with(PresenceValidator, _merge_attributes(args))
+      end
+    end
+  end
+end

data/lib/mongoid/validations/queryable.rb

@@ -17,6 +17,7 @@ module Mongoid
       #
       # @since 3.0.2
       def with_query(document)
+        klass = document.class
         begin
           Threaded.begin("#{klass.name}-validate-with-query")
           yield

data/lib/mongoid/validations/uniqueness.rb

@@ -16,20 +16,6 @@ module Mongoid
     class UniquenessValidator < ActiveModel::EachValidator
       include Queryable
 
-      attr_reader :klass
-
-      # Unfortunately, we have to tie Uniqueness validators to a class.
-      #
-      # @example Setup the validator.
-      #   UniquenessValidator.new.setup(Person)
-      #
-      # @param [ Class ] klass The class getting validated.
-      #
-      # @since 1.0.0
-      def setup(klass)
-        @klass = klass
-      end
-
       # Validate the document for uniqueness violations.
       #
       # @example Validate the document.
@@ -266,7 +252,7 @@ module Mongoid
       #
       # @since 2.4.10
       def validate_root(document, attribute, value)
-        criteria = create_criteria(klass, document, attribute, value)
+        criteria = create_criteria(document.class, document, attribute, value)
         if criteria.with(consistency: :strong).exists?
           add_error(document, attribute, value)
         end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "3.0.19"
+  VERSION = "3.0.20"
 end

data/lib/rails/mongoid.rb

@@ -146,9 +146,9 @@ module Rails
         klass = name.constantize
       rescue NameError, LoadError
         logger.info("MONGOID: Attempted to constantize #{name}, trying without namespacing.")
-        klass = parts.last.constantize
+        klass = parts.last.constantize rescue nil
       end
-      klass if klass.ancestors.include?(::Mongoid::Document)
+      klass if klass && klass.ancestors.include?(::Mongoid::Document)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -321,6 +321,7 @@ files:
 - lib/mongoid/validations/format.rb
 - lib/mongoid/validations/length.rb
 - lib/mongoid/validations/localizable.rb
+- lib/mongoid/validations/macros.rb
 - lib/mongoid/validations/presence.rb
 - lib/mongoid/validations/queryable.rb
 - lib/mongoid/validations/uniqueness.rb