evelpidon_validators 0.4.2 → 0.4.3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Evelpidon Validators changelog
 
+## 0.4.3 / 2012-01-16
+
+* Fixed bug with validation raising an error if number is nil.
+* Fixed Credit Card Validator type_attribute option is optional.
+
 ## 0.4.2 / 2012-01-16
 
 * Fixed type deprecation warning added in the wrong place

data/lib/evelpidon_validators/credit_card.rb

@@ -17,14 +17,19 @@ module ActiveModel
       end
 
       def self.valid_credit_card?(number, type)
+        return false if number.nil?
+
         if type
           ::CreditCardValidator::Validator.options[:allowed_card_types] = [type.underscore.to_sym]
+        else
+          ::CreditCardValidator::Validator.options[:allowed_card_types] = nil
         end
         ::CreditCardValidator::Validator.valid?(number)
       end
 
       def validate_each(record, attribute, value)
-        unless self.class.valid_credit_card? value, record.send(options[:type_attribute])
+        type = record.send(options[:type_attribute]) if options[:type_attribute]
+        unless self.class.valid_credit_card? value, type
           record.errors.add(attribute, :credit_card, options)
         end
       end

data/lib/evelpidon_validators/version.rb

@@ -1,3 +1,3 @@
 module EvelpidonValidators
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/test/credit_card_test.rb

@@ -14,6 +14,16 @@ class CreditCardValidatorTest < ActiveSupport::TestCase
     @payment = Payment.new
   end
 
+  test "nil number" do
+    assert_invalid_card_type_and_number 'Visa', nil
+    assert_invalid_card_type_and_number 'MasterCard', nil
+    assert_invalid_card_type_and_number 'DinersClub', nil
+    assert_invalid_card_type_and_number 'Amex', nil
+    assert_invalid_card_type_and_number 'Discover', nil
+    assert_invalid_card_type_and_number 'Maestro', nil
+    assert_invalid_card_type_and_number nil, nil
+  end
+
   test "visa cards" do
     assert_valid_card_type_and_number 'Visa', '4111111111111111'
     assert_valid_card_type_and_number 'visa', '4111111111111111'
@@ -86,6 +96,23 @@ class CreditCardValidatorTest < ActiveSupport::TestCase
     assert_invalid_card_type_and_number 'Discover', '6759671431256542'
   end
 
+  test "type attribute option is optional" do
+    class PaymentWithNoTypeValidation
+      include ActiveModel::Validations
+      attr_accessor :card_type, :card_number
+      validates :card_number, :credit_card => true
+    end
+
+    @payment = PaymentWithNoTypeValidation.new
+
+    assert_valid_card_type_and_number 'Visa', '4111111111111111'
+    assert_valid_card_type_and_number 'MasterCard', '4111111111111111'
+    assert_valid_card_type_and_number 'DinersClub', '4111111111111111'
+    assert_valid_card_type_and_number 'Amex', '4111111111111111'
+    assert_valid_card_type_and_number 'Discover', '4111111111111111'
+    assert_valid_card_type_and_number 'Maestro', '4111111111111111'
+  end
+
   #########
   protected
   #########

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evelpidon_validators
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &14644520 !ruby/object:Gem::Requirement
+  requirement: &7759920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14644520
+  version_requirements: *7759920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &14644080 !ruby/object:Gem::Requirement
+  requirement: &7759480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14644080
+  version_requirements: *7759480
 - !ruby/object:Gem::Dependency
   name: evelpidon_test_helpers
-  requirement: &14643640 !ruby/object:Gem::Requirement
+  requirement: &7759040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14643640
+  version_requirements: *7759040
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &14643140 !ruby/object:Gem::Requirement
+  requirement: &7758620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14643140
+  version_requirements: *7758620
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &14642660 !ruby/object:Gem::Requirement
+  requirement: &7758200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14642660
+  version_requirements: *7758200
 - !ruby/object:Gem::Dependency
   name: credit_card_validator
-  requirement: &14642200 !ruby/object:Gem::Requirement
+  requirement: &7757720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14642200
+  version_requirements: *7757720
 description: Useful ActiveModel validators with ClientSideValidations support.
 email:
 - n.dimitrakopoulos@pamediakopes.gr