validates 0.0.8 → 1.0.0

data/.travis.yml

@@ -1,2 +1,15 @@
 language: ruby
-script: "bundle exec turn -Itest test/lib"
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - rbx
+  - jruby
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.activemodel-3.0
+  - gemfiles/Gemfile.activemodel-4.0
+matrix:
+  allow_failures:
+    - rvm: rbx
+    - rvm: jruby

data/.yardopts

@@ -1,4 +1,6 @@
 --title "validates"
 --readme README.md
 -
-LICENSE
+LICENSE
+CONTRIBUTING.md
+CHANGELOG.md

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+### 0.1.0
+
+* Moved InnValidator to [validates_russian](https://gthub.com/asiniy/validates_russian) gem

data/CONTRIBUTING.md

@@ -0,0 +1,33 @@
+# Contributing
+
+We love pull requests. Here's a quick guide.
+
+Fork, then clone the repo:
+
+    git clone git@github.com:your-username/validates.git
+
+Make sure the tests pass:
+
+    rake
+
+Make your change. Add tests for your change. Make the tests pass:
+
+    rake
+
+Push to your fork and [submit a pull request][pr].
+
+[pr]: https://github.com/kaize/validates/compare/
+
+At this point you're waiting on us. We like to at least comment on pull requests
+within three business days (and, typically, one business day). We may suggest
+some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted:
+
+* Write tests.
+* Follow common [style guides][style].
+* Write a [good commit message][commit].
+* squash your commits before sending PR.
+
+[style]: https://github.com/thoughtbot/guides/tree/master/style
+[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

data/Gemfile

@@ -1,7 +1,9 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 
 gem 'rake'
-gem 'turn'
-gem 'minitest'
+
+group :test do
+  gem 'minitest', '~> 5'
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Mikhail Stolbov
+Copyright (c) 2012 - 2014 Mikhail Stolbov and kaize
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,30 +1,39 @@
-# Validates [![Build Status](https://travis-ci.org/kaize/validates.png)](https://travis-ci.org/kaize/validates)
+# Validates [![Gem Version](https://badge.fury.io/rb/validates.png)](http://badge.fury.io/rb/validates) [![Build Status](https://travis-ci.org/kaize/validates.png)](https://travis-ci.org/kaize/validates) [![Code Climate](https://codeclimate.com/github/kaize/validates.png)](https://codeclimate.com/github/kaize/validates)
 
-Collection of useful custom validators for Rails 3 applications, including:
+Collection of useful custom validators for Rails applications, including:
 
 - EmailValidator
 - UrlValidator
 - SlugValidator
 - MoneyValidator
-- InnValidator
+- IpValidator
 - AssociationLengthValidator
+- AbsolutePathValidator
+- UriComponentValidator
+- ColorValidator
+
+**Note** InnValidator and other Russian specific validators could be found at [validates_russian](https://github.com/asiniy/validates_russian) gem
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'validates'
+``` ruby
+gem 'validates'
+```
 
 Or install it yourself as:
 
-    $ gem install 'validates'
+``` bash
+$ gem install 'validates'
+```
 
 ## Usage
 
 For most of the validators you just want to add this line to your model:
-
-    validates :attribute, <validator_underscore>: true
-
+``` ruby
+validates :attribute, <validator_underscore>: true
+```
 where `<validator_underscore>` is an underscored, lowercase form from the validator's name (see the examples section below).
 
 ### AssociationLengthValidator
@@ -36,39 +45,58 @@ which allows you to filter the collection of the associated objects.
 
 ## Examples
 
-    class User < ActiveRecord::Base
-      validates :email, :email => true
-      validates :site, :url => true, :allow_blank => true
-      validates :inn, :inn => true   
-    end
+``` ruby
+class User < ActiveRecord::Base
+  validates :email, :email => true
+  validates :site, :url => true, :allow_blank => 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"] }
+  }
+
+  validates :employees, :association_length => { :minimum => 1, :select => :employees_filter }
 
-    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.
+  def employees_filter(employees)
+    employees.select { |employee| employee.name.in? ["Mike", "John"] }
+  end
+end
 
-      validates :employees,
-        :association_length => {
-          :minimum => 1,
-          :select => ->(employee) { employee.name.in? ["Mike", "John"] }
-        }
+class Page < ActiveRecord::Base
+  validates :slug, :slug => true
+end
 
-      validates :employees, :association_length => { :minimum => 1, :select => :employees_filter }
+class Content < ActiveRecord::Base
+  # Validates URI component.
+  # URI component must be of the following type:
+  # :ABS_URI, :REL_URI, :URI_REF, :ABS_URI_REF, :REL_URI_REF, :ESCAPED, :UNSAFE, :SCHEME,
+  # :USERINFO, :HOST, :PORT, :OPAQUE, :REGISTRY, :ABS_PATH, :REL_PATH, :QUERY or :FRAGMENT.
+  # These types are provided URI library. For more info see URI::DEFAULT_PARSER.regexp.
 
-      def employees_filter(employees)
-        employees.select { |employee| employee.name.in? ["Mike", "John"] }
-      end
-    end
+  validates :path, :uri_component => { :component => :ABS_PATH }
+end
 
-    class Page < ActiveRecord::Base
-      validates :slug, :slug => true
-    end
+```
 
 ## Contributing
 
-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. Test your changes by running `turn -Itest test/lib` command
-5. Push to the branch (`git push origin my-new-feature`)
-6. Create new Pull Request
+Please see CONTRIBUTING.md for details.
+
+## Credits
+
+Originally written by Mikhail Stolbov. Maintained by kaize.
+
+Thank you to all our amazing [contributors](http://github.com/kaize/validates/contributors)!
+
+## License
+
+validates is Copyright © 2012-2014 Mikhail Stolbov and kaize. It is free
+software, and may be redistributed under the terms specified in the LICENSE
+file.

data/gemfiles/Gemfile.activemodel-3.0

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activemodel', '~>3.0'
+gem 'activesupport', '~>3.0'
+gem 'rake'
+gem 'minitest', '~> 5'

data/gemfiles/Gemfile.activemodel-4.0

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activemodel', '~>4.0'
+gem 'activesupport', '~>4.0'
+gem 'rake'
+gem 'minitest', '~> 5'

data/lib/absolute_path_validator.rb

@@ -0,0 +1,13 @@
+class AbsolutePathValidator < ActiveModel::EachValidator
+  class << self
+    def valid?(value)
+      Pathname.new(value).absolute?
+    end
+  end
+
+  def validate_each(record, attribute, value)
+    unless self.class.valid?(value)
+      record.errors.add(attribute, :absolute_path, options.merge(value: value))
+    end
+  end
+end

data/lib/association_length_validator.rb

@@ -1,5 +1,4 @@
 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]
@@ -23,5 +22,4 @@ class AssociationLengthValidator < ActiveModel::Validations::LengthValidator
       items
     end
   end
-
 end

data/lib/color_validator.rb

@@ -0,0 +1,10 @@
+class ColorValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    unless value =~ /^[#]([a-f0-9]{3}|[a-f0-9]{6})$/ || COLORS.include?(value)
+      record.errors.add(attribute, :color, options.merge(value: value))
+    end
+  end
+
+  # from W3C: http://www.w3.org/TR/css3-color/#svg-color
+  COLORS = %w(aliceblue antiquewhite aqua aquamarine azure beige bisque black blanchedalmond blue blueviolet brown burlywood cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan darkblue darkcyan darkgoldenrod darkgray darkgreen darkgrey darkkhaki darkmagenta darkolivegreen darkorange darkorchid darkred darksalmon darkseagreen darkslateblue darkslategray darkslategrey darkturquoise darkviolet deeppink deepskyblue dimgray dimgrey dodgerblue firebrick floralwhite forestgreen fuchsia gainsboro ghostwhite gold goldenrod gray green greenyellow grey honeydew hotpink indianred indigo ivory khaki lavender lavenderblush lawngreen lemonchiffon lightblue lightcoral lightcyan lightgoldenrodyellow lightgray lightgreen lightgrey lightpink lightsalmon lightseagreen lightskyblue lightslategray lightslategrey lightsteelblue lightyellow lime limegreen linen magenta maroon mediumaquamarine mediumblue mediumorchid mediumpurple mediumseagreen mediumslateblue mediumspringgreen mediumturquoise mediumvioletred midnightblue mintcream mistyrose moccasin navajowhite navy oldlace olive olivedrab orange orangered orchid palegoldenrod palegreen paleturquoise palevioletred papayawhip peachpuff peru pink plum powderblue purple red rosybrown royalblue saddlebrown salmon sandybrown seagreen seashell sienna silver skyblue slateblue slategray slategrey snow springgreen steelblue tan teal thistle tomato turquoise violet wheat white whitesmoke yellow yellowgreen)
+end

data/lib/email_validator.rb

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

data/lib/ip_validator.rb

@@ -0,0 +1,7 @@
+require 'ipaddr'
+
+class IpValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors.add(attribute, options[:message]) if (IPAddr.new(value) rescue nil).nil?
+  end
+end

data/lib/money_validator.rb

@@ -1,7 +1,7 @@
 class MoneyValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     unless value =~ /^\d+?(?:\.\d{0,2})?$/
-      record.errors.add(attribute, :is_not_money, options.merge(:value => value))
+      record.errors.add(attribute, :is_not_money, options.merge(value: value))
     end
   end
 end

data/lib/slug_validator.rb

@@ -1,7 +1,7 @@
 class SlugValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     unless value =~ /^[\w-]+$/i
-      record.errors.add(attribute, :slug, options.merge(:value => value))
+      record.errors.add(attribute, :slug, options.merge(value: value))
     end
-  end                  
+  end
 end

data/lib/uri_component_validator.rb

@@ -0,0 +1,19 @@
+class UriComponentValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    unless value =~ URI::DEFAULT_PARSER.regexp[component]
+      record.errors.add(attribute, :uri_component, options.merge(value: value))
+    end
+  end
+
+  def check_validity!
+    valid_components = URI::DEFAULT_PARSER.regexp.keys
+
+    if valid_components.exclude? component
+      raise ArgumentError, "Component must be of the following type: #{valid_components}"
+    end
+  end
+
+  def component
+    options[:component]
+  end
+end

data/lib/url_validator.rb

@@ -1,7 +1,13 @@
 class UrlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    unless value =~ URI::regexp(%w(http https))
-      record.errors.add(attribute, :url, options.merge(:value => value))
+    unless valid?(value)
+      record.errors.add(attribute, :url, options.merge(value: value))
     end
   end
+
+  private
+
+  def valid?(url)
+    (url =~ URI::regexp(%w(http https))) == 0
+  end
 end

data/lib/validates.rb

@@ -1,7 +1,8 @@
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/enumerable'
 require 'active_model'
 
-[:email, :association_length, :inn, :money, :slug, :url].each do |name|
+[:absolute_path, :association_length, :color, :email, :inn, :ip, :money, :slug, :uri_component, :url].each do |name|
   autoload :"#{name.to_s.classify}Validator", "#{name}_validator"
 end
 

data/lib/validates/version.rb

@@ -1,3 +1,3 @@
 module Validates
-  VERSION = "0.0.8"
+  VERSION = "1.0.0"
 end

data/test/lib/absolute_path_validator_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class AbsolutePathValidatorTest < Minitest::Test
+  def test_valid
+    valid_path = '/some/path'
+
+    assert AbsolutePathValidator.valid?(valid_path)
+  end
+
+  def test_invalid
+    invalid_path = 'some/path'
+
+    refute AbsolutePathValidator.valid?(invalid_path)
+  end
+
+end

data/test/lib/color_validator_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+
+class ColorValidatorTest < ValidatorTest
+
+  def test_valid
+    valid_colors = %w(
+      #fff
+      red
+      blueviolet
+      #eeeeee
+      #abc09a
+      black
+      #0cf
+      #012345
+      #6789ab
+      #cdefff
+      green
+    )
+
+    Model.validates :field, color: true
+
+    valid_colors.each do |color|
+      model = Model.new
+      model.field = color
+
+      assert model.valid?, "#{color} not valid"
+    end
+  end
+
+  def test_invalid
+    invalid_colors = %w(
+      #ffff
+      orange-duck
+      eee
+      xxx
+      epics
+    )
+
+    Model.validates :field, color: true
+
+    invalid_colors.each do |color|
+      model = Model.new
+      model.field = color
+
+      refute model.valid?, "#{color} not valid"
+    end
+  end
+end

data/test/lib/email_validator_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
-class EmailValidatorTest < Test::Unit::TestCase
+class EmailValidatorTest < ValidatorTest
+
   def test_valid
     valid_emails = [
       'user@example.com',
@@ -46,8 +47,13 @@ class EmailValidatorTest < Test::Unit::TestCase
       'test@xn--example.com'
     ]
 
+    Model.validates :field, email: true
+
     valid_emails.each do |email|
-      assert EmailValidator.valid?(email), "#{email} not valid"
+      model = Model.new
+      model.field = email
+
+      assert model.valid?, "#{email} not valid"
     end
   end
 
@@ -97,9 +103,13 @@ class EmailValidatorTest < Test::Unit::TestCase
       'first(middle)last@iana.org'
     ]
 
+    Model.validates :field, email: true
+
     invalid_emails.each do |email|
-      assert !EmailValidator.valid?(email), "email #{email} valid"
+      model = Model.new
+      model.field = email
+
+      refute model.valid?, "#{email} not valid"
     end
   end
-
 end

data/test/lib/ip_validator_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+class IpValidatorTest < ValidatorTest
+  def test_valid
+    valid_ips = %w(
+      21.189.63.11
+      192.168.0.1
+      127.0.0.1
+      FE80:0000:0000:0000:0202:B3FF:FE1E:8329
+    )
+
+    Model.validates :field, ip: true
+
+    valid_ips.each do |ip|
+      model = Model.new
+      model.field = ip
+
+      assert model.valid?, "#{ip} not valid"
+    end
+  end
+
+  def test_invalid
+    invalid_ips = %w(
+      epic
+      123.18.18
+      127.0.0.
+      127.0.0.1.0
+    )
+
+    Model.validates :field, ip: true
+
+    invalid_ips.each do |ip|
+      model = Model.new
+      model.field = ip
+
+      refute model.valid?, "#{ip} not valid"
+    end
+  end
+
+end

data/test/lib/money_validator_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class MoneyValidatorTest < ValidatorTest
+
+  def test_valid
+    valid_money_count = %w(
+      100
+      1000.00
+      1456
+      5
+      9000.00
+    )
+
+    Model.validates :field, money: true
+
+    valid_money_count.each do |money_count|
+      model = Model.new
+      model.field = money_count
+
+      assert model.valid?, "#{money_count} not valid"
+    end
+  end
+
+  def test_invalid
+    invalid_money_cost = %w(
+      orange-duck
+      a11111
+      11111a
+      1234a5678
+    ).push('', ' ', nil, {}, [])
+
+    Model.validates :field, money: true
+
+    invalid_money_cost.each do |money_cost|
+      model = Model.new
+      model.field = money_cost
+
+      refute model.valid?, "#{money_cost} not valid"
+    end
+  end
+end

data/test/lib/slug_validator_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class SlugValidatorTest < ValidatorTest
+
+  def test_valid
+    valid_slugs = %w(
+      home
+      global-news
+      global_news
+      new-2014-year
+    )
+
+    Model.validates :field, slug: true
+
+    valid_slugs.each do |slug|
+      model = Model.new
+      model.field = slug
+
+      assert model.valid?, "#{slug} not valid"
+    end
+  end
+
+  def test_invalid
+    invalid_slugs = %w(
+      home?
+      hello,world
+      new/page
+      !all'stars
+      hello?
+    )
+
+    Model.validates :field, slug: true
+
+    invalid_slugs.each do |slug|
+      model = Model.new
+      model.field = slug
+
+      refute model.valid?, "#{slug} not valid"
+    end
+  end
+end

data/test/lib/uri_component_validator_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class UriComponentValidatorTest < ValidatorTest
+
+  def test_valid
+    Model.validates :field, uri_component: { component: :ABS_PATH }
+    model = Model.new
+    model.field = '/some/path'
+
+    assert model.valid?
+  end
+
+  def test_invalid
+    Model.validates :field, uri_component: { component: :ABS_PATH }
+    invalid_paths = ['some/path', '/with/space path']
+
+    invalid_paths.each do |path|
+      model = Model.new
+      model.field = path
+      refute model.valid?
+    end
+  end
+
+  def test_check_arguments
+    assert_raises(ArgumentError) do
+      Model.validates :field, uri_component: { component: :WRONG }
+    end
+  end
+end

data/test/lib/url_validator_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class UrlValidatorTest < ValidatorTest
+
+  def test_valid
+    valid_urls = %w{
+      http://vk.com
+      http://www.mail.ru/secret
+      http://github.com/
+      http://odesk.com/query=ruby+rails
+      http://192.168.0.1
+      http://asiniy.ru
+      https://google.com
+      https://127.0.0.1
+    }
+
+    Model.validates :field, url: true
+
+    valid_urls.each do |url|
+      model = Model.new
+      model.field = url
+      assert model.valid?, "#{url} is not valid"
+    end
+  end
+
+  def test_invalid
+    invalid_urls = %w{
+      htt://yandex.ru
+      httpns
+      zzzz-mail
+      12345678
+      /1https://vk.com
+    }.push('', ' ', nil)
+
+    Model.validates :field, url: true
+
+    invalid_urls.each do |url|
+      model = Model.new
+      model.field = url
+      refute model.valid?, "#{url} is not valid"
+    end
+  end
+end

data/test/support/model.rb

@@ -0,0 +1,5 @@
+class Model
+  include ActiveModel::Validations
+
+  attr_accessor :field
+end

data/test/test_helper.rb

@@ -1,2 +1,14 @@
 require 'bundler/setup'
 Bundler.require
+
+require 'minitest/autorun'
+
+Dir[File.dirname(__FILE__) + '/support/*.rb'].each{ |file| require file }
+
+class ValidatorTest < Minitest::Test
+
+  def teardown
+    Model.reset_callbacks(:validate)
+  end
+
+end

data/validates.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   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    = "http://github.com/kaize/validates"
-  s.summary     = %q{Collection of useful custom validators for Rails 3 applications}
-  s.description = %q{validates provides a set of commonly required validators (such as Email, Url, etc.) for Rails 3 applications}
+  s.summary     = %q{Collection of useful custom validators for Rails applications}
+  s.description = %q{validates provides a set of commonly required validators (such as Email, Url, etc.) for Rails applications}
 
   s.rubyforge_project = "validates"
 
@@ -20,10 +20,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.rdoc_options      = %w(--line-numbers --inline-source --title validates --main README.md)
-  s.extra_rdoc_files  = %w(README.md LICENSE)
+  s.extra_rdoc_files  = %w(README.md LICENSE CONTRIBUTING.md CHANGELOG.md)
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
   s.add_dependency "activemodel", [">= 3.0.0"]
   s.add_dependency "activesupport", [">= 3.0.0"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -47,7 +47,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: validates provides a set of commonly required validators (such as Email,
-  Url, etc.) for Rails 3 applications
+  Url, etc.) for Rails applications
 email:
 - mstolbov@gmail.com
 - anti191@gmail.com
@@ -58,23 +58,40 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - LICENSE
+- CONTRIBUTING.md
+- CHANGELOG.md
 files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/Gemfile.activemodel-3.0
+- gemfiles/Gemfile.activemodel-4.0
+- lib/absolute_path_validator.rb
 - lib/association_length_validator.rb
+- lib/color_validator.rb
 - lib/email_validator.rb
-- lib/inn_validator.rb
+- lib/ip_validator.rb
 - lib/money_validator.rb
 - lib/slug_validator.rb
+- lib/uri_component_validator.rb
 - lib/url_validator.rb
 - lib/validates.rb
 - lib/validates/version.rb
+- test/lib/absolute_path_validator_test.rb
+- test/lib/color_validator_test.rb
 - test/lib/email_validator_test.rb
+- test/lib/ip_validator_test.rb
+- test/lib/money_validator_test.rb
+- test/lib/slug_validator_test.rb
+- test/lib/uri_component_validator_test.rb
+- test/lib/url_validator_test.rb
+- test/support/model.rb
 - test/test_helper.rb
 - validates.gemspec
 homepage: http://github.com/kaize/validates
@@ -103,9 +120,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: validates
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Collection of useful custom validators for Rails 3 applications
-test_files: []
-has_rdoc: 
+summary: Collection of useful custom validators for Rails applications
+test_files:
+- test/lib/absolute_path_validator_test.rb
+- test/lib/color_validator_test.rb
+- test/lib/email_validator_test.rb
+- test/lib/ip_validator_test.rb
+- test/lib/money_validator_test.rb
+- test/lib/slug_validator_test.rb
+- test/lib/uri_component_validator_test.rb
+- test/lib/url_validator_test.rb
+- test/support/model.rb
+- test/test_helper.rb

data/lib/inn_validator.rb

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