validate_url 1.0.2 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3a9370dd3549d270bff452c951a9de3ae4d0288b
-  data.tar.gz: 342adc16d0211b47d822d590f0395aa53ea74b8a
+SHA256:
+  metadata.gz: 414a69dd5d0048f3563cafe2136e4b4c00731d4492afa77b4c9248bcd91f24d2
+  data.tar.gz: b92e07f5bdb42ff396395fd1adf40473ff08a4781397357cd752dbbbcb198523
 SHA512:
-  metadata.gz: ce037a673542945b111562d32cb1633dfcc955fa5a256ad16823b2094da17d8715fa28b9a4bf252ceb0809f52d88e797c3534a7f0f88d5a0c30e3024b8da3538
-  data.tar.gz: 702b42045a2f850bcc2f5595299177ce97171caa05ca0a4732d78f7ec5b9c81c83b84c700e0a2605c870ff175bbf60232871e04b3b3c7db2ec6735089fd7cebc
+  metadata.gz: e3bbe821276bf8f2c82e227a2b0c9bcb9aa76782994da820977a992e7bb0d9116a623d421e1850713cd8dfed91b22620c2d9bcd6d30770e1d198bf8486a13992
+  data.tar.gz: 07bf30ca4b67f8701baacd6505a3c9f64d792267cca3f672832b927e5f1df331ba32881faee2d755aa01abd92c7bbefde91795df3fd5da0246a8b82ed94fbd82

data/README.md

@@ -1,14 +1,14 @@
 # Validates URL
 
-This gem adds the capability of validating URLs to ActiveRecord and ActiveModel (Rails 3).
+This gem adds the capability of validating URLs to ActiveRecord and ActiveModel.
 
 ## Installation
-    
-```    
+
+```
 # add this to your Gemfile
 gem "validate_url"
 
-# and  run
+# or run
 sudo gem install validate_url
 ```
 
@@ -16,19 +16,25 @@ sudo gem install validate_url
 
 ### With ActiveRecord
 
-```ruby    
+```ruby
 class Pony < ActiveRecord::Base
   # standard validation
-  validates :homepage, :url => true
+  validates :homepage, url: true
 
   # with allow_nil
-  validates :homepage, :url => {:allow_nil => true}
+  validates :homepage, url: { allow_nil: true }
 
   # with allow_blank
-  validates :homepage, :url => {:allow_blank => true}
+  validates :homepage, url: { allow_blank: true }
 
   # without local hostnames
-  validates :homepage, :url => {:no_local => true}
+  validates :homepage, url: { no_local: true }
+
+  # with custom schemes
+  validates :homepage, url: { schemes: ['https'] }
+
+  # with public suffix database https://publicsuffix.org/
+  validates :homepage, url: { public_suffix: true }
 end
 ```
 
@@ -41,14 +47,30 @@ class Unicorn
   attr_accessor :homepage
 
   # with legacy syntax (the syntax above works also)
-  validates_url :homepage, :allow_blank => true
+  validates_url :homepage, allow_blank: true
+end
+```
+
+### With RSpec
+
+Require the matcher in `spec_helper.rb` or `rails_helper.rb`:
+
+```ruby
+require 'validate_url/rspec_matcher'
+```
+
+In your spec:
+
+```ruby
+describe Unicorn
+  it { is_expected.to validate_url_of(:homepage) }
 end
 ```
 
 ### I18n
 
-The default error message `is not valid url`.
-You can pass the `:message => "my custom error"` option to your validation to define your own, custom message.
+The default error message `is not a valid URL`.
+You can pass the `message: "my custom error"` option to your validation to define your own, custom message.
 
 
 ## Contributing
@@ -63,4 +85,16 @@ Validates URL is created and maintained by [PerfectLine](http://www.perfectline.
 ## License
 
 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.
+redistributed under the terms specified in the LICENSE file.
+
+## How to push new version
+
+```
+rake version:bump:patch
+rake gemspec
+```
+Fix validate_url.gemspec to remove unneeded wrong strings
+```
+gem build validate_url.gemspec
+gem push validate_url-1.0.8.gem
+```

data/lib/locale/ar.yml

@@ -0,0 +1,4 @@
+ar:
+  errors:
+    messages:
+      url: عنوان الموقع غير صالح

data/lib/locale/es.yml

@@ -0,0 +1,4 @@
+es:
+  errors:
+    messages:
+      url: no es una URL válida

data/lib/locale/fr.yml

@@ -0,0 +1,4 @@
+fr:
+  errors:
+    messages:
+      url: "n'est pas une URL valide"

data/lib/locale/ja.yml

@@ -1,4 +1,4 @@
 ja:
   errors:
     messages:
-      url: は不正なURLです。
+      url: は不正なURLです

data/lib/locale/km.yml

@@ -0,0 +1,4 @@
+km:
+  errors:
+    messages:
+      url: "មិនត្រឹមត្រូវ"

data/lib/locale/pl.yml

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

data/lib/locale/ro.yml

@@ -0,0 +1,4 @@
+ro:
+  errors:
+    messages:
+      url: nu este un URL valid

data/lib/locale/ru.yml

@@ -0,0 +1,4 @@
+ru:
+  errors:
+    messages:
+      url: некорректный URL

data/lib/locale/vi.yml

@@ -0,0 +1,4 @@
+vi:
+  errors:
+    messages:
+      url: không phải là một địa chỉ liên kết hợp lệ

data/lib/locale/zh-CN.yml

@@ -0,0 +1,4 @@
+zh-CN:
+  errors:
+    messages:
+      url: '网址格式不正确'

data/lib/locale/zh-TW.yml

@@ -0,0 +1,4 @@
+zh-TW:
+  errors:
+    messages:
+      url: '網址格式不正確'

data/lib/validate_url/rspec_matcher.rb

@@ -0,0 +1,12 @@
+RSpec::Matchers.define :validate_url_of do |attribute|
+  match do
+    actual = subject.is_a?(Class) ? subject.new : subject
+    actual.send(:"#{attribute}=", "htp://invalidurl")
+    expect(actual).to be_invalid
+    @expected_message ||= I18n.t("errors.messages.url")
+    expect(actual.errors.messages[attribute.to_sym]).to include(@expected_message)
+  end
+  chain :with_message do |message|
+    @expected_message = message
+  end
+end

data/lib/validate_url.rb

@@ -1,18 +1,18 @@
-require 'addressable/uri'
 require 'active_model'
 require 'active_support/i18n'
-I18n.load_path << File.dirname(__FILE__) + '/locale/en.yml'
-I18n.load_path << File.dirname(__FILE__) + '/locale/tr.yml'
-I18n.load_path << File.dirname(__FILE__) + '/locale/ja.yml'
+require 'public_suffix'
+I18n.load_path += Dir[File.dirname(__FILE__) + "/locale/*.yml"]
 
 module ActiveModel
   module Validations
     class UrlValidator < ActiveModel::EachValidator
+      RESERVED_OPTIONS = [:schemes, :no_local]
 
       def initialize(options)
-        options.reverse_merge!(:schemes => %w(http https))
-        options.reverse_merge!(:message => :url)
-        options.reverse_merge!(:no_local => false)
+        options.reverse_merge!(schemes: %w(http https))
+        options.reverse_merge!(message: :url)
+        options.reverse_merge!(no_local: false)
+        options.reverse_merge!(public_suffix: false)
 
         super(options)
       end
@@ -20,14 +20,30 @@ module ActiveModel
       def validate_each(record, attribute, value)
         schemes = [*options.fetch(:schemes)].map(&:to_s)
         begin
-          uri = Addressable::URI.parse(value)
-          unless uri && uri.host && schemes.include?(uri.scheme) && (!options.fetch(:no_local) || uri.host.include?('.'))
-            record.errors.add(attribute, options.fetch(:message), :value => value)
+          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 Addressable::URI::InvalidURIError
-          record.errors.add(attribute, options.fetch(:message), :value => value)
+        rescue URI::InvalidURIError
+          record.errors.add(attribute, :url, **filtered_options(value))
         end
       end
+
+      protected
+
+      def filtered_options(value)
+        filtered = options.except(*RESERVED_OPTIONS)
+        filtered[:value] = value
+        filtered
+      end
     end
 
     module ClassMethods
@@ -36,8 +52,8 @@ module ActiveModel
       #   class Unicorn
       #     include ActiveModel::Validations
       #     attr_accessor :homepage, :ftpsite
-      #     validates_url :homepage, :allow_blank => true
-      #     validates_url :ftpsite, :schemes => ['ftp']
+      #     validates_url :homepage, allow_blank: true
+      #     validates_url :ftpsite, schemes: ['ftp']
       #   end
       # Configuration options:
       # * <tt>:message</tt> - A custom error message (default is: "is not a valid URL").

metadata

@@ -1,39 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: validate_url
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.13
 platform: ruby
 authors:
 - Tanel Suurhans
 - Tarmo Lehtpuu
 - Vladimir Krylov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -68,6 +82,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library for validating urls in Rails.
 email:
 - tanel.suurhans@perfectline.co
@@ -83,17 +125,28 @@ files:
 - README.md
 - init.rb
 - install.rb
+- lib/locale/ar.yml
 - lib/locale/de.yml
 - lib/locale/en.yml
+- lib/locale/es.yml
+- lib/locale/fr.yml
 - lib/locale/it.yml
 - lib/locale/ja.yml
+- lib/locale/km.yml
+- lib/locale/pl.yml
 - lib/locale/pt-BR.yml
+- lib/locale/ro.yml
+- lib/locale/ru.yml
 - lib/locale/tr.yml
+- lib/locale/vi.yml
+- lib/locale/zh-CN.yml
+- lib/locale/zh-TW.yml
 - lib/validate_url.rb
+- lib/validate_url/rspec_matcher.rb
 homepage: http://github.com/perfectline/validates_url/tree/master
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Library for validating urls in Rails.
 test_files: []