validate_url 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04939802e3f1bad0661aaacb50aa8bc0ba205c83477ee84531150a5dc52a4dc5'
-  data.tar.gz: 197fab0f9bd25c2ad6301a4f901fc0bdc8a7af32649abae03a01d0a313a2da76
+  metadata.gz: 58b59a8faf6055485804d8dbc80aa6f70cec016dabf65eb0fa79d0cb9d3c6db5
+  data.tar.gz: b9015820dc18729bab6cbe3e67d982918e7727ad611d7ab916e854dbf39b7a74
 SHA512:
-  metadata.gz: 6302dcf91afa95d9b523501593caa5344463971ed3c2b46e8dcd394ae4bf8784993e387915e2a3f96d16d85035f5380875517a6ef484c9ad747721c4bb685593
-  data.tar.gz: ba740394d8b2b66621cd1b117427251372424de8c4fb1a5a5b69f09c0ee1dc06c3ceb830dadcaa237b11098080b95dcae1618c6431aaa0116ccdd543ea34d084
+  metadata.gz: a630fa8358388a40491e00d3275fa543076a8d4c00df65d18a1e5d70426e862245b5631125782c72eab76cdbbdcff18f857f5a047e04cb8ec7bac36ccb770983
+  data.tar.gz: '09bd75d874a0087033f3984646b44466ffd275c58b77128dac06b4f8a1fe8bd13ab277a9e1317769a34407174f524380313b462b75f95f9be6a35340f15bf753'

data/README.md

@@ -4,11 +4,15 @@ This gem adds the capability of validating URLs to ActiveRecord and ActiveModel.
 
 ## Installation
 
-```
-# add this to your Gemfile
+Add this to your `Gemfile`:
+
+```ruby
 gem "validate_url"
+```
+
+Or install it yourself:
 
-# or run
+```sh
 sudo gem install validate_url
 ```
 
@@ -35,6 +39,9 @@ class Pony < ActiveRecord::Base
 
   # with public suffix database https://publicsuffix.org/
   validates :homepage, url: { public_suffix: true }
+
+  # with Postgres array of urls, described [here](https://guides.rubyonrails.org/active_record_postgresql.html#array)
+  validates :homepage, url: { accept_array: true }
 end
 ```
 
@@ -62,7 +69,7 @@ require 'validate_url/rspec_matcher'
 In your spec:
 
 ```ruby
-describe Unicorn
+RSpec.describe Unicorn
   it { is_expected.to validate_url_of(:homepage) }
 end
 ```
@@ -87,14 +94,16 @@ Validates URL is created and maintained by [PerfectLine](http://www.perfectline.
 Validates URL is Copyright © 2010-2014 [PerfectLine](http://www.perfectline.co), LLC. It is free software, and may be
 redistributed under the terms specified in the LICENSE file.
 
-## How to push new version
+## How to push a new version
 
-```
+```sh
 rake version:bump:patch
 rake gemspec
 ```
-Fix validate_url.gemspec to remove unneeded wrong strings
-```
+
+Manually update `validate_url.gemspec` to remove incorrect strings.
+
+```sh
 gem build validate_url.gemspec
 gem push validate_url-1.0.8.gem
 ```

data/lib/locale/it.yml

@@ -1,4 +1,4 @@
 it:
   errors:
     messages:
-      url: non è un URL valido.
+      url: non è un URL valido

data/lib/locale/nl.yml

@@ -0,0 +1,4 @@
+nl:
+  errors:
+    messages:
+      url: is geen geldige URL

data/lib/locale/pl.yml

@@ -1,4 +1,4 @@
 pl:
   errors:
     messages:
-      url: nie jest poprawnym adresem URL.
+      url: nie jest poprawnym adresem URL

data/lib/locale/pt-PT.yml

@@ -0,0 +1,4 @@
+pt-PT:
+  errors:
+    messages:
+      url: não é uma URL válida

data/lib/locale/pt.yml

@@ -0,0 +1,4 @@
+pt:
+  errors:
+    messages:
+      url: não é uma URL válida

data/lib/validate_url.rb

@@ -13,28 +13,32 @@ module ActiveModel
         options.reverse_merge!(message: :url)
         options.reverse_merge!(no_local: false)
         options.reverse_merge!(public_suffix: false)
+        options.reverse_merge!(accept_array: false)
 
         super(options)
       end
 
       def validate_each(record, attribute, value)
         schemes = [*options.fetch(:schemes)].map(&:to_s)
-        begin
-          uri = URI.parse(value)
-          host = uri && uri.host
-          scheme = uri && uri.scheme
+        if value.respond_to?(:each)
+          # Error out if we're not allowing arrays
+          if !options.include?(:accept_array) || !options.fetch(:accept_array)
+            record.errors.add(attribute, :url, **filtered_options(value))
+          end
 
-          valid_raw_url = scheme && value =~ /\A#{URI::regexp([scheme])}\z/
-          valid_scheme = host && scheme && schemes.include?(scheme)
-          valid_no_local = !options.fetch(:no_local) || (host && host.include?('.'))
-          valid_suffix = !options.fetch(:public_suffix) || (host && PublicSuffix.valid?(host, :default_rule => nil))
+          # We have to manually handle `:allow_nil` and `:allow_blank` since it's not caught by
+          # ActiveRecord's own validators. We do that by just removing all the nil's if we want to
+          # allow them so it's not passed on later.
+          value = value.reject(&:nil?) if options.include?(:allow_nil) && options.fetch(:allow_nil)
+          value = value.reject(&:blank?) if options.include?(:allow_blank) && options.fetch(:allow_blank)
 
-          unless valid_raw_url && valid_scheme && valid_no_local && valid_suffix
-            record.errors.add(attribute, options.fetch(:message), value: value)
-          end
-        rescue URI::InvalidURIError
-          record.errors.add(attribute, :url, **filtered_options(value))
+          result = value.flat_map { |v| validate_url(record, attribute, v, schemes) }
+          errors = result.reject(&:nil?)
+
+          return errors.any? ? errors.first : true
         end
+
+        validate_url(record, attribute, value, schemes)
       end
 
       protected
@@ -44,6 +48,23 @@ module ActiveModel
         filtered[:value] = value
         filtered
       end
+
+      def validate_url(record, attribute, value, schemes)
+        uri = URI.parse(value)
+        host = uri && uri.host
+        scheme = uri && uri.scheme
+
+        valid_raw_url = scheme && value =~ /\A#{URI::regexp([scheme])}\z/
+        valid_scheme = host && scheme && schemes.include?(scheme)
+        valid_no_local = !options.fetch(:no_local) || (host && host.include?('.'))
+        valid_suffix = !options.fetch(:public_suffix) || (host && PublicSuffix.valid?(host, :default_rule => nil))
+
+        unless valid_raw_url && valid_scheme && valid_no_local && valid_suffix
+          record.errors.add(attribute, options.fetch(:message), value: value)
+        end
+      rescue URI::InvalidURIError, URI::InvalidComponentError
+        record.errors.add(attribute, :url, **filtered_options(value))
+      end
     end
 
     module ClassMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate_url
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Tanel Suurhans
@@ -133,8 +133,11 @@ files:
 - lib/locale/it.yml
 - lib/locale/ja.yml
 - lib/locale/km.yml
+- lib/locale/nl.yml
 - lib/locale/pl.yml
 - lib/locale/pt-BR.yml
+- lib/locale/pt-PT.yml
+- lib/locale/pt.yml
 - lib/locale/ro.yml
 - lib/locale/ru.yml
 - lib/locale/tr.yml