can_has_validations 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e81561f7a3d00cd1e760d29b9e529d51eb841e5b09bc91832fb4b4f0dbc71a1
-  data.tar.gz: 4ddd43af1f9f5397185d491ee7f38191f2c00bcc15a0a2c78b339ad88ddbd725
+  metadata.gz: 35a018491f2cdaaf42b335b1d161573555a41b10f3a01b3789e51afbc8b75a0e
+  data.tar.gz: acfa4a74d6709f9184fe46d24eef3fa36771c0f1a540fdbd1d75682b49e67bf8
 SHA512:
-  metadata.gz: 30e3b36920d45b0d8e9b0d12ef404b03eb838aa12b905e462b38b407c44c23a91db19f21c7918c396982f69f4afd1afed5585ae795d6d32d4ab93d12aede28a5
-  data.tar.gz: 668d9ad8cccfa46754a67d7648f046f36a708c67ff98dcfde4c9392f071446cbbfb365211de82370833cbc92cb25ba118eea18002bbdec8ff204b4ef87e5354f
+  metadata.gz: ea6a073102cae7965b1f430c169db660f16fcbb826271016a991fef4888401fbb0da206dcd030c61bdf4aab04100d934eaa6efbb76fb12f276f25a1ae30c6a04
+  data.tar.gz: 328d8fe59d6e527cc5373a1193654a689c3ff418573b4114fe358475ab5ce1c2a8e64e00ac85bd04cc5a55bd090c276cad4f19711c0919baae6895627958c455

data/lib/can_has_validations/validators/hostname_validator.rb

@@ -24,8 +24,8 @@
 #       allows 'a.example.com', but not 'example.com'
 #     validates :domain, hostname: {allow_ip: true}  # or 4 or 6 for ipv4 or ipv6 only
 #       allows '1.2.3.4' or 'a.example.com'
-#     validates :subdomain, hostname: {skip_tld: true, segments: 1}
-#       allows 'subdomain1'
+#     validates :subdomain, hostname: {skip_tld: true}
+#       allows 'subdomain1'; implies segments: 1..100 unless otherwise specified
 
 require 'resolv'
 
@@ -46,7 +46,7 @@ module ActiveModel::Validations
         return if value =~ Resolv::IPv4::Regex || value =~ Resolv::IPv6::Regex
       end
 
-      segments = options[:segments] || (2..100)
+      segments = options[:segments] || (options[:skip_tld] ? 1..100 : 2..100)
       segments = segments..segments if segments.is_a?(Integer)
       if defined?(Addressable::IDNA)
         value &&= Addressable::IDNA.to_ascii(value)
@@ -63,6 +63,8 @@ module ActiveModel::Validations
         is_valid &&= label.length <= 63
         if !options[:skip_tld] && idx+1==labels.size
           is_valid &&= label =~ FINAL_LABEL_REGEXP
+        elsif options[:allow_wildcard]==:multi && idx==0
+          is_valid &&= %w(** *).include?(label) || label =~ LABEL_REGEXP
         elsif options[:allow_wildcard] && idx==0
           is_valid &&= label=='*' || label =~ LABEL_REGEXP
         else

data/lib/can_has_validations/version.rb

@@ -1,3 +1,3 @@
 module CanHasValidations
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - thomas morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 'Assorted Rails 5.x-6.x validators: Array, Email, Existence, Grandparent,
-  Hostname, IP address, Ordering, URL, Write Once'
+  Hash keys, Hash values, Hostname, IP address, Ordering, URL, Write Once'
 email:
 - tm@iprog.com
 executables: []
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Assorted Rails 5.x-6.x validators