mongoid 2.4.5 → 2.4.6

data/CHANGELOG.md

@@ -3,7 +3,25 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 2.4.5 (branch: 2.4.0-stable)
+## 2.4.6
+
+### Resolved Issues
+
+* \#1772 Allow skip and limit to convert strings to integers. (Jean Boussier)
+
+* \#1767 Model#update_attributes accepts mass assignment options again.
+  (Hans Hasselberg)
+
+* \#1762 Criteria#any_of now properly handles localized fields.
+
+* \#1758 Metadata now returns self on options for external library support.
+
+* \#1757 Ensure serialization converts any attribute types to the type
+  defined by the field.
+
+* \#1756 Serializable hash options should pass through to embedded docs.
+
+## 2.4.5
 
 ### Resolved Issues
 

data/lib/mongoid/criterion/optional.rb

@@ -109,7 +109,7 @@ module Mongoid #:nodoc:
       #
       # @return [ Criteria ] The cloned criteria.
       def limit(value = 20)
-        clone.tap { |crit| crit.options[:limit] = value }
+        clone.tap { |crit| crit.options[:limit] = value.to_i }
       end
 
       # Returns the offset option. If a per_page option is in the list then it
@@ -163,7 +163,7 @@ module Mongoid #:nodoc:
       #
       # @return [ Criteria ] The cloned criteria.
       def skip(value = 0)
-        clone.tap { |crit| crit.options[:skip] = value }
+        clone.tap { |crit| crit.options[:skip] = value.to_i }
       end
 
       # Adds a criterion to the +Criteria+ that specifies a type or an Array of

data/lib/mongoid/criterion/selector.rb

@@ -103,7 +103,12 @@ module Mongoid #:nodoc:
       def handle_and_or_value(values)
         [].tap do |result|
            result.push(*values.map do |value|
-            Hash[value.map{ |key, value| [key, try_to_typecast(key, value)] }]
+            Hash[value.map do |_key, _value|
+              if klass.fields[_key.to_s].try(:localized?)
+                _key = "#{_key}.#{::I18n.locale}"
+              end
+              [_key, try_to_typecast(_key, _value)]
+            end]
           end)
         end
       end

data/lib/mongoid/persistence.rb

@@ -116,8 +116,8 @@ module Mongoid #:nodoc:
     # @param [ Hash ] attributes The attributes to update.
     #
     # @return [ true, false ] True if validation passed, false if not.
-    def update_attributes(attributes = {})
-      write_attributes(attributes); save
+    def update_attributes(attributes = {}, options = {})
+      assign_attributes(attributes, options); save
     end
 
     # Update the document attributes in the database and raise an error if
@@ -131,8 +131,8 @@ module Mongoid #:nodoc:
     # @raise [ Errors::Validations ] If validation failed.
     #
     # @return [ true, false ] True if validation passed.
-    def update_attributes!(attributes = {})
-      update_attributes(attributes).tap do |result|
+    def update_attributes!(attributes = {}, options = {})
+      update_attributes(attributes, options).tap do |result|
         unless result
           self.class.fail_validate!(self) if errors.any?
           self.class.fail_callback!(self, :update_attributes!)

data/lib/mongoid/relations/metadata.rb

@@ -717,6 +717,19 @@ module Mongoid # :nodoc:
         !!self[:versioned]
       end
 
+      # Returns the metadata itself. Here for compatibility with Rails
+      # association metadata.
+      #
+      # @example Get the options.
+      #   metadata.options
+      #
+      # @return [ Metadata ] self.
+      #
+      # @since 2.4.6
+      def options
+        self
+      end
+
       # Returns default order for this association.
       #
       # @example Get default order

data/lib/mongoid/serialization.rb

@@ -46,11 +46,13 @@ module Mongoid # :nodoc:
       end.compact
 
       {}.tap do |attrs|
-        attribute_names.each do |name|
-          attrs[name] = attributes[name]
-        end
-        method_names.each do |name|
-          attrs[name] = send(name)
+        (attribute_names + method_names).each do |name|
+          value = send(name)
+          if relations.has_key?(name)
+            attrs[name] = value.serializable_hash(options)
+          else
+            attrs[name] = value
+          end
         end
         serialize_relations(attrs, options) if options[:include]
       end
@@ -97,8 +99,7 @@ module Mongoid # :nodoc:
       inclusions = options[:include]
       relation_names(inclusions).each do |name|
         metadata = relations[name.to_s]
-        relation = send(metadata.name)
-        if relation
+        if metadata && relation = send(metadata.name)
           attributes[metadata.name.to_s] =
             relation.serializable_hash(relation_options(inclusions, options, name))
         end

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70356497238660 !ruby/object:Gem::Requirement
+  requirement: &70290122566500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70356497238660
+  version_requirements: *70290122566500
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70356497237480 !ruby/object:Gem::Requirement
+  requirement: &70290122563300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70356497237480
+  version_requirements: *70290122563300
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70356497236500 !ruby/object:Gem::Requirement
+  requirement: &70290122575540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70356497236500
+  version_requirements: *70290122575540
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70356497234880 !ruby/object:Gem::Requirement
+  requirement: &70290122572600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70356497234880
+  version_requirements: *70290122572600
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70356497233800 !ruby/object:Gem::Requirement
+  requirement: &70290122570780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70356497233800
+  version_requirements: *70290122570780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70356497083440 !ruby/object:Gem::Requirement
+  requirement: &70290122594580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *70356497083440
+  version_requirements: *70290122594580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70356497082860 !ruby/object:Gem::Requirement
+  requirement: &70290122606300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70356497082860
+  version_requirements: *70290122606300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70356497081920 !ruby/object:Gem::Requirement
+  requirement: &70290122604280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70356497081920
+  version_requirements: *70290122604280
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70356497081280 !ruby/object:Gem::Requirement
+  requirement: &70290122602380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70356497081280
+  version_requirements: *70290122602380
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -414,7 +414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2742246905926364196
+      hash: 2263773657060838243
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: