validate_url 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e2f24b722e790d48ad428b1d8249bc7782770a38
-  data.tar.gz: a63f7504960fede22e2d179a9dddab4e35cf30e3
+SHA256:
+  metadata.gz: 70a15c71f5f41103a97ef5aad221018601dd24584210b10fe4b079f96fcc9fb0
+  data.tar.gz: 66c06e4b38d8d084c6adccc6060fa1b950bff8874e6c2eeaf53270c012d7b566
 SHA512:
-  metadata.gz: 152ed2ee4b0e25d6425e58a7e802389a98b2eadd10b511c81fa02c8e164d212553eb2eccd71e0dbbd39d58dd3807a7e7f9501c5fbb82ea9e7d3f4877349521cc
-  data.tar.gz: 2e96898b898c4c7f675dc81577cf81ae0b22910278ac036088a5db86f4d0b3f5ce05001c0a59c38c01a4337c1fb1f143df24398e9c34f2beef52154765062777
+  metadata.gz: acda957026f81ebcd4df320d46522244c48db058c1bef71accc70d85d9e852523ac8a477ad3b1983b4899a241e18d07c79e26c6e3c8bd923d588eec4dd8fc912
+  data.tar.gz: 0a9663a190ec81682eecf389b034bb9c29db606349cdc2a65584e868fab2b390166485161e8e1f80224ea5d1fc99a404264e3d24022697e0022c0e39378cfcc0

data/README.md

@@ -8,7 +8,7 @@ This gem adds the capability of validating URLs to ActiveRecord and ActiveModel.
 # add this to your Gemfile
 gem "validate_url"
 
-# and  run
+# or run
 sudo gem install validate_url
 ```
 
@@ -51,6 +51,22 @@ class Unicorn
 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 a valid URL`.
@@ -70,3 +86,15 @@ 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
+
+```
+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/ja.yml

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

data/lib/validate_url.rb

@@ -20,16 +20,16 @@ module ActiveModel
       def validate_each(record, attribute, value)
         schemes = [*options.fetch(:schemes)].map(&:to_s)
         begin
-          escaped_uri = value ? URI.escape(value) : nil
-          uri = URI.parse(escaped_uri)
+          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_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_scheme && valid_no_local && valid_suffix
+          unless valid_raw_url && valid_scheme && valid_no_local && valid_suffix
             record.errors.add(attribute, options.fetch(:message), value: value)
           end
         rescue URI::InvalidURIError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate_url
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Tanel Suurhans
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: validate_url
+  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'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -138,8 +152,8 @@ files:
 - lib/locale/tr.yml
 - lib/locale/zh-CN.yml
 - lib/locale/zh-TW.yml
-- lib/rspec_matcher.rb
 - lib/validate_url.rb
+- lib/validate_url/rspec_matcher.rb
 homepage: http://github.com/perfectline/validates_url/tree/master
 licenses: []
 metadata: {}
@@ -158,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Library for validating urls in Rails.