validate_url 0.1.6 → 0.2.0

data/README.markdown

@@ -40,8 +40,11 @@ You can pass the `:message => "my custom error"` option to your validation to de
 
 ## Authors
 
-**Tanel Suurhans** (<http://twitter.com/tanelsuurhans>)
+**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/lib/validate_url.rb

@@ -14,13 +14,33 @@ module ActiveModel
       def validate_each(record, attribute, value)
         schemes = [*options.fetch(:schemes)].map(&:to_s)
 
-        unless URI::regexp(schemes).match(value)
+        if URI::regexp(schemes).match(value)
+          begin
+            URI.parse(value)
+          rescue URI::InvalidURIError
+            record.errors.add(attribute, options.fetch(:message), :value => value)
+          end
+        else
           record.errors.add(attribute, options.fetch(:message), :value => value)
         end
       end
     end
 
     module ClassMethods
+      # Validates whether the value of the specified attribute is valid url.
+      #
+      #   class Unicorn
+      #     include ActiveModel::Validations
+      #     attr_accessor :homepage, :ftpsite
+      #     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").
+      # * <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

data/spec/resources/user_with_custom_scheme.rb

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

data/spec/spec_helper.rb

@@ -21,4 +21,5 @@ 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 :UserWithArLegacy,     'resources/user_with_ar_legacy'
+autoload :UserWithCustomScheme, 'resources/user_with_custom_scheme'

data/spec/validate_url_spec.rb

@@ -46,10 +46,15 @@ describe "URL validation" do
       @user.should be_valid
     end
 
-    it "shout not allow a url with an invalid scheme" do
+    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
@@ -67,7 +72,7 @@ describe "URL validation" do
       @user.should_not be_valid
     end
 
-    it "shoild allow a valid url" do
+    it "should allow a valid url" do
       @user.homepage = "http://www.example.com"
       @user.should be_valid
     end
@@ -142,4 +147,14 @@ describe "URL validation" do
     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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tanel Suurhans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 +03:00
+date: 2011-01-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,21 +76,22 @@ files:
 - init.rb
 - install.rb
 - lib/validate_url.rb
-- spec/validate_url_spec.rb
-- spec/resources/user_with_blank.rb
-- spec/resources/user_with_nil.rb
+- spec/resources/user.rb
 - spec/resources/user_with_ar.rb
-- spec/resources/user_with_legacy_syntax.rb
 - spec/resources/user_with_ar_legacy.rb
-- spec/resources/user.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: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -117,11 +118,12 @@ signing_key:
 specification_version: 3
 summary: Library for validating urls in Rails.
 test_files: 
-- spec/validate_url_spec.rb
-- spec/resources/user_with_blank.rb
-- spec/resources/user_with_nil.rb
+- spec/resources/user.rb
 - spec/resources/user_with_ar.rb
-- spec/resources/user_with_legacy_syntax.rb
 - spec/resources/user_with_ar_legacy.rb
-- spec/resources/user.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