missing_validators 0.2.1 → 0.3.0

data/config/locales/en.yml

@@ -3,6 +3,7 @@ en:
     messages:
       inequality: "can't be equal to %{attr}"
       email: "isn't a valid email address"
+      url: "isn't a valid URL"
   missing_validators:
     matchers:
       ensure_inequality_of:
@@ -10,4 +11,7 @@ en:
         failure_message_for_should_not: "#{model} should not ensure inequality on attribute #{attr}"
       ensure_valid_email_format_of:
         failure_message_for_should: "#{model} should ensure valid email format of attribute #{attr}"
-        failure_message_for_should_not: "#{model} should not ensure valid email format of attribute #{attr}"
+        failure_message_for_should_not: "#{model} should not ensure valid email format of attribute #{attr}"
+      ensure_valid_url_format_of:
+        failure_message_for_should: "#{model} should ensure valid URL format of attribute #{attr}"
+        failure_message_for_should_not: "#{model} should not ensure valid URL format of attribute #{attr}"

data/lib/missing_validators.rb

@@ -4,3 +4,5 @@ require 'missing_validators/validators/inequality_validator'
 require 'missing_validators/matchers/ensure_inequality_of_matcher' if defined?(RSpec)
 require 'missing_validators/validators/email_validator'
 require 'missing_validators/matchers/ensure_valid_email_format_of' if defined?(RSpec)
+require 'missing_validators/validators/url_validator'
+require 'missing_validators/matchers/ensure_valid_url_format_of' if defined?(RSpec)

data/lib/missing_validators/matchers/ensure_valid_url_format_of.rb

@@ -0,0 +1,20 @@
+RSpec::Matchers.define :ensure_valid_url_format_of do |attribute|
+  match do |model|
+    model.send("#{attribute}=", ".")
+    model.valid?
+
+    if model.errors.has_key?(attribute)
+      model.errors[attribute].include?(I18n.t('errors.messages.url'))
+    end
+  end
+
+  failure_message_for_should do |model|
+    I18n.t 'missing_validators.matchers.ensure_valid_url_format_of.failure_message_for_should',
+      model: model.class
+  end
+
+  failure_message_for_should_not do |model|
+    I18n.t 'missing_validators.matchers.ensure_valid_url_format_of.failure_message_for_should_not',
+      model: model.class
+  end
+end

data/lib/missing_validators/validators/url_validator.rb

@@ -0,0 +1,28 @@
+require 'uri'
+# Allows to check if the value of a specific attribute is a valid URL.
+#
+# @example Validate that the user's blog URL is valid.
+#   class User << ActiveRecord::Base
+#     attr_accessor :blog, :name
+#     validates :blog, url: true
+#   end
+class UrlValidator < ActiveModel::EachValidator
+  # Checks if an attribute value is a valid URL.
+  #
+  # @param [Object] record object to validate
+  # @param [String] attribute name of the object attribute to validate
+  # @param [Object] attribute attribute value
+  def validate_each(record, attribute, value)
+    begin
+      uri = URI.parse value
+      valid_format = uri.kind_of? URI::HTTP
+    rescue
+      valid_format = false
+    end
+
+    unless valid_format
+      message = options[:message] || I18n.t('errors.messages.url')
+      record.errors[attribute] << message
+    end
+  end
+end

data/lib/missing_validators/version.rb

@@ -1,5 +1,5 @@
 # Provides a collection of custom validators that are often required in Rails applications.
 module MissingValidators
   # Gem version.
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/validators/email_validator_spec.rb

@@ -1,19 +1,8 @@
 require 'spec_helper'
 
 describe EmailValidator do
-  let(:klass) do
-    Class.new do
-      include ActiveModel::Validations
-      attr_accessor :email, :name
-      validates :email, email: true
-    end
-  end
-
   subject(:model){ klass.new }
 
-  it { should ensure_valid_email_format_of(:email) }
-  it { should_not ensure_valid_email_format_of(:name) }
-
   context "email has valid format" do
     let(:klass) do
       Class.new do
@@ -24,7 +13,12 @@ describe EmailValidator do
     end
 
     it { should allow_value("super.user@example.com").for(:email) }
+    it { should allow_value("super+user@example.com").for(:email) }
     it { should_not allow_value("user_example.com").for(:email) }
+
+
+    it { should ensure_valid_email_format_of(:email) }
+    it { should_not ensure_valid_email_format_of(:name) }
   end
 
   context "email is in a specific domain" do

data/spec/validators/url_validator_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe UrlValidator do
+  let(:klass) do
+    Class.new do
+      include ActiveModel::Validations
+      attr_accessor :url, :name
+      validates :url, url: true
+    end
+  end
+
+  subject(:model){ klass.new }
+
+  it { should ensure_valid_url_format_of(:url) }
+  it { should_not ensure_valid_url_format_of(:name) }
+
+  it { should allow_value("http://example.com").for(:url) }
+  it { should allow_value("http://FooBar.cOm").for(:url) }
+  it { should allow_value("http://foo.bar.baz.com").for(:url) }
+  it { should allow_value("http://123.com").for(:url) }
+  it { should allow_value("http://www.example.ru").for(:url) }
+  it { should allow_value("http://user-example.co.uk").for(:url) }
+  it { should allow_value("https://example.com").for(:url) }
+  it { should allow_value("http://example.org/").for(:url) }
+  it { should allow_value("https://example.net/index.html").for(:url) }
+  it { should allow_value("http://example.net/login.php").for(:url) }
+  it { should allow_value("https://example.travel/").for(:url) }
+  it { should allow_value("http://example.aero").for(:url) }
+  it { should allow_value("http://example.aero?foo=bar").for(:url) }
+
+  it { should_not allow_value("example").for(:url) }
+  it { should_not allow_value("http://user_examplecom").for(:url) }
+  it { should_not allow_value("http://user_example.com").for(:url) }
+  it { should_not allow_value("http://user_example.a").for(:url) }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: missing_validators
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153191080 !ruby/object:Gem::Requirement
+  requirement: &2156739940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153191080
+  version_requirements: *2156739940
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &2153189940 !ruby/object:Gem::Requirement
+  requirement: &2156739000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153189940
+  version_requirements: *2156739000
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2153203300 !ruby/object:Gem::Requirement
+  requirement: &2156737100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -43,7 +43,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153203300
+  version_requirements: *2156737100
 description: Adds some handy validators.
 email:
 - andrew.gridnev@gmail.com
@@ -62,13 +62,16 @@ files:
 - lib/missing_validators.rb
 - lib/missing_validators/matchers/ensure_inequality_of_matcher.rb
 - lib/missing_validators/matchers/ensure_valid_email_format_of.rb
+- lib/missing_validators/matchers/ensure_valid_url_format_of.rb
 - lib/missing_validators/validators/email_validator.rb
 - lib/missing_validators/validators/inequality_validator.rb
+- lib/missing_validators/validators/url_validator.rb
 - lib/missing_validators/version.rb
 - missing_validators.gemspec
 - spec/spec_helper.rb
 - spec/validators/email_validator_spec.rb
 - spec/validators/inequality_validator_spec.rb
+- spec/validators/url_validator_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -97,4 +100,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/validators/email_validator_spec.rb
 - spec/validators/inequality_validator_spec.rb
+- spec/validators/url_validator_spec.rb
 has_rdoc: