activevalidators 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1e773070ad87f01d07d2e87651e3e8001c0473c
-  data.tar.gz: a2cde43cd5fdcde2ccc74e0f8d4bf9f9dbd48844
+  metadata.gz: d2bfed38515b9a564947994fcb1c43dfe88ad510
+  data.tar.gz: 3e4f455a22673e298c4c7957b59ce227e3c122c8
 SHA512:
-  metadata.gz: 05f361d20a538d9d595cb3a2a1acaafd63250583264f498699938bcb36018031acd74f6e319fcc03e971f2a26850bde67f1c7ec880757195dcd6e386250c8ac3
-  data.tar.gz: 7547475f7df3d356cd79942f8458d1300082cd4fb491455fded6d2f229173762dfee2ecc654b7229dbff9d1ba243df32d5fda80860f381ab0d744cc4f38640a4
+  metadata.gz: 537572510a16b9f160eefdc2fde8ab7301049f7f967a09d226a17108183849ee18ff3b7e3ef7223055558e2f6a9c16448b53394332cd43e7f5f2b451a2fb8618
+  data.tar.gz: 935a66f8260aadc377cb2f7a8277d5fa8bdf0a158709211d2ba164a7d61b9d57dcc7375b1f1381f533fbefa193d77d8a280c0f0381d9446a36f6ec4dd96f9aa5

data/.travis.yml

@@ -3,9 +3,6 @@ rvm:
   - 1.9.3
   - 2.1.0
   - jruby-19mode
-  - rbx-2
   - ruby-head
   - jruby-head
-matrix:
-  allow_failures:
-    - rvm: jruby-head
+  - rbx-2

data/ChangeLog.md

@@ -1,6 +1,18 @@
 # UNRELEASED
 
-  * Nothing yet.
+# 3.2.0
+
+## MAJOR CHANGES
+
+  * Ensure the $LOAD\_PATH could never break ActiveValidators (see #71 for details)
+
+## DEPRECATION
+
+  * [SSN validations doesn't support any options anymore][ssn_validation_options]
+
+## FEATURES
+
+  * Regexp validator.
 
 # 3.1.0
 
@@ -195,3 +207,6 @@
   * Add errors with the ActiveModel::Errors#add method -> i18n support
   * Add phone format validator
   * Public release
+
+
+[ssn_validation_options]: https://github.com/franckverrot/activevalidators/commit/dee076a8e344897f0325747504625285be7da226

data/README.md

@@ -50,7 +50,7 @@ In your models, the gem provides new validators like `email`, or `url`:
 ```ruby
     class User
       validates :email_address, :email => true # == :email => { :strict => false }
-      validates :link_url,      :url   => true
+      validates :link_url,      :url   => true # (Could be combined with `allow_blank: true`)
       validates :user_phone,    :phone => true
       validates :company_siren, :siren => true
       validates :password,      :password => { :strength => :medium }
@@ -109,11 +109,13 @@ Exhaustive list of supported validators and their implementation:
 * `siren`
 * `slug`  : based on `ActiveSupport::String#parameterize`
 * `sin` : Social Insurance Number (only for Canada). You also can allow permanent residents cards (such cards start with '9'): `:sin => {:country => :canada, :country_options => {allow_permanent_residents: true}}`
-* `ssn` : Social Security Number (only for USA). You also may pass type, instead of boolean: `:ssn => {:type => :usa_ssn}` as the alternative.
+* `ssn` : Social Security Number (only for USA).
 * `tracking_number`: based on a set of predefined masks
 * `twitter` : based on a regular expression
 * `url`   : based on a regular expression
 * `barcode`   : based on known formats (:ean13 only for now)
+* `hex_color` : based on a regular expression
+* `regexp` : uses Ruby's [`Regexp.compile`](http://www.ruby-doc.org/core-2.1.1/Regexp.html#method-c-new) method
 
 ## Todo
 

data/activevalidators.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'activevalidators'
-  s.version     = '3.1.2'
+  s.version     = '3.2.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Franck Verrot', 'Paco Guzmán', 'Oriol Gual', 'Garrett Bjerkhoel', 'Renato Riccieri Santos Zannon', 'Brian Moseley', 'Serj L aka Loremaster']
   s.email       = ['franck@verrot.fr']

data/checksums/3.1.2.sha512

@@ -0,0 +1 @@
+4faf052c6018bd3f17ab23c2cc6f5e2e7c9beaadd3fbb85652fc70cac785b1a6886ffa1a0d0c164607acf5bbf43881f7a17b75a3eba5647784d7c67c274574c4

data/lib/{active_model → active_validators/active_model}/validations/barcode_validator.rb

@@ -12,7 +12,7 @@ module ActiveModel
 
       def validate_each(record, attribute, value)
         method = "valid_#{options[:format].to_s}?"
-        record.errors.add(attribute) if value.blank? || !self.send(method, value)
+        record.errors.add(attribute) if value.blank? || !self.send(method, value.to_s)
       end
 
       def valid_ean13?(value)
@@ -32,7 +32,7 @@ module ActiveModel
               uneven_sum += digit.to_i
             end
           end
-          (10 - ((even_sum*3 + uneven_sum) % 10)).to_s
+          ((10 - ((even_sum*3 + uneven_sum) % 10)) % 10).to_s
         end
     end
   end

data/lib/{active_model → active_validators/active_model}/validations/credit_card_validator.rb

@@ -1,4 +1,4 @@
-require 'active_model/validations/shared/luhn_checker'
+require 'active_validators/active_model/validations/shared/luhn_checker'
 
 module ActiveModel
   module Validations

data/lib/{active_model → active_validators/active_model}/validations/email_validator.rb

@@ -11,7 +11,7 @@ module ActiveModel
           mail = Mail::Address.new(value)
 
           valid = basic_check(mail) && value.include?(mail.address)
-        rescue Exception => e
+        rescue Exception => _
           valid = false
         end
 

data/lib/active_validators/active_model/validations/hex_color_validator.rb

@@ -0,0 +1,11 @@
+module ActiveModel
+  module Validations
+    class HexColorValidator < EachValidator
+      def validate_each(record, attribute, value)
+        unless value =~ /\A(\h{3}){,2}\z/
+          record.errors.add(attribute)
+        end
+      end
+    end
+  end
+end

data/lib/{active_model → active_validators/active_model}/validations/phone_validator.rb

@@ -1,3 +1,5 @@
+require 'phony'
+require 'countries'
 module ActiveModel
   module Validations
     class PhoneValidator < EachValidator

data/lib/active_validators/active_model/validations/regexp_validator.rb

@@ -0,0 +1,22 @@
+module ActiveModel
+  module Validations
+    class RegexpValidator < EachValidator
+      def validate_each(record, attribute, value)
+        unless valid_regexp?(value)
+          record.errors.add(attribute)
+        end
+      end
+
+
+      private
+
+      def valid_regexp?(value)
+        Regexp.compile(value.to_s)
+        true
+
+      rescue RegexpError
+        false
+      end
+    end
+  end
+end

data/lib/{active_model → active_validators/active_model}/validations/sin_validator.rb

@@ -1,4 +1,4 @@
-require 'active_model/validations/shared/luhn_checker'
+require 'active_validators/active_model/validations/shared/luhn_checker'
 
 module ActiveModel
   module Validations
@@ -59,4 +59,4 @@ module ActiveModel
       end
     end
   end
-end
+end

data/lib/{active_model → active_validators/active_model}/validations/ssn_validator.rb

@@ -2,16 +2,18 @@ module ActiveModel
   module Validations
     class SsnValidator < EachValidator
       def validate_each(record, attribute, value)
-        type = options.fetch(:type, :usa_ssn)                                                       # :usa_ssn is default.
-        record.errors.add(attribute) if value.blank? || !SsnValidatorGeneral.valid?(type, value)
+        record.errors.add(attribute) if value.blank? || !SsnValidatorGeneral.valid?(options, value)
       end
     end
 
+    # <b>DEPRECATED:</b> Please use <tt>:ssn => true</tt> instead.
     class SsnValidatorGeneral
-      def self.valid?(type, value)
-        if type == :usa_ssn
-          SsnValidatorUSA.new(value).valid?
+      def self.valid?(options, value)
+        if options[:type] == :usa_ssn
+          warn "[DEPRECATION] providing {:type => :usa_ssn} is deprecated and will be removed in the future. Please use `:ssn => true` instead."
         end
+
+        SsnValidatorUSA.new(value).valid?
       end
     end
 

data/lib/activevalidators.rb

@@ -1,11 +1,9 @@
 require 'active_model'
-require 'phony'
-require 'countries'
 require 'active_validators/one_nine_shims/one_nine_string'
 
 module ActiveValidators
   def self.activevalidators
-    %w(email url respond_to phone slug ip credit_card date password twitter postal_code tracking_number siren ssn sin nino barcode date)
+    %w(email url respond_to phone slug ip credit_card date password twitter postal_code tracking_number siren ssn sin nino barcode date hex_color regexp)
   end
 
   # Require each validator independently or just pass :all
@@ -17,7 +15,7 @@ module ActiveValidators
     syms = validators.include?(:all) ? activevalidators : validators.map(&:to_s) & activevalidators
 
     syms.each do |validator_name|
-      require "active_model/validations/#{validator_name}_validator"
+      require "active_validators/active_model/validations/#{validator_name}_validator"
     end
   end
 

data/test/test_helper.rb

@@ -14,7 +14,8 @@ 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, :siren, :ssn, :sin, :nino, :barcode
+    :postal_code, :carrier, :tracking_number, :start_date, :end_date, :siren, :ssn, :sin, :nino, :barcode,
+    :text_color, :redirect_rule
 
   def initialize(attrs = {})
     attrs.each_pair { |k,v| send("#{k}=", v) }

data/test/validations/barcode_test.rb

@@ -4,7 +4,15 @@ ActiveValidators.activate(:barcode)
 describe "Barcode Validation" do
   describe "EAN13 Validation" do
     it "accepts valid EAN13s" do
-      subject = build_barcode_record :ean13, :barcode => "9782940199617"
+      ["9782940199617", "9782940199600"].each do |barcode|
+        subject = build_barcode_record :ean13, :barcode => barcode
+        subject.valid?.must_equal true
+        subject.errors.size.must_equal 0
+      end
+    end
+
+    it "accepts EAN13s as integers" do
+      subject = build_barcode_record :ean13, :barcode => 9782940199617
       subject.valid?.must_equal true
       subject.errors.size.must_equal 0
     end

data/test/validations/hex_color_test.rb

@@ -0,0 +1,55 @@
+require 'test_helper'
+ActiveValidators.activate(:hex_color)
+
+describe "Hex-Color Validation" do
+  let(:invalid_message) { subject.errors.generate_message(:text_color, :invalid) }
+
+  subject { TestRecord.new }
+
+  before do
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :text_color, :hex_color => true
+  end
+
+  it "accepts blank value" do
+    subject.text_color = ''
+
+    subject.must_be :valid?
+    subject.errors.must_be :empty?
+  end
+
+  it "accepts 3 hex characters" do
+    subject.text_color = 'abc'
+
+    subject.must_be :valid?
+    subject.errors.must_be :empty?
+  end
+
+  it "accepts 6 hex characters" do
+    subject.text_color = 'abc012'
+
+    subject.must_be :valid?
+    subject.errors.must_be :empty?
+  end
+
+  it "rejects non-hex characters" do
+    subject.text_color = 'efg345'
+
+    subject.must_be :invalid?
+    subject.errors[:text_color].must_include invalid_message
+  end
+
+  it "rejects too few characters" do
+    subject.text_color = 'ef'
+
+    subject.must_be :invalid?
+    subject.errors[:text_color].must_include invalid_message
+  end
+
+  it "rejects too many characters" do
+    subject.text_color = 'efab001'
+
+    subject.must_be :invalid?
+    subject.errors[:text_color].must_include invalid_message
+  end
+end

data/test/validations/regexp_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+ActiveValidators.activate(:regexp)
+
+describe "Regexp Validation" do
+  let(:invalid_message) { subject.errors.generate_message(:redirect_rule, :invalid) }
+
+  subject { TestRecord.new }
+
+  before do
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :redirect_rule, :regexp => true
+  end
+
+  it "accepts blank value" do
+    subject.redirect_rule = ''
+
+    subject.must_be :valid?
+    subject.errors.must_be :empty?
+  end
+
+  it "rejects malformed regular expressions" do
+    subject.redirect_rule = '['
+
+    subject.must_be :invalid?
+    subject.errors[:redirect_rule].must_include invalid_message
+  end
+
+  it "allow proper regular expressions" do
+    subject.redirect_rule = '^/vanity-url(-2014)?'
+
+    subject.must_be :valid?
+    subject.errors.must_be :empty?
+  end
+
+end

data/test/validations/ssn_test.rb

@@ -5,45 +5,45 @@ describe "SSN validations" do
   describe "USA ssn" do
     describe "for invalid" do
       it "rejects empty ssn" do
-        subject = build_ssn_record({:ssn => ''}, {:type => :usa_ssn})
+        subject = build_ssn_record({:ssn => ''}, true)
         subject.valid?.must_equal false
       end
 
       it "rejects ssn when it doesn't consist of numbers" do
-        subject = build_ssn_record({:ssn => 'aaabbcccc'}, {:type => :usa_ssn})
+        subject = build_ssn_record({:ssn => 'aaabbcccc'}, true)
         subject.valid?.must_equal false
       end
 
       it "rejects ssn when the first group of digits is 000" do
-        subject = build_ssn_record({:ssn => '000112222'}, {:type => :usa_ssn})
+        subject = build_ssn_record({:ssn => '000112222'}, true)
         subject.valid?.must_equal false
       end
 
       it "rejects ssn when the first group of digits is 666" do
-        subject = build_ssn_record({:ssn => '666112222'}, {:type => :usa_ssn})
+        subject = build_ssn_record({:ssn => '666112222'}, true)
         subject.valid?.must_equal false
       end
 
       (900..999).each do |first_group_num|
         it "rejects ssn when the first group of digits is #{first_group_num}" do
-          subject = build_ssn_record({:ssn => "#{first_group_num}112222"}, {:type => :usa_ssn})
+          subject = build_ssn_record({:ssn => "#{first_group_num}112222"}, true)
           subject.valid?.must_equal false
         end
       end
 
       it "reject ssn when the second group of digits is 00" do
-        subject = build_ssn_record({:ssn => "555002222"}, {:type => :usa_ssn})
+        subject = build_ssn_record({:ssn => "555002222"}, true)
         subject.valid?.must_equal false
       end
 
       it "reject ssn when the third group of digits is 0000" do
-        subject = build_ssn_record({:ssn => "555660000"}, {:type => :usa_ssn})
+        subject = build_ssn_record({:ssn => "555660000"}, true)
         subject.valid?.must_equal false
       end
 
       (987654320..987654329).each do |reserved_ssn|
         it "rejects reserved ssn such as #{reserved_ssn}" do
-          subject = build_ssn_record({:ssn => "#{reserved_ssn}"}, {:type => :usa_ssn})
+          subject = build_ssn_record({:ssn => "#{reserved_ssn}"}, true)
           subject.valid?.must_equal false
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activevalidators
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Franck Verrot
@@ -36,7 +36,7 @@ cert_chain:
   UeH0jxnbT6lYw622u74Z7Dd6iQfaOy1h+iJxnCQglf70rs9bS665Nr0QvvrbW8Hz
   Vr/YT3S8RkdBsIdM
   -----END CERTIFICATE-----
-date: 2014-09-07 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,24 +166,27 @@ files:
 - Rakefile
 - activevalidators.gemspec
 - certs/franckverrot.pem
-- lib/active_model/validations/barcode_validator.rb
-- lib/active_model/validations/credit_card_validator.rb
-- lib/active_model/validations/date_validator.rb
-- lib/active_model/validations/email_validator.rb
-- lib/active_model/validations/ip_validator.rb
-- lib/active_model/validations/nino_validator.rb
-- lib/active_model/validations/password_validator.rb
-- 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/shared/luhn_checker.rb
-- lib/active_model/validations/sin_validator.rb
-- lib/active_model/validations/siren_validator.rb
-- lib/active_model/validations/slug_validator.rb
-- lib/active_model/validations/ssn_validator.rb
-- lib/active_model/validations/tracking_number_validator.rb
-- lib/active_model/validations/twitter_validator.rb
-- lib/active_model/validations/url_validator.rb
+- checksums/3.1.2.sha512
+- lib/active_validators/active_model/validations/barcode_validator.rb
+- lib/active_validators/active_model/validations/credit_card_validator.rb
+- lib/active_validators/active_model/validations/date_validator.rb
+- lib/active_validators/active_model/validations/email_validator.rb
+- lib/active_validators/active_model/validations/hex_color_validator.rb
+- lib/active_validators/active_model/validations/ip_validator.rb
+- lib/active_validators/active_model/validations/nino_validator.rb
+- lib/active_validators/active_model/validations/password_validator.rb
+- lib/active_validators/active_model/validations/phone_validator.rb
+- lib/active_validators/active_model/validations/postal_code_validator.rb
+- lib/active_validators/active_model/validations/regexp_validator.rb
+- lib/active_validators/active_model/validations/respond_to_validator.rb
+- lib/active_validators/active_model/validations/shared/luhn_checker.rb
+- lib/active_validators/active_model/validations/sin_validator.rb
+- lib/active_validators/active_model/validations/siren_validator.rb
+- lib/active_validators/active_model/validations/slug_validator.rb
+- lib/active_validators/active_model/validations/ssn_validator.rb
+- lib/active_validators/active_model/validations/tracking_number_validator.rb
+- lib/active_validators/active_model/validations/twitter_validator.rb
+- lib/active_validators/active_model/validations/url_validator.rb
 - lib/active_validators/one_nine_shims/one_nine_string.rb
 - lib/activevalidators.rb
 - test/test_helper.rb
@@ -191,11 +194,13 @@ files:
 - test/validations/credit_card_test.rb
 - test/validations/date_test.rb
 - test/validations/email_test.rb
+- test/validations/hex_color_test.rb
 - test/validations/ip_test.rb
 - test/validations/nino_test.rb
 - test/validations/password_test.rb
 - test/validations/phone_test.rb
 - test/validations/postal_code_test.rb
+- test/validations/regexp_test.rb
 - test/validations/respond_to_test.rb
 - test/validations/sin_test.rb
 - test/validations/siren_test.rb
@@ -234,11 +239,13 @@ test_files:
 - test/validations/credit_card_test.rb
 - test/validations/date_test.rb
 - test/validations/email_test.rb
+- test/validations/hex_color_test.rb
 - test/validations/ip_test.rb
 - test/validations/nino_test.rb
 - test/validations/password_test.rb
 - test/validations/phone_test.rb
 - test/validations/postal_code_test.rb
+- test/validations/regexp_test.rb
 - test/validations/respond_to_test.rb
 - test/validations/sin_test.rb
 - test/validations/siren_test.rb

metadata.gz.sig

@@ -1 +1 @@
-�<��HC*f��x�s�]ݱ8������X�s�1f��F�6��b8&c�`���<&�ܣ�zӡ �7��[��%�
+�l����M�����v?o��Y�)۱^aT��o�	=�1p���;�-	F��g$�+/�/F��L\�@