camt_parser 2.14.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a14cf208512428c2b5598f13c736e42e36e8d821cf74fdc9b729545387b1243
-  data.tar.gz: faeb2af47c98f82135430e9586bf962ff2db1ea38b67720dd358b43156831a32
+  metadata.gz: b5aeab74fdc7446d278695d00616a5449870180088c7dc8daf1aa52a83897cfc
+  data.tar.gz: f032bd706926a5314a2c7f110f6053962b91f6a0e4222bb633c2094f98ac3d6b
 SHA512:
-  metadata.gz: 841652ca51bd7e936feadd3f7b38a5df2bd5d18088d22bad9fc6e35c60a4519cfc4effa415c3985304a5cc3bea5943d9f9d713e659927af72cf5c760b93c24e4
-  data.tar.gz: 0f8a1bfa248544999e7849d581b4eb2a88d7c80cb153d74b9a56a974c67d8e9525c54ff522c5f724799195fe7d5cb0a2366380f98975c9cf8334d58310b0b02b
+  metadata.gz: a59f2634bf67b442365cc7b32dd5c7c4295872e536af30dc8901a2a30a7499100a785f6a09df9e2b08494a4356b3227eb3622a747aa4f3ff6def6476f4132ab7
+  data.tar.gz: febcbdb49b56ac81342cd31ab5e6252071769a167a8221850e47b817f850e90ef6fb25a3920f360be550fc58209e024a76b56678b3cd327d7367f54769412829

data/lib/camt_parser/052/base.rb

@@ -1,9 +1,10 @@
 module CamtParser
   module Format052
     class Base
-      attr_reader :group_header, :reports
+      attr_reader :group_header, :reports, :xml_data
 
       def initialize(xml_data)
+        @xml_data = xml_data
         # BkToCstmrAccptRpt = Bank to Customer Account Report
         grphdr = xml_data.xpath('BkToCstmrAcctRpt/GrpHdr')
         @group_header = CamtParser::GroupHeader.new(grphdr)

data/lib/camt_parser/052/report.rb

@@ -1,41 +1,44 @@
 module CamtParser
   module Format052
     class Report
+
+      attr_reader :xml_data
+
       def initialize(xml_data)
         @xml_data = xml_data
       end
 
       def identification
-        @identification ||= @xml_data.xpath('Id/text()').text
+        @identification ||= xml_data.xpath('Id/text()').text
       end
 
       def generation_date
-        @generation_date ||= Time.parse(@xml_data.xpath('CreDtTm/text()').text)
+        @generation_date ||= Time.parse(xml_data.xpath('CreDtTm/text()').text)
       end
 
       def account
-        @account ||= CamtParser::Account.new(@xml_data.xpath('Acct').first)
+        @account ||= CamtParser::Account.new(xml_data.xpath('Acct').first)
       end
 
       def entries
-        @entries ||= @xml_data.xpath('Ntry').map{ |x| CamtParser::Entry.new(x) }
+        @entries ||= xml_data.xpath('Ntry').map{ |x| CamtParser::Entry.new(x) }
       end
 
       def legal_sequence_number
-        @legal_sequence_number ||= @xml_data.xpath('LglSeqNb/text()').text
+        @legal_sequence_number ||= xml_data.xpath('LglSeqNb/text()').text
       end
 
       def from_date_time
-        @from_date_time ||= (x = @xml_data.xpath('FrToDt/FrDtTm')).empty? ? nil : Time.parse(x.first.content)
+        @from_date_time ||= (x = xml_data.xpath('FrToDt/FrDtTm')).empty? ? nil : Time.parse(x.first.content)
       end
 
       def to_date_time
-        @to_date_time ||= (x = @xml_data.xpath('FrToDt/ToDtTm')).empty? ? nil : Time.parse(x.first.content)
+        @to_date_time ||= (x = xml_data.xpath('FrToDt/ToDtTm')).empty? ? nil : Time.parse(x.first.content)
       end
 
       def opening_balance
         @opening_balance ||= begin
-          bal = @xml_data.xpath('Bal/Tp//Cd[contains(text(), "PRCD")]').first.ancestors('Bal')
+          bal = xml_data.xpath('Bal/Tp//Cd[contains(text(), "PRCD")]').first.ancestors('Bal')
           date = bal.xpath('Dt/Dt/text()').text
           credit = bal.xpath('CdtDbtInd/text()').text == 'CRDT'
           currency = bal.xpath('Amt').attribute('Ccy').value
@@ -46,7 +49,7 @@ module CamtParser
 
       def closing_balance
         @closing_balance ||= begin
-          bal = @xml_data.xpath('Bal/Tp//Cd[contains(text(), "CLBD")]').first.ancestors('Bal')
+          bal = xml_data.xpath('Bal/Tp//Cd[contains(text(), "CLBD")]').first.ancestors('Bal')
           date = bal.xpath('Dt/Dt/text()').text
           credit = bal.xpath('CdtDbtInd/text()').text == 'CRDT'
           currency = bal.xpath('Amt').attribute('Ccy').value
@@ -57,7 +60,7 @@ module CamtParser
 
 
       def source
-        @xml_data.to_s
+        xml_data.to_s
       end
 
       def self.parse(xml)

data/lib/camt_parser/053/base.rb

@@ -1,9 +1,11 @@
 module CamtParser
   module Format053
     class Base
-      attr_reader :group_header, :statements
+      attr_reader :group_header, :statements, :xml_data
 
       def initialize(xml_data)
+        @xml_data = xml_data
+
         grphdr = xml_data.xpath('BkToCstmrStmt/GrpHdr')
         @group_header = GroupHeader.new(grphdr)
         statements = xml_data.xpath('BkToCstmrStmt/Stmt')

data/lib/camt_parser/053/statement.rb

@@ -1,45 +1,48 @@
 module CamtParser
   module Format053
     class Statement
+
+      attr_reader :xml_data
+
       def initialize(xml_data)
         @xml_data = xml_data
       end
 
       def identification
-        @identification ||= @xml_data.xpath('Id/text()').text
+        @identification ||= xml_data.xpath('Id/text()').text
       end
 
       def generation_date
-        @generation_date ||= Time.parse(@xml_data.xpath('CreDtTm/text()').text)
+        @generation_date ||= Time.parse(xml_data.xpath('CreDtTm/text()').text)
       end
 
       def from_date_time
-        @from_date_time ||= (x = @xml_data.xpath('FrToDt/FrDtTm')).empty? ? nil : Time.parse(x.first.content)
+        @from_date_time ||= (x = xml_data.xpath('FrToDt/FrDtTm')).empty? ? nil : Time.parse(x.first.content)
       end
 
       def to_date_time
-        @to_date_time ||= (x = @xml_data.xpath('FrToDt/ToDtTm')).empty? ? nil : Time.parse(x.first.content)
+        @to_date_time ||= (x = xml_data.xpath('FrToDt/ToDtTm')).empty? ? nil : Time.parse(x.first.content)
       end
 
       def account
-        @account ||= Account.new(@xml_data.xpath('Acct').first)
+        @account ||= Account.new(xml_data.xpath('Acct').first)
       end
 
       def entries
-        @entries ||= @xml_data.xpath('Ntry').map{ |x| Entry.new(x) }
+        @entries ||= xml_data.xpath('Ntry').map{ |x| Entry.new(x) }
       end
 
       def legal_sequence_number
-        @legal_sequence_number ||= @xml_data.xpath('LglSeqNb/text()').text
+        @legal_sequence_number ||= xml_data.xpath('LglSeqNb/text()').text
       end
 
       def electronic_sequence_number
-        @electronic_sequence_number ||= @xml_data.xpath('ElctrncSeqNb/text()').text
+        @electronic_sequence_number ||= xml_data.xpath('ElctrncSeqNb/text()').text
       end
 
       def opening_balance
         @opening_balance ||= begin
-          bal = @xml_data.xpath('Bal/Tp//Cd[contains(text(), "OPBD") or contains(text(), "PRCD")]').first.ancestors('Bal')
+          bal = xml_data.xpath('Bal/Tp//Cd[contains(text(), "OPBD") or contains(text(), "PRCD")]').first.ancestors('Bal')
           date = bal.xpath('Dt/Dt/text()').text
           credit = bal.xpath('CdtDbtInd/text()').text == 'CRDT'
           currency = bal.xpath('Amt').attribute('Ccy').value
@@ -49,7 +52,7 @@ module CamtParser
 
       def closing_balance
         @closing_balance ||= begin
-          bal = @xml_data.xpath('Bal/Tp//Cd[contains(text(), "CLBD")]').first.ancestors('Bal')
+          bal = xml_data.xpath('Bal/Tp//Cd[contains(text(), "CLBD")]').first.ancestors('Bal')
           date = bal.xpath('Dt/Dt/text()').text
           credit = bal.xpath('CdtDbtInd/text()').text == 'CRDT'
           currency = bal.xpath('Amt').attribute('Ccy').value
@@ -59,7 +62,7 @@ module CamtParser
       alias_method :closing_or_intermediary_balance, :closing_balance
 
       def source
-        @xml_data.to_s
+        xml_data.to_s
       end
 
       def self.parse(xml)

data/lib/camt_parser/054/base.rb

@@ -1,9 +1,11 @@
 module CamtParser
   module Format054
     class Base
-      attr_reader :group_header, :notifications
+      attr_reader :group_header, :notifications, :xml_data
 
       def initialize(xml_data)
+        @xml_data = xml_data
+
         grphdr = xml_data.xpath('BkToCstmrDbtCdtNtfctn/GrpHdr')
         @group_header = GroupHeader.new(grphdr)
         notifications = xml_data.xpath('BkToCstmrDbtCdtNtfctn/Ntfctn')

data/lib/camt_parser/054/notification.rb

@@ -1,38 +1,49 @@
 module CamtParser
   module Format054
     class Notification
+
+      attr_reader :xml_data
+
       def initialize(xml_data)
         @xml_data = xml_data
       end
 
+      # @return [String]
       def identification
-        @identification ||= @xml_data.xpath('Id/text()').text
+        @identification ||= xml_data.xpath('Id/text()').text
       end
 
+      # @return [Time]
       def generation_date
-        @generation_date ||= Time.parse(@xml_data.xpath('CreDtTm/text()').text)
+        @generation_date ||= Time.parse(xml_data.xpath('CreDtTm/text()').text)
       end
 
+      # @return [Time, nil]
       def from_date_time
-        @from_date_time ||= (x = @xml_data.xpath('FrToDt/FrDtTm')).empty? ? nil : Time.parse(x.first.content)
+        @from_date_time ||= (x = xml_data.xpath('FrToDt/FrDtTm')).empty? ? nil : Time.parse(x.first.content)
       end
 
+      # @return [Time, nil]
       def to_date_time
-        @to_date_time ||= (x = @xml_data.xpath('FrToDt/ToDtTm')).empty? ? nil : Time.parse(x.first.content)
+        @to_date_time ||= (x = xml_data.xpath('FrToDt/ToDtTm')).empty? ? nil : Time.parse(x.first.content)
       end
 
+      # @return [Account]
       def account
-        @account ||= Account.new(@xml_data.xpath('Acct').first)
+        @account ||= Account.new(xml_data.xpath('Acct').first)
       end
 
+      # @return [Array<Entry>]
       def entries
-        @entries ||= @xml_data.xpath('Ntry').map{ |x| Entry.new(x) }
+        @entries ||= xml_data.xpath('Ntry').map{ |x| Entry.new(x) }
       end
 
+      # @return [String]
       def source
-        @xml_data.to_s
+        xml_data.to_s
       end
 
+      # @return [CamtParser::Format054::Notification]
       def self.parse(xml)
         self.new Nokogiri::XML(xml).xpath('Ntfctn')
       end

data/lib/camt_parser/general/account.rb

@@ -1,31 +1,43 @@
 module CamtParser
   class Account
+
+    attr_reader :xml_data
+
     def initialize(xml_data)
       @xml_data = xml_data
     end
 
+    # @return [String]
     def iban
-      @iban ||= @xml_data.xpath('Id/IBAN/text()').text
+      @iban ||= xml_data.xpath('Id/IBAN/text()').text
     end
 
+    # @return [String]
     def other_id
-      @other_id ||= @xml_data.xpath('Id/Othr/Id/text()').text
+      @other_id ||= xml_data.xpath('Id/Othr/Id/text()').text
     end
 
+    # @return [String]
     def account_number
       !iban.nil? && !iban.empty? ? iban : other_id
     end
 
+    # @return [String]
     def bic
-      @bic ||= @xml_data.xpath('Svcr/FinInstnId/BIC/text()').text
+      @bic ||= [
+        xml_data.xpath('Svcr/FinInstnId/BIC/text()').text,
+        xml_data.xpath('Svcr/FinInstnId/BICFI/text()').text,
+      ].reject(&:empty?).first.to_s
     end
 
+    # @return [String]
     def bank_name
-      @bank_name ||= @xml_data.xpath('Svcr/FinInstnId/Nm/text()').text
+      @bank_name ||= xml_data.xpath('Svcr/FinInstnId/Nm/text()').text
     end
 
+    # @return [String]
     def currency
-      @currency ||= @xml_data.xpath('Ccy/text()').text
+      @currency ||= xml_data.xpath('Ccy/text()').text
     end
   end
 end

data/lib/camt_parser/general/account_balance.rb

@@ -1,6 +1,10 @@
 module CamtParser
   class AccountBalance
 
+    # @param amount [String]
+    # @param currency [String]
+    # @param date [String]
+    # @param  credit [Boolean]
     def initialize(amount, currency, date, credit = false)
       @amount = amount
       @currency = currency
@@ -8,34 +12,42 @@ module CamtParser
       @credit = credit
     end
 
+    # @return [String]
     def currency
       @currency
     end
 
+    # @return [Date]
     def date
       Date.parse @date
     end
 
+    # @return [Integer] either 1 or -1
     def sign
       credit? ? 1 : -1
     end
 
+    # @return [Boolean]
     def credit?
       @credit
     end
 
+    # @return [BigDecimal]
     def amount
       CamtParser::Misc.to_amount(@amount)
     end
 
+    # @return [Integer]
     def amount_in_cents
       CamtParser::Misc.to_amount_in_cents(@amount)
     end
 
+    # @return [BigDecimal]
     def signed_amount
       amount * sign
     end
 
+    # @return [Hash{String => BigDecimal, Integer}]
     def to_h
       {
         'amount' => amount,

data/lib/camt_parser/general/batch_detail.rb

@@ -1,19 +1,22 @@
 module CamtParser
   class BatchDetail
+
+    attr_reader :xml_data
+
     def initialize(xml_data)
       @xml_data = xml_data
     end
 
     def payment_information_identification
-      @payment_information_identification ||= @xml_data.xpath('PmtInfId/text()').text
+      @payment_information_identification ||= xml_data.xpath('PmtInfId/text()').text
     end
 
     def msg_id # may be missing
-      @msg_id ||= @xml_data.xpath('MsgId/text()').text
+      @msg_id ||= xml_data.xpath('MsgId/text()').text
     end
 
     def number_of_transactions
-      @number_of_transactions ||= @xml_data.xpath('NbOfTxs/text()').text
+      @number_of_transactions ||= xml_data.xpath('NbOfTxs/text()').text
     end
   end  
 end

data/lib/camt_parser/general/charges.rb

@@ -1,8 +1,11 @@
 module CamtParser
   class Charges
+
+    attr_reader :xml_data
+
     def initialize(xml_data)
       @xml_data = xml_data
-      @total_charges_and_tax_amount = @xml_data.xpath('TtlChrgsAndTaxAmt/text()').text
+      @total_charges_and_tax_amount = xml_data.xpath('TtlChrgsAndTaxAmt/text()').text
     end
 
     def total_charges_and_tax_amount
@@ -14,7 +17,7 @@ module CamtParser
     end
 
     def records
-      @records ||= @xml_data.xpath('Rcrd').map{ |x| CamtParser::Record.new(x) }
+      @records ||= xml_data.xpath('Rcrd').map{ |x| CamtParser::Record.new(x) }
     end
   end
 end

data/lib/camt_parser/general/creditor.rb

@@ -1,23 +1,32 @@
 module CamtParser
   class Creditor
+
+    attr_reader :xml_data
+
     def initialize(xml_data)
       @xml_data = xml_data
     end
 
     def name
-      @name ||= @xml_data.xpath('RltdPties/Cdtr/Nm/text()').text
+      @name ||= [
+        xml_data.xpath('RltdPties/Cdtr/Nm/text()').text,
+        xml_data.xpath('RltdPties/Cdtr/Pty/Nm/text()').text,
+      ].reject(&:empty?).first.to_s
     end
 
     def iban
-      @iban ||= @xml_data.xpath('RltdPties/CdtrAcct/Id/IBAN/text()').text
+      @iban ||= xml_data.xpath('RltdPties/CdtrAcct/Id/IBAN/text()').text
     end
 
     def bic
-      @bic ||= @xml_data.xpath('RltdAgts/CdtrAgt/FinInstnId/BIC/text()').text
+      @bic ||= [
+        xml_data.xpath('RltdAgts/CdtrAgt/FinInstnId/BIC/text()').text,
+        xml_data.xpath('RltdAgts/CdtrAgt/FinInstnId/BICFI/text()').text,
+      ].reject(&:empty?).first.to_s
     end
 
     def bank_name
-      @bank_name ||= @xml_data.xpath('RltdAgts/CdtrAgt/FinInstnId/Nm/text()').text
+      @bank_name ||= xml_data.xpath('RltdAgts/CdtrAgt/FinInstnId/Nm/text()').text
     end
   end
 end

data/lib/camt_parser/general/debitor.rb

@@ -1,23 +1,32 @@
 module CamtParser
   class Debitor
+
+    attr_reader :xml_data
+
     def initialize(xml_data)
       @xml_data = xml_data
     end
 
     def name
-      @name ||= @xml_data.xpath('RltdPties/Dbtr/Nm/text()').text
+      @name ||= [
+        xml_data.xpath('RltdPties/Dbtr/Nm/text()').text,
+        xml_data.xpath('RltdPties/Dbtr/Pty/Nm/text()').text,
+      ].reject(&:empty?).first.to_s
     end
 
     def iban
-      @iban ||= @xml_data.xpath('RltdPties/DbtrAcct/Id/IBAN/text()').text
+      @iban ||= xml_data.xpath('RltdPties/DbtrAcct/Id/IBAN/text()').text
     end
 
     def bic
-      @bic ||= @xml_data.xpath('RltdAgts/DbtrAgt/FinInstnId/BIC/text()').text
+      @bic ||= [
+        xml_data.xpath('RltdAgts/DbtrAgt/FinInstnId/BIC/text()').text,
+        xml_data.xpath('RltdAgts/DbtrAgt/FinInstnId/BICFI/text()').text,
+      ].reject(&:empty?).first.to_s
     end
 
     def bank_name
-      @bank_name ||= @xml_data.xpath('RltdAgts/DbtrAgt/FinInstnId/Nm/text()').text
+      @bank_name ||= xml_data.xpath('RltdAgts/DbtrAgt/FinInstnId/Nm/text()').text
     end
   end
 end

data/lib/camt_parser/general/entry.rb

@@ -1,8 +1,11 @@
 module CamtParser
   class Entry
+
+    attr_reader :xml_data
+
     def initialize(xml_data)
       @xml_data = xml_data
-      @amount = @xml_data.xpath('Amt/text()').text
+      @amount = xml_data.xpath('Amt/text()').text
     end
 
     def amount
@@ -13,78 +16,100 @@ module CamtParser
       CamtParser::Misc.to_amount_in_cents(@amount)
     end
 
+    # @return [String]
     def currency
-      @currency ||= @xml_data.xpath('Amt/@Ccy').text
+      @currency ||= xml_data.xpath('Amt/@Ccy').text
     end
 
+    # @return [Boolean]
     def debit
-      @debit ||= @xml_data.xpath('CdtDbtInd/text()').text.upcase == 'DBIT'
+      @debit ||= xml_data.xpath('CdtDbtInd/text()').text.upcase == 'DBIT'
     end
 
+    # @return [Date]
     def value_date
-      @value_date ||= Date.parse(@xml_data.xpath('ValDt/Dt/text()').text)
+      @value_date ||= ((date = xml_data.xpath('ValDt/Dt/text()').text).empty? ? nil : Date.parse(date))
     end
 
+    # @return [Date]
     def booking_date
-      @booking_date ||= Date.parse(@xml_data.xpath('BookgDt/Dt/text()').text)
+      @booking_date ||= ((date = xml_data.xpath('BookgDt/Dt/text()').text).empty? ? nil : Date.parse(date))
+    end
+
+    # @return [DateTime]
+    def value_datetime
+      @value_datetime ||= ((datetime = xml_data.xpath('ValDt/DtTm/text()').text).empty? ? nil : DateTime.parse(datetime))
     end
 
+    # @return [DateTime]
+    def booking_datetime
+      @booking_datetime ||= ((datetime = xml_data.xpath('BookgDt/DtTm/text()').text).empty? ? nil : DateTime.parse(datetime))
+    end
+
+    # @return [String]
     def bank_reference # May be missing
-      @bank_reference ||= @xml_data.xpath('AcctSvcrRef/text()').text
+      @bank_reference ||= xml_data.xpath('AcctSvcrRef/text()').text
     end
 
+    # @return [Array<CamtParser::Transaction>]
     def transactions
       @transactions ||= parse_transactions
     end
 
+    # @return [Boolean]
     def credit?
       !debit
     end
 
+    # @return [Boolean]
     def debit?
       debit
     end
 
+    # @return [Integer] either 1 or -1
     def sign
       credit? ? 1 : -1
     end
 
+    # @return [Boolean]
     def reversal?
-      @reversal ||= @xml_data.xpath('RvslInd/text()').text.downcase == 'true'
+      @reversal ||= xml_data.xpath('RvslInd/text()').text.downcase == 'true'
     end
 
+    # @return [Boolean]
     def booked?
-      @booked ||= @xml_data.xpath('Sts/text()').text.upcase == 'BOOK'
+      @booked ||= xml_data.xpath('Sts/text()').text.upcase == 'BOOK'
     end
 
+    # @return [String]
     def additional_information
-      @additional_information ||= @xml_data.xpath('AddtlNtryInf/text()').text
+      @additional_information ||= xml_data.xpath('AddtlNtryInf/text()').text
     end
     alias_method :description, :additional_information
 
+    # @return [CamtParser::Charges]
     def charges
-      @charges ||= CamtParser::Charges.new(@xml_data.xpath('Chrgs'))
+      @charges ||= CamtParser::Charges.new(xml_data.xpath('Chrgs'))
     end
-    
+    # @return [CamtParser::BatchDetail, nil]
     def batch_detail
-      @batch_detail ||= @xml_data.xpath('NtryDtls/Btch').empty? ? nil : CamtParser::BatchDetail.new(@xml_data.xpath('NtryDtls/Btch'))
-    end  
+      @batch_detail ||= xml_data.xpath('NtryDtls/Btch').empty? ? nil : CamtParser::BatchDetail.new(@xml_data.xpath('NtryDtls/Btch'))
+    end
 
     private
 
     def parse_transactions
-      transaction_details = @xml_data.xpath('NtryDtls/TxDtls')
+      transaction_details = xml_data.xpath('NtryDtls/TxDtls')
 
       amt = nil
       ccy = nil
 
       if transaction_details.length == 1
-        amt = @xml_data.xpath('Amt/text()').text
-        ccy = @xml_data.xpath('Amt/@Ccy').text
+        amt = xml_data.xpath('Amt/text()').text
+        ccy = xml_data.xpath('Amt/@Ccy').text
       end
 
-      @xml_data.xpath('NtryDtls/TxDtls').map { |x| Transaction.new(x, debit?, amt, ccy) }
+      xml_data.xpath('NtryDtls/TxDtls').map { |x| Transaction.new(x, debit?, amt, ccy) }
     end
-    
   end
 end

data/lib/camt_parser/general/group_header.rb

@@ -2,9 +2,15 @@ require 'time'
 
 module CamtParser
   class GroupHeader
-    attr_reader :message_id, :creation_date_time, :additional_information, :message_pagination
+
+    attr_reader :message_id,
+                :creation_date_time,
+                :additional_information,
+                :message_pagination,
+                :xml_data
 
     def initialize(xml_data)
+      @xml_data               = xml_data
       @message_id             = xml_data.xpath('MsgId/text()').text
       @creation_date_time     = Time.parse(xml_data.xpath('CreDtTm/text()').text)
       @message_pagination     = (x = xml_data.xpath('MsgPgntn')).empty? ? nil : MessagePagination.new(x)
@@ -13,9 +19,12 @@ module CamtParser
   end
 
   class MessagePagination
-    attr_reader :page_number
+
+    attr_reader :page_number,
+                :xml_data
 
     def initialize(xml_data)
+      @xml_data            = xml_data
       @page_number         = xml_data.xpath('PgNb/text()').text.to_i
       @last_page_indicator = xml_data.xpath('LastPgInd/text()').text == 'true'
     end

data/lib/camt_parser/general/record.rb

@@ -1,8 +1,11 @@
 module CamtParser
   class Record
+
+    attr_reader :xml_data
+
     def initialize(xml_data)
       @xml_data = xml_data
-      @amount = @xml_data.xpath('Amt/text()').text
+      @amount = xml_data.xpath('Amt/text()').text
     end
 
     def amount
@@ -14,19 +17,19 @@ module CamtParser
     end
 
     def currency
-      @currency ||= @xml_data.xpath('Amt/@Ccy').text
+      @currency ||= xml_data.xpath('Amt/@Ccy').text
     end
 
     def type
-      @type ||= CamtParser::Type::Builder.build_type(@xml_data.xpath('Tp'))
+      @type ||= CamtParser::Type::Builder.build_type(xml_data.xpath('Tp'))
     end
 
     def charges_included?
-      @charges_included ||= @xml_data.xpath('ChrgInclInd/text()').text.downcase == 'true'
+      @charges_included ||= xml_data.xpath('ChrgInclInd/text()').text.downcase == 'true'
     end
 
     def debit
-      @debit ||= @xml_data.xpath('CdtDbtInd/text()').text.upcase == 'DBIT'
+      @debit ||= xml_data.xpath('CdtDbtInd/text()').text.upcase == 'DBIT'
     end
 
     def credit?

data/lib/camt_parser/general/transaction.rb

@@ -1,5 +1,8 @@
 module CamtParser
   class Transaction
+
+    attr_reader :xml_data
+
     def initialize(xml_data, debit, amount = nil, currency = nil)
       @xml_data = xml_data
       @debit    = debit
@@ -20,11 +23,11 @@ module CamtParser
     end
 
     def creditor
-      @creditor ||= CamtParser::Creditor.new(@xml_data)
+      @creditor ||= CamtParser::Creditor.new(xml_data)
     end
 
     def debitor
-      @debitor ||= CamtParser::Debitor.new(@xml_data)
+      @debitor ||= CamtParser::Debitor.new(xml_data)
     end
 
     def name
@@ -57,7 +60,7 @@ module CamtParser
 
     def remittance_information
       @remittance_information ||= begin
-        if (x = @xml_data.xpath('RmtInf/Ustrd')).empty?
+        if (x = xml_data.xpath('RmtInf/Ustrd')).empty?
           nil
         else
           x.collect(&:content).join(' ')
@@ -66,64 +69,64 @@ module CamtParser
     end
 
     def swift_code
-      @swift_code ||= @xml_data.xpath('BkTxCd/Prtry/Cd/text()').text.split('+')[0]
+      @swift_code ||= xml_data.xpath('BkTxCd/Prtry/Cd/text()').text.split('+')[0]
     end
 
     def reference
-      @reference ||= @xml_data.xpath('Refs/InstrId/text()').text
+      @reference ||= xml_data.xpath('Refs/InstrId/text()').text
     end
 
     def bank_reference # May be missing
-      @bank_reference ||= @xml_data.xpath('Refs/AcctSvcrRef/text()').text
+      @bank_reference ||= xml_data.xpath('Refs/AcctSvcrRef/text()').text
     end
 
     def end_to_end_reference # May be missing
-      @end_to_end_reference ||= @xml_data.xpath('Refs/EndToEndId/text()').text
+      @end_to_end_reference ||= xml_data.xpath('Refs/EndToEndId/text()').text
     end
 
     def mandate_reference # May be missing
-      @mandate_reference ||= @xml_data.xpath('Refs/MndtId/text()').text
+      @mandate_reference ||= xml_data.xpath('Refs/MndtId/text()').text
     end
 
     def creditor_reference # May be missing
-      @creditor_reference ||= @xml_data.xpath('RmtInf/Strd/CdtrRefInf/Ref/text()').text
+      @creditor_reference ||= xml_data.xpath('RmtInf/Strd/CdtrRefInf/Ref/text()').text
     end
 
     def transaction_id # May be missing
-      @transaction_id ||= @xml_data.xpath('Refs/TxId/text()').text
+      @transaction_id ||= xml_data.xpath('Refs/TxId/text()').text
     end
 
     def creditor_identifier # May be missing
-      @creditor_identifier ||= @xml_data.xpath('RltdPties/Cdtr/Id/PrvtId/Othr/Id/text()').text
+      @creditor_identifier ||= xml_data.xpath('RltdPties/Cdtr/Id/PrvtId/Othr/Id/text()').text
     end
 
     def payment_information # May be missing
-      @payment_information ||= @xml_data.xpath('Refs/PmtInfId/text()').text
+      @payment_information ||= xml_data.xpath('Refs/PmtInfId/text()').text
     end
 
     def additional_information # May be missing
-      @addition_information ||= @xml_data.xpath('AddtlTxInf/text()').text
+      @addition_information ||= xml_data.xpath('AddtlTxInf/text()').text
     end
 
     def reason_code # May be missing
-      @reason_code ||= @xml_data.xpath('RtrInf/Rsn/Cd/text()').text
+      @reason_code ||= xml_data.xpath('RtrInf/Rsn/Cd/text()').text
     end
 
     private
 
     def parse_amount
-      if @xml_data.xpath('Amt').any?
-        @xml_data.xpath('Amt/text()').text
-      elsif @xml_data.xpath('AmtDtls').any?
-        @xml_data.xpath('AmtDtls//Amt/text()').first.text
+      if xml_data.xpath('Amt').any?
+        xml_data.xpath('Amt/text()').text
+      elsif xml_data.xpath('AmtDtls').any?
+        xml_data.xpath('AmtDtls//Amt/text()').first.text
       end
     end
 
     def parse_currency
-      if @xml_data.xpath('Amt').any?
-        @xml_data.xpath('Amt/@Ccy').text
-      elsif @xml_data.xpath('AmtDtls').any?
-        @xml_data.xpath('AmtDtls//Amt/@Ccy').first.text
+      if xml_data.xpath('Amt').any?
+        xml_data.xpath('Amt/@Ccy').text
+      elsif xml_data.xpath('AmtDtls').any?
+        xml_data.xpath('AmtDtls//Amt/@Ccy').first.text
       end
     end
   end

data/lib/camt_parser/misc.rb

@@ -1,6 +1,9 @@
 module CamtParser
   class Misc
     class << self
+
+      # @param value [nil, String]
+      # @return [Integer, nil]
       def to_amount_in_cents(value)
         return nil if value == nil || value.strip == ''
 
@@ -10,6 +13,8 @@ module CamtParser
         format('%s%s', dollars, cents.ljust(2, '0')).to_i
       end
 
+      # @param value [nil, String]
+      # @return [BigDecimal, nil]
       def to_amount(value)
         return nil if value == nil || value.strip == ''
 

data/lib/camt_parser/register.rb

@@ -7,6 +7,8 @@ CamtParser::Xml.register('urn:iso:std:iso:20022:tech:xsd:camt.052.001.02', :camt
 ## CAMT053
 CamtParser::Xml.register('urn:iso:std:iso:20022:tech:xsd:camt.053.001.02', :camt053)
 CamtParser::Xml.register('urn:iso:std:iso:20022:tech:xsd:camt.053.001.04', :camt053)
+CamtParser::Xml.register('urn:iso:std:iso:20022:tech:xsd:camt.053.001.08', :camt053)
+CamtParser::Xml.register('urn:iso:std:iso:20022:tech:xsd:camt.053.001.10', :camt053)
 
 ## CAMT054
 CamtParser::Xml.register('urn:iso:std:iso:20022:tech:xsd:camt.054.001.02', :camt054)

data/lib/camt_parser/version.rb

@@ -1,3 +1,3 @@
 module CamtParser
-  VERSION = '2.14.0'.freeze
+  VERSION = '2.15.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camt_parser
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-15 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Gem for parsing camt files into a speaking object.