activemodel 5.0.7.2 → 5.1.0.beta1

data/lib/active_model/secure_password.rb

@@ -55,7 +55,7 @@ module ActiveModel
         # This is to avoid ActiveModel (and by extension the entire framework)
         # being dependent on a binary library.
         begin
-          require 'bcrypt'
+          require "bcrypt"
         rescue LoadError
           $stderr.puts "You don't have bcrypt installed in your application. Please add it to your Gemfile and run bundle install"
           raise

data/lib/active_model/serialization.rb

@@ -1,5 +1,5 @@
-require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/hash/slice'
+require "active_support/core_ext/hash/except"
+require "active_support/core_ext/hash/slice"
 
 module ActiveModel
   # == Active \Model \Serialization

data/lib/active_model/serializers/json.rb

@@ -1,4 +1,4 @@
-require 'active_support/json'
+require "active_support/json"
 
 module ActiveModel
   module Serializers
@@ -134,7 +134,7 @@ module ActiveModel
       #   person.name                  # => "bob"
       #   person.age                   # => 22
       #   person.awesome               # => true
-      def from_json(json, include_root=include_root_in_json)
+      def from_json(json, include_root = include_root_in_json)
         hash = ActiveSupport::JSON.decode(json)
         hash = hash.values.first if include_root
         self.attributes = hash

data/lib/active_model/translation.rb

@@ -1,5 +1,4 @@
 module ActiveModel
-
   # == Active \Model \Translation
   #
   # Provides integration between your object and the Rails internationalization
@@ -31,7 +30,7 @@ module ActiveModel
     # ActiveModel::Errors#full_messages and
     # ActiveModel::Translation#human_attribute_name.
     def lookup_ancestors
-      self.ancestors.select { |x| x.respond_to?(:model_name) }
+      ancestors.select { |x| x.respond_to?(:model_name) }
     end
 
     # Transforms attribute names into a more human format, such as "First name"
@@ -45,7 +44,7 @@ module ActiveModel
       parts     = attribute.to_s.split(".")
       attribute = parts.pop
       namespace = parts.join("/") unless parts.empty?
-      attributes_scope = "#{self.i18n_scope}.attributes"
+      attributes_scope = "#{i18n_scope}.attributes"
 
       if namespace
         defaults = lookup_ancestors.map do |klass|

data/lib/active_model/type.rb

@@ -1,22 +1,19 @@
-require 'active_model/type/helpers'
-require 'active_model/type/value'
+require "active_model/type/helpers"
+require "active_model/type/value"
 
-require 'active_model/type/big_integer'
-require 'active_model/type/binary'
-require 'active_model/type/boolean'
-require 'active_model/type/date'
-require 'active_model/type/date_time'
-require 'active_model/type/decimal'
-require 'active_model/type/decimal_without_scale'
-require 'active_model/type/float'
-require 'active_model/type/immutable_string'
-require 'active_model/type/integer'
-require 'active_model/type/string'
-require 'active_model/type/text'
-require 'active_model/type/time'
-require 'active_model/type/unsigned_integer'
+require "active_model/type/big_integer"
+require "active_model/type/binary"
+require "active_model/type/boolean"
+require "active_model/type/date"
+require "active_model/type/date_time"
+require "active_model/type/decimal"
+require "active_model/type/float"
+require "active_model/type/immutable_string"
+require "active_model/type/integer"
+require "active_model/type/string"
+require "active_model/type/time"
 
-require 'active_model/type/registry'
+require "active_model/type/registry"
 
 module ActiveModel
   module Type
@@ -27,7 +24,7 @@ module ActiveModel
       delegate :add_modifier, to: :registry
 
       # Add a new type to the registry, allowing it to be referenced as a
-      # symbol by ActiveModel::Attributes::ClassMethods#attribute.  If your
+      # symbol by ActiveRecord::Attributes::ClassMethods#attribute.  If your
       # type is only meant to be used with a specific database adapter, you can
       # do so by passing +adapter: :postgresql+. If your type has the same
       # name as a native type for the current adapter, an exception will be
@@ -53,7 +50,6 @@ module ActiveModel
     register(:immutable_string, Type::ImmutableString)
     register(:integer, Type::Integer)
     register(:string, Type::String)
-    register(:text, Type::Text)
     register(:time, Type::Time)
   end
 end

data/lib/active_model/type/big_integer.rb

@@ -1,13 +1,13 @@
-require 'active_model/type/integer'
+require "active_model/type/integer"
 
 module ActiveModel
   module Type
     class BigInteger < Integer # :nodoc:
       private
 
-      def max_value
-        ::Float::INFINITY
-      end
+        def max_value
+          ::Float::INFINITY
+        end
     end
   end
 end

data/lib/active_model/type/binary.rb

@@ -38,7 +38,7 @@ module ActiveModel
         alias_method :to_str, :to_s
 
         def hex
-          @value.unpack('H*')[0]
+          @value.unpack("H*")[0]
         end
 
         def ==(other)

data/lib/active_model/type/boolean.rb

@@ -1,21 +1,32 @@
 module ActiveModel
   module Type
-    class Boolean < Value # :nodoc:
-      FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF'].to_set
+    # == Active \Model \Type \Boolean
+    #
+    # A class that behaves like a boolean type, including rules for coercion of user input.
+    #
+    # === Coercion
+    # Values set from user input will first be coerced into the appropriate ruby type.
+    # Coercion behavior is roughly mapped to Ruby's boolean semantics.
+    #
+    # - "false", "f" , "0", +0+ or any other value in +FALSE_VALUES+ will be coerced to +false+
+    # - Empty strings are coerced to +nil+
+    # - All other values will be coerced to +true+
+    class Boolean < Value
+      FALSE_VALUES = [false, 0, "0", "f", "F", "false", "FALSE", "off", "OFF"].to_set
 
-      def type
+      def type # :nodoc:
         :boolean
       end
 
       private
 
-      def cast_value(value)
-        if value == ''
-          nil
-        else
-          !FALSE_VALUES.include?(value)
+        def cast_value(value)
+          if value == ""
+            nil
+          else
+            !FALSE_VALUES.include?(value)
+          end
         end
-      end
     end
   end
 end

data/lib/active_model/type/date.rb

@@ -17,38 +17,38 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        if value.is_a?(::String)
-          return if value.empty?
-          fast_string_to_date(value) || fallback_string_to_date(value)
-        elsif value.respond_to?(:to_date)
-          value.to_date
-        else
-          value
+        def cast_value(value)
+          if value.is_a?(::String)
+            return if value.empty?
+            fast_string_to_date(value) || fallback_string_to_date(value)
+          elsif value.respond_to?(:to_date)
+            value.to_date
+          else
+            value
+          end
         end
-      end
 
-      ISO_DATE = /\A(\d{4})-(\d\d)-(\d\d)\z/
-      def fast_string_to_date(string)
-        if string =~ ISO_DATE
-          new_date $1.to_i, $2.to_i, $3.to_i
+        ISO_DATE = /\A(\d{4})-(\d\d)-(\d\d)\z/
+        def fast_string_to_date(string)
+          if string =~ ISO_DATE
+            new_date $1.to_i, $2.to_i, $3.to_i
+          end
         end
-      end
 
-      def fallback_string_to_date(string)
-        new_date(*::Date._parse(string, false).values_at(:year, :mon, :mday))
-      end
+        def fallback_string_to_date(string)
+          new_date(*::Date._parse(string, false).values_at(:year, :mon, :mday))
+        end
 
-      def new_date(year, mon, mday)
-        if year && year != 0
-          ::Date.new(year, mon, mday) rescue nil
+        def new_date(year, mon, mday)
+          if year && year != 0
+            ::Date.new(year, mon, mday) rescue nil
+          end
         end
-      end
 
-      def value_from_multiparameter_assignment(*)
-        time = super
-        time && time.to_date
-      end
+        def value_from_multiparameter_assignment(*)
+          time = super
+          time && time.to_date
+        end
     end
   end
 end

data/lib/active_model/type/date_time.rb

@@ -12,33 +12,33 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        return apply_seconds_precision(value) unless value.is_a?(::String)
-        return if value.empty?
+        def cast_value(value)
+          return apply_seconds_precision(value) unless value.is_a?(::String)
+          return if value.empty?
 
-        fast_string_to_time(value) || fallback_string_to_time(value)
-      end
+          fast_string_to_time(value) || fallback_string_to_time(value)
+        end
 
-      # '0.123456' -> 123456
-      # '1.123456' -> 123456
-      def microseconds(time)
-        time[:sec_fraction] ? (time[:sec_fraction] * 1_000_000).to_i : 0
-      end
+        # '0.123456' -> 123456
+        # '1.123456' -> 123456
+        def microseconds(time)
+          time[:sec_fraction] ? (time[:sec_fraction] * 1_000_000).to_i : 0
+        end
 
-      def fallback_string_to_time(string)
-        time_hash = ::Date._parse(string)
-        time_hash[:sec_fraction] = microseconds(time_hash)
+        def fallback_string_to_time(string)
+          time_hash = ::Date._parse(string)
+          time_hash[:sec_fraction] = microseconds(time_hash)
 
-        new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset))
-      end
+          new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset))
+        end
 
-      def value_from_multiparameter_assignment(values_hash)
-        missing_parameter = (1..3).detect { |key| !values_hash.key?(key) }
-        if missing_parameter
-          raise ArgumentError, missing_parameter
+        def value_from_multiparameter_assignment(values_hash)
+          missing_parameter = (1..3).detect { |key| !values_hash.key?(key) }
+          if missing_parameter
+            raise ArgumentError, missing_parameter
+          end
+          super
         end
-        super
-      end
     end
   end
 end

data/lib/active_model/type/decimal.rb

@@ -4,6 +4,7 @@ module ActiveModel
   module Type
     class Decimal < Value # :nodoc:
       include Helpers::Numeric
+      BIGDECIMAL_PRECISION = 18
 
       def type
         :decimal
@@ -15,52 +16,47 @@ module ActiveModel
 
       private
 
-      def cast_value(value)
-        casted_value = case value
-        when ::Float
-          convert_float_to_big_decimal(value)
-        when ::Numeric
-          BigDecimal(value, precision.to_i)
-        when ::String
-          begin
-            value.to_d
-          rescue ArgumentError
-            BigDecimal(0)
-          end
-        else
-          if value.respond_to?(:to_d)
-            value.to_d
-          else
-            cast_value(value.to_s)
-          end
+        def cast_value(value)
+          casted_value = \
+            case value
+            when ::Float
+              convert_float_to_big_decimal(value)
+            when ::Numeric, ::String
+              BigDecimal(value, precision || BIGDECIMAL_PRECISION)
+            else
+              if value.respond_to?(:to_d)
+                value.to_d
+              else
+                cast_value(value.to_s)
+              end
+            end
+
+          apply_scale(casted_value)
         end
 
-        apply_scale(casted_value)
-      end
-
-      def convert_float_to_big_decimal(value)
-        if precision
-          BigDecimal(apply_scale(value), float_precision)
-        else
-          value.to_d
+        def convert_float_to_big_decimal(value)
+          if precision
+            BigDecimal(apply_scale(value), float_precision)
+          else
+            value.to_d
+          end
         end
-      end
 
-      def float_precision
-        if precision.to_i > ::Float::DIG + 1
-          ::Float::DIG + 1
-        else
-          precision.to_i
+        def float_precision
+          if precision.to_i > ::Float::DIG + 1
+            ::Float::DIG + 1
+          else
+            precision.to_i
+          end
         end
-      end
 
-      def apply_scale(value)
-        if scale
-          value.round(scale)
-        else
-          value
+        def apply_scale(value)
+          if scale
+            value.round(scale)
+          else
+            value
+          end
         end
-      end
     end
   end
 end

data/lib/active_model/type/float.rb

@@ -7,19 +7,28 @@ module ActiveModel
         :float
       end
 
+      def type_cast_for_schema(value)
+        return "::Float::NAN" if value.try(:nan?)
+        case value
+        when ::Float::INFINITY then "::Float::INFINITY"
+        when -::Float::INFINITY then "-::Float::INFINITY"
+        else super
+        end
+      end
+
       alias serialize cast
 
       private
 
-      def cast_value(value)
-        case value
-        when ::Float then value
-        when "Infinity" then ::Float::INFINITY
-        when "-Infinity" then -::Float::INFINITY
-        when "NaN" then ::Float::NAN
-        else value.to_f
+        def cast_value(value)
+          case value
+          when ::Float then value
+          when "Infinity" then ::Float::INFINITY
+          when "-Infinity" then -::Float::INFINITY
+          when "NaN" then ::Float::NAN
+          else value.to_f
+          end
         end
-      end
     end
   end
 end

data/lib/active_model/type/helpers.rb

@@ -1,4 +1,4 @@
-require 'active_model/type/helpers/accepts_multiparameter_time'
-require 'active_model/type/helpers/numeric'
-require 'active_model/type/helpers/mutable'
-require 'active_model/type/helpers/time_value'
+require "active_model/type/helpers/accepts_multiparameter_time"
+require "active_model/type/helpers/numeric"
+require "active_model/type/helpers/mutable"
+require "active_model/type/helpers/time_value"

data/lib/active_model/type/helpers/accepts_multiparameter_time.rb

@@ -1,7 +1,7 @@
 module ActiveModel
   module Type
-    module Helpers
-      class AcceptsMultiparameterTime < Module # :nodoc:
+    module Helpers # :nodoc: all
+      class AcceptsMultiparameterTime < Module
         def initialize(defaults: {})
           define_method(:cast) do |value|
             if value.is_a?(Hash)