url_validator 0.0.2 → 0.0.3

data/lib/url_validator/version.rb

@@ -1,4 +1,4 @@
 module UrlValidator
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end
 

data/lib/url_validator.rb

@@ -7,14 +7,16 @@ module ActiveModel
     class UrlValidator < ActiveModel::Validator
 
       def validate(record)
-        schemes = options[:schemes] || %w(http https).join('|')
         message = options[:message] || "is not a valid URL"
-        url_regexp = /^((#{schemes}):\/\/){0,1}[a-z0-9]+([a-z0-9\-\.]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
+        schemes = options[:schemes] || %w(http https)
+        url_regexp = /^((#{schemes.join('|')}):\/\/){0,1}[a-z0-9]+([a-z0-9\-\.]+)*\.[a-z]{2,5}(:[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])
-          normalized_value = record.send(attribute.to_s + '_normalized')
+          record.send("#{attribute}=", preffered_schema << value) if !value.start_with?(*schemes)
+          normalized_value = record.send("#{attribute}_normalized")
           begin
             uri = Addressable::URI.parse(value)
             unless url_regexp =~ normalized_value

data/spec/models/user_spec.rb

@@ -236,5 +236,50 @@ describe "User" do
       @user.errors[:website].to_s.should == 'is not a valid URL'
     end
   end
+
+  context "automated preffilling prefix - preffill if didnt exists" do
+    before do
+      @user = User.new
+      @user.website = 'website.com'
+      @user_with_s = UserWithPrefferedSchema.new
+      @user_with_s.website = 'website.com'
+    end
+
+    it "should preffill http:// to url" do
+      @user.should be_valid
+      @user.website.start_with?('http://').should be_true
+    end
+
+    it "should preffill https:// to url" do
+      @user_with_s.should be_valid
+      @user_with_s.website.start_with?('https://').should be_true
+    end
+  end
+
+  context "automated preffilling prefix - dont preffill if exist" do
+    before do
+      @user = User.new
+      @user.website = 'http://website.com'
+      @user_with_s = UserWithPrefferedSchema.new
+      @user_with_s.website = 'https://website.com'
+    end
+
+    it "should not preffill http://" do
+      @user.should be_valid
+      @user.website.should == 'http://website.com'
+      @user.website = 'https://website.com'
+      @user.valid?
+      @user.website.should == 'https://website.com'
+    end
+
+    it "should not preffill https://" do
+      @user_with_s.should be_valid
+      @user_with_s.website.should == 'https://website.com'
+      @user_with_s.website = 'http://website.com'
+      @user.valid?
+      @user_with_s.website.should == 'http://website.com'
+    end
+  end
+
 end
 

data/spec/resources/user_with_preffered_schema.rb

@@ -0,0 +1,8 @@
+class UserWithPrefferedSchema
+  include ActiveModel::Validations
+
+  attr_accessor :website, :url
+
+  validates_url :website, :preffered_schema => 'https://'
+end
+

data/spec/spec_helper.rb

@@ -22,4 +22,5 @@ autoload :User                 ,'resources/user'
 autoload :UserWithBlank        ,'resources/user_with_blank'
 autoload :UserWithAr           ,'resources/user_with_ar'
 autoload :UserWithCustomScheme ,'resources/user_with_custom_scheme'
+autoload :UserWithPrefferedSchema ,'resources/user_with_preffered_schema'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: url_validator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Zdenko Nevrala
@@ -112,6 +112,7 @@ files:
 - spec/resources/user_with_ar.rb
 - spec/resources/user_with_blank.rb
 - spec/resources/user_with_custom_scheme.rb
+- spec/resources/user_with_preffered_schema.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - url_validator.gemspec