can_has_validations 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd7c0ba5910899942ccfa116005b0458596cd475c30495c788fbd72bf25f8f6
-  data.tar.gz: 1507f461b6c2a10e1084d4e7af494924b168b4db83f318eac672b9ac94b58817
+  metadata.gz: a60d6f36d2de2de081e45e2608c207d3cc81447900b2f0c7ef61727373fb2819
+  data.tar.gz: aed858aa2888e7646b3878dd039052b0196d9a41e64188bcf45f494dc3bb0e6d
 SHA512:
-  metadata.gz: 8e9d0f1333fbd0f77cb45ec67c741f9b63b5609324e919830e7a4076831a2527efd222ede98fabcb4b632ccdc76fc4a4ce048f2e7bd0659504928f80e7dcdc70
-  data.tar.gz: c85f1eabcbe0e2579dc2ea5917d731088fa7afe0a5da14ddb8a40ccee8a94bca0c6af44405f263a978cad987ce1695e0abbe47ae7d3cfc113fccec153618d0e6
+  metadata.gz: db744b1438739df7fd6aae9d071ccbae7683c405fab61ff56307045d2312760b8559b950246a8c578aa3e58c6fdff3d0bbe8f7a27c520d95ea92902b9ef2ef52
+  data.tar.gz: 17486807b2bede046e96282943b8dfa76154e4283d20b8ec18958154f75a24508e919786f2b5e2f802315ee4246c41bfa187b24f93769e67d14767496c34c419

data/lib/can_has_validations/validators/email_validator.rb

@@ -13,7 +13,7 @@ module ActiveModel::Validations
 
     def validate_each(record, attribute, value)
       unless email_valid?(value)
-        record.errors.add(attribute, :invalid_email, options.merge(value: value))
+        record.errors.add(attribute, :invalid_email, **options.merge(value: value))
       end
     end
 

data/lib/can_has_validations/validators/grandparent_validator.rb

@@ -21,7 +21,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))
       end
     end
   end

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
@@ -71,7 +73,7 @@ module ActiveModel::Validations
       end
 
       unless is_valid
-        record.errors.add(attribute, :invalid_hostname, options.except(*RESERVED_OPTIONS).merge!(value: value))
+        record.errors.add(attribute, :invalid_hostname, **options.except(*RESERVED_OPTIONS).merge!(value: value))
       end
     end
 

data/lib/can_has_validations/validators/ipaddr_validator.rb

@@ -30,23 +30,30 @@ module ActiveModel::Validations
           IPAddr.new(value) rescue nil
       end
       unless ip
-        record.errors.add(attribute, :invalid_ip, options.merge(value: value))
+        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))
+        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))
+      if allowed_ips && allowed_ips.none?{|blk| ip_within_block? ip, blk}
+        record.errors.add(attribute, :ip_not_allowed, **options.merge(value: value))
+      elsif disallowed_ips && disallowed_ips.any?{|blk| ip_within_block? ip, blk}
+        record.errors.add(attribute, :ip_not_allowed, **options.merge(value: value))
       end
     end
 
 
     private
 
+    def ip_within_block?(ip, blk)
+      return false unless ip.family == blk.family
+      ip = ip.to_range
+      blk = blk.to_range
+      ip.begin >= blk.begin && ip.end <= blk.end
+    end
+
     def normalize_within(val, key)
       if val.nil? || val.respond_to?(:call) || val.is_a?(Symbol)
         val
@@ -72,20 +79,9 @@ module ActiveModel::Validations
       else
         val
       end
+      # raise "#{val.inspect} did not resolve to an Array of IPAddr" unless res.is_a?(Array) && res.all?{|r| r.is_a?(IPAddr)}
+      # res
     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/ordering_validator.rb

@@ -18,7 +18,7 @@ module ActiveModel::Validations
         next unless value && greater
         unless value < greater
           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))
+          record.errors.add(attribute, :before, **options.except(:before).merge!(attribute2: attr2, value: value))
         end
       end
     end
@@ -33,7 +33,7 @@ module ActiveModel::Validations
         next unless value && lesser
         unless value > lesser
           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))
+          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

@@ -22,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, scheme: allowed_schemes))
+        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

@@ -18,7 +18,9 @@ module ActiveModel::Validations
 
     def validate_each(record, attribute, _)
       return unless record.persisted?
-      if !record.respond_to?("#{attribute}_changed?") && record.respond_to?("#{attribute}_id_changed?")
+      if ( !record.respond_to?("#{attribute}_changed?") ||
+           !record.respond_to?("#{attribute}_was")
+         ) && record.respond_to?("#{attribute}_id_changed?")
         attr2 = "#{attribute}_id"
       else
         attr2 = attribute
@@ -26,7 +28,7 @@ module ActiveModel::Validations
       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))
+          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 = '1.3.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - thomas morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -44,8 +44,8 @@ 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'
+description: 'Assorted Rails 5.x-7.x validators: Array, Email, Existence, Grandparent,
+  Hash keys, Hash values, Hostname, IP address, Ordering, URL, Write Once'
 email:
 - tm@iprog.com
 executables: []
@@ -121,39 +121,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
-summary: Assorted Rails 5.x-6.x validators
+summary: Assorted Rails 5.x-7.x validators
 test_files:
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
+- test/can_has_validations_test.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - 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/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/app/views/layouts/application.html.erb
 - test/dummy/config/application.rb
-- test/dummy/config/database.yml
 - test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.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/initializers/secret_token.rb
-- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/script/rails
-- test/dummy/Rakefile
-- test/dummy/public/favicon.ico
+- test/dummy/log/test.log
+- test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/log/test.log
-- test/dummy/README.rdoc
-- test/can_has_validations_test.rb
+- test/dummy/public/favicon.ico
+- test/dummy/script/rails
 - test/test_helper.rb