can_has_validations 0.6.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d565ec38823188e137ba900db6247e643f3c436a6a8f0be7d210a8af0f2606e6
-  data.tar.gz: 47fc9fc83d7224d9831d66a98e967b161b6f3fa66de7186b8b51c85ffc8287d1
+  metadata.gz: 92f14adff8817a7d4d4d6d5b9a1b00a0860f9279ca86dafaad567e67e4970ee6
+  data.tar.gz: ea792545cf1ed844ec5ad498068dd9990712b240c31f3e214d6c3518f429f9b4
 SHA512:
-  metadata.gz: 1cfa321ceee3431a7b2a99027794a655a5cd2b0a570eb715ccbaf06be183956689bfb7e369b0927d31f6a80f781591fae5422803df836fe2b41a9e52babe3bbd
-  data.tar.gz: 34d93b15d141061ded5dc58c2cdb62f2abe646e60c4e49e6b4ee8856d76356a3e83be0c080db3f71a5499ae095955299a3cfc978ee90d86fc50c4b465e289662
+  metadata.gz: c2b1cb68de2eeb27e3d1a7b0c8b86d9d64f76f62a7f51feddfc5e62c9f009f14caadf7fd6eafac768c47e77fb31ed27cc8edab196b5d565d626582e0025403db
+  data.tar.gz: a7a1fa2e08fe737f88b9e428047d01b398a852a82528439483abfb1251027d0e5542429b82c981f8dc3cf5ece39aca0e3404e009bc5d8b75a15850bf33585dd7

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 YOURNAME
+Copyright 2012-2020 thomas morgan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -10,6 +10,7 @@ Validations provided:
 * Existence
 * Grandparent
 * Hostname
+* IP address
 * Ordering
 * URL
 * Write Once
@@ -147,6 +148,9 @@ TLD, so as to not fail as ICANN continues to add TLDs.
     # allows '_abc.example.com'
     validates :domain, hostname: {allow_underscore: true}
 
+    # allows '4.0/25.3.2.1.example.com'
+    validates :domain, hostname: {allow_slash: true}
+
     # allows 'a.example.com', but not 'example.com'
     validates :domain, hostname: {segments: 3..100}
 
@@ -158,6 +162,34 @@ TLD, so as to not fail as ICANN continues to add TLDs.
     # use 4 or 6 for ipv4 or ipv6 only
 
 
+## IP address validator ##
+
+Ensures an attribute is generally formatted as a IP or IP block.
+
+    # allows '1.2.3.4' or '::1'
+    validates :ip, ipaddr: true
+
+    # allows '1.2.3.0/24' or '2001:db8::/64'
+    validates :cidr, ipaddr: {allow_block: true}
+
+    # if an ip block, the attribute must be fully contained within an allowed block.
+    # allows '10.0.0.1' and '10.0.0.0/24', but not '10.0.0.0/15'
+    validates :private_ip, ipaddr: {
+      allow_block: true,
+      within: [IPAddr.new('10.0.0.0/16'), '127.0.0.1']
+        # allowed IPs and blocks may be IPAddrs or Strings
+    }
+
+    # the inverse of :within
+    validates :public_ip6, ipaddr: {without: ['fc00::/7']]}
+
+    # :within and :without may also be procs or method names
+    validates :ip, ipaddr: {
+      within: :some_method,
+      without: ->(record){ ... }
+    }
+
+
 ## Ordering validators ##
 
 Ensures two attribute values maintain a relative order to one another. This is
@@ -183,13 +215,17 @@ Always skips over nil values; use `:presence` to validate those.
 
 ## URL validator ##
 
-Ensure an attribute is generally formatted as a URL. If `addressable/uri` is
+Ensures an attribute is generally formatted as a URL. If `addressable/uri` is
 already loaded, it will be used to parse IDN's. Additionally, allowed schemes
 can be specified; they default to ['http','https'].
 
     validates :website, url: true
     validates :secure_url, url: {scheme: 'https'}
 
+    # Dynamic list of schemes. *Must* return an array.
+    validates :git, url: {scheme: :some_method}
+    validates :old_school, url: {scheme: ->(record){ %w(ftp gopher) }}
+
     # With IDN parsing:
     require 'addressable/uri'
     validates :website, url: true
@@ -201,8 +237,8 @@ can be specified; they default to ['http','https'].
 
 ## Write Once validator ##
 
-Ensure that once a value is written, it becomes readonly. There are two uses
-for this. 
+Ensures that once a value is written, it becomes readonly. There are a few
+uses for this.
 
 The first is as an equivalent to `attr_readonly :user_id` except that it also
 produces a validation error instead of silently ignoring the change as
@@ -217,6 +253,10 @@ sorts.
 
     validates :user_id, allow_nil: true, write_once: true
 
+The third use is to allow a nil value, and treat the nil also as write-once.
+
+    validates :source, write_once: {immutable_nil: true}
+
 
 ## Error messages
 
@@ -228,6 +268,9 @@ Default messages are as follows:
         messages:
           invalid_email: "is an invalid email"
           invalid_hostname: "is an invalid hostname"
+          invalid_ip: "is an invalid IP"
+          ip_not_allowed: "is not an allowed IP"
+          single_ip_required: "must be a single IP"
           invalid_url: "is an invalid URL"
           unchangeable: "cannot be changed"
           before: "must be before %{attribute2}"
@@ -236,4 +279,4 @@ Default messages are as follows:
 
 ## Compatibility ##
 
-Tested with Ruby 2.3-2.5 and ActiveSupport and ActiveModel 4.2-5.2.
+The current version is tested with Ruby 2.5-2.6 and ActiveModel 5.2-6.0.

data/lib/can_has_validations.rb

@@ -1,6 +1,6 @@
 require 'active_model/validations'
 
-%w(array email existence grandparent hostname ordering url write_once).each do |validator|
+%w(array email existence grandparent hostname ipaddr ordering url write_once).each do |validator|
   require "can_has_validations/validators/#{validator}_validator"
 end
 

data/lib/can_has_validations/locale/en.yml

@@ -3,8 +3,10 @@ en:
     messages:
       invalid_email: "is an invalid email"
       invalid_hostname: "is an invalid hostname"
+      invalid_ip: "is an invalid IP"
+      ip_not_allowed: "is not an allowed IP"
+      single_ip_required: "must be a single IP"
       invalid_url: "is an invalid URL"
       unchangeable: "cannot be changed"
       before: "must be before %{attribute2}"
       after: "must be after %{attribute2}"
-      

data/lib/can_has_validations/validators/email_validator.rb

@@ -1,15 +1,55 @@
 # Ensure an attribute is generally formatted as an email.
 # eg: validates :user_email, email: true
 
+require_relative 'hostname_validator'
+
 module ActiveModel::Validations
   class EmailValidator < ActiveModel::EachValidator
 
-    EMAIL_REGEXP = /\A([a-z0-9._+-]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+    EMAIL_REGEXP       = /\A([a-z0-9._+-]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+    SEGMENT_REGEXP     = /\A[a-z0-9+_-]+\z/i
+    LABEL_REGEXP       = HostnameValidator::LABEL_REGEXP
+    FINAL_LABEL_REGEXP = HostnameValidator::FINAL_LABEL_REGEXP
 
     def validate_each(record, attribute, value)
-      unless value =~ EMAIL_REGEXP
+      unless email_valid?(value)
         record.errors.add(attribute, :invalid_email, options.merge(value: value))
       end
     end
+
+    def email_valid?(value)
+      return unless value
+      recipient, domain = value.split('@', 2)
+      is_valid = true
+
+      recipient ||= ''
+      is_valid &&= recipient.length <= 255
+      is_valid &&= recipient !~ /\.\./
+      is_valid &&= !recipient.starts_with?('.') 
+      is_valid &&= !recipient.ends_with?('.') 
+      recipient.split('.').each do |segment|
+        is_valid &&= segment =~ SEGMENT_REGEXP
+      end
+
+      domain ||= ''
+      if defined?(Addressable::IDNA)
+        domain &&= Addressable::IDNA.to_ascii(domain)
+      end
+      labels = domain.split('.')
+      is_valid &&= domain.length <= 255
+      is_valid &&= domain !~ /\.\./
+      is_valid &&= labels.size.in? 2..100
+      labels.each_with_index do |label, idx|
+        is_valid &&= label.length <= 63
+        if idx+1==labels.size
+          is_valid &&= label =~ FINAL_LABEL_REGEXP
+        else
+          is_valid &&= label =~ LABEL_REGEXP
+        end
+      end
+
+      is_valid
+    end
+
   end
 end

data/lib/can_has_validations/validators/grandparent_validator.rb

@@ -16,7 +16,8 @@ module ActiveModel::Validations
         if cousin.nil?
           options[:allow_nil]
         else
-          association.send(options[:parent]) == cousin.send(options[:parent])
+          association &&
+            association.send(options[:parent]) == cousin.send(options[:parent])
         end
       end
       unless all_match

data/lib/can_has_validations/validators/hostname_validator.rb

@@ -18,6 +18,8 @@
 #       allows '*.example.com'
 #     validates :domain, hostname: {allow_underscore: true}
 #       allows '_abc.example.com'
+#     validates :domain, hostname: {allow_slash: true}
+#       allows '4.0/25.3.2.1.example.com'  # rfc2317
 #     validates :domain, hostname: {segments: 3..100}
 #       allows 'a.example.com', but not 'example.com'
 #     validates :domain, hostname: {allow_ip: true}  # or 4 or 6 for ipv4 or ipv6 only
@@ -30,9 +32,9 @@ require 'resolv'
 module ActiveModel::Validations
   class HostnameValidator < ActiveModel::EachValidator
 
-    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)
+    LABEL_REGEXP = %r{\A([a-zA-Z0-9_]([a-zA-Z0-9_/-]+)?)?[a-zA-Z0-9]\z}
+    FINAL_LABEL_REGEXP = %r{\A(xn--[a-zA-Z0-9]{2,}|[a-zA-Z]{2,})\z}
+    RESERVED_OPTIONS = %i(allow_ip allow_slash allow_underscore allow_wildcard)
 
     def validate_each(record, attribute, value)
       case options[:allow_ip]
@@ -55,6 +57,7 @@ module ActiveModel::Validations
       is_valid &&= value.length <= 255
       is_valid &&= value !~ /\.\./
       is_valid &&= value !~ /_/ unless options[:allow_underscore]
+      is_valid &&= value !~ %r{/} unless options[:allow_slash]
       is_valid &&= labels.size.in? segments
       labels.each_with_index do |label, idx|
         is_valid &&= label.length <= 63

data/lib/can_has_validations/validators/ipaddr_validator.rb

@@ -0,0 +1,91 @@
+# Ensure an attribute is generally formatted as a IP or IP block.
+# eg: validates :ip, ipaddr: true
+#     validates :cidr, ipaddr: {allow_block: true}
+#     validates :private_ip, ipaddr: {within: [IPAddr.new('10.0.0.0/8'), '127.0.0.1']}
+#       ip must be within any one of the provided ips/blocks
+#       if ip is block, it must be fully contained within any one of the provided blocks
+#     validates :public_ip6, ipaddr: {without: ['fc00::/7']]}
+#       ip must be outside all of the provided ips/blocks
+#       if ip is block, it must be fully outside all of the provided blocks
+
+require 'ipaddr'
+
+module ActiveModel::Validations
+  class IpaddrValidator < ActiveModel::EachValidator
+
+    def initialize(options)
+      options[:within]  = normalize_within options[:within], :within
+      options[:without] = normalize_within options[:without], :without
+      super
+    end
+
+    def validate_each(record, attribute, value)
+      allowed_ips    = resolve_array record, options[:within]
+      disallowed_ips = resolve_array record, options[:without]
+
+      ip = case value
+        when IPAddr
+          ip
+        when String
+          IPAddr.new(value) rescue nil
+      end
+      unless ip
+        record.errors.add(attribute, :invalid_ip, options.merge(value: value))
+        return
+      end
+
+      if !options[:allow_block] && (ip.ipv4? && ip.prefix!=32 or ip.ipv6? && ip.prefix!=128)
+        record.errors.add(attribute, :single_ip_required, options.merge(value: value))
+      end
+      if allowed_ips && allowed_ips.none?{|blk| blk.include? ip}
+        record.errors.add(attribute, :ip_not_allowed, options.merge(value: value))
+      elsif disallowed_ips && disallowed_ips.any?{|blk| blk.include? ip}
+        record.errors.add(attribute, :ip_not_allowed, options.merge(value: value))
+      end
+    end
+
+
+    private
+
+    def normalize_within(val, key)
+      if val.nil? || val.respond_to?(:call) || val.is_a?(Symbol)
+        val
+      else
+        Array(val).flatten.map do |i|
+          case i
+          when IPAddr
+            i
+          when String
+            IPAddr.new i
+          else
+            raise "Unexpected value for #{key.inspect} : #{i}"
+          end
+        end
+      end
+    end
+
+    def resolve_array(record, val)
+      res = if val.respond_to?(:call)
+        val.call(record)
+      elsif val.is_a?(Symbol)
+        record.send(val)
+      else
+        val
+      end
+    end
+
+  end
+end
+
+# tests for & fixes broken IPAddr <= 1.2.2
+if IPAddr.new('192.168.2.0/32').include? '192.168.2.0/24'
+  # warn 'IPAddr <= 1.2.2 is broken; monkey-patching'
+  class IPAddr
+    def include?(other)
+      range = to_range
+      other = coerce_other(other).to_range
+      range.begin <= other.begin && range.end >= other.end
+    end
+    alias === include?
+  end
+end

data/lib/can_has_validations/validators/url_validator.rb

@@ -7,7 +7,13 @@
 module ActiveModel::Validations
   class UrlValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
-      allowed_schemes = Array.wrap(options[:scheme] || %w(http https))
+      allowed_schemes = if options[:scheme].respond_to?(:call)
+        options[:scheme].call(record)
+      elsif options[:scheme].is_a?(Symbol)
+        record.send(options[:scheme])
+      else
+        Array.wrap(options[:scheme] || %w(http https))
+      end
 
       if defined?(Addressable::URI)
         u = Addressable::URI.parse(value) rescue nil
@@ -16,7 +22,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.merge(value: value))
+        record.errors.add(attribute, :invalid_url, options.merge(value: value, scheme: allowed_schemes))
       end
     end
   end

data/lib/can_has_validations/validators/write_once_validator.rb

@@ -12,14 +12,20 @@ module ActiveModel::Validations
     #   nil to be allowed. prevent this.
     def validate(record)
       attributes.each do |attribute|
-        value = record.read_attribute_for_validation(attribute)
-        validate_each(record, attribute, value)
+        validate_each(record, attribute, nil)
       end
     end
 
-    def validate_each(record, attribute, value)
-      if record.persisted? && record.send("#{attribute}_changed?")
-        if options[:immutable_nil] || !record.send("#{attribute}_was").nil?
+    def validate_each(record, attribute, _)
+      return unless record.persisted?
+      if !record.respond_to?("#{attribute}_changed?") && record.respond_to?("#{attribute}_id_changed?")
+        attr2 = "#{attribute}_id"
+      else
+        attr2 = attribute
+      end
+      if record.send("#{attr2}_changed?")
+        if options[:immutable_nil] || !record.send("#{attr2}_was").nil?
+          value = record.read_attribute_for_validation(attribute)
           record.errors.add(attribute, :unchangeable, options.except(:immutable_nil).merge!(value: value))
         end
       end

data/lib/can_has_validations/version.rb

@@ -1,3 +1,3 @@
 module CanHasValidations
-  VERSION = '0.6.3'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 1.2.0
 platform: ruby
 authors:
 - thomas morgan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Assorted Rails 4.x-5.x validators.
+description: Assorted Rails 5.x-6.x validators.
 email:
 - tm@iprog.com
 executables: []
@@ -61,6 +61,7 @@ files:
 - lib/can_has_validations/validators/existence_validator.rb
 - lib/can_has_validations/validators/grandparent_validator.rb
 - lib/can_has_validations/validators/hostname_validator.rb
+- lib/can_has_validations/validators/ipaddr_validator.rb
 - lib/can_has_validations/validators/ordering_validator.rb
 - lib/can_has_validations/validators/url_validator.rb
 - lib/can_has_validations/validators/write_once_validator.rb
@@ -98,9 +99,10 @@ files:
 - test/dummy/script/rails
 - test/test_helper.rb
 homepage: https://github.com/zarqman/can_has_validations
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,40 +117,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
-summary: Assorted Rails 4.x-5.x validators
+summary: Assorted Rails 5.x-6.x validators
 test_files:
-- test/can_has_validations_test.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/database.yml
+- test/dummy/config/boot.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config.ru
-- test/dummy/log/test.log
-- test/dummy/public/404.html
+- test/dummy/script/rails
+- test/dummy/Rakefile
+- test/dummy/public/favicon.ico
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
+- test/dummy/public/404.html
+- test/dummy/log/test.log
 - test/dummy/README.rdoc
-- test/dummy/script/rails
+- test/can_has_validations_test.rb
 - test/test_helper.rb