credit_card_validations 1.1.2 → 1.2.0

data/README.md

@@ -34,11 +34,12 @@ The following issuing institutes are accepted:
     Dinner Club US   | :diners_us
     Discover         | :discover
     JCB              | :jcb
+    Laser            | :laser
     Maestro          | :maestro
     MasterCard       | :mastercard
     Solo             | :solo
     Visa             | :visa
-    Laser            | :laser
+
 
 Examples using string monkey patch
 

data/credit_card_validations.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activesupport", ">= 3.0", "< 4.1"
 
   gem.add_development_dependency "test-unit"
+  gem.add_development_dependency "mocha"
   gem.add_development_dependency 'rake'
 
 end

data/lib/credit_card_validations/card_rules.rb

@@ -50,7 +50,7 @@ module CreditCardValidations
     ]
 
     UNIONPAY = [
-        {length: [16, 17, 18, 19], prefixes: ['620', '621', '623', '625', '626']}
+        {length: [16, 17, 18, 19], prefixes: ['620', '621', '623', '625', '626'], :skip_validation => true}
     ]
 
 

data/lib/credit_card_validations/detector.rb

@@ -15,18 +15,17 @@ module CreditCardValidations
     end
 
     #brand name
-    def brand
-       valid_number?
+    def brand(*brands)
+       valid_number?(*brands)
     end
 
     def valid_number?(*brands)
-      return nil unless valid_luhn?
       number_length = number.length
       brand_rules = brands.blank? ? self.rules : self.rules.slice(*brands.map{ |el| el.downcase })
       unless brand_rules.blank?
         brand_rules.each do |brand_name, rules|
           rules.each do |rule|
-            return brand_name if (rule[:length].include?(number_length) and number.match(rule[:regexp]))
+            return brand_name if ( (rule[:skip_validation] || valid_luhn?) and rule[:length].include?(number_length) and number.match(rule[:regexp]))
           end
         end
       end
@@ -35,7 +34,7 @@ module CreditCardValidations
 
     #check if luhn valid
     def valid_luhn?
-      Luhn.valid?(number)
+      @valid_luhn ||= Luhn.valid?(number)
     end
 
     class << self
@@ -46,11 +45,11 @@ module CreditCardValidations
       end
 
       #create rule for detecting brand
-      def add_rule(brand, length, prefixes)
+      def add_rule(brand, length, prefixes, skip_validation = false)
         prefixes = Array.wrap(prefixes)
         length = Array.wrap(length)
         rules[brand] = [] if rules[brand].blank?
-        rules[brand] << {length: length,  regexp: compile_regexp(prefixes), prefixes: prefixes}
+        rules[brand] << {length: length,  regexp: compile_regexp(prefixes), prefixes: prefixes, :skip_validation => skip_validation}
         #create methods like  visa? mastercard? etc
         class_eval <<-BOOLEAN_RULE, __FILE__, __LINE__
           def #{brand}?
@@ -62,11 +61,11 @@ module CreditCardValidations
 
     CardRules.constants.each do |const_name|
       CardRules.const_get(const_name).each do |const_value|
-        self.add_rule(const_name.to_s.downcase.to_sym , const_value[:length], const_value[:prefixes])
+        self.add_rule(const_name.to_s.downcase.to_sym , const_value[:length], const_value[:prefixes], const_value[:skip_validation])
       end
 
     end
   end
 
 
-end
+end

data/lib/credit_card_validations/version.rb

@@ -1,3 +1,3 @@
 module CreditCardValidations
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/test/credit_card_validations_test.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'mocha/setup'
 lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
 unit_tests = File.expand_path("#{File.dirname(__FILE__)}/../test")
 $:.unshift(lib)
@@ -41,6 +42,16 @@ class CreditCardValidationsTest < Test::Unit::TestCase
     assert_nil detector('1111111111111111').brand
   end
 
+  def test_card_brand_detection_with_restriction
+    @test_numbers.slice(:visa, :mastercard).each do |key, value|
+      assert_equal key, detector(value).brand(:visa, :mastercard)
+    end
+
+    @test_numbers.except(:visa, :mastercard).each do |key, value|
+      assert_nil detector(value).brand(:visa, :mastercard)
+    end
+  end
+
   def test_card_valid_method
     @test_numbers.each do |key, value|
       assert detector(value).valid?(key)
@@ -77,20 +88,40 @@ class CreditCardValidationsTest < Test::Unit::TestCase
      cc = CreditCardModel.new
      cc.number = @test_numbers[:maestro]
      assert cc.valid?
-      
+
      cc = CreditCardModel.new
      cc.number = @test_numbers[:mastercard]
      assert !cc.valid?
      assert cc.errors[:number].include?(cc.errors.generate_message(:number, :invalid))
   end
-  
+
   def test_string_extension
     require 'credit_card_validations/string'
-    assert_equal  @test_numbers[:mastercard].credit_card_brand, :mastercard  
-    assert  @test_numbers[:mastercard].valid_credit_card_brand?(:mastercard)  
-    assert !@test_numbers[:mastercard].valid_credit_card_brand?(:visa, :amex)  
-  end  
-  
+    assert_equal  @test_numbers[:mastercard].credit_card_brand, :mastercard
+    assert  @test_numbers[:mastercard].valid_credit_card_brand?(:mastercard)
+    assert !@test_numbers[:mastercard].valid_credit_card_brand?(:visa, :amex)
+  end
+
+
+  def test_skip_validation
+    d = detector(@test_numbers[:unionpay])
+    d.expects(:valid_luhn?).never
+    assert d.valid?(:unionpay)
+
+    d = detector(@test_numbers[:unionpay])
+    d.expects(:valid_luhn?).once
+    assert !d.valid?(:visa)
+
+    d = detector(@test_numbers[:unionpay])
+    d.expects(:valid_luhn?).never
+    assert d.valid?(:unionpay, :visa)
+
+    d = detector(@test_numbers[:unionpay])
+    d.expects(:valid_luhn?).once
+    assert d.valid?(:visa, :unionpay)
+  end
+
+
   protected
 
   def detector(number)
@@ -98,4 +129,4 @@ class CreditCardValidationsTest < Test::Unit::TestCase
   end
 
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: credit_card_validations
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70126777364960 !ruby/object:Gem::Requirement
+  requirement: &70292463116540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '4.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70126777364960
+  version_requirements: *70292463116540
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70126777364180 !ruby/object:Gem::Requirement
+  requirement: &70292463129120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '4.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70126777364180
+  version_requirements: *70292463129120
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70126777363520 !ruby/object:Gem::Requirement
+  requirement: &70292467198680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,10 +49,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126777363520
+  version_requirements: *70292467198680
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70292467197900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70292467197900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70126777363040 !ruby/object:Gem::Requirement
+  requirement: &70292467197180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -60,7 +71,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126777363040
+  version_requirements: *70292467197180
 description: A ruby gem for validating credit card numbers (a port of ZF2 Zend\Validator\CreditCard)
 email:
 - fedoronchuk@gmail.com