url_validator 0.0.7 → 0.1.0

data/lib/url_validator.rb

@@ -9,17 +9,29 @@ module ActiveModel
       def validate(record)
         message = options[:message] || "is not a valid URL"
         schemes = options[:schemes] || %w(http https)
-        url_regexp = /^((#{schemes.join('|')}):\/\/){0,1}[a-z0-9]+([a-z0-9\-\.]+)*\.[a-z]{2,6}(:[0-9]{1,5})?(\/.*)?$/ix
         preffered_schema = options[:preffered_schema] || "#{schemes.first}://"
         options[:attributes].each do |attribute|
-          value = record.send(attribute).to_s
-          next if value.blank? && (options[:allow_blank] || options[:allow_nil])
-          record.send("#{attribute}=", preffered_schema + value) if !value.start_with?(*schemes)
-          normalized_value = record.send("#{attribute}_normalized")
           begin
+            value = record.send(attribute).to_s
+            value.gsub!(/\s+/, "") if value.present?
+            next if value.blank? && (options[:allow_blank] || options[:allow_nil])
+
             uri = Addressable::URI.parse(value)
-            unless url_regexp =~ normalized_value
-              record.errors.add(attribute, message, :value => uri.to_s)
+
+            if uri.scheme.blank?
+              record.send("#{attribute}=", preffered_schema + value)
+              value = preffered_schema + value
+              uri = Addressable::URI.parse(value)
+            end
+
+            unless schemes.include?(uri.scheme)
+              raise Addressable::URI::InvalidURIError
+            end
+
+            normalized_value = record.send("#{attribute}_normalized")
+
+            if value.blank? && (!options[:allow_blank] || !options[:allow_nil])
+              raise Addressable::URI::InvalidURIError
             end
           rescue Addressable::URI::InvalidURIError
             record.errors.add(attribute, message, :value => uri.to_s)

data/lib/url_validator/version.rb

@@ -1,4 +1,4 @@
 module UrlValidator
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end
 

data/spec/models/user_spec.rb

@@ -32,19 +32,18 @@ describe "User" do
       @user.should_not be_valid
     end
 
-    it "www.website.c should not be valid" do
-      @user.website = 'www.website.c'
-      @user.should_not be_valid
+    it "should sanitize space in url" do
+      @user.website = "web.asd dot.com"
+      @user.should be_valid
     end
 
-    it "www.web site.com should not be valid" do
-      @user.website = 'www.web site.com'
-      @user.should_not be_valid
+    it "should sanitize space in url" do
+      @user.website = "webasd\tdot.com"
+      @user.should be_valid
     end
 
-    it "should not accept invalid URLs" do
-      ["htt://www.website.com", "htttp://www.website.com",
-        "http:/www.website.com", "http://website"].each do |url|
+    ["htt://www.website.com", "htttp://www.website.com"].each do |url|
+      it "should not accept invalid #{url}" do
         @user.website = url
         @user.should_not be_valid
       end
@@ -146,15 +145,10 @@ describe "User" do
     end
 
     it "should not allow invalid url: website" do
-      @user.website = "website"
+      @user.website = "ftp://website.com"
       @user.should_not be_valid
       @user.errors[:website].should_not be_empty
     end
-
-    it "should not allow invalid url: website.c" do
-      @user.website = "website.c"
-      @user.should_not be_valid
-    end
   end
 
   context "with regular validator and custom scheme ftp://" do
@@ -192,7 +186,7 @@ describe "User" do
     end
 
     it "should not be valid http://www.詹姆斯.c" do
-      @user.website = "www.詹姆斯.c"
+      @user.website = "ftp://www.詹姆斯"
       @user.should_not be_valid
       @user.errors[:website].should_not be_empty
     end

data/spec/spec.opts

@@ -1,3 +1,2 @@
 --colour
 --format progress
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: url_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -147,3 +147,4 @@ test_files:
 - spec/resources/user_with_preffered_schema.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: