mongoid 2.4.8 → 2.4.9

data/CHANGELOG.md

@@ -3,6 +3,44 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 2.4.10 (branch: 2.4.0-stable)
+
+### Resolved Issues
+
+## 2.4.9
+
+### Resolved Issues
+
+* \#1943 Ensure numericality validation works for big decimals.
+
+* \#1938 Length validation now works with localized fields.
+
+* \#1936 Conflicting pushes with other pushes is now properly handled.
+
+* \#1933 `Proxy#extend` should delegate through to the target, where
+  extending the proxy itself is now handled through `Proxy#proxy_extend`.
+
+* \#1930 Ensure complex criteria are expanded in all where clauses.
+  (Hans Hasselberg)
+
+* \#1928 Deletion of embedded documents via nested attributes now performs
+  a $pull with id match criteria instead of a $pullAll to cover all cases.
+  Previously newly added defaults to documents that had already persisted
+  could not be deleted in this matter since the doc did not match what was
+  in the database.
+
+* \#1924/\#1917 Fix pushing to embedded relations with default scopes not
+  scoping on the new document. (Hans Hasselberg)
+
+* \#1922/\#1919 Dropping collections unmemoizes the internally wrapped
+  collection, in order to ensure when defining capped collections that
+  they are always recreated as capped. (Hans Hasselberg)
+
+* \#1916/\#1913 Uniqueness validation no longer is affected by the default
+  scope. (Hans Hasselberg)
+
+* \#1778 Ensure foreign keys are always set regardless of binding state.
+
 ## 2.4.8
 
 ### Resolved Issues

data/lib/config/locales/en.yml

@@ -61,4 +61,4 @@ en:
         scope_overwrite:
           "Cannot create scope :%{scope_name}, because of existing method
           %{model_name}.%{scope_name}."
-        blank_on_locale: "can't be blank in %{in_locale}"
+        blank_on_locale: "can't be blank in %{location}"

data/lib/mongoid/atomic.rb

@@ -160,15 +160,18 @@ module Mongoid #:nodoc:
     #
     # @since 2.2.0
     def atomic_pulls
-      delayed_atomic_pulls.inject({}) do |pulls, (name, docs)|
-        pulls.tap do |pull|
-          docs.each do |doc|
-            (pull[doc.atomic_path] ||= []).push(doc.as_document)
-            doc.destroyed = true
-            doc.flagged_for_destroy = false
-          end
+      pulls = {}
+      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
+          doc.id
         end
+        pulls[path] = { "_id" => { "$in" => ids }} and path = nil
       end
+      pulls
     end
 
     # Get all the push attributes that need to occur.
@@ -273,7 +276,7 @@ module Mongoid #:nodoc:
       mods.push(doc.atomic_pushes)
       mods.push(doc.atomic_array_pushes)
       mods.add_to_set(doc.atomic_array_add_to_sets)
-      mods.pull(doc.atomic_array_pulls)
+      mods.pull_all(doc.atomic_array_pulls)
     end
   end
 end

data/lib/mongoid/atomic/modifiers.rb

@@ -26,18 +26,33 @@ module Mongoid #:nodoc:
         end
       end
 
-      # Adds pull modifiers to the modifiers hash.
+      # Adds pull all modifiers to the modifiers hash.
       #
-      # @example Add pull operations.
-      #   modifiers.pull({ "addresses" => { "street" => "Bond" }})
+      # @example Add pull all operations.
+      #   modifiers.pull_all({ "addresses" => { "street" => "Bond" }})
       #
-      # @param [ Hash ] modifications The pull modifiers.
+      # @param [ Hash ] modifications The pull all modifiers.
       #
-      # @since 2.2.0
+      # @since 3.0.0
+      def pull_all(modifications)
+        modifications.each_pair do |field, value|
+          add_operation(pull_alls, field, value)
+          pull_fields[field.split(".", 2)[0]] = field
+        end
+      end
+
+      # Adds pull all modifiers to the modifiers hash.
+      #
+      # @example Add pull all operations.
+      #   modifiers.pull({ "addresses" => { "_id" => { "$in" => [ 1, 2, 3 ]}}})
+      #
+      # @param [ Hash ] modifications The pull all modifiers.
+      #
+      # @since 3.0.0
       def pull(modifications)
         modifications.each_pair do |field, value|
-          add_operation(pulls, field, value)
-          pull_fields << field.split(".", 2)[0]
+          pulls[field] = value
+          pull_fields[field.split(".", 2)[0]] = field
         end
       end
 
@@ -51,6 +66,7 @@ module Mongoid #:nodoc:
       # @since 2.1.0
       def push(modifications)
         modifications.each_pair do |field, value|
+          push_fields[field] = field
           mods = push_conflict?(field) ? conflicting_pushes : pushes
           add_operation(mods, field, Array.wrap(value))
         end
@@ -69,7 +85,7 @@ module Mongoid #:nodoc:
           next if field == "_id"
           mods = set_conflict?(field) ? conflicting_sets : sets
           add_operation(mods, field, value)
-          set_fields << field.split(".", 2)[0]
+          set_fields[field.split(".", 2)[0]] = field
         end
       end
 
@@ -133,7 +149,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.2.0
       def set_conflict?(field)
-        pull_fields.include?(field.split(".", 2)[0])
+        pull_fields.has_key?(field.split(".", 2)[0])
       end
 
       # Is the operation going to be a conflict for a $push?
@@ -148,7 +164,8 @@ module Mongoid #:nodoc:
       # @since 2.2.0
       def push_conflict?(field)
         name = field.split(".", 2)[0]
-        set_fields.include?(name) || pull_fields.include?(name)
+        set_fields.has_key?(name) || pull_fields.has_key?(name) ||
+          (push_fields.keys.count { |item| item =~ /#{name}/ } > 1)
       end
 
       # Get the conflicting pull modifications.
@@ -208,7 +225,19 @@ module Mongoid #:nodoc:
       #
       # @since 2.2.0
       def pull_fields
-        @pull_fields ||= []
+        @pull_fields ||= {}
+      end
+
+      # Get the names of the fields that need to be pushed.
+      #
+      # @example Get the push fields.
+      #   modifiers.push_fields
+      #
+      # @return [ Array<String> ] The push fields.
+      #
+      # @since 2.2.0
+      def push_fields
+        @push_fields ||= {}
       end
 
       # Get the names of the fields that need to be set.
@@ -220,21 +249,33 @@ module Mongoid #:nodoc:
       #
       # @since 2.2.0
       def set_fields
-        @set_fields ||= []
+        @set_fields ||= {}
       end
 
       # Get the $pullAll operations or intialize a new one.
       #
       # @example Get the $pullAll operations.
-      #   modifiers.pulls
+      #   modifiers.pull_alls
       #
       # @return [ Hash ] The $pullAll operations.
       #
-      # @since 2.1.0
-      def pulls
+      # @since 3.0.0
+      def pull_alls
         self["$pullAll"] ||= {}
       end
 
+      # Get the $pull operations or intialize a new one.
+      #
+      # @example Get the $pull operations.
+      #   modifiers.pulls
+      #
+      # @return [ Hash ] The $pull operations.
+      #
+      # @since 3.0.0
+      def pulls
+        self["$pull"] ||= {}
+      end
+
       # Get the $pushAll operations or intialize a new one.
       #
       # @example Get the $pushAll operations.

data/lib/mongoid/collection.rb

@@ -149,5 +149,9 @@ module Mongoid #:nodoc
         master(options).update(selector, document, options)
       end
     end
+
+    def drop(*args)
+      @master = nil if master.drop
+    end
   end
 end

data/lib/mongoid/extensions/hash/criteria_helpers.rb

@@ -16,12 +16,13 @@ module Mongoid #:nodoc:
         # @since 1.0.0
         def expand_complex_criteria
           {}.tap do |hsh|
-            each_pair do |k,v|
+            each_pair do |k, v|
               if k.respond_to?(:key) && k.respond_to?(:to_mongo_query)
                 hsh[k.key] ||= {}
                 v = v.expand_complex_criteria if v.is_a?(::Hash)
                 hsh[k.key].merge!(k.to_mongo_query(v))
               else
+                v.map!{|e| e.is_a?(::Hash) ? e.expand_complex_criteria : e } if v.is_a?(::Array)
                 hsh[k] = v
               end
             end

data/lib/mongoid/fields/internal/big_decimal.rb

@@ -19,7 +19,13 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def deserialize(object)
-          object ? ::BigDecimal.new(object) : object
+          return object unless object
+          begin
+            Float(object)
+            ::BigDecimal.new(object)
+          rescue ArgumentError, TypeError
+            object
+          end
         end
 
         # Special case to serialize the object.

data/lib/mongoid/matchers/all.rb

@@ -15,8 +15,8 @@ module Mongoid #:nodoc:
       # @return [ true, false ] If the values match.
       def matches?(value)
         attribute_array = Array.wrap(@attribute)
-        value.values.first.all? do |e| 
-          if e.is_a?(Regexp) 
+        value.values.first.all? do |e|
+          if e.is_a?(Regexp)
             attribute_array.any? { |_attribute| _attribute =~ e }
           else
             attribute_array.include?(e)

data/lib/mongoid/matchers/in.rb

@@ -15,8 +15,8 @@ module Mongoid #:nodoc:
       # @return [ true, false ] If a value exists.
       def matches?(value)
         attribute_array = Array.wrap(@attribute)
-        value.values.first.any? do |e| 
-          if e.is_a?(Regexp) 
+        value.values.first.any? do |e|
+          if e.is_a?(Regexp)
             attribute_array.any? { |_attribute| _attribute =~ e }
           else
             attribute_array.include?(e)

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

@@ -19,13 +19,13 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind
+            base.you_must(metadata.foreign_key_setter, target.id)
+            if metadata.inverse_type
+              base.you_must(metadata.inverse_type_setter, target.class.model_name)
+            end
             unless _binding?
               _binding do
                 inverse = metadata.inverse(target)
-                base.you_must(metadata.foreign_key_setter, target.id)
-                if metadata.inverse_type
-                  base.you_must(metadata.inverse_type_setter, target.class.model_name)
-                end
                 if inverse
                   if set_base_metadata
                     if base.referenced_many?
@@ -49,13 +49,13 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind
+            base.you_must(metadata.foreign_key_setter, nil)
+            if metadata.inverse_type
+              base.you_must(metadata.inverse_type_setter, nil)
+            end
             unless _binding?
               _binding do
                 inverse = metadata.inverse(target)
-                base.you_must(metadata.foreign_key_setter, nil)
-                if metadata.inverse_type
-                  base.you_must(metadata.inverse_type_setter, nil)
-                end
                 if inverse
                   set_base_metadata
                   if base.referenced_many?

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

@@ -17,12 +17,12 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind_one(doc)
+            doc.you_must(metadata.foreign_key_setter, base.id)
+            if metadata.type
+              doc.you_must(metadata.type_setter, base.class.model_name)
+            end
             unless _binding?
               _binding do
-                doc.you_must(metadata.foreign_key_setter, base.id)
-                if metadata.type
-                  doc.you_must(metadata.type_setter, base.class.model_name)
-                end
                 doc.send(metadata.inverse_setter, base)
               end
             end
@@ -37,12 +37,12 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc)
+            doc.you_must(metadata.foreign_key_setter, nil)
+            if metadata.type
+              doc.you_must(metadata.type_setter, nil)
+            end
             unless _binding?
               _binding do
-                doc.you_must(metadata.foreign_key_setter, nil)
-                if metadata.type
-                  doc.you_must(metadata.type_setter, nil)
-                end
                 doc.send(metadata.inverse_setter, nil)
               end
             end

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

@@ -19,13 +19,13 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind
+            target.you_must(metadata.foreign_key_setter, base.id)
+            if metadata.type
+              target.you_must(metadata.type_setter, base.class.model_name)
+            end
             unless _binding?
               _binding do
-                target.you_must(metadata.foreign_key_setter, base.id)
                 target.send(metadata.inverse_setter, base)
-                if metadata.type
-                  target.you_must(metadata.type_setter, base.class.model_name)
-                end
               end
             end
           end
@@ -40,13 +40,13 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind
+            target.you_must(metadata.foreign_key_setter, nil)
+            if metadata.type
+              target.you_must(metadata.type_setter, nil)
+            end
             unless _binding?
               _binding do
-                target.you_must(metadata.foreign_key_setter, nil)
                 target.send(metadata.inverse_setter, nil)
-                if metadata.type
-                  target.you_must(metadata.type_setter, nil)
-                end
               end
             end
           end

data/lib/mongoid/relations/embedded/many.rb

@@ -300,7 +300,7 @@ module Mongoid # :nodoc:
           tap do |proxy|
             if replacement.blank?
               if _assigning? && !proxy.empty?
-                base.atomic_unsets.push(proxy.first.atomic_path)
+                base.atomic_unsets.push(_unscoped.first.atomic_path)
               end
               proxy.clear
             else
@@ -318,7 +318,7 @@ module Mongoid # :nodoc:
                   doc.save if base.persisted? && !_assigning?
                 end
                 if _assigning?
-                  name = proxy.first.atomic_path
+                  name = _unscoped.first.atomic_path
                   base.delayed_atomic_sets[name] = proxy.as_document
                 end
               end
@@ -353,10 +353,10 @@ module Mongoid # :nodoc:
         #
         # @since 2.0.0.rc.1
         def append(document)
-          target.push(document)
+          target.push(*scope([document]))
           _unscoped.push(document)
           integrate(document)
-          document._index = target.size - 1
+          document._index = _unscoped.size - 1
         end
 
         # Instantiate the binding associated with this relation.

data/lib/mongoid/relations/proxy.rb

@@ -5,14 +5,16 @@ module Mongoid # :nodoc:
     # This class is the superclass for all relation proxy objects, and contains
     # common behaviour for all of them.
     class Proxy
-      include Threaded::Lifecycle
+      alias :extend_proxy :extend
 
       # We undefine most methods to get them sent through to the target.
       instance_methods.each do |method|
         undef_method(method) unless
-          method =~ /(^__|^send$|^object_id$|^extend$|^respond_to\?$|^tap$)/
+          method =~ /(^__|^send|^object_id|^respond_to|^tap|extend_proxy)/
       end
 
+      include Threaded::Lifecycle
+
       attr_accessor :base, :loaded, :metadata, :target
 
       # Backwards compatibility with Mongoid beta releases.
@@ -34,7 +36,7 @@ module Mongoid # :nodoc:
       def init(base, target, metadata)
         @base, @target, @metadata = base, target, metadata
         yield(self) if block_given?
-        extend metadata.extension if metadata.extension?
+        extend_proxy(metadata.extension) if metadata.extension?
       end
 
       # The default substitutable object for a relation proxy is the clone of

data/lib/mongoid/validations.rb

@@ -1,8 +1,10 @@
 # encoding: utf-8
+require "mongoid/validations/localizable"
 require "mongoid/validations/associated"
 require "mongoid/validations/format"
-require "mongoid/validations/uniqueness"
+require "mongoid/validations/length"
 require "mongoid/validations/presence"
+require "mongoid/validations/uniqueness"
 
 module Mongoid #:nodoc:
 

data/lib/mongoid/validations/format.rb

@@ -2,7 +2,7 @@
 module Mongoid #:nodoc:
   module Validations #:nodoc:
 
-    # Validates that the specified attributes do or do not match a certain 
+    # Validates that the specified attributes do or do not match a certain
     # regular expression.
     #
     # @example Set up the format validator.
@@ -14,27 +14,7 @@ module Mongoid #:nodoc:
     #     validates_format_of :website, :with => URI.regexp
     #   end
     class FormatValidator < ActiveModel::Validations::FormatValidator
-
-      # Validates each for format.
-      #
-      # @example Validate format.
-      #   validator.validate_each(model, :name, "value")
-      #
-      # @param [ Document ] document The document.
-      # @param [ Symbol, String ] attribute The attribute to validate.
-      # @param [ Object ] value The attribute value.
-      #
-      # @since 2.4.2
-      def validate_each(document, attribute, value)
-        field = document.fields[attribute.to_s]
-        if field && field.localized? && !value.blank?
-          value.each_pair do |_locale, _value|
-            super(document, attribute, _value)
-          end
-        else
-          super
-        end
-      end
+      include Localizable
     end
   end
 end

data/lib/mongoid/validations/length.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module Mongoid
+  module Validations
+
+    # Validates that the specified attributes do or do not match a certain
+    # length.
+    #
+    # @example Set up the length validator.
+    #
+    #   class Person
+    #     include Mongoid::Document
+    #     field :website
+    #
+    #     validates_length_of :website, in: 1..10
+    #   end
+    class LengthValidator < ActiveModel::Validations::LengthValidator
+      include Localizable
+    end
+  end
+end

data/lib/mongoid/validations/localizable.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+module Mongoid
+  module Validations
+
+    # Adds localization support to validations.
+    module Localizable
+
+      # Validates each for localized fields.
+      #
+      # @example Validate localized fields.
+      #   validator.validate_each(model, :name, "value")
+      #
+      # @param [ Document ] document The document.
+      # @param [ Symbol, String ] attribute The attribute to validate.
+      # @param [ Object ] value The attribute value.
+      #
+      # @since 2.4.2
+      def validate_each(document, attribute, value)
+        field = document.fields[attribute.to_s]
+        if field.try(:localized?) && !value.blank?
+          value.values.each do |_value|
+            super(document, attribute, _value)
+          end
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/validations/presence.rb

@@ -27,9 +27,9 @@ module Mongoid #:nodoc:
       # @since 2.4.0
       def validate_each(document, attribute, value)
         field = document.fields[attribute.to_s]
-        if field && field.localized? && !value.blank?
+        if field.try(:localized?) && !value.blank?
           value.each_pair do |locale, value|
-            document.errors.add(attribute, :blank_on_locale, options.merge(:in_locale => locale)) if value.blank?
+            document.errors.add(attribute, :blank_on_locale, options.merge(:location => locale)) if value.blank?
           end
         else
           document.errors.add(attribute, :blank, options) if value.blank?

data/lib/mongoid/validations/uniqueness.rb

@@ -56,7 +56,7 @@ module Mongoid #:nodoc:
             )
           end
         else
-          criteria = klass.where(criterion(document, attrib, val))
+          criteria = klass.unscoped.where(criterion(document, attrib, val))
           criteria = scope(criteria, document, attrib)
           if criteria.exists?
             document.errors.add(
@@ -146,7 +146,7 @@ module Mongoid #:nodoc:
         !document._parent || document.embedded_one?
       end
 
-      # Scope reference has changed? 
+      # Scope reference has changed?
       #
       # @example Has scope reference changed?
       #   validator.scope_value_changed?(doc)
@@ -155,7 +155,7 @@ module Mongoid #:nodoc:
       #
       # @return [ true, false ] If the scope reference has changed.
       #
-      # @since 
+      # @since
       def scope_value_changed?(document)
         Array.wrap(options[:scope]).any? do |item|
           document.send("attribute_changed?", item.to_s)

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.4.8"
+  VERSION = "2.4.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -425,6 +425,8 @@ files:
 - lib/mongoid/timestamps.rb
 - lib/mongoid/validations/associated.rb
 - lib/mongoid/validations/format.rb
+- lib/mongoid/validations/length.rb
+- lib/mongoid/validations/localizable.rb
 - lib/mongoid/validations/presence.rb
 - lib/mongoid/validations/uniqueness.rb
 - lib/mongoid/validations.rb
@@ -459,7 +461,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2935457969941610047
+      hash: 3721994237204070315
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: