validate_credit_card_fields 0.9.5 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08479b11ce7e965583a9682f6cc262917980bf05
-  data.tar.gz: 081101d249d8ae2061d5202652772e8bad8a98f8
+  metadata.gz: efa05300aa911f202e15eaa78bfde95eed37e77b
+  data.tar.gz: 205943230670a96425e1469b13f2ad6a2ac1238b
 SHA512:
-  metadata.gz: 3644cc31ca0295440b0b355b556e04143d3ac1ebf7eac012df8a7d9fa478731a8d9b10857d233c19ac24f8d2e97fb97ccbd46b69d60e67cb8baf1ec0689ee7ac
-  data.tar.gz: 7190a8b5502317e99b2d42eeee7f4ddaf080c0714ba76dbc45939a70b2050c0602f045181e3d8120aa7e804435bb786b3ef8b54a3d62505d1f4d23c7e178605d
+  metadata.gz: a7964ac49e2d875da01604cb4e31e7e3bebae517f0937b3446315d3521394fe1a2746bc627aa3082e043ab1fa6a0366bda9ecd523d186c4891ecab0c7ca79346
+  data.tar.gz: 0505b5113a2737041939b29748408f428b370150cee33e19872d2489c41749e2bb2aebea989f2ceb2743496ca4a74cfa1fb3825edf043d6e278f2844647430f3

data/README.md

@@ -32,11 +32,18 @@ In place of `:your_something_field` place keys representing desired value in you
 
 `providers` are used to specify provider limitations. Supply it with a list of **supported** providers (those you want to be valid). Leaving it blank will allow any of the accepted providers below:
 
-    :visa, :master_card, :maestro, :diners_club, :amex, :discover, :jcb
+    :visa, :master_card, :maestro, :diners_club, :amex, :discover, :jcb, :solo, :china_union, :dankort
 
 When a field name isn't presented, validator will use default values:
 
     :cc_number, :cc_cvv, :cc_month, :cc_year, :cc_owner
+    
+Now possible to validate credit card owner using first and last names, for example:
+    
+    validate_credit_card_fields first_name: :your_first_name_field,
+                                last_name: :your_last_name_field
+
+If both `:first_name` and `:last_name` keys are provided, those two fields will be validated, otherwise it'll fall back to `:owner`.
 
 
 ## Contributing

data/lib/validate_credit_card_fields/version.rb

@@ -1,3 +1,3 @@
 module ValidateCreditCardFields
-  VERSION = "0.9.5"
+  VERSION = "0.9.7"
 end

data/lib/validate_credit_card_fields.rb

@@ -13,15 +13,19 @@ module ActiveModel
       PROVIDERS = {
         visa: /^4[0-9]{12}(?:[0-9]{3})?$/,
         master_card: /^5[1-5][0-9]{14}$/,
-        maestro: /(^6759[0-9]{2}([0-9]{10})$)|(^6759[0-9]{2}([0-9]{12})$)|(^6759[0-9]{2}([0-9]{13})$)/,
+        maestro: /^(?:5[0678]\d\d|6304|6390|67\d\d)\d{8,15}$/,
         diners_club: /^3(?:0[0-5]|[68][0-9])[0-9]{11}$/,
         amex: /^3[47][0-9]{13}$/,
         discover: /^6(?:011|5[0-9]{2})[0-9]{12}$/,
-        jcb: /^(?:2131|1800|35\d{3})\d{11}$/
+        jcb: /^(?:2131|1800|35\d{3})\d{11}$/,
+        solo: /(^(6334)[5-9](\d{11}$|\d{13,14}$)) |(^(6767)(\d{12}$|\d{14,15}$))/,
+        china_union: /^62[0-5]\d{13,16}$/,
+        dankort: /^5019\d{12}$/
       }
 
       attr_accessor :options, :cc_number, :cc_cvv, :cc_month,
-                    :cc_year, :cc_owner, :cc_providers, :cc_type, :custom_messages
+                    :cc_year, :cc_owner, :cc_providers, :cc_type, :custom_messages,
+                    :cc_first_name, :cc_last_name, :using_owner
 
       def initialize(options={})
         @options = options
@@ -30,8 +34,14 @@ module ActiveModel
         @cc_cvv = init_option(:cvv, :cc_cvv)
         @cc_month = init_option(:month, :cc_month)
         @cc_year = init_option(:year, :cc_year)
-        @cc_owner = init_option(:owner, :cc_owner)
         @cc_providers = options[:providers]
+        @using_owner = !options[:owner].nil? || options[:first_name].nil? || options[:last_name].nil?
+        if @using_owner
+          @cc_owner = init_option(:owner, :cc_owner)
+        else
+          @cc_first_name = init_option(:first_name, :cc_first_name)
+          @cc_last_name = init_option(:last_name, :cc_last_name)
+        end
       end
 
       def init_option(key, default)
@@ -62,8 +72,12 @@ module ActiveModel
 
       private
 
+      def validated_fields
+        [cc_number, cc_cvv, cc_month, cc_year] + (using_owner ? [cc_owner] : [cc_first_name, cc_last_name])
+      end      
+
       def validate_fields_presence
-        [cc_number, cc_cvv, cc_month, cc_year, cc_owner].each do |field|
+        validated_fields.each do |field|
           add_error(field, :blank) if @record.public_send(field).blank?
         end
       end
@@ -72,7 +86,7 @@ module ActiveModel
         err = if @cc_type.nil? || !luhn_algorithm_valid?
                 :invalid
               elsif !cc_providers.blank? && !cc_providers.include?(@cc_type)
-                :not_supported
+                :inclusion
               end
         add_error(cc_number, err) if err
       end
@@ -113,6 +127,7 @@ module ActiveModel
       end
 
       def luhn_algorithm_valid?
+        return true if @cc_type == :china_union
         s1 = s2 = 0
         @record.public_send(cc_number).to_s.reverse.chars.each_slice(2) do |odd, even|
           s1 += odd.to_i
@@ -140,7 +155,7 @@ module ActiveModel
       end
 
       def check_fields_format
-        invalid_attr = [cc_number, cc_cvv, cc_month, cc_year, cc_owner].find do |attr|
+        invalid_attr = validated_fields.find do |attr|
           !@record.public_send(attr).is_a?(NilClass) && !@record.public_send(attr).is_a?(String)
         end
         if invalid_attr

data/spec/dummy/named_user.rb

@@ -0,0 +1,21 @@
+require 'active_model'
+
+class NamedUser
+  include ActiveModel::Validations
+
+  attr_accessor  :credit_card_number, :credit_card_cvv, :credit_card_month,
+    :credit_card_year, :first_name, :last_name
+
+  validate_credit_card_fields  number: :credit_card_number,
+                               cvv: :credit_card_cvv,
+                               month: { field: :credit_card_month },
+                               year: :credit_card_year,
+                               first_name: :first_name,
+                               last_name: :last_name,
+                               providers: [:amex, :visa]
+
+  def [](key)
+    send(key)
+  end
+
+end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'active_model'
 require 'byebug'
 require 'validate_credit_card_fields'
 require 'dummy/user'
+require 'dummy/named_user'
 
 RSpec.configure do |config|
   # some (optional) config here

data/spec/validate_credit_card_fields_spec.rb

@@ -36,6 +36,46 @@ describe ValidateCreditCardFields do
       end
     end
 
+    context 'first and last name instead of owner' do
+      let(:dummy) { NamedUser.new }
+
+      context 'first_name' do
+
+        it 'must be present' do
+          dummy.first_name = nil
+          should_have_error :first_name, 'can\'t be blank'
+        end
+
+        it 'raises an error if it\'s not a string' do
+          dummy.first_name = 1
+          expect{dummy.valid?}.to raise_error{CCTypeError}
+        end
+
+        it 'not raising error if nil' do
+          dummy.first_name = nil
+          expect{dummy.valid?}.not_to raise_error{CCTypeError}
+        end
+      end
+
+      context 'last_name' do
+
+        it 'must be present' do
+          dummy.last_name = nil
+          should_have_error :last_name, 'can\'t be blank'
+        end
+
+        it 'raises an error if it\'s not a string' do
+          dummy.last_name = 1
+          expect{dummy.valid?}.to raise_error{CCTypeError}
+        end
+
+        it 'not raising error if nil' do
+          dummy.last_name = nil
+          expect{dummy.valid?}.not_to raise_error{CCTypeError}
+        end
+      end
+    end
+
     context 'number' do
 
       it 'must be present' do
@@ -295,7 +335,37 @@ describe ValidateCreditCardFields do
       end
     end
 
+    context 'with both first and last name provided' do
+      let(:fields) { [:cc_number, :cc_cvv, :cc_month, :cc_year, :cc_first_name, :cc_last_name] }
+      let(:options) { {first_name: :cc_first_name, last_name: :cc_last_name} }
+      before do
+        dummy.cc_first_name = 'Tomasz'        
+        dummy.cc_last_name = 'Czosnek'
+      end
+
+      it 'raises no owner errors' do
+        has_valid :cc_owner
+      end
+
+      it 'raises first name errors' do
+        dummy.cc_first_name = ''
+        should_have_error :cc_first_name, 'can\'t be blank'
+      end
 
+      it 'raises last name errors' do
+        dummy.cc_last_name = ''
+        should_have_error :cc_last_name, 'can\'t be blank'
+      end
+    end
+
+    context 'without first or last name provided' do
+      let(:options) { {last_name: 'whatever'} }
+
+      it 'falls back to owner requirement' do
+        dummy.valid?
+        expect(dummy.errors).to include(:cc_owner)
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate_credit_card_fields
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors:
 - Piotr Kruczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -98,6 +98,7 @@ files:
 - Rakefile
 - lib/validate_credit_card_fields.rb
 - lib/validate_credit_card_fields/version.rb
+- spec/dummy/named_user.rb
 - spec/dummy/user.rb
 - spec/spec_helper.rb
 - spec/validate_credit_card_fields_spec.rb
@@ -127,6 +128,7 @@ signing_key:
 specification_version: 4
 summary: Credit card validation with all dependant fields
 test_files:
+- spec/dummy/named_user.rb
 - spec/dummy/user.rb
 - spec/spec_helper.rb
 - spec/validate_credit_card_fields_spec.rb