evelpidon_validators 0.4.0 → 0.4.2

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Evelpidon Validators changelog
 
+## 0.4.2 / 2012-01-16
+
+* Fixed type deprecation warning added in the wrong place
+
+## 0.4.1 / 2012-01-16
+
+* Renamed credit card validator type option to type_attribute (type is deprecated)
+* Type is optional for a credit card validation
+
 ## 0.4.0 / 2012-01-13
 
 * Fix for nested forms and sibling finding

data/lib/assets/javascripts/evelpidon_validators/credit_card.js

@@ -1,7 +1,7 @@
 clientSideValidations.validators.remote['credit_card'] = function(element, options) {
     if ($.ajax({
         url: '/validators/credit_card.json',
-        data: { value: element.val(), type: clientSideValidations.helpers.getSiblingField(element, options.type).val() },
+        data: { value: element.val(), type: clientSideValidations.helpers.getSiblingField(element, options.type_attribute).val() },
         async: false
     }).status == 404) { return options.message; }
 };

data/lib/evelpidon_validators/credit_card.rb

@@ -7,13 +7,24 @@ end
 module ActiveModel
   module Validations
     class CreditCardValidator < EachValidator
+      def initialize(options)
+        if options[:type]
+          warn "The :type option has been deprecated, please use :type_attribute instead."
+          options[:type_attribute] ||= options[:type]
+        end
+
+        super
+      end
+
       def self.valid_credit_card?(number, type)
-        ::CreditCardValidator::Validator.options[:allowed_card_types] = [(type || '').underscore.to_sym]
+        if type
+          ::CreditCardValidator::Validator.options[:allowed_card_types] = [type.underscore.to_sym]
+        end
         ::CreditCardValidator::Validator.valid?(number)
       end
 
       def validate_each(record, attribute, value)
-        unless self.class.valid_credit_card? value, record.send(options[:type])
+        unless self.class.valid_credit_card? value, record.send(options[:type_attribute])
           record.errors.add(attribute, :credit_card, options)
         end
       end

data/lib/evelpidon_validators/version.rb

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

data/test/credit_card_test.rb

@@ -6,7 +6,7 @@ class CreditCardValidatorTest < ActiveSupport::TestCase
   class Payment
     include ActiveModel::Validations
     attr_accessor :card_type, :card_number
-    validates :card_number, :credit_card => { :type => :card_type }
+    validates :card_number, :credit_card => { :type_attribute => :card_type }
   end
 
   setup do
@@ -17,6 +17,7 @@ class CreditCardValidatorTest < ActiveSupport::TestCase
   test "visa cards" do
     assert_valid_card_type_and_number 'Visa', '4111111111111111'
     assert_valid_card_type_and_number 'visa', '4111111111111111'
+    assert_valid_card_type_and_number nil, '4111111111111111'
 
     assert_invalid_card_type_and_number 'MasterCard', '4111111111111111'
     assert_invalid_card_type_and_number 'DinersClub', '4111111111111111'
@@ -28,6 +29,7 @@ class CreditCardValidatorTest < ActiveSupport::TestCase
   test "master card cards" do
     assert_valid_card_type_and_number 'MasterCard', '5555555555554444'
     assert_valid_card_type_and_number 'master_card', '5555555555554444'
+    assert_valid_card_type_and_number nil, '5555555555554444'
 
     assert_invalid_card_type_and_number 'Visa', '5555555555554444'
     assert_invalid_card_type_and_number 'DinersClub', '5555555555554444'
@@ -39,6 +41,7 @@ class CreditCardValidatorTest < ActiveSupport::TestCase
   test "diners club cards" do
     assert_valid_card_type_and_number 'DinersClub', '30569309025904'
     assert_valid_card_type_and_number 'diners_club', '30569309025904'
+    assert_valid_card_type_and_number nil, '30569309025904'
 
     assert_invalid_card_type_and_number 'Visa', '30569309025904'
     assert_invalid_card_type_and_number 'MasterCard', '30569309025904'
@@ -50,6 +53,7 @@ class CreditCardValidatorTest < ActiveSupport::TestCase
   test "amex cards" do
     assert_valid_card_type_and_number 'Amex', '371449635398431'
     assert_valid_card_type_and_number 'amex', '371449635398431'
+    assert_valid_card_type_and_number nil, '371449635398431'
 
     assert_invalid_card_type_and_number 'Visa', '371449635398431'
     assert_invalid_card_type_and_number 'MasterCard', '371449635398431'
@@ -61,6 +65,7 @@ class CreditCardValidatorTest < ActiveSupport::TestCase
   test "discover cards" do
     assert_valid_card_type_and_number 'Discover', '6011000990139424'
     assert_valid_card_type_and_number 'discover', '6011000990139424'
+    assert_valid_card_type_and_number nil, '6011000990139424'
 
     assert_invalid_card_type_and_number 'Visa', '6011000990139424'
     assert_invalid_card_type_and_number 'MasterCard', '6011000990139424'
@@ -72,6 +77,7 @@ class CreditCardValidatorTest < ActiveSupport::TestCase
   test "maestro cards" do
     assert_valid_card_type_and_number 'Maestro', '6759671431256542'
     assert_valid_card_type_and_number 'maestro', '6759671431256542'
+    assert_valid_card_type_and_number nil, '6759671431256542'
 
     assert_invalid_card_type_and_number 'Visa', '6759671431256542'
     assert_invalid_card_type_and_number 'MasterCard', '6759671431256542'

metadata

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