validate_url 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a9370dd3549d270bff452c951a9de3ae4d0288b
-  data.tar.gz: 342adc16d0211b47d822d590f0395aa53ea74b8a
+  metadata.gz: 5f0f637da31e1ad9ccb51ac9dee234805c35ccbc
+  data.tar.gz: d2222f7e3844215454a43626c1d283a62a86d13a
 SHA512:
-  metadata.gz: ce037a673542945b111562d32cb1633dfcc955fa5a256ad16823b2094da17d8715fa28b9a4bf252ceb0809f52d88e797c3534a7f0f88d5a0c30e3024b8da3538
-  data.tar.gz: 702b42045a2f850bcc2f5595299177ce97171caa05ca0a4732d78f7ec5b9c81c83b84c700e0a2605c870ff175bbf60232871e04b3b3c7db2ec6735089fd7cebc
+  metadata.gz: 8e39fcb677c0f7f96083bc4aaa37d5ca17fc9d0b375ac7f0d1ffb57d81ab3c827d5c4d4f4e979f4924c896a9f51a58860aa8c9eb82ac96843f5a0a4e23d4a31d
+  data.tar.gz: 300b61a831028476ccf33182a82c50ebba2cca03d1bc75e9710d7b316fae1ca0d239a3c8e0a9d86396e254fc48ebc4bf71b1a86bd56106af6e6eb8c9608b9a22

data/README.md

@@ -1,10 +1,10 @@
 # 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"
 
@@ -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,14 @@ 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
 ```
 
 ### 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 +69,4 @@ 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.

data/lib/locale/fr.yml

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

data/lib/locale/km.yml

@@ -0,0 +1,4 @@
+km:
+  errors:
+    messages:
+      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/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/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,29 @@ 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_suffix = !options.fetch(:public_suffix) || (host && PublicSuffix.valid?(host, :default_rule => nil))
+          valid_no_local = !options.fetch(:no_local) || (host && host.include?('.'))
+          valid_scheme = host && scheme && schemes.include?(scheme)
+
+          unless 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 +51,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate_url
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Tanel Suurhans
@@ -10,30 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: validate_url
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: rake
   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:
@@ -41,7 +55,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,19 +69,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: diff-lcs
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        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:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !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: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  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
@@ -85,10 +141,17 @@ files:
 - install.rb
 - lib/locale/de.yml
 - lib/locale/en.yml
+- lib/locale/fr.yml
 - lib/locale/it.yml
 - lib/locale/ja.yml
+- lib/locale/km.yml
 - lib/locale/pt-BR.yml
+- lib/locale/ro.yml
+- lib/locale/ru.yml
 - lib/locale/tr.yml
+- lib/locale/zh-CN.yml
+- lib/locale/zh-TW.yml
+- lib/rspec_matcher.rb
 - lib/validate_url.rb
 homepage: http://github.com/perfectline/validates_url/tree/master
 licenses: []
@@ -109,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Library for validating urls in Rails.