mongoid 3.1.0 → 3.1.1

data/CHANGELOG.md

@@ -3,7 +3,17 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
 
-## 3.1.0 (branch: master)
+## 3.1.1
+
+* \#2839 Validations fixed to use the type cast value with the exception
+  of the numericality validator. (Lailson Bandeira)
+
+* \#2838 `store_in` options now properly merge instead of override.
+  (Colin MacKenzie)
+
+### Resolved Issues
+
+## 3.1.0
 
 ### New Features
 

data/lib/mongoid/attributes.rb

@@ -12,7 +12,6 @@ module Mongoid
     include Readonly
 
     attr_reader :attributes
-    attr_reader :attributes_before_type_cast
     alias :raw_attributes :attributes
 
     # Determine if an attribute is present.
@@ -30,6 +29,18 @@ module Mongoid
       !attribute.blank? || attribute == false
     end
 
+    # Get the attributes that have not been cast.
+    #
+    # @example Get the attributes before type cast.
+    #   document.attributes_before_type_cast
+    #
+    # @return [ Hash ] The uncast attributes.
+    #
+    # @since 3.1.0
+    def attributes_before_type_cast
+      @attributes_before_type_cast ||= {}
+    end
+
     # Does the document have the provided attribute?
     #
     # @example Does the document have the attribute?

data/lib/mongoid/document.rb

@@ -89,7 +89,6 @@ module Mongoid
       _building do
         @new_record = true
         @attributes ||= {}
-        @attributes_before_type_cast ||= {}
         options ||= {}
         apply_pre_processed_defaults
         process_attributes(attrs, options[:as] || :default, !options[:without_protection]) do
@@ -285,7 +284,6 @@ module Mongoid
         doc = allocate
         doc.criteria_instance_id = criteria_instance_id
         doc.instance_variable_set(:@attributes, attributes)
-        doc.instance_variable_set(:@attributes_before_type_cast, {})
         doc.apply_defaults
         IdentityMap.set(doc) unless _loading_revision?
         yield(doc) if block_given?

data/lib/mongoid/hierarchy.rb

@@ -179,7 +179,8 @@ module Mongoid
         unless fields.has_key?("_type")
           field(:_type, default: self.name, type: String)
         end
-        subclass.field(:_type, default: subclass.name, type: String)
+        subclass_default = subclass.name || ->{ self.class.name }
+        subclass.field(:_type, default: subclass_default, type: String)
       end
     end
   end

data/lib/mongoid/sessions.rb

@@ -293,7 +293,8 @@ module Mongoid
       def store_in(options)
         Validators::Storage.validate(self, options)
         @collection_name, @database_name = nil, nil
-        self.storage_options = options
+        self.storage_options ||= {}
+        self.storage_options.merge! options
       end
 
       # Tell the next persistance operation to store in a specific collection,

data/lib/mongoid/validations.rb

@@ -62,8 +62,6 @@ module Mongoid
         relation.do_or_do_not(:in_memory) || relation
       elsif fields[attribute].try(:localized?)
         attributes[attribute]
-      elsif respond_to?("#{attr}_before_type_cast")
-        send("#{attr}_before_type_cast")
       else
         send(attr)
       end

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -375,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Elegant Persistance in Ruby for MongoDB.