mongoid 2.4.1 → 2.4.2

data/CHANGELOG.md

@@ -3,7 +3,44 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 2.4.1 \[ In Development \] \[ Branch: 2.4.0-stable \]
+## 2.4.2 \[ In Development \] \[ Branch: 2.4.0-stable \]
+
+### Resolved Issues
+
+* \#1627 Validating format now works properly with localized fields.
+  (Douwe Maan)
+
+* \#1617 Relation proxy methods now show up in Mongoid's list of
+  prohibited fields.
+
+* \#1615 Allow a single configuration of host and port for all spec runs,
+  overridden by setting MONGOID_SPEC_HOST and MONGOID_SPEC_PORT env vars.
+
+* \#1610 When versioning paranoid documents and max version is set, hard
+  delete old versions from the embedded relation.
+
+* \#1609 Allow connection retry during cursor iteration as well as all other
+  operations.
+
+* \#1608 Guard against no method errors when passing ids in nested attributes
+  and the documents do not exist.
+
+* \#1605 Remove deprecation warning on rescue responses, Rails 3.2
+
+* \#1602 Preserve structure of $and and $or queries when typecasting.
+
+* \#1600 Uniqueness validation no longer errors when provided a relation.
+
+* \#1599 Make sure enumerable targets yield to what is in memory first when
+  performing #each, not always the unloaded first.
+
+* \#1597 Fix the ability to change the order of array fields with the same
+  elements.
+
+* \#1590 Allow proper serialization of boolean values in criteria where the
+  field is nested inside an array.
+
+## 2.4.1
 
 ### Resolved Issues
 

data/lib/mongoid/components.rb

@@ -66,6 +66,7 @@ module Mongoid #:nodoc
       Mongoid::NestedAttributes,
       Mongoid::Persistence,
       Mongoid::Relations,
+      Mongoid::Relations::Proxy,
       Mongoid::Safety,
       Mongoid::Serialization,
       Mongoid::Sharding,

data/lib/mongoid/config.rb

@@ -23,6 +23,7 @@ module Mongoid #:nodoc
     option :autocreate_indexes, :default => false
     option :identity_map_enabled, :default => false
     option :include_root_in_json, :default => false
+    option :include_type_for_serialization, :default => false
     option :max_retries_on_connection_failure, :default => 0
     option :parameterize_keys, :default => true
     option :scope_overwrite_exception, :default => false

data/lib/mongoid/criterion/selector.rb

@@ -102,11 +102,9 @@ module Mongoid #:nodoc:
 
       def handle_and_or_value(values)
         [].tap do |result|
-          values.map do |value|
-            value.each do |key, value|
-              result.push key => try_to_typecast(key, value)
-            end
-          end
+           result.push(*values.map do |value|
+            Hash[value.map{ |key, value| [key, try_to_typecast(key, value)] }]
+          end)
         end
       end
 

data/lib/mongoid/cursor.rb

@@ -45,8 +45,10 @@ module Mongoid #:nodoc
     # @example Iterate over the cursor.
     #   cursor.each { |doc| p doc.title }
     def each
-      cursor.each do |document|
-        yield Mongoid::Factory.from_db(klass, document)
+      retry_on_connection_failure do
+        while document = cursor.next_document
+          yield Factory.from_db(klass, document)
+        end
       end
     end
 

data/lib/mongoid/fields.rb

@@ -8,6 +8,7 @@ require "mongoid/fields/internal/binary"
 require "mongoid/fields/internal/boolean"
 require "mongoid/fields/internal/date"
 require "mongoid/fields/internal/date_time"
+require "mongoid/fields/internal/false_class"
 require "mongoid/fields/internal/float"
 require "mongoid/fields/internal/hash"
 require "mongoid/fields/internal/integer"
@@ -23,6 +24,7 @@ require "mongoid/fields/internal/string"
 require "mongoid/fields/internal/symbol"
 require "mongoid/fields/internal/time"
 require "mongoid/fields/internal/time_with_zone"
+require "mongoid/fields/internal/true_class"
 require "mongoid/fields/internal/foreign_keys/array"
 require "mongoid/fields/internal/foreign_keys/object"
 

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

@@ -21,17 +21,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.4.0
         def add_atomic_changes(document, name, key, mods, new, old)
-          pushes = (new || []) - (old || [])
-          pulls = (old || []) - (new || [])
-          if old.nil?
-            mods[key] = pushes
-          elsif !pushes.empty? && !pulls.empty?
-            mods[key] = document.attributes[name]
-          elsif !pushes.empty?
-            document.atomic_array_pushes[key] = pushes
-          elsif !pulls.empty?
-            document.atomic_array_pulls[key] = pulls
-          end
+          mods[key] = new
         end
 
         # Array fields are resizable.

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

@@ -0,0 +1,10 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Fields #:nodoc:
+    module Internal #:nodoc:
+      # Defines the behaviour for false values.
+      class FalseClass < Boolean
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Fields #:nodoc:
+    module Internal #:nodoc:
+      # Defines the behaviour for true values.
+      class TrueClass < Boolean
+      end
+    end
+  end
+end

data/lib/mongoid/railtie.rb

@@ -81,10 +81,15 @@ module Rails #:nodoc:
       # 404s and not 500s, validation errors are 422s.
       initializer "load http errors" do |app|
         config.after_initialize do
-          ActionDispatch::ShowExceptions.rescue_responses.update({
+          responses = {
             "Mongoid::Errors::DocumentNotFound" => :not_found,
             "Mongoid::Errors::Validations" => 422
-          })
+          }
+          if rescue_responses = config.action_dispatch.rescue_responses
+            rescue_responses.update(responses)
+          else
+            ActionDispatch::ShowExceptions.rescue_responses.update(responses)
+          end
         end
       end
 

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -92,7 +92,9 @@ module Mongoid # :nodoc:
           def process(parent, attrs)
             return if reject?(parent, attrs)
             if id = attrs.extract_id
-              doc = existing.find(convert_id(existing.first.class, id))
+              first = existing.first
+              converted = first ? convert_id(first.class, id) : id
+              doc = existing.find(converted)
               if destroyable?(attrs)
                 existing.delete(doc)
                 doc.destroy unless doc.embedded?

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

@@ -151,8 +151,9 @@ module Mongoid #:nodoc:
             end
           else
             unloaded.each do |doc|
-              yield(doc)
-              loaded.push(added.delete_one(doc) || loaded.delete_one(doc) || doc)
+              document = added.delete_one(doc) || loaded.delete_one(doc) || doc
+              yield(document)
+              loaded.push(document)
             end
           end
           added.each do |doc|

data/lib/mongoid/serialization.rb

@@ -31,7 +31,7 @@ module Mongoid # :nodoc:
       only   = Array.wrap(options[:only]).map(&:to_s)
       except = Array.wrap(options[:except]).map(&:to_s)
 
-      except |= ['_type']
+      except |= ['_type'] unless Mongoid.include_type_for_serialization
 
       field_names = fields.keys.map { |field| field.to_s }
       attribute_names = (attributes.keys + field_names).sort

data/lib/mongoid/validations.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "mongoid/validations/associated"
+require "mongoid/validations/format"
 require "mongoid/validations/uniqueness"
 require "mongoid/validations/presence"
 
@@ -88,6 +89,21 @@ module Mongoid #:nodoc:
 
     module ClassMethods #:nodoc:
 
+      # Validates whether or not a field matches a certain regular expression.
+      #
+      # @example
+      #   class Person
+      #     include Mongoid::Document
+      #     field :website
+      #
+      #     validates_format_of :website, :with => URI.regexp
+      #   end
+      #
+      # @param [ Array ] *args The arguments to pass to the validator.
+      def validates_format_of(*args)
+        validates_with(FormatValidator, _merge_attributes(args))
+      end
+
       # Validates whether or not an association is valid or not. Will correctly
       # handle has one and has many associations.
       #

data/lib/mongoid/validations/format.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Validations #:nodoc:
+
+    # Validates that the specified attributes do or do not match a certain 
+    # regular expression.
+    #
+    # @example Set up the format validator.
+    #
+    #   class Person
+    #     include Mongoid::Document
+    #     field :website
+    #
+    #     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
+    end
+  end
+end

data/lib/mongoid/validations/uniqueness.rb

@@ -41,7 +41,7 @@ module Mongoid #:nodoc:
       #
       # @since 1.0.0
       def validate_each(document, attribute, value)
-        return unless document.send("#{attribute}_changed?")
+        return unless document.send("attribute_changed?", attribute.to_s)
         if document.embedded?
           return if skip_validation?(document)
           relation = document._parent.send(document.metadata.name)

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -40,7 +40,16 @@ module Mongoid #:nodoc:
           previous.versioned_attributes, :without_protection => true
         ).attributes.delete("_id")
         if version_max.present? && versions.length > version_max
-          versions.delete(versions.first)
+          deleted = versions.first
+          if deleted.paranoid?
+            versions.delete_one(deleted)
+            collection.update(
+              atomic_selector,
+              { "$pull" => { "versions" => { "version" => deleted.version }}}
+            )
+          else
+            versions.delete(deleted)
+          end
         end
         self.version = (version || 1 ) + 1
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-15 00:00:00.000000000 Z
+date: 2012-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70092776306560 !ruby/object:Gem::Requirement
+  requirement: &70314945130600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70092776306560
+  version_requirements: *70314945130600
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70092776305140 !ruby/object:Gem::Requirement
+  requirement: &70314945129660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70092776305140
+  version_requirements: *70314945129660
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70092776302420 !ruby/object:Gem::Requirement
+  requirement: &70314945129040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70092776302420
+  version_requirements: *70314945129040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70092776301540 !ruby/object:Gem::Requirement
+  requirement: &70314945128260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70092776301540
+  version_requirements: *70314945128260
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70092776300860 !ruby/object:Gem::Requirement
+  requirement: &70314945127340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +65,21 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70092776300860
+  version_requirements: *70314945127340
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70092776296740 !ruby/object:Gem::Requirement
+  requirement: &70314945126120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *70092776296740
+  version_requirements: *70314945126120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70092776295300 !ruby/object:Gem::Requirement
+  requirement: &70314945106580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70092776295300
+  version_requirements: *70314945106580
 - !ruby/object:Gem::Dependency
-  name: watchr
-  requirement: &70092776293380 !ruby/object:Gem::Requirement
+  name: guard-rspec
+  requirement: &70314945098020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70092776293380
+  version_requirements: *70314945098020
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70092776292500 !ruby/object:Gem::Requirement
+  requirement: &70314945048580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70092776292500
+  version_requirements: *70314945048580
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -229,6 +229,7 @@ files:
 - lib/mongoid/fields/internal/boolean.rb
 - lib/mongoid/fields/internal/date.rb
 - lib/mongoid/fields/internal/date_time.rb
+- lib/mongoid/fields/internal/false_class.rb
 - lib/mongoid/fields/internal/fixnum.rb
 - lib/mongoid/fields/internal/float.rb
 - lib/mongoid/fields/internal/foreign_keys/array.rb
@@ -246,6 +247,7 @@ files:
 - lib/mongoid/fields/internal/time.rb
 - lib/mongoid/fields/internal/time_with_zone.rb
 - lib/mongoid/fields/internal/timekeeping.rb
+- lib/mongoid/fields/internal/true_class.rb
 - lib/mongoid/fields/mappings.rb
 - lib/mongoid/fields/serializable.rb
 - lib/mongoid/fields.rb
@@ -377,6 +379,7 @@ files:
 - lib/mongoid/timestamps/updated.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/validations/associated.rb
+- lib/mongoid/validations/format.rb
 - lib/mongoid/validations/presence.rb
 - lib/mongoid/validations/uniqueness.rb
 - lib/mongoid/validations.rb
@@ -411,7 +414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1067878638816238851
+      hash: 4438000233284558311
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: