uk_account_validator 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ed06611b9e4a497d4b1b7898d8a614b0d3c7a9
-  data.tar.gz: 401c799d9db00473a5c16e301f56a63626adec98
+  metadata.gz: c637157bc170af3a8dfffc98dc8eb077c8399a53
+  data.tar.gz: 306471bc50f263137a9345d71bdbb01030dfedd9
 SHA512:
-  metadata.gz: fba09039c2827ea271879a61846a53bbf479657f5eaeb6051da7b5dd538dc7d0d8c391451a9839722668a7e354ea7cd04b866e9e260055edc1188d902250263b
-  data.tar.gz: 698615735fb54619616f4894404acc90155b46190f96ad20146273cbfdbb9eb18c69b970915745727f703df279511d52f35a40f35936fe9d2a5f8990ce3b0c15
+  metadata.gz: 5d4c22ba1364efd73e909e109f99875f281ec87dbbd90e27042cd50223f3a899e7efe803da9aeac4d7f4c634fdfb256413f51ee6f9255f47958ad0ff5f69cdc2
+  data.tar.gz: 8455a102924d27c735870f1fe061c6200105a8a766a6fe36bf14e761b0e78aad6dc8a4f64b1258a718174d41ee2ca3cb2b0e0d8287de0fdcfe957821584adad3

data/.travis.yml

@@ -6,8 +6,7 @@ rvm:
   - 2.1.6
   - 2.2.1
 
-install:
-  - bundle install --without development
+bundler_args: --without development
 
 script:
   - bundle exec cucumber

data/lib/uk_account_validator.rb

@@ -1,3 +1,4 @@
+require 'uk_account_validator/number_indices.rb'
 require 'uk_account_validator/validator.rb'
 require 'uk_account_validator/modulus_weight.rb'
 require 'uk_account_validator/modulus_weights_table.rb'
@@ -8,6 +9,19 @@ require 'uk_account_validator/validators/modulus10.rb'
 require 'uk_account_validator/validators/modulus11.rb'
 require 'uk_account_validator/validators/double_alternate.rb'
 
+require 'uk_account_validator/exceptions/base_exception.rb'
+require 'uk_account_validator/exceptions/exception_1.rb'
+require 'uk_account_validator/exceptions/exception_2_9.rb'
+require 'uk_account_validator/exceptions/exception_3.rb'
+require 'uk_account_validator/exceptions/exception_4.rb'
+require 'uk_account_validator/exceptions/exception_5.rb'
+require 'uk_account_validator/exceptions/exception_6.rb'
+require 'uk_account_validator/exceptions/exception_7.rb'
+require 'uk_account_validator/exceptions/exception_8.rb'
+require 'uk_account_validator/exceptions/exception_10.rb'
+require 'uk_account_validator/exceptions/exception_12.rb'
+require 'uk_account_validator/exceptions/exception_14.rb'
+
 module UkAccountValidator
   def self.modulus_weights_table
     @modulus_weights_table ||= read_modulus_weights_table

data/lib/uk_account_validator/exceptions/base_exception.rb

@@ -0,0 +1,65 @@
+class BaseException
+  include NumberIndices
+
+  attr_reader :modulus_weight, :account_number, :sort_code, :check_number
+
+  def initialize(modulus_weight, account_number, sort_code, check_number)
+    @modulus_weight = modulus_weight
+    @account_number = account_number
+    @sort_code      = sort_code
+    @check_number   = check_number
+  end
+
+  def self.allow_any?
+    false
+  end
+
+  def override_test?
+    false
+  end
+
+  # Returns the new modulus weight after applying the exception.
+  def replace_weight(_test_digits)
+    return modulus_weight
+  end
+
+  # Returns the new total after any adjustments
+  def after_calculate_total(total, _test_digits)
+    return total
+  end
+
+  def apply_account_number_substitutions
+    return account_number
+  end
+
+  # Returns the new sort code after substitutions
+  def apply_sort_code_substitutions
+    return sort_code
+  end
+
+  # Useful functions
+
+  # Zero all weights
+  def zero_all
+    UkAccountValidator::ModulusWeight.new(
+      modulus_weight.sort_code_start,
+      modulus_weight.sort_code_end,
+      modulus_weight.modulus,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      modulus_weight.exception
+    )
+  end
+
+  # Zero weights for u to b
+  def zero_u_b
+    UkAccountValidator::ModulusWeight.new(
+      modulus_weight.sort_code_start,
+      modulus_weight.sort_code_end,
+      modulus_weight.modulus,
+      0, 0, 0, 0, 0, 0, 0, 0,
+      modulus_weight.c, modulus_weight.d, modulus_weight.e,
+      modulus_weight.f, modulus_weight.g, modulus_weight.h,
+      modulus_weight.exception
+    )
+  end
+end

data/lib/uk_account_validator/exceptions/exception_1.rb

@@ -0,0 +1,10 @@
+# Perform the double alternate check except:
+#   Add 27 to the total (ie before you divide by 10)
+# This effectively places a financial institution number (580149) before the
+# sorting code and account number which is subject to the alternate doubling as
+# well.
+class Exception1 < BaseException
+  def after_calculate_total(total, _test_digits)
+    return total + 27
+  end
+end

data/lib/uk_account_validator/exceptions/exception_10.rb

@@ -0,0 +1,18 @@
+# For the exception 10 check, if ab = 09 or ab = 99 and g = 9, zeroise weighting
+# positions u-b.
+class Exception10 < BaseException
+  def self.allow_any?
+    true
+  end
+
+  def replace_weight(test_digits)
+    # if ab = 09 or 99 and g=9, zeroise weighting positions u-b.
+    a = test_digits[NUMBER_INDEX[:a]]
+    b = test_digits[NUMBER_INDEX[:b]]
+
+    return zero_u_b if (a == 0 && b == 9) ||
+      (a == 9 && b == 9 && test_digits[NUMBER_INDEX[:g]] == 9)
+
+    return modulus_weight
+  end
+end

data/lib/uk_account_validator/exceptions/exception_12.rb

@@ -0,0 +1,9 @@
+# These are for Nationwide Flex accounts. Where there is a 12 in the exception
+# column for the first check for a sorting code and a 13 in the exception column
+# for the second check for the same sorting code, if either check is successful
+# the account number is deemed valid.
+class Exception12 < BaseException
+  def self.allow_any?
+    true
+  end
+end

data/lib/uk_account_validator/exceptions/exception_14.rb

@@ -0,0 +1,30 @@
+# Perform the modulus 11 check as normal:
+#  * If the check passes (that is, there is no remainder), then the account
+#    number should be considered valid. Do not perform the second check.
+#  * If the first check fails, then the second check must be performed as
+#    specified below.
+#
+# Second check:
+#  * If the 8th digit of the account number (reading from left to right) is not
+#    0, 1 or 9 then the account number fails the second check and is not a valid
+#    Coutts account number
+#  * If the 8th digit is 0, 1 or 9, then remove the digit from the account
+#    number and insert a 0 as the 1st digit for check purposes only
+#  * Perform the modulus 11 check on the modified account number using the same
+#    weightings as specified in the table (that is, 0 0 0 0 0 0 8 7 6 5 4 3 2 1):
+#    - If there is no remainder, then the account number should be considered
+#      valid
+#    - If there is a remainder, then the account number fails the second check
+#      and is not a valid Coutts account number
+class Exception14 < BaseException
+  def self.allow_any?
+    true
+  end
+
+  def apply_account_number_substitutions
+    return account_number unless %w(0 1 9).include?(account_number[7])
+
+    account_number.slice!(7)
+    return '0' + account_number
+  end
+end

data/lib/uk_account_validator/exceptions/exception_2_9.rb

@@ -0,0 +1,68 @@
+# Only occurs for some standard modulus 11 checks, when there is a 2 in the
+# exception column for the first check for a sorting code and a 9 in the
+# exception column for the second check for the same sorting code. This is used
+# specifically for Lloyds euro accounts.
+#
+# Perform the standard check, except:
+#  * If a <> 0 and g <> 9, substitute the weight specified in the modulus weight
+#    table with:
+#      u v w x y z a b c d e  f g h
+#      0 0 1 2 5 3 6 4 8 7 10 9 3 1
+#
+#  * If a <> 0 and g = 9, substitute the weight specified in the modulus weight
+#    table with:
+#      u v w x y z a b c d e f g h
+#      0 0 0 0 0 0 0 0 8 7 10 9 3 1
+#
+# If the first row with exception 2 passes the standard modulus 11 check, you do
+# not need to carry out the second check (ie it is deemed to be a valid sterling
+# account).
+#
+# All Lloyds euro accounts are held at sorting code 30-96-34, however customers
+# may perceive that their euro account is held at the branch where sterling
+# accounts are held and thus quote a sorting code other than 30-96-34. The
+# combination of the "sterling" sorting code and "euro" account number will
+# cause the first standard modulus 11 check to fail. In such cases, carry out
+# the second modulus 11 check, substituting the sorting code with 309634 and the
+# appropriate weighting. If this check passes it is deemed to be a valid euro
+# account.
+
+class Exception29 < BaseException
+  def self.allow_any?
+    true
+  end
+
+  def apply_sort_code_substitutions
+    return '309634' if check_number == 2
+
+    return sort_code
+  end
+
+  def replace_weight(test_digits)
+    return modulus_weight if test_digits[NUMBER_INDEX[:a]] == 0
+    return substitute_modulus_weight if check_number == 2
+
+    if test_digits[NUMBER_INDEX[:g]] != 9
+      return UkAccountValidator::ModulusWeight.new(
+        modulus_weight.sort_code_start,
+        modulus_weight.sort_code_end,
+        modulus_weight.modulus,
+        0, 0, 1, 2, 5, 3, 6, 4, 8, 7, 10, 9, 3, 1,
+        modulus_weight.exception
+      )
+    else
+      return UkAccountValidator::ModulusWeight.new(
+        modulus_weight.sort_code_start,
+        modulus_weight.sort_code_end,
+        modulus_weight.modulus,
+        0, 0, 0, 0, 0, 0, 0, 0, 8, 7, 10, 9, 3, 1,
+        modulus_weight.exception
+      )
+    end
+  end
+
+  # Returns the modulus weight for 309634
+  def substitute_modulus_weight
+    UkAccountValidator.modulus_weights_table.find('309634').first
+  end
+end

data/lib/uk_account_validator/exceptions/exception_3.rb

@@ -0,0 +1,10 @@
+# If c=6 or c=9 the double alternate check does not need to be carried out
+class Exception3 < BaseException
+  def replace_weight(test_digits)
+    c = test_digits[NUMBER_INDEX[:c]]
+
+    return zero_all if c == 6 || c == 9
+
+    return modulus_weight
+  end
+end

data/lib/uk_account_validator/exceptions/exception_4.rb

@@ -0,0 +1,16 @@
+# Perform the standard modulus 11 check.
+# After you have finished the check, ensure that the remainder is the same as
+# the two-digit checkdigit;
+# the checkdigit for exception 4 is gh from the original account number.
+class Exception4 < BaseException
+  def override_test?
+    true
+  end
+
+  def test(modulus, total, test_digits, _test)
+    check_sum = [test_digits[NUMBER_INDEX[:g]], test_digits[NUMBER_INDEX[:h]]].join
+    check_sum = check_sum.to_i
+
+    total % modulus == check_sum
+  end
+end

data/lib/uk_account_validator/exceptions/exception_5.rb

@@ -0,0 +1,48 @@
+# Perform the first check (standard modulus check) except:
+#  * If the sorting code appears in SCSUBTAB.txt, substitute it for the
+#    "substitute with" column (for check purposes only).
+#    If the sorting code is not found, use the original sorting code.
+#
+# For the standard check with exception 5 the checkdigit is g from the original
+# account number.
+#  * After dividing the result by 11:
+#    - if the remainder = 0 and g = 0 the account number is valid
+#    - if the remainder = 1 the account number is invalid
+#    - for all other remainders, take the remainder away from 11. If the number
+#      you get is the same as g then the account number is valid.
+#
+# Perform the second double alternate check, and for the double alternate check
+# with exception 5 the checkdigit is h from the original account number, except:
+#  * After dividing the result by 10:
+#    - if the remainder = 0 and h = 0 the account number is valid
+#    - for all other remainders, take the remainder away from 10. If the number
+#      you get is the same as h then the account number is valid.
+class Exception5 < BaseException
+  def apply_sort_code_substitutions
+    substitutions = UkAccountValidator.read_sort_code_substitution
+
+    return substitutions[sort_code] if substitutions.keys.include?(sort_code)
+
+    return sort_code
+  end
+
+  def override_test?
+    true
+  end
+
+  def test(modulus, total, test_digits, test)
+    if test == :double_alternate
+      check_digit = :h
+    else
+      check_digit = :g
+    end
+
+    check_sum    = total % modulus
+    expected_sum = test_digits[NUMBER_INDEX[check_digit]].to_i
+
+    return false if check_sum == 1 && check_digit == :g
+    return true  if check_sum == 0 && expected_sum == 0
+
+    return (modulus - check_sum) == expected_sum
+  end
+end

data/lib/uk_account_validator/exceptions/exception_6.rb

@@ -0,0 +1,16 @@
+# Indicates that these sorting codes may contain foreign currency accounts which
+# cannot be checked.
+# Perform the first and second checks, except:
+#   If a = 4, 5, 6, 7 or 8, and g and h are the same, the accounts are for a
+#   foreign currency and the checks cannot be used.
+class Exception6 < BaseException
+  def replace_weight(test_digits)
+    a = test_digits[NUMBER_INDEX[:a]]
+    g = test_digits[NUMBER_INDEX[:g]]
+    h = test_digits[NUMBER_INDEX[:h]]
+
+    return zero_all if (a == 4 || a == 5 || a == 6 || a == 7 || a == 8) && g == h
+
+    return modulus_weight
+  end
+end

data/lib/uk_account_validator/exceptions/exception_7.rb

@@ -0,0 +1,9 @@
+# Perform the check as specified, except if g = 9 zeroise weighting positions
+# u-b.
+class Exception7 < BaseException
+  def replace_weight(test_digits)
+    return modulus_weight unless test_digits[NUMBER_INDEX[:g]] == 9
+
+    return zero_u_b
+  end
+end

data/lib/uk_account_validator/exceptions/exception_8.rb

@@ -0,0 +1,7 @@
+# Perform the check as specified, except substitute the sorting code with
+# 090126, for check purposes only
+class Exception8 < BaseException
+  def apply_sort_code_substitutions
+    return '090126'
+  end
+end

data/lib/uk_account_validator/modulus_weight.rb

@@ -1,6 +1,6 @@
 module UkAccountValidator
   class ModulusWeight
-    attr_accessor :sort_code_start, :sort_code_end, :modulus, :u, :v, :w, :x,
+    attr_reader :sort_code_start, :sort_code_end, :modulus, :u, :v, :w, :x,
                 :y, :z, :a, :b, :c, :d, :e, :f, :g, :h, :exception
 
     # the size of each column
@@ -11,7 +11,7 @@ module UkAccountValidator
       # See https://www.ruby-forum.com/topic/184294#805359
       data = definition_line.unpack("A#{COLUMN_SIZES.join('A')}")
 
-      data.map! { |d| d.strip }
+      data.map!(&:strip)
 
       @sort_code_start, @sort_code_end, @modulus, @u, @v, @w, @x,
         @y, @z, @a, @b, @c, @d, @e, @f, @g, @h, @exception = data

data/lib/uk_account_validator/number_indices.rb

@@ -0,0 +1,18 @@
+module NumberIndices
+  NUMBER_INDEX = {
+    u: 0,
+    v: 1,
+    w: 2,
+    x: 3,
+    y: 4,
+    z: 5,
+    a: 6,
+    b: 7,
+    c: 8,
+    d: 9,
+    e: 10,
+    f: 11,
+    g: 12,
+    h: 13
+  }
+end

data/lib/uk_account_validator/validator.rb

@@ -11,7 +11,7 @@ module UkAccountValidator
       @modulus_weights ||= UkAccountValidator.modulus_weights_table.find(sort_code)
     end
 
-    def validator(modulus)
+    def modulus_validator(modulus)
       case modulus
       when 'MOD10'
         Validators::Modulus10
@@ -26,35 +26,50 @@ module UkAccountValidator
 
     def valid?
       exceptions = modulus_weights.map(&:exception)
+      exception_class = self.exception_class(exceptions)
 
       results = modulus_weights.each_with_index.map do |modulus_weight, i|
-        if i == 1 && exceptions.include?('2') && exceptions.include?('9')
-          next Validator.new(account_number, '309634').valid?
-        end
+        exception = exception_class.new(modulus_weight, account_number, sort_code, i + 1)
 
-        validator(modulus_weight.modulus).new(account_number, sort_code, modulus_weight, exceptions).valid?
+        @account_number = exception.apply_account_number_substitutions
+
+        modulus_validator(modulus_weight.modulus).new(
+          account_number, sort_code, modulus_weight, exception
+        ).valid?
       end
 
-      return results.any? if exceptions.include?('2') && exceptions.include?('9')
-      return results.any? if exceptions.include?('10') && exceptions.include?('11')
-      return results.any? if exceptions.include?('12') && exceptions.include?('13')
-      return apply_exception_14 if !results.any? && exceptions.include?('14')
+      return results.any? if exception_class.allow_any?
 
       results.all?
     end
 
-    # If the 8th digit of the account number (reading from left to right) is
-    # not 0, 1 or 9 then the account number fails the second check and is not a
-    # valid Coutts account number.
-    # If the 8th digit is 0, 1 or 9, then remove the digit from the account
-    # number and insert a 0 as the 1st digit for check purposes only
-    def apply_exception_14
-      return false unless %w(0 1 9).include?(account_number[7])
-
-      account_number.slice!(7)
-      exception_account_number = '0' + account_number
-
-      return Validator.new(exception_account_number, sort_code).valid?
+    def exception_class(exception_strings)
+      case
+      when exception_strings.include?('1')
+        Exception1
+      when exception_strings.include?('2') && exception_strings.include?('9')
+        Exception29
+      when exception_strings.include?('3')
+        Exception3
+      when exception_strings.include?('4')
+        Exception4
+      when exception_strings.include?('5')
+        Exception5
+      when exception_strings.include?('6')
+        Exception6
+      when exception_strings.include?('7')
+        Exception7
+      when exception_strings.include?('8')
+        Exception8
+      when exception_strings.include?('10') && exception_strings.include?('11')
+        Exception10
+      when exception_strings.include?('12') && exception_strings.include?('13')
+        Exception12
+      when exception_strings.include?('14')
+        Exception14
+      else
+        BaseException
+      end
     end
   end
 end

data/lib/uk_account_validator/validators/base_validator.rb

@@ -1,154 +1,28 @@
 module UkAccountValidator
   module Validators
     class BaseValidator
-      NUMBER_INDEX = {
-        u: 0,
-        v: 1,
-        w: 2,
-        x: 3,
-        y: 4,
-        z: 5,
-        a: 6,
-        b: 7,
-        c: 8,
-        d: 9,
-        e: 10,
-        f: 11,
-        g: 12,
-        h: 13
-      }
+      include NumberIndices
 
-      def initialize(account_number, sort_code, modulus_weight, exceptions)
+      attr_reader :account_number, :sort_code, :modulus_weight, :exception
+
+      def initialize(account_number, sort_code, modulus_weight, exception)
         @account_number = account_number
         @sort_code      = sort_code
         @modulus_weight = modulus_weight
-        @exceptions     = exceptions
+        @exception      = exception
 
-        @sort_code = apply_exception_5_substitutions(sort_code) if @modulus_weight.exception == '5'
+        @sort_code = exception.apply_sort_code_substitutions
       end
 
       def applying_exceptions(test_digits)
-        apply_exception_2_9(test_digits) if @exceptions.include?('2') &&  @exceptions.include?('9')
-        apply_exception_3(test_digits)  if @modulus_weight.exception == '3'
-        apply_exception_6(test_digits)  if @modulus_weight.exception == '6'
-        apply_exception_7(test_digits)  if @modulus_weight.exception == '7'
-        apply_exception_8(test_digits)  if @modulus_weight.exception == '8'
-        apply_exception_10(test_digits) if @modulus_weight.exception == '10'
+        @modulus_weight = exception.replace_weight(test_digits)
 
         total = yield
 
-        total += 27 if @modulus_weight.exception == '1'
+        total = exception.after_calculate_total(total, test_digits)
 
         total
       end
-
-      def zero_all
-        @modulus_weight = ModulusWeight.new(
-          @modulus_weight.sort_code_start,
-          @modulus_weight.sort_code_end,
-          @modulus_weight.modulus,
-          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-          @modulus_weight.exception
-        )
-      end
-
-      def zero_u_b
-        @modulus_weight = ModulusWeight.new(
-          @modulus_weight.sort_code_start,
-          @modulus_weight.sort_code_end,
-          @modulus_weight.modulus,
-          0, 0, 0, 0, 0, 0, 0, 0,
-          @modulus_weight.c, @modulus_weight.d, @modulus_weight.e,
-          @modulus_weight.f, @modulus_weight.g, @modulus_weight.h,
-          @modulus_weight.exception
-        )
-      end
-
-      def apply_exception_2_9(test_digits)
-        return if test_digits[NUMBER_INDEX[:a]] == 0
-
-        if test_digits[NUMBER_INDEX[:g]] != 9
-          @modulus_weight = ModulusWeight.new(
-            @modulus_weight.sort_code_start,
-            @modulus_weight.sort_code_end,
-            @modulus_weight.modulus,
-            0, 0, 1, 2, 5, 3, 6, 4, 8, 7, 10, 9, 3, 1,
-            @modulus_weight.exception
-          )
-        else
-          @modulus_weight = ModulusWeight.new(
-            @modulus_weight.sort_code_start,
-            @modulus_weight.sort_code_end,
-            @modulus_weight.modulus,
-            0, 0, 0, 0, 0, 0, 0, 0, 8, 7, 10, 9, 3, 1,
-            @modulus_weight.exception
-          )
-        end
-      end
-
-      def apply_exception_3(test_digits)
-        c = test_digits[NUMBER_INDEX[:c]]
-        zero_all if c == 6 || c == 9
-      end
-
-      def apply_exception_4(total, test_digits)
-        check_sum = [test_digits[NUMBER_INDEX[:g]], test_digits[NUMBER_INDEX[:h]]].join
-        check_sum = check_sum.to_i
-
-        total % modulus == check_sum
-      end
-
-      def apply_exception_5_substitutions(sort_code)
-        substitutions = UkAccountValidator.read_sort_code_substitution
-
-        if substitutions.keys.include?(sort_code)
-          sort_code = substitutions[sort_code]
-        end
-
-        return sort_code
-      end
-
-      def apply_exception_5(total, test_digits, check_digit)
-        check_sum    = total % modulus
-        expected_sum = test_digits[NUMBER_INDEX[check_digit]].to_i
-
-        return false if check_sum == 1 && check_digit == :g
-        return true  if check_sum == 0 && expected_sum == 0
-
-        return (modulus - check_sum) == expected_sum
-      end
-
-      # If a = 4, 5, 6, 7 or 8, and g and h are the same
-      def apply_exception_6(test_digits)
-        a = test_digits[NUMBER_INDEX[:a]]
-        g = test_digits[NUMBER_INDEX[:g]]
-        h = test_digits[NUMBER_INDEX[:h]]
-
-        zero_all if (a == 4 || a == 5 || a == 6 || a == 7 || a == 8) && g == h
-      end
-
-      def apply_exception_7(test_digits)
-        return unless test_digits[NUMBER_INDEX[:g]] == 9
-
-        zero_u_b
-      end
-
-      def apply_exception_8(test_digits)
-        test_string = '090126' + @account_number
-
-        test_digits.replace(test_string.split(//).map(&:to_i))
-      end
-
-      def apply_exception_10(test_digits)
-        # if ab = 09 or 99 and g=9, zeroise weighting positions u-b.
-        a = test_digits[NUMBER_INDEX[:a]]
-        b = test_digits[NUMBER_INDEX[:b]]
-
-        return unless (a == 0 && b == 9) ||
-          (a == 9 && b == 9 && test_digits[NUMBER_INDEX[:g]] == 9)
-
-        zero_u_b
-      end
     end
   end
 end

data/lib/uk_account_validator/validators/double_alternate.rb

@@ -24,11 +24,8 @@ module UkAccountValidator
           weighted_test_digits.inject(:+)
         end
 
-        case @modulus_weight.exception
-        when '4'
-          return apply_exception_4(total, test_digits)
-        when '5'
-          return apply_exception_5(total, test_digits, :h)
+        if exception.override_test?
+          return exception.test(modulus, total, test_digits, :double_alternate)
         end
 
         total % modulus == 0

data/lib/uk_account_validator/validators/standard_modulus.rb

@@ -7,7 +7,7 @@ module UkAccountValidator
       end
 
       def valid?
-        test_string = @sort_code + @account_number
+        test_string = sort_code + account_number
 
         test_digits = test_string.split(//).map(&:to_i)
 
@@ -15,15 +15,12 @@ module UkAccountValidator
           NUMBER_INDEX.each_pair.reduce(0) do |t, pair|
             weight, index = pair
 
-            t + @modulus_weight.send(weight) * test_digits[index]
+            t + modulus_weight.send(weight) * test_digits[index]
           end
         end
 
-        case @modulus_weight.exception
-        when '4'
-          return apply_exception_4(total, test_digits)
-        when '5'
-          return apply_exception_5(total, test_digits, :g)
+        if exception.override_test?
+          return exception.test(modulus, total, test_digits, :standard_modulus)
         end
 
         total % modulus == 0

data/lib/uk_account_validator/version.rb

@@ -1,3 +1,3 @@
 module UkAccountValidator
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

data/uk_account_validator.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['hayden@haydenball.me.uk']
   spec.summary       = 'Validate UK Account Numbers and Sort Codes'
   spec.description   = spec.summary
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/ball-hayden/uk_account_validator'
   spec.license       = '2 Clause BSD'
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uk_account_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Hayden Ball
@@ -37,8 +37,21 @@ files:
 - features/support/env.rb
 - features/two_modulus_check.feature
 - lib/uk_account_validator.rb
+- lib/uk_account_validator/exceptions/base_exception.rb
+- lib/uk_account_validator/exceptions/exception_1.rb
+- lib/uk_account_validator/exceptions/exception_10.rb
+- lib/uk_account_validator/exceptions/exception_12.rb
+- lib/uk_account_validator/exceptions/exception_14.rb
+- lib/uk_account_validator/exceptions/exception_2_9.rb
+- lib/uk_account_validator/exceptions/exception_3.rb
+- lib/uk_account_validator/exceptions/exception_4.rb
+- lib/uk_account_validator/exceptions/exception_5.rb
+- lib/uk_account_validator/exceptions/exception_6.rb
+- lib/uk_account_validator/exceptions/exception_7.rb
+- lib/uk_account_validator/exceptions/exception_8.rb
 - lib/uk_account_validator/modulus_weight.rb
 - lib/uk_account_validator/modulus_weights_table.rb
+- lib/uk_account_validator/number_indices.rb
 - lib/uk_account_validator/validator.rb
 - lib/uk_account_validator/validators/base_validator.rb
 - lib/uk_account_validator/validators/double_alternate.rb
@@ -47,7 +60,7 @@ files:
 - lib/uk_account_validator/validators/standard_modulus.rb
 - lib/uk_account_validator/version.rb
 - uk_account_validator.gemspec
-homepage: ''
+homepage: https://github.com/ball-hayden/uk_account_validator
 licenses:
 - 2 Clause BSD
 metadata: {}
@@ -82,3 +95,4 @@ test_files:
 - features/step_definitions/modulus_weights_table.rb
 - features/support/env.rb
 - features/two_modulus_check.feature
+has_rdoc: