activemodel 5.0.0.beta3 → 5.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c283ac88f7c8c09878346cd9ac5317371c141bb6
-  data.tar.gz: 9141a1af7e5100d957d9192e0e2beae4306e2c68
+  metadata.gz: a5df9d369a3faa94a6d5fc38b04390262022f27d
+  data.tar.gz: b9ee6b37708667d8d35b8dba1d56ea03f0248384
 SHA512:
-  metadata.gz: 069aec401e7854c4d2e3e578ed6d4226f07d9411049b262ef1d5a81ab639c9d34aff29e22af5676a0ec065b98a4ef9e0cf5b31c2d228aff833d70465de61cf21
-  data.tar.gz: a4e7860c438a2ac4933cdada88fe0e84c0154870ec7fbd88f60d6b53f1d4c3e1824ac494f7f54871c9bd7b72f299890b9c2c5efdbf1f937e68297ddd0c9ec26b
+  metadata.gz: 58760c123352b90b58ec20cc8c1df1e6fcdcb006aed4cebbd91ea679ba3da46bd143616ab1912f2096749144601cc3b50b6eea3a9979ff0e9b75d8bae7598070
+  data.tar.gz: d2003ffd49c49cdd016e7c73aa9d333d10f1c6d261939a1b39b6b7366412bb7c8922a784b3e0272469f7e6d67f821d7c5421d8b7c21b29fbc2224a1fffd73e0b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Rails 5.0.0.beta4 (April 27, 2016) ##
+
+*   Allow passing record being validated to the message proc to generate
+    customized error messages for that object using I18n helper.
+
+    *Prathamesh Sonpatki*
+
 ## Rails 5.0.0.beta3 (February 24, 2016) ##
 
 *   No changes.

data/lib/active_model/conversion.rb

@@ -40,8 +40,8 @@ module ActiveModel
       self
     end
 
-    # Returns an Array of all key attributes if any is set, regardless if
-    # the object is persisted or not. Returns +nil+ if there are no key attributes.
+    # Returns an Array of all key attributes if any of the attributes is set, whether or not
+    # the object is persisted. Returns +nil+ if there are no key attributes.
     #
     #   class Person
     #     include ActiveModel::Conversion

data/lib/active_model/dirty.rb

@@ -119,6 +119,9 @@ module ActiveModel
     extend ActiveSupport::Concern
     include ActiveModel::AttributeMethods
 
+    OPTION_NOT_GIVEN = Object.new # :nodoc:
+    private_constant :OPTION_NOT_GIVEN
+
     included do
       attribute_method_suffix '_changed?', '_change', '_will_change!', '_was'
       attribute_method_suffix '_previously_changed?', '_previous_change'
@@ -174,11 +177,10 @@ module ActiveModel
     end
 
     # Handles <tt>*_changed?</tt> for +method_missing+.
-    def attribute_changed?(attr, options = {}) #:nodoc:
-      result = changes_include?(attr)
-      result &&= options[:to] == __send__(attr) if options.key?(:to)
-      result &&= options[:from] == changed_attributes[attr] if options.key?(:from)
-      result
+    def attribute_changed?(attr, from: OPTION_NOT_GIVEN, to: OPTION_NOT_GIVEN) # :nodoc:
+      !!changes_include?(attr) &&
+        (to == OPTION_NOT_GIVEN || to == __send__(attr)) &&
+        (from == OPTION_NOT_GIVEN || from == changed_attributes[attr])
     end
 
     # Handles <tt>*_was</tt> for +method_missing+.
@@ -187,7 +189,7 @@ module ActiveModel
     end
 
     # Handles <tt>*_previously_changed?</tt> for +method_missing+.
-    def attribute_previously_changed?(attr, options = {}) #:nodoc:
+    def attribute_previously_changed?(attr) #:nodoc:
       previous_changes_include?(attr)
     end
 

data/lib/active_model/errors.rb

@@ -110,7 +110,7 @@ module ActiveModel
     #   person.errors.include?(:name) # => true
     #   person.errors.include?(:age)  # => false
     def include?(attribute)
-      messages[attribute].present?
+      messages.key?(attribute) && messages[attribute].present?
     end
     alias :has_key? :include?
     alias :key? :include?
@@ -346,7 +346,7 @@ module ActiveModel
     #   # => {:name=>["can't be empty"]}
     def add_on_empty(attributes, options = {})
       ActiveSupport::Deprecation.warn(<<-MESSAGE.squish)
-        ActiveModel::Errors#add_on_empty is deprecated and will be removed in Rails 5.1
+        ActiveModel::Errors#add_on_empty is deprecated and will be removed in Rails 5.1.
 
         To achieve the same use:
 
@@ -368,7 +368,7 @@ module ActiveModel
     #   # => {:name=>["can't be blank"]}
     def add_on_blank(attributes, options = {})
       ActiveSupport::Deprecation.warn(<<-MESSAGE.squish)
-        ActiveModel::Errors#add_on_blank is deprecated and will be removed in Rails 5.1
+        ActiveModel::Errors#add_on_blank is deprecated and will be removed in Rails 5.1.
 
         To achieve the same use:
 
@@ -486,7 +486,8 @@ module ActiveModel
         default: defaults,
         model: @base.model_name.human,
         attribute: @base.class.human_attribute_name(attribute),
-        value: value
+        value: value,
+        object: @base
       }.merge!(options)
 
       I18n.translate(key, options)

data/lib/active_model/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveModel
     MAJOR = 5
     MINOR = 0
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model/type.rb

@@ -47,7 +47,7 @@ module ActiveModel
     register(:binary, Type::Binary)
     register(:boolean, Type::Boolean)
     register(:date, Type::Date)
-    register(:date_time, Type::DateTime)
+    register(:datetime, Type::DateTime)
     register(:decimal, Type::Decimal)
     register(:float, Type::Float)
     register(:immutable_string, Type::ImmutableString)

data/lib/active_model/type/decimal.rb

@@ -29,12 +29,12 @@ module ActiveModel
           end
         end
 
-        scale ? casted_value.round(scale) : casted_value
+        apply_scale(casted_value)
       end
 
       def convert_float_to_big_decimal(value)
         if precision
-          BigDecimal(value, float_precision)
+          BigDecimal(apply_scale(value), float_precision)
         else
           value.to_d
         end
@@ -47,6 +47,14 @@ module ActiveModel
           precision.to_i
         end
       end
+
+      def apply_scale(value)
+        if scale
+          value.round(scale)
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/active_model/validations/clusivity.rb

@@ -30,14 +30,15 @@ module ActiveModel
         @delimiter ||= options[:in] || options[:within]
       end
 
-      # In Ruby 1.9 <tt>Range#include?</tt> on non-number-or-time-ish ranges checks all
+      # In Ruby 2.2 <tt>Range#include?</tt> on non-number-or-time-ish ranges checks all
       # possible values in the range for equality, which is slower but more accurate.
       # <tt>Range#cover?</tt> uses the previous logic of comparing a value with the range
-      # endpoints, which is fast but is only accurate on Numeric, Time, or DateTime ranges.
+      # endpoints, which is fast but is only accurate on Numeric, Time, Date,
+      # or DateTime ranges.
       def inclusion_method(enumerable)
         if enumerable.is_a? Range
           case enumerable.first
-          when Numeric, Time, DateTime
+          when Numeric, Time, DateTime, Date
             :cover?
           else
             :include?

data/lib/active_model/validations/length.rb

@@ -136,7 +136,7 @@ module ActiveModel
       # * <tt>:too_long</tt> - The error message if the attribute goes over the
       #   maximum (default is: "is too long (maximum is %{count} characters)").
       # * <tt>:too_short</tt> - The error message if the attribute goes under the
-      #   minimum (default is: "is too short (min is %{count} characters)").
+      #   minimum (default is: "is too short (minimum is %{count} characters)").
       # * <tt>:wrong_length</tt> - The error message if using the <tt>:is</tt>
       #   method and the attribute is the wrong size (default is: "is the wrong
       #   length (should be %{count} characters)").

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta3
+  version: 5.0.0.beta4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -93,7 +93,7 @@ files:
 - lib/active_model/validations/with.rb
 - lib/active_model/validator.rb
 - lib/active_model/version.rb
-homepage: http://www.rubyonrails.org
+homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata: {}
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).