can_has_validations 1.11.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93eb576442685b58ac4e17cebf3c3a95ff9469e504711cf21139ceae1ce2535f
-  data.tar.gz: c18178014c06da3ea3ddca1bdaba444e66d4fca9a92c8ae0dc136c113b88e626
+  metadata.gz: 13e394fba7dc57b9c99ee269fe7c1bbb868e3f5622ed98a2b142a5ffc7ca4fec
+  data.tar.gz: bf2d29c9de0698c7cc9bc734534e556f7b6625f61ba032cef15ccb71f4e7ac70
 SHA512:
-  metadata.gz: '04128aea6dda3a4fe0f484333d2bde2aa0c8563adff238627854b7d4266c7e6aa4d68ebba91717ebdbc31598b23199d5950d2a829b555bcd73b11631f6a4042b'
-  data.tar.gz: d6bdf830b2ebcd33c68dfb9323889eea393b905cc8b1f207281732bb0c700046edc08e79c06f4ba3a58401ed484c2ee82a4655c5837c28da6d962e358b405035
+  metadata.gz: 64c45df4c4266413b999c21aff1356ddfb2178e7dc54e115638f9b08c6a50c2f12c237a2573ecd4684665b3b7690cd408cc4b5b8f58ba34dd74f5a8e520b6436
+  data.tar.gz: b6b3ec67d6711a4e8a6fabcf1ee018bf58f003fc29f0500e5bec21d85e34d9104ec5ccc2dfe46f4f4a287d986cb0f44872bcf0ed5e3dbe14f55c521ef283c5d6

data/lib/can_has_validations/validators/url_validator.rb

@@ -7,6 +7,9 @@
 #     validates :database, url: {port: [5432, nil]}
 #       to allow scheme's default port, must specify `nil` too
 # :scheme defaults to `%w(http https)`
+#   to allow any, use `scheme: nil`
+#   to require blank, use `scheme: [nil]`
+#   note: to allow no scheme, uri must still start with '//'
 # :host defaults to `nil` which allows any
 # :port defaults to `nil` which allows any
 #   to require blank, use `port: false` or `port: [nil]`
@@ -26,6 +29,8 @@ module ActiveModel::Validations
           options[:scheme].call(record)
         elsif options[:scheme].is_a?(Symbol)
           record.send(options[:scheme])
+        elsif options.key?(:scheme) && options[:scheme].nil?
+          [u&.scheme]
         else
           Array.wrap(options[:scheme] || %w(http https))
         end
@@ -54,7 +59,7 @@ module ActiveModel::Validations
           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)
+      if !u || !u2 || 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

data/lib/can_has_validations/version.rb

@@ -1,3 +1,3 @@
 module CanHasValidations
-  VERSION = '1.11.1'
+  VERSION = '1.12.0'
 end

data/test/dummy/log/test.log

@@ -118,3 +118,10 @@ Generating image variants require the image_processing gem. Please add `gem "ima
 CanHasValidationsTest: test_truth
 ---------------------------------
   TRANSACTION (0.0ms)  ROLLBACK TRANSACTION
+Generating image variants require the image_processing gem. Please add `gem "image_processing", "~> 1.2"` to your Gemfile or set `config.active_storage.variant_processor = :disabled`.
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  TRANSACTION (0.0ms)  BEGIN deferred TRANSACTION
+---------------------------------
+CanHasValidationsTest: test_truth
+---------------------------------
+  TRANSACTION (0.0ms)  ROLLBACK TRANSACTION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.0
 platform: ruby
 authors:
 - thomas morgan