validates 0.0.3 → 0.0.5

data/README.md

@@ -15,6 +15,7 @@ Add this to your `Gemfile`:
     model User < ActiveRecord::Base
       validates :email, :email => true
       validates :site, :url => true, :allow_blank => true
+      validates :inn, :inn => true   
     end
 
     model Page < ActiveRecord::Base
@@ -30,6 +31,8 @@ Email, Slug, Url, Money
 
 0.0.3 - Added Money validator
 
+0.0.4 - Add inn  validator. 
+
 ## Similar
 
 * http://github.com/balexand/email_validator

data/lib/validates.rb

@@ -3,4 +3,4 @@ require "validates/email_validator"
 require "validates/slug_validator"
 require "validates/url_validator"
 require "validates/money_validator"
-
+require "validates/inn_validator"

data/lib/validates/email_regexp.rb

@@ -0,0 +1,7 @@
+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,6 +1,8 @@
 class EmailValidator < ActiveModel::EachValidator
+  include EmailRegexp
+
   def validate_each(record, attribute, value)
-    unless value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+    unless regexp_compare(value)
       record.errors.add(attribute, :email, options.merge(:value => value))
     end
   end

data/lib/validates/inn_validator.rb

@@ -0,0 +1,28 @@
+class InnValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, inn)
+    result = false
+    p10 = [2, 4, 10, 3, 5, 9, 4, 6, 8]
+    p11 = [7, 2, 4, 10, 3, 5, 9, 4, 6, 8]
+    p12 = [3, 7, 2, 4, 10, 3, 5, 9, 4, 6, 8]
+    inn = inn.gsub(/\D/, "") unless inn.nil?
+    inn ||= []
+    if inn.length == 10
+      n10 = calc(p10, inn)
+      result = (n10 == inn[9].to_i)
+    end
+
+    if inn.length == 12
+      n11 = calc(p11, inn)
+      n12 = calc(p12, inn)
+      result = (n11 == inn[10].to_i) && (n12 == inn[11].to_i)
+    end
+
+    unless result
+      record.errors.add(attribute, :inn, options.merge(:value => inn))
+    end
+  end
+
+  def calc(p, inn)
+    p.to_enum(:each_with_index).inject(0){|sum, elem| sum + elem[0].to_f * inn[elem[1]].to_f}%11%10
+  end
+end

data/lib/validates/version.rb

@@ -1,3 +1,3 @@
 module Validates
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/test/email_regexp_test.rb

@@ -0,0 +1,53 @@
+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

data/validates.gemspec

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

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: validates
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
 - Mikhail Stolbov
+- Anton Taraev
+- Konstantin Kosmatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -27,9 +29,11 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-description: Email, Slug, Url, Money validators for Rails 3
+description: Email, Slug, Url, Money, INN validators for Rails 3
 email:
 - mstolbov@gmail.com
+- anti191@gmail.com
+- key@kosmatov.su
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -39,11 +43,14 @@ files:
 - README.md
 - Rakefile
 - 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
 - validates.gemspec
 homepage: https://github.com/kaize/validates
 licenses: []
@@ -70,3 +77,4 @@ signing_key:
 specification_version: 3
 summary: Collection of simple validators for Rails 3
 test_files: []
+has_rdoc: