validates 0.0.6 → 0.0.7

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in validates.gemspec
 gemspec
+
+gem 'minitest'
+gem 'turn'
+gem 'rake'

data/README.md

@@ -1,41 +1,63 @@
 # Validates
 
-## Summary
+[![Build Status](https://travis-ci.org/kaize/validates.png)](https://travis-ci.org/kaize/validates)
 
 Simple format validators for Rails 3
 
-## Installing
+## Installation
 
-Add this to your `Gemfile`:
+Add this line to your application's Gemfile:
 
-    gem "validates"
+    gem 'validates'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install 'validates'
 
 ## Usage
 
-    model User < ActiveRecord::Base
+Availables validators: AssociationLength, Email, Existence, Slug, Url, Money
+
+    class User < ActiveRecord::Base
       validates :email, :email => true
       validates :site, :url => true, :allow_blank => true
       validates :inn, :inn => true   
     end
 
-    model Page < ActiveRecord::Base
-      validates :slug, :slug => true
-    end
+    class Company < ActiveRecord::Base
+      # note AssociationLengthValidator is inherited from ActiveModel::Validations::LengthValidator
+      # http://api.rubyonrails.org/classes/ActiveModel/Validations/LengthValidator.html
+      # so you can easily use standard options like :is, :minimum, :maximum, etc.
 
+      validates :employees,
+        :association_length => {
+          :minimum => 1,
+          :select => ->(employee) { employee.name.in? ["Mike", "John"] }
+        }
 
-## Availables validators
+      validates :employees, :association_length => { :minimum => 1, :select => :employees_filter }
 
-Email, Slug, Url, Money
+      def employees_filter(employees)
+        employees.select { |employee| employee.name.in? ["Mike", "John"] }
+      end
+    end
 
-## Relise notes
+    class Page < ActiveRecord::Base
+      validates :slug, :slug => true
+    end
 
-0.0.3 - Added Money validator
+## Contributing
 
-0.0.4 - Add inn  validator. 
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
 
-## Similar
+run tests:
 
-* http://github.com/balexand/email_validator
-* http://github.com/cesario/activevalidators
-* https://rubygems.org/gems/date_validator
-* and more...
+    turn -Itest test/lib

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/lib/*_test.rb']
+  t.verbose = true
+end
+
+task :default => :test

data/lib/association_length_validator.rb

@@ -0,0 +1,27 @@
+class AssociationLengthValidator < ActiveModel::Validations::LengthValidator
+
+  def validate_each(record, attribute, value)
+    value = value.reject(&:marked_for_destruction?)
+    value = select_items(record, value, options[:select]) if options[:select]
+
+    super(record, attribute, value)
+  end
+
+  private
+
+  def select_items(record, items, select_expr)
+    case select_expr
+    when Symbol, String
+      if record.respond_to?(select_expr)
+        record.send(select_expr, items)
+      else
+        raise ArgumentError, "Missing instance method #{record.class.name}##{select_expr}"
+      end
+    when Proc
+      items.select(&select_expr)
+    else
+      items
+    end
+  end
+
+end

data/lib/email_validator.rb

@@ -0,0 +1,76 @@
+class EmailValidator < ActiveModel::EachValidator
+
+  def validate_each(record, attribute, value)
+    unless self.class.valid?(value)
+      record.errors.add(attribute, :email, options.merge(:value => value))
+    end
+  end
+
+  class << self
+    MAX_EMAIL_LENGTH = 254
+
+    # Maximum domain length
+    MAX_DOMAIN_LENGTH = 255
+    MAX_DOMAIN_PART_LENGTH = 64
+
+    # Maximum user length
+    MAX_USER_LENGTH = 64
+
+    # User allowed chars
+    LOCAL_ALLOWED_CHARS = '(?:[a-z0-9A-Z\!\#\$\%\&\'\*\-\/\=\?\+\-\^\_\`\{\|\}\~]|(?<!(?:^|\.))\.(?!$))'
+
+    def valid?(value)
+      email_format_valid?(value)
+    end
+
+    private
+
+    # Validate email format
+    # @params [String] email
+    # @return [true,false,nil]
+    def email_format_valid?(email)
+
+      domain, local= email.reverse.split('@', 2)
+
+      return if email.length > MAX_EMAIL_LENGTH
+
+      return if domain.nil? or local.nil? or domain.empty? or local.empty?
+
+      domain.reverse!
+      local.reverse!
+
+      return if domain.length > MAX_DOMAIN_LENGTH or local.length > MAX_USER_LENGTH
+
+      return unless email_domain_syntax_valid?(domain) and email_local_syntax_valid?(local)
+
+      true
+    end
+
+    # Validate emails domain syntax
+    # @params [String] domain
+    # @return [true, false]
+    def email_domain_syntax_valid?(domain)
+      parts = domain.downcase.gsub(/(?:^\[(.+)\]$)/,'\1').split('.', -1)
+
+      return false unless parts.all? { |part| part =~ /^(?!\-)[[:alnum:]\-]+(?<!\-)$/ && part.length < MAX_DOMAIN_PART_LENGTH}
+
+      return true if parts.length == 4 and parts.all? { |part| part =~ /\A[0-9]+\Z/ and part.to_i.between?(0, 255) }
+
+      return false if parts[-1] =~ /^\d+$/
+
+      true
+    end
+
+    # Validate emails locale syntax
+    def email_local_syntax_valid?(local)
+      return if not email_local_syntax_regexp =~ local
+      true
+    end
+
+    # Return emails local part syntax regexp
+    # @return [Regexp]
+    def email_local_syntax_regexp
+      Regexp.new("^(?:\"(?:[\\\\]?#{LOCAL_ALLOWED_CHARS}|\\\\[\"\\s\\\\]|[@])*\"|#{LOCAL_ALLOWED_CHARS}*)$")
+    end
+  end
+end

data/lib/{validates/url_validator.rb → url_validator.rb}

@@ -3,5 +3,5 @@ class UrlValidator < ActiveModel::EachValidator
     unless value =~ URI::regexp(%w(http https))
       record.errors.add(attribute, :url, options.merge(:value => value))
     end
-  end                  
+  end
 end

data/lib/validates.rb

@@ -1,7 +1,8 @@
-require "validates/version"
-require "validates/email_regexp"
-require "validates/email_validator"
-require "validates/slug_validator"
-require "validates/url_validator"
-require "validates/money_validator"
-require "validates/inn_validator"
+[:email, :existence, :inn, :money, :slug, :url].each do |name|
+  autoload :"#{name.capitalize}Validator", "#{name}_validator"
+end
+
+require 'active_model' # why i need do it?
+
+module Validates
+end

data/lib/validates/version.rb

@@ -1,3 +1,3 @@
 module Validates
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/lib/email_validator_test.rb

@@ -0,0 +1,105 @@
+require 'test_helper'
+
+class EmailValidatorTest < Test::Unit::TestCase
+  def test_valid
+    valid_emails = [
+      'user@example.com',
+      'user.mail@example.com',
+      'user@example-domain.com',
+      'user@example-d-a.com',
+      'user@example.domain.com',
+      'user_mail@example.com',
+      'user+mail@example.com',
+      'user123@example.com',
+      'user@example123.com',
+      'user@example.domain',
+      'UseR@example.com',
+      'user-mail@example.com',
+      'user@example',
+      'u@example.com',
+      '!#$%&`*+/=?^`{|}~@example.com',
+      '123@example.com',
+      'user@123.com',
+      'user@255.255.255.255',
+      'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghiklm@iana.org',
+      'test@abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghikl.com',
+      'user@dom--ain.com',
+      'user@example.dom-ain',
+      'a@a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v',
+      'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghiklm@abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghikl.abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghikl.abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghi',
+      '"user"@domain.com',
+      '""@domain.com',
+      '"\a"@domain.com',
+      '"\\""@domain.com',
+      '"\\\\"@domain.com',
+      '1234567890123456789012345678901234567890123456789012345678901234@iana.org',
+      '"user\ mail"@domain.com',
+      '"Joe.\\Blow"@domain.com',
+      '"user@maik"@domain.com',
+      'user/mail=test@domain.com',
+      '$U12345@domain.com',
+      '!def!xyz%abc@iana.org',
+      '_user@domain.com',
+      '~@iana.org',
+      'user@[127.0.0.1]',
+      'foobar@192.168.0.1',
+      'test@xn--example.com'
+    ]
+
+    valid_emails.each do |email|
+      assert EmailValidator.valid?(email), "#{email} not valid"
+    end
+  end
+
+  def test_invalid
+    invalid_emails = [
+      '',
+      'example_email',
+      '@',
+      'user@',
+      '@domain',
+      'use"r@example.com',
+      'user@example_domain.com',
+      'user@domain.12',
+      'user@domain..com',
+      'user@.domain.com',
+      'user@-domain.com',
+      'user@domain-.com',
+      'user@domain.-a.com',
+      'user mail@example.com',
+      'us[er@example.com',
+      'us\er@example.com',
+      '.user@domain.com',
+      'user.@domain.com',
+      'user..mail@domain.com',
+      'user_at-domain.com',
+      'test\@example@domain.com',
+      'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghiklmn@iana.org',
+      'test@abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghiklm.com',
+      'user@.domain.com',
+      'user@domain.com.',
+      'user@domain..com',
+      '123456789012345678901234567890123456789012345678901234567890@12345678901234567890123456789012345678901234567890123456789.12345678901234567890123456789012345678901234567890123456789.12345678901234567890123456789012345678901234567890123456789.12345.iana.org',
+      'a@abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghikl.abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghikl.abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghikl.abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefg.hij',
+      'a@abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghikl.abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghikl.abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghikl.abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefg.hijk',
+      '"""@domain.com',
+      '"\"@domain.com',
+      'user"@domain.com',
+      '"user@domain.com',
+      '"user"test@domain.com',
+      'user"test"@domain.com',
+      '"user""test"@domain.com',
+      '"user"."test"@domain.com',
+      'first.last@sub.do,com',
+      'user\@domain.com',
+      'x@x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456',
+      '()[]\;:,><@iana.org',
+      'first(middle)last@iana.org'
+    ]
+
+    invalid_emails.each do |email|
+      assert !EmailValidator.valid?(email), "email #{email} valid"
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'bundler/setup'
+Bundler.require

data/validates.gemspec

@@ -5,8 +5,8 @@ require "validates/version"
 Gem::Specification.new do |s|
   s.name        = "validates"
   s.version     = Validates::VERSION
-  s.authors     = ["Mikhail Stolbov","Anton Taraev","Konstantin Kosmatov"]
-  s.email       = ["mstolbov@gmail.com","anti191@gmail.com","key@kosmatov.su"]
+  s.authors     = ["Mikhail Stolbov","Anton Taraev","Konstantin Kosmatov","Andrey Subbota"]
+  s.email       = ["mstolbov@gmail.com","anti191@gmail.com","key@kosmatov.su","subbota@gmail.com"]
   s.homepage    = "https://github.com/kaize/validates"
   s.summary     = "Collection of simple validators for Rails 3"
   s.description = "Email, Slug, Url, Money, INN validators for Rails 3"

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: validates
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
 - Mikhail Stolbov
 - Anton Taraev
 - Konstantin Kosmatov
+- Andrey Subbota
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -34,6 +35,7 @@ email:
 - mstolbov@gmail.com
 - anti191@gmail.com
 - key@kosmatov.su
+- subbota@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -42,15 +44,16 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- lib/association_length_validator.rb
+- lib/email_validator.rb
+- lib/inn_validator.rb
+- lib/money_validator.rb
+- lib/slug_validator.rb
+- lib/url_validator.rb
 - lib/validates.rb
-- lib/validates/email_regexp.rb
-- lib/validates/email_validator.rb
-- lib/validates/inn_validator.rb
-- lib/validates/money_validator.rb
-- lib/validates/slug_validator.rb
-- lib/validates/url_validator.rb
 - lib/validates/version.rb
-- test/email_regexp_test.rb
+- test/lib/email_validator_test.rb
+- test/test_helper.rb
 - validates.gemspec
 homepage: https://github.com/kaize/validates
 licenses: []

data/lib/validates/email_regexp.rb

@@ -1,7 +0,0 @@
-module EmailRegexp
-  def regexp_compare(value)
-    value =~ /\A[-.\w+]+@([a-z\d][-a-z\d]+\.?[a-z\d]+)+\.[a-z]{2,}\z/i
-  end
-
-end
-

data/lib/validates/email_validator.rb

@@ -1,9 +0,0 @@
-class EmailValidator < ActiveModel::EachValidator
-  include EmailRegexp
-
-  def validate_each(record, attribute, value)
-    unless regexp_compare(value)
-      record.errors.add(attribute, :email, options.merge(:value => value))
-    end
-  end
-end

data/test/email_regexp_test.rb

@@ -1,53 +0,0 @@
-require 'test/unit'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/validates/email_regexp')
-
-class EmailRegexpTest < Test::Unit::TestCase
-  include EmailRegexp
-
-  def test_valid
-    valid_emails = [
-      'user@example.com',
-      'user.mail@example.com',
-      'user@example-domain.com',
-      'user@example-d-a.com',
-      'user@example.domain.com',
-      'user_mail@example.com',
-      'user+mail@example.com',
-      'user123@example.com',
-      'user@example123.com',
-      'user@example.domain',
-      'UseR@example.com',
-      'user-mail@example.com'
-    ]
-
-    valid_emails.each do |email|
-      assert regexp_compare(email), "#{email} not valid"
-    end
-  end
-
-  def test_invalid
-    invalid_emails = [
-      'example_email',
-      'us`er@example.com',
-      'use"r@example.com',
-      'user@example_domain.com',
-      'user@domain.12',
-      'user@domain',
-      'user@domain..com',
-      'user@.domain.com',
-      'user@-domain.com',
-      'user@domain-.com',
-      'user@domain.-a.com',
-      'user@domain-com',
-      'user mail@example.com',
-      'us[er@example.com',
-      'us\'er@example.com',
-      'us\er@example.com'
-    ]
-
-    invalid_emails.each do |email|
-      assert !regexp_compare(email), "#{email} valid"
-    end
-  end
-
-end