mongoid 3.0.13 → 3.0.14

data/CHANGELOG.md

@@ -3,6 +3,23 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 3.0.14
+
+### Resolved Issues
+
+* \#2575 Prevent end of month times from rounding up since floats are not
+  precise enough to handle usec. (Steve Valaitis)
+
+* \#2573 Don't use i18n for inspection messages.
+
+* \#2571 Remove blank error message from locales. (Jordan Elver)
+
+* \#2568 Fix uniqueness validation for lacalized fields when a scope is also
+  provided.
+
+* \#2552 Ensure `InvalidPath` errors are raised when embedded documents try to
+  get paths from a root selector.
+
 ## 3.0.13
 
 ### Resolved Issues

data/lib/config/locales/en.yml

@@ -1,29 +1,7 @@
 en:
   mongoid:
-    inspection:
-      criteria: "#<Mongoid::Criteria\n
-        \_\_selector: %{selector},\n
-        \_\_options:  %{options},\n
-        \_\_class:    %{klass},\n
-        \_\_embedded: %{embedded}>\n"
-      metadata: "#<Mongoid::Relations::Metadata\n
-        \_\_autobuild:    %{autobuild},\n
-        \_\_class_name:   %{class_name},\n
-        \_\_cyclic:       %{cyclic},\n
-        \_\_dependent:    %{dependent},\n
-        \_\_inverse_of:   %{inverse_of},\n
-        \_\_key:          %{key},\n
-        \_\_macro:        %{macro},\n
-        \_\_name:         %{name},\n
-        \_\_order:        %{order},\n
-        \_\_polymorphic:  %{polymorphic},\n
-        \_\_relation:     %{relation},\n
-        \_\_setter:       %{setter},\n
-        \_\_versioned:    %{versioned}>\n"
     errors:
       messages:
-        blank:
-          "can't be blank"
         blank_in_locale:
           "can't be blank in %{location}"
         ambiguous_relationship:
@@ -171,6 +149,17 @@ en:
             slip by."
           resolution: "Valid options are: %{valid}, make sure these are the ones
             you are using."
+        invalid_path:
+          message: "Having a root path assigned for %{klass} is invalid."
+          summary: "Mongoid has two different path objects for determining
+            the location of a document in the database, Root and Embedded.
+            This error is raised when an embedded document somehow gets a
+            root path assigned."
+          resolution: "Most likely your embedded model, %{klass} is also
+            referenced via a has_many from a root document in another
+            collection. Double check the relation definitions and fix any
+            instances where embedded documents are improperly referenced
+            from other collections."
         invalid_scope:
           message: "Defining a scope of value %{value} on %{klass} is not
             allowed."

data/lib/mongoid/atomic/paths/root.rb

@@ -21,6 +21,19 @@ module Mongoid
           @document, @path, @position = document, "", ""
         end
 
+        # Asking for the insert modifier on a document with a root path
+        # indicates a mixed relation most likely happened.
+        #
+        # @example Attempt to get the insert modifier.
+        #   root.insert_modifier
+        #
+        # @raise [ Errors::InvalidPath ] The error for the attempt.
+        #
+        # @since 3.0.14
+        def insert_modifier
+          raise Errors::InvalidPath.new(document.class)
+        end
+
         # Get the selector to use for the root document when performing atomic
         # updates. When sharding this will include the shard key.
         #

data/lib/mongoid/contextual/map_reduce.rb

@@ -201,6 +201,26 @@ module Mongoid
         results["timeMillis"]
       end
 
+      # Get a pretty string representation of the map/reduce, including the
+      # criteria, map, reduce, finalize, and out option.
+      #
+      # @example Inspect the map_reduce.
+      #   map_reduce.inspect
+      #
+      # @return [ String ] The inspection string.
+      #
+      # @since 3.1.0
+      def inspect
+%Q{#<Mongoid::Contextual::MapReduce
+  selector: #{criteria.selector.inspect}
+  class:    #{criteria.klass}
+  map:      #{command[:map]}
+  reduce:   #{command[:reduce]}
+  finalize: #{command[:finalize]}
+  out:      #{command[:out].inspect}>
+}
+      end
+
       private
 
       # Apply criteria specific options - query, sort, limit.

data/lib/mongoid/criterion/inspection.rb

@@ -13,15 +13,12 @@ module Mongoid
       #
       # @since 1.0.0
       def inspect
-        ::I18n.translate(
-          "mongoid.inspection.criteria",
-          {
-            selector: selector.inspect,
-            options: options.inspect,
-            klass: klass,
-            embedded: embedded?
-          }
-        )
+%Q{#<Mongoid::Criteria
+  selector: #{selector.inspect}
+  options:  #{options.inspect}
+  class:    #{klass}
+  embedded: #{embedded?}>
+}
       end
     end
   end

data/lib/mongoid/document.rb

@@ -193,7 +193,11 @@ module Mongoid
         without_autobuild do
           relation, stored = send(name), meta.store_as
           if attributes.has_key?(stored) || !relation.blank?
-            attributes[stored] = relation.as_document
+            if relation
+              attributes[stored] = relation.as_document
+            else
+              attributes.delete(stored)
+            end
           end
         end
       end

data/lib/mongoid/errors.rb

@@ -13,6 +13,7 @@ require "mongoid/errors/invalid_find"
 require "mongoid/errors/invalid_includes"
 require "mongoid/errors/invalid_index"
 require "mongoid/errors/invalid_options"
+require "mongoid/errors/invalid_path"
 require "mongoid/errors/invalid_scope"
 require "mongoid/errors/invalid_set_polymorphic_relation"
 require "mongoid/errors/invalid_storage_options"

data/lib/mongoid/errors/invalid_path.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # Used when attempting to get embedded paths with incorrect root path set.
+    class InvalidPath < MongoidError
+
+      # Create the new error.
+      #
+      # @example Create the error.
+      #   InvalidPath.new(Address)
+      #
+      # @param [ Class ] klass The document class.
+      #
+      # @since 3.0.14
+      def initialize(klass)
+        super(compose_message("invalid_path", { klass: klass }))
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/time.rb

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

data/lib/mongoid/relations/accessors.rb

@@ -58,6 +58,21 @@ module Mongoid
         ivar(name)
       end
 
+      # Resets the criteria inside the relation proxy. Used by many to many
+      # relations to keep the underlying ids array in sync.
+      #
+      # @example Reset the relation criteria.
+      #   person.reset_relation_criteria(:preferences)
+      #
+      # @param [ Symbol ] name The name of the relation.
+      #
+      # @since 3.0.14
+      def reset_relation_criteria(name)
+        if instance_variable_defined?("@#{name}")
+          send(name).reset_relation_criteria
+        end
+      end
+
       # Set the supplied relation to an instance variable on the class with the
       # provided name. Used as a helper just for code cleanliness.
       #

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

@@ -19,7 +19,10 @@ module Mongoid
           def bind_one(doc)
             binding do
               inverse_keys = doc.you_must(metadata.inverse_foreign_key)
-              inverse_keys.push(base.id) if inverse_keys
+              if inverse_keys
+                inverse_keys.push(base.id)
+                doc.reset_relation_criteria(metadata.inverse)
+              end
               base.synced[metadata.foreign_key] = true
               doc.synced[metadata.inverse_foreign_key] = true
             end
@@ -35,7 +38,10 @@ module Mongoid
             binding do
               base.send(metadata.foreign_key).delete_one(doc.id)
               inverse_keys = doc.you_must(metadata.inverse_foreign_key)
-              inverse_keys.delete_one(base.id) if inverse_keys
+              if inverse_keys
+                inverse_keys.delete_one(base.id)
+                doc.reset_relation_criteria(metadata.inverse)
+              end
               base.synced[metadata.foreign_key] = true
               doc.synced[metadata.inverse_foreign_key] = true
             end

data/lib/mongoid/relations/metadata.rb

@@ -357,25 +357,21 @@ module Mongoid
       #
       # @since 2.0.0.rc.1
       def inspect
-        ::I18n.translate(
-          "mongoid.inspection.metadata",
-          {
-            autobuild: autobuilding?,
-            class_name: class_name,
-            cyclic: cyclic.inspect,
-            dependent: dependent.inspect,
-            inverse_of: inverse_of.inspect,
-            key: key,
-            locale: :en,
-            macro: macro,
-            name: name,
-            order: order.inspect,
-            polymorphic: polymorphic?,
-            relation: relation,
-            setter: setter,
-            versioned: versioned?
-          }
-        )
+%Q{#<Mongoid::Relations::Metadata
+  autobuild:    #{autobuilding?}
+  class_name:   #{class_name}
+  cyclic:       #{cyclic.inspect}
+  dependent:    #{dependent.inspect}
+  inverse_of:   #{inverse_of.inspect}
+  key:          #{key}
+  macro:        #{macro}
+  name:         #{name}
+  order:        #{order.inspect}
+  polymorphic:  #{polymorphic?}
+  relation:     #{relation}
+  setter:       #{setter}
+  versioned:    #{versioned?}>
+}
       end
 
       # Get the name of the inverse relations if they exists. If this is a

data/lib/mongoid/relations/proxy.rb

@@ -39,6 +39,17 @@ module Mongoid
         extend_proxy(metadata.extension) if metadata.extension?
       end
 
+      # Resets the criteria inside the relation proxy. Used by many to many
+      # relations to keep the underlying ids array in sync.
+      #
+      # @example Reset the relation criteria.
+      #   person.preferences.reset_relation_criteria
+      #
+      # @since 3.0.14
+      def reset_relation_criteria
+        target.reset_unloaded(criteria)
+      end
+
       # The default substitutable object for a relation proxy is the clone of
       # the target.
       #

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

@@ -121,6 +121,7 @@ module Mongoid
           doc = super
           if doc && persistable?
             base.pull(foreign_key, doc.id)
+            target._unloaded = criteria
             unsynced(base, foreign_key)
           end
           doc
@@ -169,7 +170,11 @@ module Mongoid
         # @since 2.0.0.rc.1
         def substitute(replacement)
           purge
-          push(replacement.compact.uniq) unless replacement.blank?
+          unless replacement.blank?
+            push(replacement.compact.uniq)
+          else
+            reset_relation_criteria
+          end
           self
         end
 

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

@@ -147,10 +147,10 @@ module Mongoid
         #     puts doc
         #   end
         #
-        # @example return an enumerator containing all the docs 
+        # @example return an enumerator containing all the docs
         #
         #   a = enumerable.each
-        #  
+        #
         # @return [ true ] That the enumerable is now _loaded.
         #
         # @since 2.1.0
@@ -322,6 +322,19 @@ module Mongoid
           @executed = false
         end
 
+        # Resets the underlying unloaded criteria object with a new one. Used
+        # my HABTM relations to keep the underlying array in sync.
+        #
+        # @example Reset the unloaded documents.
+        #   enumerable.reset_unloaded(criteria)
+        #
+        # @param [ Criteria ] criteria The criteria to replace with.
+        #
+        # @since 3.0.14
+        def reset_unloaded(criteria)
+          @_unloaded = criteria if _unloaded.is_a?(Criteria)
+        end
+
         # Does this enumerable respond to the provided method?
         #
         # @example Does the enumerable respond to the method?

data/lib/mongoid/validations/uniqueness.rb

@@ -105,13 +105,13 @@ module Mongoid
       # @since 2.4.10
       def create_criteria(base, document, attribute, value)
         field = document.fields[attribute.to_s]
-        criteria = base.unscoped
+        criteria = scope(base.unscoped, document, attribute)
         if field.try(:localized?)
           criteria.selector.update(criterion(document, attribute, value))
         else
           criteria = criteria.where(criterion(document, attribute, value))
         end
-        scope(criteria, document, attribute)
+        criteria
       end
 
       # Get the default criteria for checking uniqueness.

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -132,6 +132,7 @@ files:
 - lib/mongoid/errors/invalid_includes.rb
 - lib/mongoid/errors/invalid_index.rb
 - lib/mongoid/errors/invalid_options.rb
+- lib/mongoid/errors/invalid_path.rb
 - lib/mongoid/errors/invalid_scope.rb
 - lib/mongoid/errors/invalid_set_polymorphic_relation.rb
 - lib/mongoid/errors/invalid_storage_options.rb
@@ -352,7 +353,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4207639439439343607
+      hash: 4134482588596477262
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: