can_has_validations 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9758f98d0ba52576c225f0ffe184d18fe1b5e00038117faf309a122493f495c3
-  data.tar.gz: 5efdd9ed78a93c3e6372bd869149b49fb4d38e3421921805981f94f1a0b42444
+  metadata.gz: c78f8e5cbb5c2bd034070fad41bbaf78b622430b2c0546b6cf2cb22f05fe0d93
+  data.tar.gz: e852f21850a91d4a0f348b96b913c315de7d663d812ac05b30f16917b216ad5a
 SHA512:
-  metadata.gz: a054838d0d0e7fd0aa25a805faa82a7708a21e909fa3cbd8e4fef962cca68ea2a4a4e70c81b064e2d23b50d60b5d51795c22e6255596d42a95e09037ac1699f6
-  data.tar.gz: 805563f53b9f845d06ba6617ed565f28737b204e6d5bdc2efc88b4abf5d38a704bfe33b3ccae75909010846b8b7369fc82a133fd3780c2e07c6c591e5a0a89fc
+  metadata.gz: ef126f2bd28db8947e189adef8572ca63d3cd964ab19732fd1291d49315c703b0f386793aeb2df22c4cea97ef195be9b6e6affacb91a49748f0df9cc05152cc3
+  data.tar.gz: 920a6ca45c368c4e3ddd077018b0ea67bb3bc11a46ca0855480077d3e62c8c5ccccbb6b55da1fbf99b3b727d9408f264b3744d6f938b9e6db1bfef390ff25434

data/MIT-LICENSE

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

data/lib/can_has_validations/validators/email_validator.rb

@@ -1,38 +1,40 @@
 # Ensure an attribute is generally formatted as an email.
 # eg: validates :user_email, email: true
+#     validates :user_email, email: {allow_unicode: 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
-    SEGMENT_REGEXP     = /\A[a-z0-9+_-]+\z/i
-    LABEL_REGEXP       = HostnameValidator::LABEL_REGEXP
+    EMAIL_REGEXP       = /\A([a-z0-9._+-]+)@((?:[a-z0-9-]+\.)+[a-z]{2,})\z/i
+    SEGMENT_REGEXP     = /\A[a-z0-9_+-]+\z/i
+    LABEL_REGEXP       = %r{\A([a-zA-Z0-9]([a-zA-Z0-9-]+)?)?[a-zA-Z0-9]\z}
+      # HostnameValidator::LABEL_REGEXP minus _/
     FINAL_LABEL_REGEXP = HostnameValidator::FINAL_LABEL_REGEXP
 
     def validate_each(record, attribute, value)
-      unless email_valid?(value)
+      unless email_valid?(value, **options.slice(:allow_unicode))
         record.errors.add(attribute, :invalid_email, **options.merge(value: value))
       end
     end
 
-    def email_valid?(value)
+    def email_valid?(value, allow_unicode: false)
       return unless value
-      recipient, domain = value.split('@', 2)
+      recipient, domain = value.to_s.split('@', 2)
       is_valid = true
 
       recipient ||= ''
       is_valid &&= recipient.length <= 255
       is_valid &&= recipient !~ /\.\./
-      is_valid &&= !recipient.starts_with?('.') 
-      is_valid &&= !recipient.ends_with?('.') 
+      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)
+      if allow_unicode && defined?(Addressable::IDNA)
         domain &&= Addressable::IDNA.to_ascii(domain)
       end
       labels = domain.split('.')

data/lib/can_has_validations/validators/url_validator.rb

@@ -3,26 +3,59 @@
 # eg: validates :website, url: true
 #     validates :redis, url: {scheme: 'redis'}
 #     validates :database, url: {scheme: %w(postgres mysql)}
+#     validates :website, url: {host: 'example.com'}
+#     validates :database, url: {port: [5432, nil]}
+#       to allow scheme's default port, must specify `nil` too
+# :scheme defaults to `%w(http https)`
+# :host defaults to `nil` which allows any
+# :port defaults to `nil` which allows any
+#   to require blank, use `port: false` or `port: [nil]`
 
 module ActiveModel::Validations
   class UrlValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
-      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
         u2 = u && URI.parse(u.normalize.to_s) rescue nil
       else
         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, scheme: allowed_schemes))
+
+      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
+
+      allowed_hosts =
+        if options[:host].respond_to?(:call)
+          options[:host].call(record)
+        elsif options[:host].is_a?(Symbol)
+          record.send(options[:host])
+        elsif options[:host].nil?
+          [u&.host]
+        else
+          Array.wrap(options[:host])
+        end
+
+      allowed_ports =
+        if options[:port].respond_to?(:call)
+          options[:port].call(record)
+        elsif options[:port].is_a?(Symbol)
+          record.send(options[:port])
+        elsif options[:port].nil?
+          [u&.port]
+        elsif options[:port] == false
+          [nil]
+        else
+          Array.wrap(options[:port])
+        end
+
+      if !u || !u2 || u.relative? || allowed_schemes.exclude?(u.scheme) || allowed_hosts.exclude?(u.host) || allowed_ports.exclude?(u.port)
+        record.errors.add(attribute, :invalid_url, **options.merge(value: value, scheme: allowed_schemes, host: allowed_hosts, port: allowed_ports))
       end
     end
   end

data/lib/can_has_validations/version.rb

@@ -1,3 +1,3 @@
 module CanHasValidations
-  VERSION = '1.6.0'
+  VERSION = '1.8.0'
 end

data/test/dummy/log/test.log

@@ -2,5 +2,22 @@
   TRANSACTION (0.1ms)  begin transaction
 ---------------------------------
 CanHasValidationsTest: test_truth
+---------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+   (0.8ms)  SELECT sqlite_version(*)
+  TRANSACTION (0.1ms)  begin transaction
+---------------------------------
+CanHasValidationsTest: test_truth
+---------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+   (0.6ms)  SELECT sqlite_version(*)
+  TRANSACTION (0.1ms)  begin transaction
+---------------------------------
+CanHasValidationsTest: test_truth
+---------------------------------
+  TRANSACTION (0.0ms)  rollback transaction
+  TRANSACTION (0.1ms)  begin transaction
+---------------------------------
+CanHasValidationsTest: test_truth
 ---------------------------------
   TRANSACTION (0.0ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - thomas morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Assorted Rails 5.x-7.x validators