activemodel 4.2.0.rc1 → 4.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f380f03e7c700340afc2572d537610afd437f3c2
-  data.tar.gz: 18b93e5b90dec5948270acd5ac0a34b550240d9f
+  metadata.gz: 730f64c39007b7ccd83f0a170179606e187a83f4
+  data.tar.gz: 84c9b855006ecb33711a8615d2db862574ad220f
 SHA512:
-  metadata.gz: b164154f5c556ce4ae382ea059ec8281f4eedec5ab1edcffc1b3098cd746dc69955431178aee61d4ecb3366a7e14f27c103af39a24e379257333ab03acfc2ea8
-  data.tar.gz: ea08bc3f46a6d0c036af6ffdb6f9af9c52c58bd2fab4d25c70c25808c189cdf1dfb7a73ec9945e1b56003e06093fae989206e1e436c92c6e1050f6d69ccf41dc
+  metadata.gz: 5e764a287ef04bacdea7a34fbe405e43b072ed373611b1d4d36584077c2cb3b76031d7ce8d9eef55e30f2e1225d5a08ea4b6db52a1cb36d572712716c5a3acb1
+  data.tar.gz: 31ae1b2f2ccd0750467e9daf39ff4d35237a66b67ebe5a9d343fb31b953a997e90bccd51956943374f9e9b6f39b3c5c583c6acccbe43e126b4a4320e74fe645b

data/README.rdoc

@@ -246,7 +246,7 @@ The latest version of Active Model can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/activemodel
+* https://github.com/rails/rails/tree/4-2-stable/activemodel
 
 
 == License

data/lib/active_model/attribute_methods.rb

@@ -353,14 +353,12 @@ module ActiveModel
           @attribute_method_matchers_cache ||= ThreadSafe::Cache.new(initial_capacity: 4)
         end
 
-        def attribute_method_matcher(method_name) #:nodoc:
+        def attribute_method_matchers_matching(method_name) #:nodoc:
           attribute_method_matchers_cache.compute_if_absent(method_name) do
             # Must try to match prefixes/suffixes first, or else the matcher with no prefix/suffix
             # will match every time.
             matchers = attribute_method_matchers.partition(&:plain?).reverse.flatten(1)
-            match = nil
-            matchers.detect { |method| match = method.match(method_name) }
-            match
+            matchers.map { |method| method.match(method_name) }.compact
           end
         end
 
@@ -469,8 +467,8 @@ module ActiveModel
       # Returns a struct representing the matching attribute method.
       # The struct's attributes are prefix, base and suffix.
       def match_attribute_method?(method_name)
-        match = self.class.send(:attribute_method_matcher, method_name)
-        match if match && attribute_method?(match.attr_name)
+        matches = self.class.send(:attribute_method_matchers_matching, method_name)
+        matches.detect { |match| attribute_method?(match.attr_name) }
       end
 
       def missing_attribute(attr_name, stack)

data/lib/active_model/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveModel
     MAJOR = 4
     MINOR = 2
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model/validations/numericality.rb

@@ -23,6 +23,10 @@ module ActiveModel
         raw_value = record.send(before_type_cast) if record.respond_to?(before_type_cast)
         raw_value ||= value
 
+        if record_attribute_changed_in_place?(record, attr_name)
+          raw_value = value
+        end
+
         return if options[:allow_nil] && raw_value.nil?
 
         unless value = parse_raw_value_as_a_number(raw_value)
@@ -86,6 +90,13 @@ module ActiveModel
           options[:only_integer]
         end
       end
+
+      private
+
+      def record_attribute_changed_in_place?(record, attr_name)
+        record.respond_to?(:attribute_changed_in_place?) &&
+          record.attribute_changed_in_place?(attr_name.to_s)
+      end
     end
 
     module HelperMethods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc1
+  version: 4.2.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 description: A toolkit for building modeling frameworks like Active Record. Rich support
@@ -94,17 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).