activemodel 4.0.13 → 4.1.0.beta1

data/lib/active_model/validations/clusivity.rb

@@ -15,15 +15,15 @@ module ActiveModel
     private
 
       def include?(record, value)
-        exclusions = if delimiter.respond_to?(:call)
-                       delimiter.call(record)
-                     elsif delimiter.respond_to?(:to_sym)
-                       record.send(delimiter)
-                     else
-                       delimiter
-                     end
+        members = if delimiter.respond_to?(:call)
+                    delimiter.call(record)
+                  elsif delimiter.respond_to?(:to_sym)
+                    record.send(delimiter)
+                  else
+                    delimiter
+                  end
 
-        exclusions.send(inclusion_method(exclusions), value)
+        members.send(inclusion_method(members), value)
       end
 
       def delimiter
@@ -35,10 +35,13 @@ module ActiveModel
       # <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.
       def inclusion_method(enumerable)
-        return :include? unless enumerable.is_a?(Range)
-        case enumerable.first
-        when Numeric, Time, DateTime
-          :cover?
+        if enumerable.is_a? Range
+          case enumerable.first
+          when Numeric, Time, DateTime
+            :cover?
+          else
+            :include?
+          end
         else
           :include?
         end

data/lib/active_model/validations/confirmation.rb

@@ -2,14 +2,20 @@ module ActiveModel
 
   module Validations
     class ConfirmationValidator < EachValidator # :nodoc:
+      def initialize(options)
+        super
+        setup!(options[:class])
+      end
+
       def validate_each(record, attribute, value)
         if (confirmed = record.send("#{attribute}_confirmation")) && (value != confirmed)
           human_attribute_name = record.class.human_attribute_name(attribute)
-          record.errors.add(:"#{attribute}_confirmation", :confirmation, options.merge(:attribute => human_attribute_name))
+          record.errors.add(:"#{attribute}_confirmation", :confirmation, options.merge(attribute: human_attribute_name))
         end
       end
 
-      def setup(klass)
+      private
+      def setup!(klass)
         klass.send(:attr_reader, *attributes.map do |attribute|
           :"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation")
         end.compact)

data/lib/active_model/validations/exclusion.rb

@@ -8,7 +8,7 @@ module ActiveModel
 
       def validate_each(record, attribute, value)
         if include?(record, value)
-          record.errors.add(attribute, :exclusion, options.except(:in, :within).merge!(:value => value))
+          record.errors.add(attribute, :exclusion, options.except(:in, :within).merge!(value: value))
         end
       end
     end

data/lib/active_model/validations/format.rb

@@ -17,8 +17,8 @@ module ActiveModel
           raise ArgumentError, "Either :with or :without must be supplied (but not both)"
         end
 
-        check_options_validity(options, :with)
-        check_options_validity(options, :without)
+        check_options_validity :with
+        check_options_validity :without
       end
 
       private
@@ -29,24 +29,26 @@ module ActiveModel
       end
 
       def record_error(record, attribute, name, value)
-        record.errors.add(attribute, :invalid, options.except(name).merge!(:value => value))
+        record.errors.add(attribute, :invalid, options.except(name).merge!(value: value))
       end
 
-      def regexp_using_multiline_anchors?(regexp)
-        regexp.source.start_with?("^") ||
-          (regexp.source.end_with?("$") && !regexp.source.end_with?("\\$"))
+      def check_options_validity(name)
+        if option = options[name]
+          if option.is_a?(Regexp)
+            if options[:multiline] != true && regexp_using_multiline_anchors?(option)
+              raise ArgumentError, "The provided regular expression is using multiline anchors (^ or $), " \
+              "which may present a security risk. Did you mean to use \\A and \\z, or forgot to add the " \
+              ":multiline => true option?"
+            end
+          elsif !option.respond_to?(:call)
+            raise ArgumentError, "A regular expression or a proc or lambda must be supplied as :#{name}"
+          end
+        end
       end
 
-      def check_options_validity(options, name)
-        option = options[name]
-        if option && !option.is_a?(Regexp) && !option.respond_to?(:call)
-          raise ArgumentError, "A regular expression or a proc or lambda must be supplied as :#{name}"
-        elsif option && option.is_a?(Regexp) &&
-              regexp_using_multiline_anchors?(option) && options[:multiline] != true
-          raise ArgumentError, "The provided regular expression is using multiline anchors (^ or $), " \
-          "which may present a security risk. Did you mean to use \\A and \\z, or forgot to add the " \
-          ":multiline => true option?"
-        end
+      def regexp_using_multiline_anchors?(regexp)
+        source = regexp.source
+        source.start_with?("^") || (source.end_with?("$") && !source.end_with?("\\$"))
       end
     end
 

data/lib/active_model/validations/inclusion.rb

@@ -8,7 +8,7 @@ module ActiveModel
 
       def validate_each(record, attribute, value)
         unless include?(record, value)
-          record.errors.add(attribute, :inclusion, options.except(:in, :within).merge!(:value => value))
+          record.errors.add(attribute, :inclusion, options.except(:in, :within).merge!(value: value))
         end
       end
     end
@@ -29,8 +29,7 @@ module ActiveModel
       # * <tt>:in</tt> - An enumerable object of available items. This can be
       #   supplied as a proc, lambda or symbol which returns an enumerable. If the
       #   enumerable is a numerical range the test is performed with <tt>Range#cover?</tt>,
-      #   otherwise with <tt>include?</tt>. When using a proc or lambda the instance
-      #   under validation is passed as an argument.
+      #   otherwise with <tt>include?</tt>.
       # * <tt>:within</tt> - A synonym(or alias) for <tt>:in</tt>
       # * <tt>:message</tt> - Specifies a custom error message (default is: "is
       #   not included in the list").

data/lib/active_model/validations/length.rb

@@ -3,8 +3,8 @@ module ActiveModel
   # == Active \Model Length \Validator
   module Validations
     class LengthValidator < EachValidator # :nodoc:
-      MESSAGES  = { :is => :wrong_length, :minimum => :too_short, :maximum => :too_long }.freeze
-      CHECKS    = { :is => :==, :minimum => :>=, :maximum => :<= }.freeze
+      MESSAGES  = { is: :wrong_length, minimum: :too_short, maximum: :too_long }.freeze
+      CHECKS    = { is: :==, minimum: :>=, maximum: :<= }.freeze
 
       RESERVED_OPTIONS  = [:minimum, :maximum, :within, :is, :tokenizer, :too_short, :too_long]
 

data/lib/active_model/validations/numericality.rb

@@ -2,17 +2,18 @@ module ActiveModel
 
   module Validations
     class NumericalityValidator < EachValidator # :nodoc:
-      CHECKS = { :greater_than => :>, :greater_than_or_equal_to => :>=,
-                 :equal_to => :==, :less_than => :<, :less_than_or_equal_to => :<=,
-                 :odd => :odd?, :even => :even?, :other_than => :!= }.freeze
+      CHECKS = { greater_than: :>, greater_than_or_equal_to: :>=,
+                 equal_to: :==, less_than: :<, less_than_or_equal_to: :<=,
+                 odd: :odd?, even: :even?, other_than: :!= }.freeze
 
       RESERVED_OPTIONS = CHECKS.keys + [:only_integer]
 
       def check_validity!
         keys = CHECKS.keys - [:odd, :even]
         options.slice(*keys).each do |option, value|
-          next if value.is_a?(Numeric) || value.is_a?(Proc) || value.is_a?(Symbol)
-          raise ArgumentError, ":#{option} must be a number, a symbol or a proc"
+          unless value.is_a?(Numeric) || value.is_a?(Proc) || value.is_a?(Symbol)
+            raise ArgumentError, ":#{option} must be a number, a symbol or a proc"
+          end
         end
       end
 
@@ -43,11 +44,15 @@ module ActiveModel
               record.errors.add(attr_name, option, filtered_options(value))
             end
           else
-            option_value = option_value.call(record) if option_value.is_a?(Proc)
-            option_value = record.send(option_value) if option_value.is_a?(Symbol)
+            case option_value
+            when Proc
+              option_value = option_value.call(record)
+            when Symbol
+              option_value = record.send(option_value)
+            end
 
             unless value.send(CHECKS[option], option_value)
-              record.errors.add(attr_name, option, filtered_options(value).merge(:count => option_value))
+              record.errors.add(attr_name, option, filtered_options(value).merge!(count: option_value))
             end
           end
         end
@@ -56,16 +61,9 @@ module ActiveModel
     protected
 
       def parse_raw_value_as_a_number(raw_value)
-        case raw_value
-        when /\A0[xX]/
-          nil
-        else
-          begin
-            Kernel.Float(raw_value)
-          rescue ArgumentError, TypeError
-            nil
-          end
-        end
+        Kernel.Float(raw_value) if raw_value !~ /\A0[xX]/
+      rescue ArgumentError, TypeError
+        nil
       end
 
       def parse_raw_value_as_an_integer(raw_value)
@@ -73,7 +71,9 @@ module ActiveModel
       end
 
       def filtered_options(value)
-        options.except(*RESERVED_OPTIONS).merge!(:value => value)
+        filtered = options.except(*RESERVED_OPTIONS)
+        filtered[:value] = value
+        filtered
       end
     end
 

data/lib/active_model/validations/validates.rb

@@ -159,9 +159,9 @@ module ActiveModel
         when Hash
           options
         when Range, Array
-          { :in => options }
+          { in: options }
         else
-          { :with => options }
+          { with: options }
         end
       end
     end

data/lib/active_model/validations/with.rb

@@ -83,9 +83,10 @@ module ActiveModel
       #   end
       def validates_with(*args, &block)
         options = args.extract_options!
+        options[:class] = self
+
         args.each do |klass|
           validator = klass.new(options, &block)
-          validator.setup(self) if validator.respond_to?(:setup)
 
           if validator.respond_to?(:attributes) && !validator.attributes.empty?
             validator.attributes.each do |attribute|

data/lib/active_model/validator.rb

@@ -79,21 +79,19 @@ module ActiveModel
   #     include ActiveModel::Validations
   #     attr_accessor :title
   #
-  #     validates :title, presence: true, title: true
+  #     validates :title, presence: true
   #   end
   #
-  # Validator may also define a +setup+ instance method which will get called
-  # with the class that using that validator as its argument. This can be
-  # useful when there are prerequisites such as an +attr_accessor+ being present.
+  # It can be useful to access the class that is using that validator when there are prerequisites such
+  # as an +attr_accessor+ being present. This class is accessible via +options[:class]+ in the constructor.
+  # To setup your validator override the constructor.
   #
   #   class MyValidator < ActiveModel::Validator
-  #     def setup(klass)
-  #       klass.send :attr_accessor, :custom_attribute
+  #     def initialize(options={})
+  #       super
+  #       options[:class].send :attr_accessor, :custom_attribute
   #     end
   #   end
-  #
-  # This setup method is only called when used with validation macros or the
-  # class level <tt>validates_with</tt> method.
   class Validator
     attr_reader :options
 
@@ -107,7 +105,8 @@ module ActiveModel
 
     # Accepts options that will be made available through the +options+ reader.
     def initialize(options = {})
-      @options = options.freeze
+      @options  = options.except(:class).freeze
+      deprecated_setup(options)
     end
 
     # Return the kind for this validator.
@@ -123,6 +122,21 @@ module ActiveModel
     def validate(record)
       raise NotImplementedError, "Subclasses must implement a validate(record) method."
     end
+
+    private
+    def deprecated_setup(options) # TODO: remove me in 4.2.
+      return unless respond_to?(:setup)
+      ActiveSupport::Deprecation.warn "The `Validator#setup` instance method is deprecated and will be removed on Rails 4.2. Do your setup in the constructor instead:
+
+class MyValidator < ActiveModel::Validator
+  def initialize(options={})
+    super
+    options[:class].send :attr_accessor, :custom_attribute
+  end
+end
+"
+      setup(options[:class])
+    end
   end
 
   # +EachValidator+ is a validator which iterates through the attributes given

data/lib/active_model/version.rb

@@ -1,7 +1,7 @@
 module ActiveModel
   # Returns the version of the currently loaded ActiveModel as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.13"
+    Gem::Version.new "4.1.0.beta1"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.1.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,31 +16,31 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 description: A toolkit for building modeling frameworks like Active Record. Rich support
-  for attributes, callbacks, validations, observers, serialization, internationalization,
-  and testing.
+  for attributes, callbacks, validations, serialization, internationalization, and
+  testing.
 email: david@loudthinking.com
 executables: []
 extensions: []
@@ -49,11 +49,9 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.rdoc
-- lib/active_model.rb
 - lib/active_model/attribute_methods.rb
 - lib/active_model/callbacks.rb
 - lib/active_model/conversion.rb
-- lib/active_model/deprecated_mass_assignment_security.rb
 - lib/active_model/dirty.rb
 - lib/active_model/errors.rb
 - lib/active_model/forbidden_attributes_protection.rb
@@ -68,7 +66,6 @@ files:
 - lib/active_model/serializers/xml.rb
 - lib/active_model/test_case.rb
 - lib/active_model/translation.rb
-- lib/active_model/validations.rb
 - lib/active_model/validations/absence.rb
 - lib/active_model/validations/acceptance.rb
 - lib/active_model/validations/callbacks.rb
@@ -82,8 +79,10 @@ files:
 - lib/active_model/validations/presence.rb
 - lib/active_model/validations/validates.rb
 - lib/active_model/validations/with.rb
+- lib/active_model/validations.rb
 - lib/active_model/validator.rb
 - lib/active_model/version.rb
+- lib/active_model.rb
 homepage: http://www.rubyonrails.org
 licenses:
 - MIT
@@ -94,17 +93,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).

data/lib/active_model/deprecated_mass_assignment_security.rb

@@ -1,21 +0,0 @@
-module ActiveModel
-  module DeprecatedMassAssignmentSecurity # :nodoc:
-    extend ActiveSupport::Concern
-
-     module ClassMethods # :nodoc:
-       def attr_protected(*args)
-         raise "`attr_protected` is extracted out of Rails into a gem. " \
-           "Please use new recommended protection model for params" \
-           "(strong_parameters) or add `protected_attributes` to your " \
-           "Gemfile to use old one."
-       end
-
-       def attr_accessible(*args)
-         raise "`attr_accessible` is extracted out of Rails into a gem. " \
-           "Please use new recommended protection model for params" \
-           "(strong_parameters) or add `protected_attributes` to your " \
-           "Gemfile to use old one."
-       end
-     end
-  end
-end