Use macro for account number

Author: zachingle

lib/mt9.rb

@@ -3,9 +3,12 @@
 require "dry-validation"
 require "fixy"
 
-require_relative "mt9/base_record"
-require_relative "mt9/header_record"
-require_relative "mt9/version"
+require "mt9/values"
+require "mt9/validators/base_contract"
+require "mt9/validators/header_record_contract"
+require "mt9/base_record"
+require "mt9/header_record"
+require "mt9/version"
 
 module MT9
   class ValidationError < StandardError

lib/mt9/header_record.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "validators/header_record_contract"
-
 module MT9
   class HeaderRecord < BaseRecord
     set_line_ending Fixy::Record::LINE_ENDING_CRLF

lib/mt9/validators/base_contract.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module MT9
+  module Validators
+    class BaseContract < Dry::Validation::Contract
+      register_macro(:is_account_number?) do
+        key.failure("must be 15 or 16 numeric characters") unless /^(\d{15}|\d{16})$/.match(value)
+        key.failure("must not start with a reserved bank code") if value.start_with?(*MT9::Values::RESERVED_BANK_CODES)
+      end
+    end
+  end
+end

lib/mt9/validators/header_record_contract.rb

@@ -2,24 +2,15 @@
 
 module MT9
   module Validators
-    class HeaderRecordContract < Dry::Validation::Contract
-      RESERVED_BANK_CODES = %w[99].freeze
-
-      DIRECT_CREDIT = "12"
-      DIRECT_DEBIT = "20"
-      FILE_TYPES = [DIRECT_CREDIT, DIRECT_DEBIT].freeze
-
+    class HeaderRecordContract < BaseContract
       schema do
-        required(:file_type).filled(:string, included_in?: FILE_TYPES)
+        required(:file_type).filled(:string, included_in?: MT9::Values::FILE_TYPES)
         required(:account_number).filled(:string)
         required(:due_date).filled(:string)
         optional(:client_short_name).value(:string, size?: 0..20)
       end
 
-      rule(:account_number) do
-        key.failure("must be 15 or 16 numeric characters") unless /^(\d{15}|\d{16})$/.match(value)
-        key.failure("must not start with a reserved bank code") if value.start_with?(*RESERVED_BANK_CODES)
-      end
+      rule(:account_number).validate(:is_account_number?)
 
       rule(:due_date) do
         key.failure("must be 6 or 8 numeric characters") unless /^(\d{6}|\d{8})$/.match(value)

lib/mt9/values.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module MT9
+  module Values
+    RESERVED_BANK_CODES = %w[99].freeze
+
+    DIRECT_CREDIT = "12"
+    DIRECT_DEBIT = "20"
+    FILE_TYPES = [DIRECT_CREDIT, DIRECT_DEBIT].freeze
+  end
+end