credit_card_support 2.2.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d28f5ada154ffad6494b10e654dd28ce5a70ef43
-  data.tar.gz: a2b190748bda184e408bb857ac3c58738f485071
+  metadata.gz: 2c234bacc8120091ca1852b16ed40061c72fc238
+  data.tar.gz: dad00f6e83a6172da99df4a6b0dcf84d215d639a
 SHA512:
-  metadata.gz: fea56635c7c333e07d03b5cc1b6a8f38f3d4d71cbbcb194ce06932a66bdf8315346b1765fcc9021d3ee0b1b922bfb8fe2e359f9ff17bcfe84ec666c264ec85a0
-  data.tar.gz: 310fc7c7a36fcbd4d29a1452d901c7dc2b6fb5adb24cbb438bc7dcf0f1b2708ab909f9eabbeac9082cd63967dfc969c351efe5b85c7a240b4ac0304118a3dfff
+  metadata.gz: c738a7bee61bf2383af58a0d541d14f622d14a549ae87ee868b67e61a0c42d091b4dbe2a3ac5eb1e24b3e8d217ddcb74a00c08c5cdce0c03efb16c89654d5aaf
+  data.tar.gz: ebcc7cba76b432ec8cf11bd77de18048e959a4e768f08675095ea9e539112ca20ce5239c70fa1616af15848d9514eaabd7ac5e6c5cf6950ac3333105c91b0bf2

data/lib/credit_card_support/validators/credit_card_number_validator.rb

@@ -2,32 +2,36 @@ I18n.load_path << File.dirname(__FILE__) + '/../locale/en.yml'
 
 module ActiveModel
   module Validations
-    class CreditCardNumberValidator < ActiveModel::EachValidator
 
+    class CreditCardValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         @record     = record
         @attribute  = attribute
-        @value      = "#{value}"
+        @value      = "#{value}".strip.gsub(/ /, '') # remove random whitespace
 
         @value.extend(CreditCardSupport::CreditCardNumber)
 
-        validates_luhn &&
-        validates_testcard &&
-        validates_issuer_allowed
+        validate_internal
       end
 
-      def validates_luhn
-        if !@value.luhn?
-          @record.errors.add(@attribute, t(:luhn_not_valid))
-          false
-        else
-          true
-        end
+      def t(code, *args)
+         I18n.t("credit_card_support.validators.number.messages.#{code}", *args)
+      end
+    end
+
+    class CreditCardSupportValidator < CreditCardValidator
+      def validate_internal
+        validates_testcard &&
+        validates_issuer_allowed
       end
 
       def validates_testcard
         if !options[:allow_testcards] && @value.testcard?
-          @record.errors.add(@attribute, t(:testcard_not_supported))
+          @record.errors.add(
+            @attribute,
+            :testcard_not_supported,
+            options.merge(message: options[:message] || t(:testcard_not_supported))
+          )
           false
         else
           true
@@ -36,17 +40,31 @@ module ActiveModel
 
       def validates_issuer_allowed
         if options[:allow_issuers] && !options[:allow_issuers].include?(@value.issuer)
-          @record.errors.add(@attribute, t(:issuer_not_supported, issuer: @value.issuer))
+          @record.errors.add(
+            @attribute,
+            :issuer_not_supported,
+            options.merge(message: options[:message] || t(:issuer_not_supported, issuer: @value.issuer)).merge(issuer: @value.issuer)
+          )
           false
         else
           true
         end
       end
+    end
 
-      def t(code, *args)
-         I18n.t("credit_card_support.validators.number.messages.#{code}", *args)
+    class CreditCardNumberValidator < CreditCardValidator
+      def validate_internal
+        if !@value.luhn?
+          @record.errors.add(
+            @attribute,
+            :luhn_not_valid,
+            options.merge(message: options[:message] || t(:luhn_not_valid))
+          )
+          false
+        else
+          true
+        end
       end
-
     end
   end
 end

data/lib/credit_card_support/version.rb

@@ -1,8 +1,8 @@
 module CreditCardSupport
   module Version
     MAJOR = 2
-    MINOR = 2
-    PATCH = 0
+    MINOR = 5
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/spec/lib/credit_card_support/validators/credit_card_number_validator_spec.rb

@@ -23,27 +23,41 @@ class CreditCard
 end
 
 class CreditCardTest < CreditCard
-  validates :number, presence: true,
-                      length: {
-                        minimum: 13,
-                        maximum: 19
-                        },
-                      credit_card_number: {
-                        allow_testcards: true,
-                        allow_issuers: [:visa, :master_card]
-                      }
+  validates :number,
+  credit_card_number: true,
+  credit_card_support: {
+    allow_testcards: true,
+    allow_issuers: [:visa, :master_card]
+  }
+end
+
+class CreditCardWithCustomMessage < CreditCard
+  validates :number,
+  credit_card_number: { message: 'Luhn fail!' },
+  credit_card_support: {
+    allow_testcards: true,
+    allow_issuers: [:visa, :master_card],
+    message: "Not supported!"
+  }
+end
+
+class CreditCardWithCustomLambdaMessage < CreditCard
+  validates :number,
+  credit_card_number: { message: ->(trans_string, context){ "Luhn fail! #{trans_string} #{context[:value]}" } },
+  credit_card_support: {
+    allow_testcards: false,
+    allow_issuers: [:visa, :master_card],
+    message: ->(trans_string, context){ "Not supported! #{trans_string} #{context[:value]}" }
+  }
 end
 
 class CreditCardProduction < CreditCard
-  validates :number, presence: true,
-                      length: {
-                        minimum: 13,
-                        maximum: 19
-                        },
-                      credit_card_number: {
-                        allow_testcards: false,
-                        allow_issuers: [:visa, :master_card]
-                      }
+  validates :number,
+  credit_card_number: true,
+  credit_card_support: {
+    allow_testcards: false,
+    allow_issuers: [:visa, :master_card]
+  }
 end
 
 
@@ -59,16 +73,71 @@ describe ActiveModel::Validations::CreditCardNumberValidator do
       subject.number = nil
       subject.should_not be_valid
     end
+
     it "must be luhn" do
       subject.number = '4012888888881882'
       subject.should_not be_valid
+      subject.errors[:number].first.should == 'is not valid'
+    end
+
+    it "must reject unsupported cards" do
+      subject.number = '3528000000000007'
+      subject.should_not be_valid
+      subject.errors[:number].first.should == 'jcb not supported'
+    end
+
+    it "must support random whitespace around card numbers" do
+      subject.number = ' 4012 8888 8 8 8 8 1881    '
+      subject.should be_valid
+    end
+
+    context "with custom card support messages" do
+      subject { CreditCardWithCustomMessage.new(number: '3528000000000007') }
+      it "has a custom message" do
+        subject.valid?
+        subject.errors[:number].first.should == 'Not supported!'
+      end
     end
+
+    context "with custom luhn calculation failure messages" do
+      subject { CreditCardWithCustomMessage.new(number: '4111111111111112') }
+      it "has a custom message" do
+        subject.valid?
+        subject.errors[:number].first.should == 'Luhn fail!'
+      end
+    end
+
+    context "with custom card support messages in lambda form" do
+      subject { CreditCardWithCustomLambdaMessage.new(number: '3528000000000007') }
+      it "has a custom message" do
+        subject.valid?
+        subject.errors[:number].first.should == 'Not supported! activemodel.errors.models.credit_card_with_custom_lambda_message.attributes.number.testcard_not_supported 3528000000000007'
+      end
+    end
+
+    context "with custom test card support messages in lambda form" do
+      subject { CreditCardWithCustomLambdaMessage.new(number: '4111111111111111') }
+      it "has a custom message" do
+        subject.valid?
+        subject.errors[:number].first.should == 'Not supported! activemodel.errors.models.credit_card_with_custom_lambda_message.attributes.number.testcard_not_supported 4111111111111111'
+      end
+    end
+
+    context "with custom luhn calculation failure messages in lambda form" do
+      subject { CreditCardWithCustomLambdaMessage.new(number: '4111111111111112') }
+      it "has a custom message" do
+        subject.valid?
+        subject.errors[:number].first.should == 'Luhn fail! activemodel.errors.models.credit_card_with_custom_lambda_message.attributes.number.luhn_not_valid 4111111111111112'
+      end
+    end
+
     context "production" do
       subject { CreditCardProduction.new(number: '4485071359608368') }
       context "testnumber" do
         it "is invalid" do
           subject.number = '4012888888881881'
           subject.should be_invalid
+          subject.errors[:number].first.should == 'testcards not supported'
         end
       end
       context "valid number" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: credit_card_support
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Margus Pärt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -61,8 +61,6 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - README.md
-- LICENSE.txt
-- HISTORY.txt
 - lib/credit_card_support/credit_card_number.rb
 - lib/credit_card_support/locale/en.yml
 - lib/credit_card_support/luhn_number.rb
@@ -74,7 +72,8 @@ files:
 - spec/lib/credit_card_support/validators/credit_card_number_validator_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/tione/credit_card_support
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/HISTORY.txt

@@ -1,18 +0,0 @@
-2.0.0
-
-Rewrite.
-
-
-1.0.2
-
-Readme improvement.
-
-
-1.0.1
-
-Redid validator loading - its automatically loaded if ActiveModel is loaded.
-
-
-1.0.0
-
-Initial.

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2012 mxrguspxrt
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.