validate_url 0.1.2 → 0.1.3

data/lib/validates_url.rb

@@ -1,80 +1,29 @@
-module Perfectline
-  module ValidatesUrl
+require 'uri'
+require 'active_model'
 
-    class Validator
-      require 'uri'
-      
-      def self.valid_url?(value, schemes)
-        schemes = [*schemes].map(&:to_s)
-        begin
-          uri = ::URI.parse(value)
+module ActiveModel
+  module Validations
+    class UrlValidator < ActiveModel::EachValidator
 
-          unless schemes.include?(uri.scheme)
-            raise ::URI::InvalidURIError
-          end
-
-          unless uri.send(:scheme).present?
-            raise ::URI::InvalidURIError
-          end
-
-          unless uri.send(:host).present?
-            raise ::URI::InvalidURIError
-          end
-
-        rescue ::URI::InvalidURIError
-          return false
-        end
-
-        true
-      end
-    end
-
-    module Rails2
-      require 'active_record'
-      
-      def validates_url(*attribute_names)
-        options = attribute_names.extract_options!.symbolize_keys
+      def initialize(options)
         options.reverse_merge!(:schemes => %w(http https))
         options.reverse_merge!(:message => "is not a valid URL")
-
-        validates_each(attribute_names, options) do |record, attribute, value|
-          unless valid_url?(value, options.fetch(:schemes))
-            record.errors.add(attribute, options[:message], :value => value)
-          end
-        end
+        super(options)
       end
-    end
-
-    module Rails3
-      require 'active_model'
-      require 'active_model/validations'
 
-      class UrlValidator < ActiveModel::EachValidator
-        def initialize(options)
-          options.reverse_merge!(:schemes => %w(http https))
-          options.reverse_merge!(:message => "is not a valid URL")
-          super(options)
-        end
+      def validate_each(record, attribute, value)
+        schemes = [*options.fetch(:schemes)].map(&:to_s)
 
-        def validate_each(record, attribute, value)
-          unless Perfectline::ValidatesUrl::Validator.valid_url?(value, options.fetch(:schemes))
-            record.errors.add(attribute, options.fetch(:message), :value => value)
-          end
+        unless URI::regexp(schemes).match(value)
+          record.errors.add(attribute, options.fetch(:message), :value => value)
         end
       end
+    end
 
-      module ClassMethods
-        def validates_url(*attr_names)
-          validates_with UrlValidator, _merge_attributes(attr_names)
-        end
+    module ClassMethods
+      def validates_url(*attr_names)
+        validates_with UrlValidator, _merge_attributes(attr_names)
       end
     end
   end
-end
-
-if Rails::VERSION::MAJOR >= 3
-  ActiveModel::Validations::UrlValidator = Perfectline::ValidatesUrl::Rails3::UrlValidator
-  ActiveModel::Validations::HelperMethods.send(:include, Perfectline::ValidatesUrl::Rails3::ClassMethods)
-else
-  ActiveRecord::Base.send(:include, Perfectline::ValidatesUrl::Rails2)
 end

data/spec/resources/user.rb

@@ -1,5 +1,3 @@
-require 'active_model/validations'
-
 class User
   include ActiveModel::Validations
 

data/spec/resources/user_with_ar.rb

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

data/spec/resources/user_with_ar_legacy.rb

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

data/spec/spec_helper.rb

@@ -2,12 +2,23 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/resources')
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'spec'
-require 'rails'
-require 'validates_url'
+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__), '..', 'rails', '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'

data/spec/validates_url_spec.rb

@@ -1,6 +1,20 @@
 require 'spec_helper'
 
-describe "URL validation", Perfectline::ValidatesUrl::Rails3::UrlValidator do
+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
@@ -32,6 +46,10 @@ describe "URL validation", Perfectline::ValidatesUrl::Rails3::UrlValidator do
       @user.should be_valid
     end
 
+    it "shout not allow a url with an invalid scheme" do
+      @user.homepage = "ftp://localhost"
+      @user.should_not be_valid
+    end
   end
 
   context "with allow nil" do
@@ -102,4 +120,26 @@ describe "URL validation", Perfectline::ValidatesUrl::Rails3::UrlValidator do
     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
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tanel Suurhans
@@ -22,6 +22,7 @@ dependencies:
   name: activemodel
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,6 +37,7 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -48,6 +50,7 @@ dependencies:
   name: diff-lcs
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -73,6 +76,14 @@ files:
 - install.rb
 - lib/validates_url.rb
 - rails/init.rb
+- spec/validates_url_spec.rb
+- spec/resources/user_with_blank.rb
+- spec/resources/user_with_nil.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/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/perfectline/validates_url/tree/master
 licenses: []
@@ -83,6 +94,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -90,6 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -99,14 +112,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Library for validating urls in Rails.
 test_files: 
-- spec/resources/user.rb
+- spec/validates_url_spec.rb
 - spec/resources/user_with_blank.rb
-- spec/resources/user_with_legacy_syntax.rb
 - spec/resources/user_with_nil.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/spec_helper.rb
-- spec/validates_url_spec.rb