activevalidators 2.0.2 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: de64a7aa6feb36cf4d57acc13a620b8b26ad7b14
+  data.tar.gz: e9983a0c5dba7483e26f6594e704f0e01468c872
+SHA512:
+  metadata.gz: d5df00615461a33d2c4a71ee15cddbc99e69cdff6759421dfd4289b913b2b1b51c6481d27feb42a8f821a9a55b07c9615293583ab9792ba8679946767176d042
+  data.tar.gz: 5908af5ffe6643ba5c8df5b981254c5652964833e1af5f8ee61acfc9ac493ead71f957ce5866c9a789ac417d357b18a48936e5185da4c7a9c164eaf967d491c3

data/.travis.yml

@@ -1,11 +1,8 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - ree
-  - jruby-18mode
-  - rbx-18mode
-  - 1.9.2
   - 1.9.3
+  - 2.1.0
   - jruby-19mode
-  - rbx-19mode
+  - rbx
   - ruby-head
+  - jruby-head

data/Gemfile

@@ -1,2 +1,12 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
+
+group :test do
+  platform :rbx do
+    gem 'rubysl-singleton'
+    gem 'rubysl-mutex_m'
+    gem 'rubysl-net-smtp'
+    gem 'rubysl-ipaddr'
+    gem 'rubysl-base64'
+  end
+end

data/README.md

@@ -19,6 +19,7 @@ In your models, the gem provides new validators like `email`, or `url`:
       validates :email_address, :email => true # == :email => { :strict => false }
       validates :link_url,      :url   => true
       validates :user_phone,    :phone => true
+      validates :company_siren, :siren => true
       validates :password,      :password => { :strength => :medium }
       validates :twitter_at,    :twitter => { :format => :username_with_at }
       validates :twitter_url,   :twitter => { :format => :url }
@@ -61,6 +62,7 @@ Exhaustive list of supported validators and their implementation:
 * `phone` : based on a set of predefined masks
 * `postal_code`: based on a set of predefined masks
 * `respond_to`
+* `siren`
 * `slug`  : based on `ActiveSupport::String#parameterize`
 * `tracking_number`: based on a set of predefined masks
 * `twitter` : based on a regular expression
@@ -98,4 +100,4 @@ Lots of improvements can be made:
 
 ## Copyright
 
-Copyright (c) 2010-2012 Franck Verrot. MIT LICENSE. See LICENSE for details.
+Copyright (c) 2010-2014 Franck Verrot. MIT LICENSE. See LICENSE for details.

data/activevalidators.gemspec

@@ -1,20 +1,21 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'activevalidators'
-  s.version     = '2.0.2'
+  s.version     = '2.1.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Franck Verrot', 'Paco Guzmán', 'Oriol Gual', 'Garrett Bjerkhoel', 'Renato Riccieri Santos Zannon', 'Brian Moseley']
   s.email       = ['franck@verrot.fr']
   s.homepage    = 'http://github.com/franckverrot/activevalidators'
   s.summary     = %q{Collection of ActiveModel/ActiveRecord validations}
   s.description = %q{ActiveValidators is a collection of ActiveModel/ActiveRecord validations}
+  s.license     = 'MIT'
 
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest', '~> 4.2.0' # Rails fixes this...
   s.add_dependency 'rake'          , '>= 0.8.7'
   s.add_dependency 'activemodel'   , '>= 3.0.0'
-  s.add_dependency 'phony'         , '~> 1.7.4'
-  s.add_dependency 'countries'     , '~> 0.8.2'
+  s.add_dependency 'phony'         , '>= 1.9.0'
+  s.add_dependency 'countries'     , '~> 0.9.3'
   s.add_dependency 'mail'
   s.add_dependency 'date_validator'
 

data/lib/active_model/validations/credit_card_validator.rb

@@ -46,22 +46,22 @@ module ActiveModel
         end
 
         def self.luhn_valid?(s)
-          return false unless s && s.is_a?(String)
-          return false if s.empty?
-          value = s.gsub(/\D/, '')
-          return false if value.empty?
-          value.
-            reverse.
-            each_char.
-            collect(&:to_i).
-            each_with_index.
-            inject(0) {| num, (i, index) |
-              num + if (index + 1) % 2 == 0
-                      i*=2; ((i > 9) ? (i % 10) + 1 : i)
-              else
-                i
-              end
-          } % 10 == 0
+          value = s.gsub(/\D/, '').reverse
+
+          sum = i = 0
+
+          value.each_char do |ch|
+            n = ch.to_i
+
+            n *= 2 if i.odd?
+
+            n = 1 + (n - 10) if n >= 10
+
+            sum += n
+            i   += 1
+          end
+
+          (sum % 10).zero?
         end
       end
     end

data/lib/active_model/validations/email_validator.rb

@@ -7,24 +7,10 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
-        # takes from: https://github.com/hallelujah/valid_email
         begin
           mail = Mail::Address.new(value)
-          # We must check that value contains a domain and that value is an email address
-          valid = mail.domain && value.include?(mail.address)
 
-          if options[:only_address]
-            # We need to dig into treetop
-            # A valid domain must have dot_atom_text elements size > 1
-            # user@localhost is excluded
-            # treetop must respond to domain
-            # We exclude valid email values like <user@localhost.com>
-            # Hence we use m.__send__(tree).domain
-            tree = mail.__send__(:tree)
-            valid &&= (tree.domain.dot_atom_text.elements.size > 1)
-          else
-            valid &&= (mail.domain.split('.').length > 1)
-          end
+          valid = basic_check(mail) && value.include?(mail.address)
         rescue Exception => e
           valid = false
         end
@@ -37,6 +23,25 @@ module ActiveModel
 
         record.errors.add attribute, (options[:message]) unless valid
       end
+
+      def basic_check(mail)
+        # We must check that value contains a domain and that value is an email address
+        valid = !!mail.domain
+
+        if options[:only_address]
+          # We need to dig into treetop
+          # A valid domain must have dot_atom_text elements size > 1
+          # user@localhost is excluded
+          # treetop must respond to domain
+          # We exclude valid email values like <user@localhost.com>
+          # Hence we use m.__send__(tree).domain
+          tree = mail.__send__(:tree)
+          valid &&= (tree.domain.dot_atom_text.elements.size > 1)
+        else
+          valid &&= (mail.domain.split('.').length > 1)
+        end
+        valid
+      end
     end
   end
 end

data/lib/active_model/validations/ip_validator.rb

@@ -2,7 +2,8 @@ module ActiveModel
   module Validations
     class IpValidator < EachValidator
       def validate_each(record, attribute, value)
-        record.errors.add(attribute) if value.blank? || !regex.match(value)
+        value_str = value.to_s # might be an IPAddr
+        record.errors.add(attribute) if value_str.blank? || !regex.match(value_str)
       end
 
       def check_validity!

data/lib/active_model/validations/siren_validator.rb

@@ -0,0 +1,33 @@
+module ActiveModel
+  module Validations
+    class SirenValidator < EachValidator
+      # Validates siren format according to
+      # http://fr.wikipedia.org/wiki/SIREN
+      def valid_siren?(input)
+        str = input.to_s
+        reversed_array = str.split('').reverse
+
+        digits = reversed_array.each_with_index.map do |char, i|
+          coeff = (i % 2) + 1
+          (char.to_i * coeff).to_s.split('')
+        end
+
+        sum = digits.flatten.map(&:to_i).inject(:+)
+
+        (sum % 10) == 0
+      end
+
+      def validate_each(record, attribute, value)
+        if value.nil?
+          record.errors.add_on_blank(attribute)
+        else
+          if value.to_s.length != 9
+            record.errors.add attribute, :length
+          else
+            record.errors.add attribute, :format unless valid_siren?(value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_model/validations/url_validator.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/array/wrap'
 require 'uri'
 
 module ActiveModel

data/lib/activevalidators.rb

@@ -6,7 +6,7 @@ require 'active_validators/one_nine_shims/one_nine_string'
 module ActiveModel
   module Validations
     def self.activevalidators
-      %w(email url respond_to phone slug ip credit_card date password twitter postal_code tracking_number)
+      %w(email url respond_to phone slug ip credit_card date password twitter postal_code tracking_number siren)
     end
 
     activevalidators.each do |validator_name|

data/test/test_helper.rb

@@ -1,26 +1,20 @@
-require 'rubygems'
+gem 'minitest'
+require 'minitest/autorun'
+require 'minitest/mock'
 
 # silence warnings
 old_w, $-w = $-w, false
 
-require 'minitest/spec'
-require 'minitest/mock'
-require 'minitest/autorun'
+require 'activevalidators'
 
 # unsilence warnings
 $-w = old_w
 
-require 'activevalidators'
-
-%w(models).each do |directory|
-  Dir["#{File.dirname(__FILE__)}/#{directory}/*.rb"].each {|f| require f}
-end
-
 class TestRecord
   include ActiveModel::Validations
   attr_accessor :ip, :url, :slug, :responder, :global_condition,
     :local_condition, :phone, :email, :card, :password, :twitter_username,
-    :postal_code, :carrier, :tracking_number, :start_date, :end_date
+    :postal_code, :carrier, :tracking_number, :start_date, :end_date, :siren
 
   def initialize(attrs = {})
     attrs.each_pair { |k,v| send("#{k}=", v) }

data/test/validations/date_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'active_support/core_ext/hash/reverse_merge'
 
 # ActiveValidators relies on another gem called "date_validator" edited
 # by the fine folks at Codegram.

data/test/validations/ip_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper.rb'
+require 'ipaddr'
 
 describe "IP Validation" do
   describe "IPv4 Validation" do
@@ -8,6 +9,12 @@ describe "IP Validation" do
       subject.errors.size.must_equal 0
     end
 
+    it "accepts IPAddrs" do
+      subject = build_ip_record :v4, :ip => IPAddr.new('192.168.1.1')
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+
     describe "for invalid IPs" do
       it "rejects invalid IPs" do
         subject = build_ip_record :v4, :ip => '267.34.56.3'
@@ -30,6 +37,12 @@ describe "IP Validation" do
       subject.errors.size.must_equal 0
     end
 
+    it "accepts IPAddrs" do
+      subject = build_ip_record :v6, :ip => IPAddr.new('::1')
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+
     describe "for invalid IPs" do
       it "rejects invalid IPs" do
         subject = build_ip_record :v6, :ip => '192.168.1.1'

data/test/validations/siren_test.rb

@@ -0,0 +1,55 @@
+require 'test_helper.rb'
+
+describe "Siren Validation" do
+  it "Rejects if not supplied" do
+    subject = build_siren_record true
+    subject.valid?.must_equal false
+    subject.errors.size.must_equal 1
+  end
+
+  describe 'supplied as a string' do
+    it "Accepts if valid" do
+      subject = build_siren_record true, :siren => '552100554'
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+
+    it "Reject if invalid" do
+      subject = build_siren_record true, :siren => '552100553'
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+
+    it "Reject if not the right size" do
+      subject = build_siren_record true, :siren => '55210055'
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+  end
+
+  describe 'supplied as a number' do
+    it "Accepts if valid" do
+      subject = build_siren_record true, :siren => 732829320
+      subject.valid?.must_equal true
+      subject.errors.size.must_equal 0
+    end
+
+    it "Reject if invalid" do
+      subject = build_siren_record true, :siren => 732829321
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+
+    it "Reject if not the right size" do
+      subject = build_siren_record true, :siren => 73282932
+      subject.valid?.must_equal false
+      subject.errors.size.must_equal 1
+    end
+  end
+
+  def build_siren_record siren, attrs = {}
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :siren, :siren => siren
+    TestRecord.new attrs
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activevalidators
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Franck Verrot
@@ -14,134 +13,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: phony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.4
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.4
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: date_validator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ActiveValidators is a collection of ActiveModel/ActiveRecord validations
@@ -151,8 +134,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -165,6 +148,7 @@ files:
 - lib/active_model/validations/phone_validator.rb
 - lib/active_model/validations/postal_code_validator.rb
 - lib/active_model/validations/respond_to_validator.rb
+- lib/active_model/validations/siren_validator.rb
 - lib/active_model/validations/slug_validator.rb
 - lib/active_model/validations/tracking_number_validator.rb
 - lib/active_model/validations/twitter_validator.rb
@@ -180,33 +164,34 @@ files:
 - test/validations/phone_test.rb
 - test/validations/postal_code_test.rb
 - test/validations/respond_to_test.rb
+- test/validations/siren_test.rb
 - test/validations/slug_test.rb
 - test/validations/tracking_number_test.rb
 - test/validations/twitter_test.rb
 - test/validations/url_test.rb
 homepage: http://github.com/franckverrot/activevalidators
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Collection of ActiveModel/ActiveRecord validations
 test_files:
 - test/test_helper.rb
@@ -218,6 +203,7 @@ test_files:
 - test/validations/phone_test.rb
 - test/validations/postal_code_test.rb
 - test/validations/respond_to_test.rb
+- test/validations/siren_test.rb
 - test/validations/slug_test.rb
 - test/validations/tracking_number_test.rb
 - test/validations/twitter_test.rb