sepa_file_parser 0.10.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc89d325dfff3184b2c7c1e9246bf300624cec80eb694371b8ffed66a86ff3b
-  data.tar.gz: ce7ed8c47d0c158a235f662fd8af44148fce23f5c46b6a31c96559ea146ce126
+  metadata.gz: e3d4c9dd4f2835c1bd8e01abfe30067f0781287be95a49cc7f1f85a469c174c1
+  data.tar.gz: 181904b224d038fd2c8ff609b4917b2979b7056cd8ad48f87951a657822a781a
 SHA512:
-  metadata.gz: aa561758b2159891d6bb31e9282e8f9466e6156f86f96d61e2070388f5fcb34654347bb8c769ba797e70dbf64a78e5e0f4fa002b592d228298852615cc380fdd
-  data.tar.gz: f82b5c6a1599d02b59e408b4cc734a362294bcd443e647c0d8ff798087d756b52358ef4cefdc6b52b88e2bd8b64d3b858127c6c6be71aeb4b06029e9e22e6df4
+  metadata.gz: a30180907db45a71a6954bd158ead499e69f6511259e6b0068e688dfd4e3fea2b835b73eecd47e0d26cf8908f61c7aa502733d547f2945a414001bd2ab22cc52
+  data.tar.gz: 601ee6524df3c9cc7fbf8ec2362ccf9ed0f799e545273324b7e4891d9c421347a75553c07ace3bfd1bb86afa68a3dd9787bd7d7b1e67019b591bd3f7bca63f90

data/lib/sepa_file_parser/camt052/report.rb

@@ -26,6 +26,10 @@ module SepaFileParser
         @entries ||= xml_data.xpath('Ntry').map{ |x| SepaFileParser::Entry.new(x) }
       end
 
+      def electronic_sequence_number
+        @electronic_sequence_number ||= xml_data.xpath('ElctrncSeqNb/text()').text
+      end
+
       def legal_sequence_number
         @legal_sequence_number ||= xml_data.xpath('LglSeqNb/text()').text
       end

data/lib/sepa_file_parser/general/account.rb

@@ -13,6 +13,7 @@ module SepaFileParser
         ].reject(&:empty?).first.to_s,
         bank_name: xml_data.xpath('Svcr/FinInstnId/Nm/text()').text,
         currency:  xml_data.xpath('Ccy/text()').text,
+        owner:     SepaFileParser::Owner.new(xml_data.xpath('Ownr'))
       )
     end
 
@@ -25,12 +26,13 @@ module SepaFileParser
       )
     end
 
-    def initialize(iban: nil, other_id: nil, bic:, bank_name:, currency:)
+    def initialize(iban: nil, other_id: nil, bic:, bank_name:, currency:, owner: nil)
       @iban      = iban
       @other_id  = other_id
       @bic       = bic
       @bank_name = bank_name
       @currency  = currency
+      @owner     = owner
     end
 
     # @return [String]
@@ -62,5 +64,9 @@ module SepaFileParser
     def currency
       @currency.to_s
     end
+
+    def owner
+      @owner
+    end
   end
 end

data/lib/sepa_file_parser/general/bank_transaction_code.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module SepaFileParser
+  class BankTransactionCode
+
+    attr_reader :xml_data
+
+    def initialize(xml_data)
+      @xml_data = xml_data
+    end
+
+    def domain_code # May be missing
+      @domain_code ||= xml_data.xpath('Domn/Cd/text()').text
+    end
+
+    def family_code # May be missing
+      @family_code ||= xml_data.xpath('Domn/Fmly/Cd/text()').text
+    end
+
+    def sub_family_code # May be missing
+      @sub_family_code ||= xml_data.xpath('Domn/Fmly/SubFmlyCd/text()').text
+    end
+  end
+end

data/lib/sepa_file_parser/general/creditor_reference_information.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module SepaFileParser
+  class CreditorReferenceInformation
+
+    attr_reader :xml_data
+
+    def initialize(xml_data)
+      @xml_data = xml_data
+    end
+
+    def creditor_reference
+      @creditor_reference ||= xml_data.xpath('Ref/text()').text
+    end
+
+    def code_or_proprietary
+      @code_or_proprietary ||= [
+        xml_data.xpath('Tp/CdOrPrtry/Cd/text()').text,
+        xml_data.xpath('Tp/CdOrPrtry/Prtry/text()').text,
+      ].reject(&:empty?).first.to_s
+    end
+  end  
+end

data/lib/sepa_file_parser/general/entry.rb

@@ -100,11 +100,24 @@ module SepaFileParser
     end
     # @return [SepaFileParser::BatchDetail, nil]
     def batch_detail
-      @batch_detail ||= xml_data.xpath('NtryDtls/Btch').empty? ? nil : SepaFileParser::BatchDetail.new(@xml_data.xpath('NtryDtls/Btch'))
+      @batch_detail ||= xml_data.xpath('NtryDtls/Btch').empty? ? nil : parse_batch_detail
+    end
+
+    # @return [SepaFileParser::BankTransactionCode, nil]
+    def bank_transaction_code
+      @bank_transaction_code ||= xml_data.xpath('BkTxCd').empty? ? nil : parse_bank_trx_code
     end
 
     private
 
+    def parse_batch_detail
+      SepaFileParser::BatchDetail.new(xml_data.xpath('NtryDtls/Btch'))
+    end
+
+    def parse_bank_trx_code
+      SepaFileParser::BankTransactionCode.new(xml_data.xpath('BkTxCd'))
+    end
+
     def parse_transactions
       transaction_details = xml_data.xpath('NtryDtls/TxDtls')
 

data/lib/sepa_file_parser/general/owner.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module SepaFileParser
+
+  class Owner
+
+    attr_reader :xml_data
+
+    def initialize(xml_data)
+      @xml_data = xml_data
+    end
+
+    # @return [String]
+    def name
+      @name ||= xml_data.xpath('Nm/text()').text
+    end
+
+    # @return [SepaFileParser::PostalAddress, nil]
+    def postal_address # May be missing
+      postal_address = xml_data.xpath('PstlAdr')
+
+      return nil if postal_address == nil || postal_address.empty?
+
+      @address ||= SepaFileParser::PostalAddress.new(postal_address)
+    end
+  end
+end

data/lib/sepa_file_parser/general/return_information.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module SepaFileParser
+  class ReturnInformation
+
+    attr_reader :xml_data
+
+    def initialize(xml_data)
+      @xml_data = xml_data
+    end
+
+    def additional_information # May be missing
+      @additional_information ||= xml_data.xpath('AddtlInf/text()').text
+    end
+
+    def reason_code
+      @reason_code ||= xml_data.xpath('Rsn/Cd/text()').text
+    end
+  end
+end

data/lib/sepa_file_parser/general/transaction.rb

@@ -72,6 +72,10 @@ module SepaFileParser
       credit? ? 1 : -1
     end
 
+    def additional_remittance_information # May be missing
+      @additional_remittance_information ||= xml_data.xpath('RmtInf/Strd/AddtlRmtInf/text()').text
+    end
+
     def remittance_information
       @remittance_information ||= begin
         if (x = xml_data.xpath('RmtInf/Ustrd')).empty?
@@ -115,7 +119,15 @@ module SepaFileParser
     end
 
     def creditor_reference # May be missing
-      @creditor_reference ||= xml_data.xpath('RmtInf/Strd/CdtrRefInf/Ref/text()').text
+      @creditor_reference ||= creditor_reference_information&.creditor_reference
+    end
+
+    def creditor_reference_information
+      if xml_data.xpath('RmtInf/Strd/CdtrRefInf').empty?
+        return nil
+      end
+
+      @creditor_reference_information ||= parse_creditor_reference_information
     end
 
     def message_id # May be missing
@@ -147,7 +159,16 @@ module SepaFileParser
     end
 
     def reason_code # May be missing
-      @reason_code ||= xml_data.xpath('RtrInf/Rsn/Cd/text()').text
+      @reason_code ||= parse_return_information.reason_code # For compatibility
+    end
+
+    def return_information
+      @return_information ||= parse_return_information
+    end
+
+    # @return [SepaFileParser::BankTransactionCode, nil]
+    def bank_transaction_code
+      @bank_transaction_code ||= xml_data.xpath('BkTxCd').empty? ? nil : parse_bank_trx_code
     end
 
     private
@@ -171,5 +192,17 @@ module SepaFileParser
         xml_data.xpath('AmtDtls//Amt/@Ccy').first.text
       end
     end
+
+    def parse_return_information
+      @return_information ||= ReturnInformation.new(xml_data.xpath('RtrInf'))
+    end
+
+    def parse_bank_trx_code
+      SepaFileParser::BankTransactionCode.new(xml_data.xpath('BkTxCd'))
+    end
+
+    def parse_creditor_reference_information
+      CreditorReferenceInformation.new(xml_data.xpath('RmtInf/Strd/CdtrRefInf'))
+    end
   end
 end

data/lib/sepa_file_parser/version.rb

@@ -2,6 +2,6 @@
 
 module SepaFileParser
 
-  VERSION = '0.10.0'
+  VERSION = '0.11.1'
 
 end

data/lib/sepa_file_parser.rb

@@ -8,12 +8,15 @@ require_relative 'sepa_file_parser/misc'
 require_relative 'sepa_file_parser/version'
 require_relative 'sepa_file_parser/errors'
 require_relative 'sepa_file_parser/general/account_balance'
+require_relative 'sepa_file_parser/general/bank_transaction_code'
 require_relative 'sepa_file_parser/general/creditor'
+require_relative 'sepa_file_parser/general/creditor_reference_information'
 require_relative 'sepa_file_parser/general/debitor'
 require_relative 'sepa_file_parser/general/entry'
 require_relative 'sepa_file_parser/general/record'
 require_relative 'sepa_file_parser/general/charges'
 require_relative 'sepa_file_parser/general/account'
+require_relative 'sepa_file_parser/general/owner'
 require_relative 'sepa_file_parser/general/batch_detail'
 require_relative 'sepa_file_parser/general/group_header'
 require_relative 'sepa_file_parser/general/pain_entry'
@@ -23,6 +26,7 @@ require_relative 'sepa_file_parser/general/type/builder'
 require_relative 'sepa_file_parser/general/type/code'
 require_relative 'sepa_file_parser/general/type/proprietary'
 require_relative 'sepa_file_parser/general/ultimate_debitor'
+require_relative 'sepa_file_parser/general/return_information'
 require_relative 'sepa_file_parser/camt052/report'
 require_relative 'sepa_file_parser/camt052/base'
 require_relative 'sepa_file_parser/camt053/statement'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sepa_file_parser
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Tobias Schoknecht
@@ -111,15 +111,19 @@ files:
 - lib/sepa_file_parser/file.rb
 - lib/sepa_file_parser/general/account.rb
 - lib/sepa_file_parser/general/account_balance.rb
+- lib/sepa_file_parser/general/bank_transaction_code.rb
 - lib/sepa_file_parser/general/batch_detail.rb
 - lib/sepa_file_parser/general/charges.rb
 - lib/sepa_file_parser/general/creditor.rb
+- lib/sepa_file_parser/general/creditor_reference_information.rb
 - lib/sepa_file_parser/general/debitor.rb
 - lib/sepa_file_parser/general/entry.rb
 - lib/sepa_file_parser/general/group_header.rb
+- lib/sepa_file_parser/general/owner.rb
 - lib/sepa_file_parser/general/pain_entry.rb
 - lib/sepa_file_parser/general/postal_address.rb
 - lib/sepa_file_parser/general/record.rb
+- lib/sepa_file_parser/general/return_information.rb
 - lib/sepa_file_parser/general/transaction.rb
 - lib/sepa_file_parser/general/type/builder.rb
 - lib/sepa_file_parser/general/type/code.rb