validator 0.0.2 → 0.1.0

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+script: "rspec spec"

data/README.markdown

@@ -1,7 +1,7 @@
-Active Model Validator
+Active Model Validator [![Travis](https://secure.travis-ci.org/nahaylo/validator.png)](http://travis-ci.org/nahaylo/validator)
 ============================
 
-This is a ActiveModel validators for domains and ip addresses.
+This is a ActiveModel validators for domains, ip addresses and email addresses.
 
 Installation
 ------------
@@ -10,11 +10,12 @@ Installation
 Usage
 -------
 
-In your models, the gem provides new validators like :domain or :ip_address
+In your models, the gem provides new validators like :domain, :ip_address or :email
 
     class Model < ActiveRecord::Base
       validates :domain_name, :domain => true
       validates :ip, :ip_address => true
+      validates :email_address, :email => true
     end
 
 
@@ -23,9 +24,9 @@ Domain Validator
 
     validates :domain_name, :domain => true
 
-    validates :domain_name, :domain => {:message => 'custom message'}
+    validates :domain_name, :domain => { :message => 'custom message' }
 
-    # custom full domain length and label length
+    # custom full domain and label length
     validates :domain_name, :domain => { :length => 200, :label_length => 60 }
 
 
@@ -47,6 +48,17 @@ Ip Address Validator
     validates :ip, :ip_address => { :message => "custom message" }
 
 
+Email Address Validator
+-----------------------
+
+    validates :email_address, :email => true
+
+    validates :email_address, :email => { :message => 'custom message' }
+
+    # custom local part, full domain and label length of email address
+    validates :email_address, :email => { :local_length => 60, :domain => { :length => 200, :label_length => 60 }}
+
+
 Localization Tricks
 -------------------
 To customize error message, you can use { :message => "your custom message" } or simple use Rails localization en.yml file, for instance:

data/lib/active_model/validations/email_validator.rb

@@ -0,0 +1,67 @@
+module ActiveModel
+  module Validations
+    class EmailValidator < ActiveModel::EachValidator
+      def initialize(options)
+        options[:local_length] ||= ::Validator::Email::LOCAL_LENGTH
+
+        options[:domain] ||= {}
+        options[:domain_length] = options[:domain][:length] ||= ::Validator::Domain::LENGTH
+        options[:domain_label_length] = options[:domain][:label_length] ||= ::Validator::Domain::LABEL_LENGTH
+
+        super(options)
+      end
+
+      def validate_each(record, attr_name, value)
+        # do not validate if value is empty
+        return if value.nil?
+
+        @validator = ::Validator::Email.new(value)
+
+        unless @validator.is_email? 
+          record.errors.add(attr_name, :'email.invalid', options)
+          return false
+        end
+
+        unless @validator.valid_by_local_length?(options[:local_length])
+          record.errors.add(attr_name, :'email.local_length', options)
+          return false
+        end
+
+        unless @validator.valid_by_regexp?
+          record.errors.add(attr_name, :'email.invalid', options)
+          return false
+        end
+
+        # validate domain part of email address
+        @domain_validator = ::Validator::Domain.new(@validator.domain)
+
+        # max domain length
+        unless @domain_validator.valid_by_length?(options[:domain_length])
+          record.errors.add(attr_name, :'email.domain.length', options)
+        end
+
+        # label is limited to between 1 and 63 octets
+        unless @domain_validator.valid_by_label_length?(options[:domain_label_length])
+          record.errors.add(attr_name, :'email.domain.label_length', options)
+        end
+
+        # skip proceeding validation if errors
+        return unless record.errors.blank?
+
+        unless @domain_validator.valid_by_regexp?
+          record.errors.add(attr_name, :'email.domain.invalid', options)
+        end
+      end
+    end
+
+    module HelperMethods
+      #   class User < ActiveRecord::Base
+      #     validates_email_of :email_address
+      #   end
+      #
+      def validates_email_of(*attr_names)
+        validates_with EmailValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/lib/validator/email.rb

@@ -0,0 +1,38 @@
+module Validator
+  class Email
+    attr_accessor :domain
+
+    # Returns the local part (the left hand side of the @ sign in the email address) of the address
+    #  a = Email.new('vitaliy@gmail.com')
+    #  a.local #=> 'vitaliy'
+    attr_accessor :local
+
+    LOCAL_LENGTH = 64 
+    
+    def initialize(value)
+      @value = value
+      self.parse
+    end
+
+    def parse
+      @local, @domain = @value.split(/@/)
+    end
+
+    def is_email?
+      @value.split(/@/).size == 2
+    end
+
+    def valid_by_local_length?(local_length = nil)
+      @local.length <= (local_length || LOCAL_LENGTH)
+    end
+
+    def valid_by_regexp?
+      @value =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+    end
+
+    # valid if passes all conditions
+    def valid?
+      is_email? and valid_by_local_length? and valid_by_regexp?
+    end
+  end
+end

data/lib/validator/locale/en.yml

@@ -14,3 +14,10 @@ en:
         prefix_invalid:
           ipv4: "prefix must be in range 1..32"
           ipv6: "prefix must be in range 1..128"
+      email:
+        invalid: "invalid email address"
+        local_length: "local part of email address is limited to %{local_length} characters"
+        domain:
+          invalid: "invalid domain name"
+          length: "domain name length is limited to %{domain_length} characters"
+          label_length: "domain label length is limited to %{domain_label_length} characters"

data/lib/validator/version.rb

@@ -1,3 +1,3 @@
 module Validator
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/validator.rb

@@ -4,9 +4,10 @@ require "active_support/inflector"
 
 require "active_model/validations/domain_validator"
 require "active_model/validations/ip_address_validator"
+require "active_model/validations/email_validator"
 
 module Validator
-  %w(domain version ip_address).each do |model|
+  %w(domain version ip_address email).each do |model|
     autoload model.camelize.to_sym, "validator/#{model}"
   end
 end

data/spec/domain_validator_spec.rb

@@ -62,12 +62,12 @@ module ActiveModel
 
         describe 'invalid' do
           it {
-            domain.domain_name = "not_valid_because_of_length_#{'w'*230}.com"
+            domain.domain_name = "not-valid-because-of-length-#{'w'*230}.com"
             domain.should have_errors_on(:domain_name, 2).with_message(I18n.t(:'errors.messages.domain.length', :length => 255))
           }
 
           it {
-            domain.domain_name = "not_valid_because_of_length_of_label#{'w'*230}.com"
+            domain.domain_name = "not-valid-because-of-length-of-label#{'w'*230}.com"
             domain.should have_errors_on(:domain_name, 2).with_message(I18n.t(:'errors.messages.domain.label_length', :label_length => 63))
           }
 

data/spec/email_validator_spec.rb

@@ -0,0 +1,133 @@
+require 'spec_helper'
+require 'test_classes/email'
+
+module ActiveModel
+  module Validations
+    describe EmailValidator do
+      let(:email) { TestEmail.new }
+      let(:email_with_domain_length) { TestEmailWithDomainLength.new }
+      let(:email_with_message) { TestEmailWithMessage.new }
+
+      describe "validations" do
+        # for blank email
+        it { email.should be_valid }
+
+        describe 'valid' do
+
+          it {
+            [
+              "a+b@plus-in-local.com",
+              "a_b@underscore-in-local.com",
+              "user@example.com",
+              "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@letters-in-local.org",
+              "01234567890@numbers-in-local.net",
+              "a@single-character-in-local.org",
+              "one-character-third-level@a.example.com",
+              "single-character-in-sld@x.org",
+              "local@dash-in-sld.com",
+              "letters-in-sld@123.com",
+              "one-letter-sld@x.org",
+              "uncommon-tld@sld.museum",
+              "uncommon-tld@sld.travel",
+              "uncommon-tld@sld.mobi",
+              "country-code-tld@sld.uk",
+              "country-code-tld@sld.rw",
+              "local@sld.newTLD",
+              "local@sub.domains.com",
+              "aaa@bbb.co.jp",
+              "nigel.worthington@big.co.uk",
+              "f@c.com",
+              "areallylongnameaasdfasdfasdfasdf@asdfasdfasdfasdfasdf.ab.cd.ef.gh.co.ca",
+              "valid@#{'a'*63}.#{'b'*63}.#{'c'*63}.#{'d'*59}.com",
+              "valid@#{'w'*63}.com"
+            ].each do |e|
+              email.email = e
+              email.should_not have_errors_on(:email)
+            end
+          }
+
+          it "should be valid with local part length 64" do
+            email.email = "valid_because_of_length#{'w'*41}@valid.domain.com"
+            email.should_not have_errors_on(:email)
+          end
+
+          it "should be valid for custom length and label length" do
+            email_with_domain_length.email = "valid@valid-domain.com"
+            email_with_domain_length.should be_valid
+          end
+
+        end
+
+        describe 'invalid' do
+          it "if consists of more then two @" do
+            email.email = 'invali@email@domain.com'
+            email.should have_errors_on(:email).with_message(I18n.t(:'errors.messages.email.invalid'))
+          end
+
+          it {
+            email.email = "invalid_because_of_length#{'w'*41}@valid.domain.com"
+            email.should have_errors_on(:email).with_message(I18n.t(:'errors.messages.email.local_length', :local_length => 64))
+          }
+
+          it {
+            [
+              "f@s",
+              "f@s.c",
+              "@bar.com",
+              "test@example.com@example.com",
+              "test@",
+              "@missing-local.org",
+              "a b@space-in-local.com",
+              "! \#$%\`|@invalid-characters-in-local.org",
+              "<>@[]\`|@even-more-invalid-characters-in-local.org",
+              "missing-sld@.com",
+              "invalid-characters-in-sld@! \"\#$%(),/;<>_[]\`|.org",
+              "missing-dot-before-tld@com",
+              "missing-tld@sld.",
+              "missing-at-sign.net",
+              "unbracketed-IP@127.0.0.1",
+              "invalid-ip@127.0.0.1.26",
+              "another-invalid-ip@127.0.0.256",
+              "IP-and-port@127.0.0.1:25",
+              "the-local-part-is-invalid-if-it-is-longer-than-sixty-four-characters@sld.net",
+              "valid@not-valid-because-of-length-#{'w'*230}.com"
+            ].each do |e|
+              email.email = e
+              email.should have_errors_on(:email)#.with_message(I18n.t(:'errors.messages.email.invalid_format'))
+              #puts email.errors.full_messages
+            end
+          }
+
+          it {
+            email.email = "valid-local-part@not-valid-because-of-length-#{'w'*230}.com"
+            email.should have_errors_on(:email).with_message(I18n.t(:'errors.messages.email.domain.length', :domain_length => 255))
+          }
+
+          it {
+            email.email = "valid-local-part@not-valid-because-of-length-of-label#{'w'*230}.com"
+            email.should have_errors_on(:email, 2).with_message(I18n.t(:'errors.messages.email.domain.label_length', :domain_label_length => 63))
+          }
+
+          it {
+            email.email = "valid-local-part@#{'w'*64}.com"
+            email.should have_errors_on(:email).with_message(I18n.t(:'errors.messages.email.domain.label_length', :domain_label_length => 63))
+          }
+
+          context 'custom full domain length and label length' do
+            it {
+              email_with_domain_length.email = "valid-local-part@#{'w'*61}.com"
+              email_with_domain_length.should have_errors_on(:email).with_message(I18n.t(:'errors.messages.email.domain.label_length', :domain_label_length => 60))
+            }
+
+            it {
+              email_with_domain_length.email = "valid-local-part@not-valid-because-of-length-#{'w'*190}.com"
+              email_with_domain_length.should have_errors_on(:email).with_message(I18n.t(:'errors.messages.email.domain.length', :domain_length => 200))
+            }
+          end
+
+        end
+      end
+    end
+  end
+end
+

data/spec/test_classes/email.rb

@@ -0,0 +1,17 @@
+class BaseTestEmail
+  include ActiveModel::Validations
+
+  attr_accessor :email
+end
+
+class TestEmail < BaseTestEmail
+  validates :email, :email => true
+end
+
+class TestEmailWithDomainLength < BaseTestEmail
+  validates :email, :email => { :domain => { :length => 200, :label_length => 60 } }
+end
+
+class TestEmailWithMessage < BaseTestEmail
+  validates :email, :email => { :message => 'invalid' }
+end

data/validator.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.version     = Validator::VERSION
   s.authors     = ["Vitaliy Nahaylo"]
   s.email       = ["nahaylo@gmail.com"]
-  s.homepage    = ""
-  s.summary     = "Validator"
-  s.description = "Validators for domains and ip addresses"
+  s.homepage    = "https://github.com/nahaylo/validator"
+  s.summary     = "ActiveModel validations for domains, ip addresses and email addresses with fully localization support."
+  s.description = "ActiveModel validations for domains, ip addresses and email addresses with fully localization support."
 
   s.rubyforge_project = "validator"
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "ipaddress"
-  s.add_runtime_dependency 'activemodel', ['>= 3.0.0', '< 3.2.0']
-  s.add_development_dependency 'activesupport', ['>= 3.0.0', '< 3.2.0']
+  s.add_runtime_dependency 'activemodel', '>= 3.0.0'
+  s.add_development_dependency 'activesupport', '>= 3.0.0'
   s.add_development_dependency "rspec"
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Vitaliy Nahaylo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 +02:00
+date: 2012-02-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,14 +46,6 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 2
-        - 0
-        version: 3.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -70,14 +62,6 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 2
-        - 0
-        version: 3.2.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -94,7 +78,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-description: Validators for domains and ip addresses
+description: ActiveModel validations for domains, ip addresses and email addresses with fully localization support.
 email: 
 - nahaylo@gmail.com
 executables: []
@@ -105,25 +89,30 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - lib/active_model/validations/domain_validator.rb
+- lib/active_model/validations/email_validator.rb
 - lib/active_model/validations/ip_address_validator.rb
 - lib/validator.rb
 - lib/validator/domain.rb
+- lib/validator/email.rb
 - lib/validator/ip_address.rb
 - lib/validator/locale/en.yml
 - lib/validator/version.rb
 - spec/domain_validator_spec.rb
+- spec/email_validator_spec.rb
 - spec/ip_address_validator_spec.rb
 - spec/spec_helper.rb
 - spec/test_classes/domain.rb
+- spec/test_classes/email.rb
 - spec/test_classes/ip_address.rb
 - validator.gemspec
 has_rdoc: true
-homepage: ""
+homepage: https://github.com/nahaylo/validator
 licenses: []
 
 post_install_message: 
@@ -155,10 +144,12 @@ rubyforge_project: validator
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: Validator
+summary: ActiveModel validations for domains, ip addresses and email addresses with fully localization support.
 test_files: 
 - spec/domain_validator_spec.rb
+- spec/email_validator_spec.rb
 - spec/ip_address_validator_spec.rb
 - spec/spec_helper.rb
 - spec/test_classes/domain.rb
+- spec/test_classes/email.rb
 - spec/test_classes/ip_address.rb