validate_url 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 56176990e55020f229be5db2b22de43302d511b8
+  data.tar.gz: 9d64d0c5c462cb659877ac189810286893715ae9
+SHA512:
+  metadata.gz: 7ddec38758e7ae1c64ce42d07fe23e12ce9eb35ba127b1f7649a5a89ca7af8ecca85b7ce935d1962070d6d1068c30897e706a98abe6555676cd6e1ebc9d4781c
+  data.tar.gz: 668a65dacd3ebce344b060b64cf9d7c0953c985120ed56bc57fd99d0a1c84a20b054aefadce2c778227ff3f610d4693263c865018bef371d4fc98e7d71ebfb56

data/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2010 [PerfectLine](http://www.perfectline.co), LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -0,0 +1,63 @@
+# Validates URL
+
+This gem adds the capability of validating URLs to ActiveRecord and ActiveModel (Rails 3).
+
+## Installation
+    
+```    
+# add this to your Gemfile
+gem "validate_url"
+
+# and  run
+sudo gem install validate_url
+```
+
+## Usage
+
+### With ActiveRecord
+
+```ruby    
+class Pony < ActiveRecord::Base
+  # standard validation
+  validates :homepage, :url => true
+
+  # with allow_nil
+  validates :homepage, :url => {:allow_nil => true}
+
+  # with allow_blank
+  validates :homepage, :url => {:allow_blank => true}
+end
+```
+
+### With ActiveModel
+
+```ruby
+class Unicorn
+  include ActiveModel::Validations
+
+  attr_accessor :homepage
+
+  # with legacy syntax (the syntax above works also)
+  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.
+
+
+## Contributing
+
+
+Big thanks to Tanel Suurhans, Tarmo Lehtpuu, Steve Smith and all the [contributors](https://github.com/perfectline/validates_url/contributors)! We appreciate all your work on new features and bugfixes.
+
+## Credits
+
+Validates URL is created and maintained by [PerfectLine](http://www.perfectline.co), LLC.
+
+## 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.

data/lib/validate_url.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require 'addressable/uri'
 require 'active_model'
 
 module ActiveModel
@@ -13,14 +13,12 @@ module ActiveModel
 
       def validate_each(record, attribute, value)
         schemes = [*options.fetch(:schemes)].map(&:to_s)
-
-        if URI::regexp(schemes).match(value)
-          begin
-            URI.parse(value)
-          rescue URI::InvalidURIError
+        begin
+          uri = Addressable::URI.parse(value)
+          unless uri && schemes.include?(uri.scheme)
             record.errors.add(attribute, options.fetch(:message), :value => value)
           end
-        else
+        rescue Addressable::URI::InvalidURIError
           record.errors.add(attribute, options.fetch(:message), :value => value)
         end
       end
@@ -40,10 +38,10 @@ module ActiveModel
       # * <tt>:allow_nil</tt> - If set to true, skips this validation if the attribute is +nil+ (default is +false+).
       # * <tt>:allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is +false+).
       # * <tt>:schemes</tt> - Array of URI schemes to validate against. (default is +['http', 'https']+)
-      
+
       def validates_url(*attr_names)
         validates_with UrlValidator, _merge_attributes(attr_names)
       end
     end
   end
-end
+end

metadata

@@ -1,129 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: validate_url
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Tanel Suurhans
 - Tarmo Lehtpuu
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-18 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-06-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  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 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.1.2
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 description: Library for validating urls in Rails.
-email: 
+email:
 - tanel.suurhans@perfectline.ee
 - tarmo.lehtpuu@perfectline.ee
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.markdown
-files: 
-- README.markdown
+extra_rdoc_files:
+- LICENSE.md
+- README.md
+files:
+- LICENSE.md
+- README.md
 - init.rb
 - install.rb
 - lib/validate_url.rb
-- spec/resources/user.rb
-- spec/resources/user_with_ar.rb
-- spec/resources/user_with_ar_legacy.rb
-- spec/resources/user_with_blank.rb
-- spec/resources/user_with_custom_scheme.rb
-- spec/resources/user_with_legacy_syntax.rb
-- spec/resources/user_with_nil.rb
-- spec/spec_helper.rb
-- spec/validate_url_spec.rb
-has_rdoc: true
 homepage: http://github.com/perfectline/validates_url/tree/master
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library for validating urls in Rails.
-test_files: 
-- spec/resources/user.rb
-- spec/resources/user_with_ar.rb
-- spec/resources/user_with_ar_legacy.rb
-- spec/resources/user_with_blank.rb
-- spec/resources/user_with_custom_scheme.rb
-- spec/resources/user_with_legacy_syntax.rb
-- spec/resources/user_with_nil.rb
-- spec/spec_helper.rb
-- spec/validate_url_spec.rb
+test_files: []

data/README.markdown

@@ -1,50 +0,0 @@
-# ValidateUrl
-
-This gem adds the capability of validating URLs to ActiveRecord and ActiveModel (Rails 3).
-
-### Installation
-    # add this to your Gemfile
-    gem "validate_url"
-
-    # and  run
-    sudo gem install validate_url
-
-### Usage
-
-#### With ActiveRecord
-    class Pony < ActiveRecord::Base
-      # standard validation
-      validates :homepage, :url => true
-
-      # with allow_nil
-      validates :homepage, :url => {:allow_nil => true}
-
-      # with allow_blank
-      validates :homepage, :url => {:allow_blank => true}
-    end
-
-#### With ActiveModel
-    class Unicorn
-      include ActiveModel::Validations
-
-      attr_accessor :homepage
-
-      # with legacy syntax (the syntax above works also)
-      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.
-
-## Authors
-
-**Tanel Suurhans** (<http://twitter.com/tanelsuurhans>)  
-**Tarmo Lehtpuu** (<http://twitter.com/tarmolehtpuu>)
-
-## Contributions
-Thanks to **Steve Smith** for making the validation process even simpler.
-
-## License
-Copyright 2010 by PerfectLine LLC (<http://www.perfectline.co.uk>) and is released under the MIT license.

data/spec/resources/user.rb

@@ -1,7 +0,0 @@
-class User
-  include ActiveModel::Validations
-
-  attr_accessor :homepage
-
-  validates :homepage, :url => true
-end

data/spec/resources/user_with_ar.rb

@@ -1,5 +0,0 @@
-class UserWithAr < ActiveRecord::Base
-  self.table_name = "users"
-
-  validates :homepage, :url => true
-end

data/spec/resources/user_with_ar_legacy.rb

@@ -1,5 +0,0 @@
-class UserWithArLegacy < ActiveRecord::Base
-  self.table_name = "users"
-
-  validates_url :homepage
-end

data/spec/resources/user_with_blank.rb

@@ -1,9 +0,0 @@
-require 'active_model/validations'
-
-class UserWithBlank
-  include ActiveModel::Validations
-
-  attr_accessor :homepage
-
-  validates :homepage, :url => {:allow_blank => true}
-end

data/spec/resources/user_with_custom_scheme.rb

@@ -1,7 +0,0 @@
-class UserWithCustomScheme
-  include ActiveModel::Validations
-
-  attr_accessor :homepage
-
-  validates :homepage, :url => { :schemes => ['ftp'] }
-end

data/spec/resources/user_with_legacy_syntax.rb

@@ -1,9 +0,0 @@
-require 'active_model/validations'
-
-class UserWithLegacySyntax
-  include ActiveModel::Validations
-
-  attr_accessor :homepage
-
-  validates_url :homepage, :allow_blank => true
-end

data/spec/resources/user_with_nil.rb

@@ -1,9 +0,0 @@
-require 'active_model/validations'
-
-class UserWithNil
-  include ActiveModel::Validations
-
-  attr_accessor :homepage
-
-  validates :homepage, :url => {:allow_nil => true}
-end

data/spec/spec_helper.rb

@@ -1,25 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/resources')
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'rspec'
-require 'sqlite3'
-require 'active_record'
-require 'active_record/base'
-require 'active_record/migration'
-
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.establish_connection(
-    "adapter"   => "sqlite3",
-    "database"  => ":memory:"
-)
-
-require File.join(File.dirname(__FILE__), '..', 'init')
-
-autoload :User,                 'resources/user'
-autoload :UserWithNil,          'resources/user_with_nil'
-autoload :UserWithBlank,        'resources/user_with_blank'
-autoload :UserWithLegacySyntax, 'resources/user_with_legacy_syntax'
-autoload :UserWithAr,           'resources/user_with_ar'
-autoload :UserWithArLegacy,     'resources/user_with_ar_legacy'
-autoload :UserWithCustomScheme, 'resources/user_with_custom_scheme'

data/spec/validate_url_spec.rb

@@ -1,160 +0,0 @@
-require 'spec_helper'
-
-describe "URL validation" do
-
-  before(:all) do
-    ActiveRecord::Schema.define(:version => 1) do
-
-      create_table :users, :force => true do |t|
-        t.column :homepage, :string
-      end
-
-    end
-  end
-
-  after(:all) do
-    ActiveRecord::Base.connection.drop_table(:users)
-  end
-
-  context "with regular validator" do
-    before do
-      @user = User.new
-    end
-
-    it "should not allow nil as url" do
-      @user.homepage = nil
-      @user.should_not be_valid
-    end
-
-    it "should not allow blank as url" do
-      @user.homepage = ""
-      @user.should_not be_valid
-    end
-
-    it "should not allow an url without scheme" do
-      @user.homepage = "www.example.com"
-      @user.should_not be_valid
-    end
-
-    it "should allow an url with http" do
-      @user.homepage = "http://localhost"
-      @user.should be_valid
-    end
-
-    it "should allow an url with https" do
-      @user.homepage = "https://localhost"
-      @user.should be_valid
-    end
-
-    it "should not allow a url with an invalid scheme" do
-      @user.homepage = "ftp://localhost"
-      @user.should_not be_valid
-    end
-    
-    it "should not allow a url with only a scheme" do
-      @user.homepage = "http://"
-      @user.should_not be_valid
-    end    
-  end
-
-  context "with allow nil" do
-    before do
-      @user = UserWithNil.new
-    end
-
-    it "should allow nil as url" do
-      @user.homepage = nil
-      @user.should be_valid
-    end
-
-    it "should not allow blank as url" do
-      @user.homepage = ""
-      @user.should_not be_valid
-    end
-
-    it "should allow a valid url" do
-      @user.homepage = "http://www.example.com"
-      @user.should be_valid
-    end
-  end
-
-  context "with allow blank" do
-    before do
-      @user = UserWithBlank.new
-    end
-
-    it "should allow nil as url" do
-      @user.homepage = nil
-      @user.should be_valid
-    end
-
-    it "should allow blank as url" do
-      @user.homepage = ""
-      @user.should be_valid
-    end
-
-    it "should allow a valid url" do
-      @user.homepage = "http://www.example.com"
-      @user.should be_valid
-    end
-  end
-
-  context "with legacy syntax" do
-    before do
-      @user = UserWithLegacySyntax.new
-    end
-
-    it "should allow nil as url" do
-      @user.homepage = nil
-      @user.should be_valid
-    end
-
-    it "should allow blank as url" do
-      @user.homepage = ""
-      @user.should be_valid
-    end
-
-    it "should allow a valid url" do
-      @user.homepage = "http://www.example.com"
-      @user.should be_valid
-    end
-
-    it "should not allow invalid url" do
-      @user.homepage = "random"
-      @user.should_not be_valid
-    end
-  end
-
-  context "with ActiveRecord" do
-    before do
-      @user = UserWithAr.new
-    end
-
-    it "should not allow invalid url" do
-      @user.homepage = "random"
-      @user.should_not be_valid
-    end
-  end
-
-  context "with ActiveRecord and legacy syntax" do
-    before do
-      @user = UserWithArLegacy.new
-    end
-
-    it "should not allow invalid url" do
-      @user.homepage = "random"
-      @user.should_not be_valid
-    end
-  end
-
-  context "with regular validator and custom scheme" do
-    before do
-      @user = UserWithCustomScheme.new
-    end
-    
-    it "should allow alternative URI schemes" do
-      @user.homepage = "ftp://ftp.example.com"
-      @user.should be_valid
-    end
-  end
-end