format_validator 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7d32692c4abc76830fa5812fae6c2cf9f89e5fe
-  data.tar.gz: 82f63c5032a0d3c089ec17b5dff088eaab32fd76
+  metadata.gz: c12190d354629682f5b6170ee284421d864abe59
+  data.tar.gz: 5d9bc02e416b14c2644cef9d2c6f5d6b105648e7
 SHA512:
-  metadata.gz: 70f0341d45b93a701a98102e8c12df7be9216b1c373c89a2fffd280269f2d00642de8ccbff26d35e7f05e2bf4b24df97b3166a15c27b3bfee606bfc6cf3a09c8
-  data.tar.gz: 22b9f9645a9c1bda090dbf875bd83dc7a4732da3fa698a128cbd1a07fa96844b88efb4cf93760aae5b6f66f47d64a4dd01e034932233a5cc4c4ee7d45f3caa8a
+  metadata.gz: e10d8ea27a8cda27fde3897b63c7234777280002ccfc8e5fcdd73d8e01f20144526dbb87203e26d3506df5d96146878839533b800731f3bab1f507fa8ac31654
+  data.tar.gz: 8425a246aae184a2fe81b1e2b98ce1f55d75eda5ea02220c75abf1e8dca6074ef4585a47423e79bca8b8b9fed96a25c16acf1b9250c15b815f37d8dd68f494de

data/CHANGELOG

@@ -9,3 +9,9 @@
 ## v0.0.3
 
 * Minor fix for future date validator
+
+## v0.0.4
+
+* Validate hostname
+* Update README
+* Minor fix for url validator regex

data/README.md

@@ -12,17 +12,12 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
-
-    $ gem install format_validator
-
 ## Usage
 
-As of today the gem validates only email, url, and zip_code.
-
 ``` ruby
 validates :email, email_format: true
 validates :url, url_format: true
+validates :hostname, hostname_format: true
 validates :zip_code, zip_code_format: true
 validates :expiration_date, future_date: true
 ```

data/format_validator.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = FormatValidator::VERSION
   spec.authors       = ['Jamal El Milahi']
   spec.email         = ['jamal@elmilahi.com']
-  spec.description   = %q{Active Model missing format validators}
+  spec.description   = %q{Active Model's missing format validators}
   spec.summary       = %q{format_validator is a gem that adds the missing format validators to Active Model}
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/bloc40/format_validator'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)

data/lib/format_validator.rb

@@ -1,5 +1,10 @@
 require 'format_validator/version'
 require 'format_validator/email_format_validator'
 require 'format_validator/url_format_validator'
+require 'format_validator/hostname_format_validator'
 require 'format_validator/zip_code_format_validator'
 require 'format_validator/future_date_validator'
+
+module FormatValidator
+  I18n.load_path << File.expand_path('../locales/en.yml', __FILE__)
+end

data/lib/format_validator/email_format_validator.rb

@@ -3,7 +3,7 @@ module ActiveModel
     class EmailFormatValidator < ActiveModel::EachValidator
       def validate_each(object, attribute, value)
         unless value =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
-          object.errors[attribute] << (options[:message] || 'is not valid')
+          object.errors[attribute] << (options[:message] || I18n.t('form.errors.email'))
         end
       end
     end

data/lib/format_validator/future_date_validator.rb

@@ -3,7 +3,7 @@ module ActiveModel
     class FutureDateValidator < ActiveModel::EachValidator
       def validate_each(object, attribute, value)
         if value.to_i <= Time.now.to_i
-          object.errors[attribute] << (options[:message] || 'must be in the future')
+          object.errors[attribute] << (options[:message] || I18n.t('form.errors.date'))
         end
       end
     end

data/lib/format_validator/hostname_format_validator.rb

@@ -0,0 +1,11 @@
+module ActiveModel
+  module Validations
+    class HostnameFormatValidator < ActiveModel::EachValidator
+      def validate_each(object, attribute, value)
+        unless value =~ /\A([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\z/i
+          object.errors[attribute] << (options[:message] || I18n.t('form.errors.hostname'))
+        end
+      end
+    end
+  end
+end

data/lib/format_validator/url_format_validator.rb

@@ -2,8 +2,8 @@ module ActiveModel
   module Validations
     class UrlFormatValidator < ActiveModel::EachValidator
       def validate_each(object, attribute, value)
-        unless value =~ /\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\Z/i
-          object.errors[attribute] << (options[:message] || 'is not valid')
+        unless value =~ /\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\z/i
+          object.errors[attribute] << (options[:message] || I18n.t('form.errors.url'))
         end
       end
     end

data/lib/format_validator/version.rb

@@ -1,3 +1,3 @@
 module FormatValidator
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/format_validator/zip_code_format_validator.rb

@@ -3,7 +3,7 @@ module ActiveModel
     class ZipCodeFormatValidator < ActiveModel::EachValidator
       def validate_each(object, attribute, value)
         unless value =~ /^\d{5}(-\d{4})?$/
-          object.errors[attribute] << (options[:message] || 'is not valid')
+          object.errors[attribute] << (options[:message] || I18n.t('form.errors.zip_code'))
         end
       end
     end

data/lib/locales/en.yml

@@ -0,0 +1,8 @@
+en:
+  form:
+    errors:
+      date: must be in the future
+      email: is invalid
+      url: is invalid
+      hostname: is invalid
+      zip_code: is invalid

data/spec/format_validator/email_format_validator_spec.rb

@@ -26,7 +26,7 @@ describe 'EmailFormatValidator' do
           subject.email = invalid_email
           subject.valid?.must_equal false
           subject.errors.messages.size.must_equal 1
-          subject.errors.messages[:email].must_equal ['is not valid']
+          subject.errors.messages[:email].must_equal ['is invalid']
         end
       end
     end

data/spec/format_validator/hostname_format_validator_spec.rb

@@ -0,0 +1,36 @@
+require_relative '../spec_helper'
+
+describe 'HostnameFormatValidator' do
+  describe '#validate_each' do
+    let(:klass) do
+      Class.new do
+        include ActiveModel::Validations
+        attr_accessor :hostname
+        validates :hostname, hostname_format: true
+      end
+    end
+
+    subject { klass.new }
+
+    describe 'valid' do
+      %w[www.example.com example.com foo.example.com].each do |_hostname|
+        it "should not add any error when the hostname is #{_hostname}" do
+          subject.hostname = _hostname
+          subject.valid?.must_equal true
+          subject.errors.messages.must_be_empty
+        end
+      end
+    end
+
+    describe 'invalid' do
+      ['example',  'http://example.com', 'example. com'].each do |_hostname|
+        it "should add error when hostname is (#{_hostname})" do
+          subject.hostname = _hostname
+          subject.valid?.must_equal false
+          subject.errors.messages.size.must_equal 1
+          subject.errors.messages[:hostname].must_equal ['is invalid']
+        end
+      end
+    end
+  end
+end

data/spec/format_validator/url_format_validator_spec.rb

@@ -28,7 +28,7 @@ describe 'UrlFormatValidator' do
           subject.url = _url
           subject.valid?.must_equal false
           subject.errors.messages.size.must_equal 1
-          subject.errors.messages[:url].must_equal ['is not valid']
+          subject.errors.messages[:url].must_equal ['is invalid']
         end
       end
     end

data/spec/format_validator/zip_code_format_validator_spec.rb

@@ -28,7 +28,7 @@ describe 'ZipCodeFormatValidator' do
           subject.zip_code = invalid_zip_code
           subject.valid?.must_equal false
           subject.errors.messages.size.must_equal 1
-          subject.errors.messages[:zip_code].must_equal ['is not valid']
+          subject.errors.messages[:zip_code].must_equal ['is invalid']
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: format_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jamal El Milahi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -52,7 +52,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Active Model missing format validators
+description: Active Model's missing format validators
 email:
 - jamal@elmilahi.com
 executables: []
@@ -70,15 +70,18 @@ files:
 - lib/format_validator.rb
 - lib/format_validator/email_format_validator.rb
 - lib/format_validator/future_date_validator.rb
+- lib/format_validator/hostname_format_validator.rb
 - lib/format_validator/url_format_validator.rb
 - lib/format_validator/version.rb
 - lib/format_validator/zip_code_format_validator.rb
+- lib/locales/en.yml
 - spec/format_validator/email_format_validator_spec.rb
 - spec/format_validator/future_date_validator_spec.rb
+- spec/format_validator/hostname_format_validator_spec.rb
 - spec/format_validator/url_format_validator_spec.rb
 - spec/format_validator/zip_code_format_validator_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/bloc40/format_validator
 licenses:
 - MIT
 metadata: {}
@@ -106,6 +109,7 @@ summary: format_validator is a gem that adds the missing format validators to Ac
 test_files:
 - spec/format_validator/email_format_validator_spec.rb
 - spec/format_validator/future_date_validator_spec.rb
+- spec/format_validator/hostname_format_validator_spec.rb
 - spec/format_validator/url_format_validator_spec.rb
 - spec/format_validator/zip_code_format_validator_spec.rb
 - spec/spec_helper.rb