camt_parser 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cea54db82055dc9825dec0bd1dc69860c3e241a
-  data.tar.gz: 71af9966dc5c6b135b27b3b0b585c19b85206b05
+  metadata.gz: f9c4efbdb4dee0ae8fd78526f7a73f1383703a2f
+  data.tar.gz: 78381a822b9bb67cf618fa3931c35f7461edd527
 SHA512:
-  metadata.gz: 98fca3ade4834b9daad53f3f933a4d77b539744c028fda5deda730f4bc26dd8f07c009bc01287bbce749bc7929cf0a2691a911550698025127d1c278a577d415
-  data.tar.gz: 52f3495532f6c3c88b0bce030edf174af6e22cad7e43e5a9eedf7e6ebed5ca6149a33ba9bdbff221f6f5c0c850ed7072159860bd1f476ced55de657c71fe129c
+  metadata.gz: 64761fdefb33d2e13a8a768c20944d40843e96cd4373fb6c4b3bb13a4ef0e858b7114ff2313ba9019371f6cd0c5fcfbb50d1e3d71dce0ac72651b2cbc2062eaf
+  data.tar.gz: b5ac7fd402d1ea2ed5ebdd07c84b1f3a73e00b267bdd117a9d3f1d59e948041e0c2f8a938aa551040ae9b7c462c6a7487b3d1fa94e2ea8789de75f20527df200

data/lib/camt_parser.rb

@@ -11,9 +11,14 @@ require_relative "camt_parser/general/account_balance"
 require_relative "camt_parser/general/creditor"
 require_relative "camt_parser/general/debitor"
 require_relative "camt_parser/general/entry"
+require_relative "camt_parser/general/record"
+require_relative "camt_parser/general/charges"
 require_relative "camt_parser/general/account"
 require_relative "camt_parser/general/group_header"
 require_relative "camt_parser/general/transaction"
+require_relative "camt_parser/general/type/builder"
+require_relative "camt_parser/general/type/code"
+require_relative "camt_parser/general/type/proprietary"
 require_relative "camt_parser/052/report"
 require_relative "camt_parser/052/base"
 require_relative "camt_parser/053/statement"

data/lib/camt_parser/053/statement.rb

@@ -39,7 +39,7 @@ module CamtParser
 
       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(), "OPBD") or contains(text(), "PRCD")]').first.ancestors('Bal')
           date = bal.xpath('Dt/Dt/text()').text
           currency = bal.xpath('Amt').attribute('Ccy').value
           AccountBalance.new bal.xpath('Amt/text()').text, currency, date, true

data/lib/camt_parser/general/charges.rb

@@ -0,0 +1,20 @@
+module CamtParser
+  class Charges
+    def initialize(xml_data)
+      @xml_data = xml_data
+      @total_charges_and_tax_amount = @xml_data.xpath('TtlChrgsAndTaxAmt/text()').text
+    end
+
+    def total_charges_and_tax_amount
+      CamtParser::Misc.to_amount(@total_charges_and_tax_amount)
+    end
+
+    def total_charges_and_tax_amount_in_cents
+      CamtParser::Misc.to_amount_in_cents(@total_charges_and_tax_amount)
+    end
+
+    def records
+      @records ||= @xml_data.xpath('Rcrd').map{ |x| CamtParser::Record.new(x) }
+    end
+  end
+end

data/lib/camt_parser/general/entry.rb

@@ -58,6 +58,10 @@ module CamtParser
     end
     alias_method :description, :additional_information
 
+    def charges
+      @charges ||= CamtParser::Charges.new(@xml_data.xpath('Chrgs'))
+    end
+
     private
 
     def parse_transactions

data/lib/camt_parser/general/record.rb

@@ -0,0 +1,44 @@
+module CamtParser
+  class Record
+    def initialize(xml_data)
+      @xml_data = xml_data
+      @amount = @xml_data.xpath('Amt/text()').text
+    end
+
+    def amount
+      CamtParser::Misc.to_amount(@amount)
+    end
+
+    def amount_in_cents
+      CamtParser::Misc.to_amount_in_cents(@amount)
+    end
+
+    def currency
+      @currency ||= @xml_data.xpath('Amt/@Ccy').text
+    end
+
+    def type
+      @type ||= CamtParser::Type::Builder.build_type(@xml_data.xpath('Tp'))
+    end
+
+    def charges_included?
+      @charges_included ||= @xml_data.xpath('ChrgInclInd/text()').text.downcase == 'true'
+    end
+
+    def debit
+      @debit ||= @xml_data.xpath('CdtDbtInd/text()').text.upcase == 'DBIT'
+    end
+
+    def credit?
+      !debit
+    end
+
+    def debit?
+      debit
+    end
+
+    def sign
+      credit? ? 1 : -1
+    end
+  end
+end

data/lib/camt_parser/general/transaction.rb

@@ -3,8 +3,8 @@ module CamtParser
     def initialize(xml_data, debit, amount = nil, currency = nil)
       @xml_data = xml_data
       @debit    = debit
-      @amount   = amount   || @xml_data.xpath('AmtDtls/TxAmt/Amt/text()').text
-      @currency = currency || @xml_data.xpath('AmtDtls/TxAmt/Amt/@Ccy').text
+      @amount   = parse_amount || amount
+      @currency = parse_currency || currency
     end
 
     def amount
@@ -96,5 +96,27 @@ module CamtParser
     def payment_information # May be missing
       @payment_information ||= @xml_data.xpath('Refs/PmtInfId/text()').text
     end
+
+    private
+
+    def parse_amount
+      @amount = if @xml_data.xpath('Amt').any?
+        @xml_data.xpath('Amt/text()').text
+      elsif @xml_data.xpath('AmtDtls').any?
+        @xml_data.xpath('AmtDtls/TxAmt/Amt/text()').text
+      else
+        nil
+      end
+    end
+
+    def parse_currency
+      @currenty = if @xml_data.xpath('Amt').any?
+        @xml_data.xpath('Amt/@Ccy').text
+      elsif @xml_data.xpath('AmtDtls').any?
+        @xml_data.xpath('AmtDtls/TxAmt/Amt/@Ccy').text
+      else
+        nil
+      end
+    end
   end
 end

data/lib/camt_parser/general/type/builder.rb

@@ -0,0 +1,18 @@
+module CamtParser
+  module Type
+    class Builder
+      def self.build_type(xml_data)
+        if xml_data.xpath('Prtry').any?
+          Proprietary.new(
+            xml_data.xpath('Prtry/Id/text()').text,
+            xml_data.xpath('Prtry/Issr/text()').text
+          )
+        elsif xml_data.xpath('Cd').any?
+          Code.new(xml_data.xpath('Cd/text()').text)
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/camt_parser/general/type/code.rb

@@ -0,0 +1,11 @@
+module CamtParser
+  module Type
+    class Code
+      attr_reader :code
+
+      def initialize(code)
+        @code = code
+      end
+    end
+  end
+end

data/lib/camt_parser/general/type/proprietary.rb

@@ -0,0 +1,11 @@
+module CamtParser
+  module Type
+    class Proprietary
+      attr_reader :id, :issuer
+
+      def initialize(id, issuer)
+        @id, @issuer = id, issuer
+      end
+    end
+  end
+end

data/lib/camt_parser/version.rb

@@ -1,3 +1,3 @@
 module CamtParser
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/camt_parser/xml.rb

@@ -9,7 +9,7 @@ module CamtParser
       case namespaces
       when 'urn:iso:std:iso:20022:tech:xsd:camt.052.001.02'
         return CamtParser::Format052::Base.new(doc.xpath('Document'))
-      when 'urn:iso:std:iso:20022:tech:xsd:camt.053.001.02'
+      when 'urn:iso:std:iso:20022:tech:xsd:camt.053.001.02', 'urn:iso:std:iso:20022:tech:xsd:camt.053.001.04'
         return CamtParser::Format053::Base.new(doc.xpath('Document'))
       when 'urn:iso:std:iso:20022:tech:xsd:camt.054.001.04'
         return CamtParser::Format054::Base.new(doc.xpath('Document'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camt_parser
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,11 +98,16 @@ files:
 - lib/camt_parser/file.rb
 - lib/camt_parser/general/account.rb
 - lib/camt_parser/general/account_balance.rb
+- lib/camt_parser/general/charges.rb
 - lib/camt_parser/general/creditor.rb
 - lib/camt_parser/general/debitor.rb
 - lib/camt_parser/general/entry.rb
 - lib/camt_parser/general/group_header.rb
+- lib/camt_parser/general/record.rb
 - lib/camt_parser/general/transaction.rb
+- lib/camt_parser/general/type/builder.rb
+- lib/camt_parser/general/type/code.rb
+- lib/camt_parser/general/type/proprietary.rb
 - lib/camt_parser/misc.rb
 - lib/camt_parser/string.rb
 - lib/camt_parser/version.rb