can_has_validations 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39feb1ba720229383addaf65d761cf38ce5da9545b5e402cf3a9a064523b987a
-  data.tar.gz: 8128047f635300ddae1771a1d997f22cb732391d79f4d49bc7c2e47bab2c51a4
+  metadata.gz: f14277d359dfd7f7a00e948c866c90497ac39d025fc753c83e0770c66102654b
+  data.tar.gz: 747a36b1d4e4c3723e5bb3455b9f5023570a1c0913520a1c21a5a9d18cf6ebae
 SHA512:
-  metadata.gz: 212be440432bb1ff47193b1948a603138d01e813fd88d0978c8fd8c9ab1d61d39dee23914a1aa0b91abbd955a520b991c609b0a597571e253edfa3242f8006b2
-  data.tar.gz: 190a03e36354954c46b9a1b4e45e22197cad6b6819565320446f55fb9e6f6ed3cbfe42d038afd141ba9ca61f087da392c84464636a7c5ce12bea3035c38b01e7
+  metadata.gz: b6891aa12d3765c1338807e0b6de3fa799cacbe7c0eb44f1b8685b105b5cb5dc11eea40962ed637fd00e1cd1d68f1419fedae3ecd3bc4dfafd64bad441afb3e6
+  data.tar.gz: d92195ac58fa2ea3c9bae481b9dbdbcaccc0a2a8afa23c6607b46d1917d636500fd6c410c11cb3839d79ecfbd724fc57193555ce35e5ca728cf9804a274210ba

data/README.md

@@ -159,7 +159,9 @@ TLD, so as to not fail as ICANN continues to add TLDs.
 
 Ensures two attribute values maintain a relative order to one another. This is
 often useful when two date or range values. Validations can be written using
-either `:before` or `:after` to make them readable.
+either `:before` or `:after` to make them readable. The special value of `:now`
+will automatically become Time.now (without needing a lambda).
+
 
 Always skips over nil values; use `:presence` to validate those.
 
@@ -167,7 +169,9 @@ Always skips over nil values; use `:presence` to validate those.
     validates :start_at, before: :finish_at
     validates :finish_at, after: [:start_at, :alt_start_at]
     validates :start_at, presence: true, before: :finish_at
-    validates :finish_at, after: ->(r){ Time.current }
+    # These two are the same, except `:now` produces a clearer error message:
+    validates :finish_at, after: :now
+    validates :finish_at, after: ->(r){ Time.now }
     
     # Long versions, if you need to add extra validation options:
     validates :start_at, before: {value_of: :finish_at, message: "..." }
@@ -229,4 +233,4 @@ Default messages are as follows:
 
 ## Compatibility ##
 
-Tested with Ruby 2.3-2.4 and ActiveSupport and ActiveModel 4.2-5.1.
+Tested with Ruby 2.3-2.5 and ActiveSupport and ActiveModel 4.2-5.2.

data/lib/can_has_validations/validators/array_validator.rb

@@ -28,7 +28,7 @@ module ActiveModel
       def initialize(options)
         record_class = options[:class]
         super
-        record_class.prepend DefaultKeys
+        record_class.extend DefaultKeys
 
         defaults = @options.dup
         validations = defaults.slice!(*record_class.send(:_validates_default_keys), :attributes)
@@ -37,8 +37,8 @@ module ActiveModel
 
         defaults[:attributes] = attributes
 
-        @validators = validations.map do |key, options|
-          next unless options
+        @validators = validations.map do |key, sub_options|
+          next unless sub_options
           key = "#{key.to_s.camelize}Validator"
 
           begin
@@ -47,7 +47,7 @@ module ActiveModel
             raise ArgumentError, "Unknown validator: '#{key}'"
           end
 
-          validator = klass.new(defaults.merge(_parse_validates_options(options)))
+          klass.new(defaults.merge(_parse_validates_options(sub_options)))
         end
       end
 

data/lib/can_has_validations/validators/email_validator.rb

@@ -8,7 +8,7 @@ module ActiveModel::Validations
 
     def validate_each(record, attribute, value)
       unless value =~ EMAIL_REGEXP
-        record.errors.add(attribute, :invalid_email, options)
+        record.errors.add(attribute, :invalid_email, options.merge(value: value))
       end
     end
   end

data/lib/can_has_validations/validators/grandparent_validator.rb

@@ -20,7 +20,7 @@ module ActiveModel::Validations
         end
       end
       unless all_match
-        record.errors.add(attribute, :invalid, options.except(:allow_nil, :parent, :scope))
+        record.errors.add(attribute, :invalid, options.except(:allow_nil, :parent, :scope).merge!(value: value))
       end
     end
   end

data/lib/can_has_validations/validators/hostname_validator.rb

@@ -30,6 +30,7 @@ module ActiveModel::Validations
 
     LABEL_REGEXP = /\A([a-zA-Z0-9_]([a-zA-Z0-9_-]+)?)?[a-zA-Z0-9]\z/
     FINAL_LABEL_REGEXP = /\A(xn--[a-zA-Z0-9]{2,}|[a-zA-Z]{2,})\z/
+    RESERVED_OPTIONS = %i(allow_ip allow_underscore allow_wildcard)
 
     def validate_each(record, attribute, value)
       case options[:allow_ip]
@@ -65,7 +66,7 @@ module ActiveModel::Validations
       end
 
       unless is_valid
-        record.errors.add(attribute, :invalid_hostname, options)
+        record.errors.add(attribute, :invalid_hostname, options.except(*RESERVED_OPTIONS).merge!(value: value))
       end
     end
 

data/lib/can_has_validations/validators/ordering_validator.rb

@@ -1,10 +1,11 @@
 # Attribute ordering
 #   Ensures one value is greater or lesser than another (set of) value(s).
+#   The special value of :now will automatically become Time.now (without needing a lambda).
 #   Always skips over nil values; use :presence to validate those.
 # eg: validates :start_at, before: :finish_at
 #     validates :start_at, before: {value_of: :finish_at, if: ... }
-#     validates :finish_at, after: [:start_at, :alt_start_at]
-#     validates :finish_at, after: {values_of: [:start_at, :alt_start_at], if: ... }
+#     validates :finish_at, after: [:start_at, :now]
+#     validates :finish_at, after: {values_of: [:start_at, :now], if: ... }
 
 module ActiveModel::Validations
   class BeforeValidator < ActiveModel::EachValidator
@@ -12,11 +13,12 @@ module ActiveModel::Validations
       compare_to = Array.wrap(options[:value_of] || options[:values_of] || options[:in] || options[:with])
       compare_to.each do |attr_name|
         greater = attr_name.call(record) if attr_name.respond_to?(:call)
+        greater ||= Time.now if attr_name==:now && !record.respond_to?(:now)
         greater ||= record.send attr_name
         next unless value && greater
         unless value < greater
-          attr2 = record.class.human_attribute_name attr_name
-          record.errors.add(attribute, :before, options.except(:before).merge!(attribute2: attr2))
+          attr2 = attr_name.respond_to?(:call) ? 'it is' : record.class.human_attribute_name(attr_name)
+          record.errors.add(attribute, :before, options.except(:before).merge!(attribute2: attr2, value: value))
         end
       end
     end
@@ -26,11 +28,12 @@ module ActiveModel::Validations
       compare_to = Array.wrap(options[:value_of] || options[:values_of] || options[:in] || options[:with])
       compare_to.each do |attr_name|
         lesser = attr_name.call(record) if attr_name.respond_to?(:call)
+        lesser ||= Time.now if attr_name==:now && !record.respond_to?(:now)
         lesser ||= record.send attr_name
         next unless value && lesser
         unless value > lesser
-          attr2 = record.class.human_attribute_name attr_name
-          record.errors.add(attribute, :after, options.except(:after).merge!(attribute2: attr2))
+          attr2 = attr_name.respond_to?(:call) ? 'it is' : record.class.human_attribute_name(attr_name)
+          record.errors.add(attribute, :after, options.except(:after).merge!(attribute2: attr2, value: value))
         end
       end
     end

data/lib/can_has_validations/validators/url_validator.rb

@@ -8,7 +8,7 @@ module ActiveModel::Validations
   class UrlValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
       allowed_schemes = Array.wrap(options[:scheme] || %w(http https))
-      
+
       if defined?(Addressable::URI)
         u = Addressable::URI.parse(value) rescue nil
         u2 = u && URI.parse(u.normalize.to_s) rescue nil
@@ -16,7 +16,7 @@ module ActiveModel::Validations
         u2 = u = URI.parse(value) rescue nil
       end
       if !u || !u2 || u.relative? || allowed_schemes.exclude?(u.scheme)
-        record.errors.add(attribute, :invalid_url, options)
+        record.errors.add(attribute, :invalid_url, options.merge(value: value))
       end
     end
   end

data/lib/can_has_validations/validators/write_once_validator.rb

@@ -20,7 +20,7 @@ module ActiveModel::Validations
     def validate_each(record, attribute, value)
       if record.persisted? && record.send("#{attribute}_changed?")
         if options[:immutable_nil] || !record.send("#{attribute}_was").nil?
-          record.errors.add(attribute, :unchangeable, options)
+          record.errors.add(attribute, :unchangeable, options.except(:immutable_nil).merge!(value: value))
         end
       end
     end

data/lib/can_has_validations/version.rb

@@ -1,3 +1,3 @@
 module CanHasValidations
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - thomas morgan
@@ -90,6 +90,7 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -142,6 +143,7 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html