camt_parser 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89b432e8beb46ea683a5d897d11a3e3f7a923c6b
-  data.tar.gz: c90fca06cf5c7c2758ff54de9b5621e4caefc561
+  metadata.gz: 683b4dfccdf419dbd3dfd37e7a4002d354283995
+  data.tar.gz: 87c93c3d59bc8f83d44b7d02323fdfe044cf5e2d
 SHA512:
-  metadata.gz: 1975140e3c8293086a96811e6c63f0e2cfb32169866391ab0191cc96d0c71fecb5e66f35796830f481e43e8788dc0d85088b9e2c9a410d26ccbb7cd1415e2273
-  data.tar.gz: 6c9d7648926d601d6afb9982b9fb28a6f5af9b46c6f53139a8f1d4d00ad7c368c78ff76762a7244e84330e9230228d4814e9c45b72261644607b7161649cf5d1
+  metadata.gz: 0f02b7ecd0a390a709831cbbfe58494f5aa69251b1cf3930f4fe919d297a8f2b87c1c4239899f2b895d25636f12c26fe3ae21d927d719ced342953a6cef2471f
+  data.tar.gz: aad82828f6b3735eff91d5adfbcc1c3d846a0360331111a556be4b1fa60fc460280d2b3bf31e7763ff9f0e0992d2361e979ad08f9b7623952e013d666594eda2

data/lib/camt_parser/general/creditor.rb

@@ -5,19 +5,19 @@ module CamtParser
     end
 
     def name
-      @name ||= @xml_data.xpath('TxDtls/RltdPties/Cdtr/Nm/text()').text
+      @name ||= @xml_data.xpath('RltdPties/Cdtr/Nm/text()').text
     end
 
     def iban
-      @iban ||= @xml_data.xpath('TxDtls/RltdPties/CdtrAcct/Id/IBAN/text()').text
+      @iban ||= @xml_data.xpath('RltdPties/CdtrAcct/Id/IBAN/text()').text
     end
 
     def bic
-      @bic ||= @xml_data.xpath('TxDtls/RltdAgts/CdtrAgt/FinInstnId/BIC/text()').text
+      @bic ||= @xml_data.xpath('RltdAgts/CdtrAgt/FinInstnId/BIC/text()').text
     end
 
     def bank_name
-      @bank_name ||= @xml_data.xpath('TxDtls/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

@@ -5,19 +5,19 @@ module CamtParser
     end
 
     def name
-      @name ||= @xml_data.xpath('TxDtls/RltdPties/Dbtr/Nm/text()').text
+      @name ||= @xml_data.xpath('RltdPties/Dbtr/Nm/text()').text
     end
 
     def iban
-      @iban ||= @xml_data.xpath('TxDtls/RltdPties/DbtrAcct/Id/IBAN/text()').text
+      @iban ||= @xml_data.xpath('RltdPties/DbtrAcct/Id/IBAN/text()').text
     end
 
     def bic
-      @bic ||= @xml_data.xpath('TxDtls/RltdAgts/DbtrAgt/FinInstnId/BIC/text()').text
+      @bic ||= @xml_data.xpath('RltdAgts/DbtrAgt/FinInstnId/BIC/text()').text
     end
 
     def bank_name
-      @bank_name ||= @xml_data.xpath('TxDtls/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

@@ -29,18 +29,14 @@ module CamtParser
       @booking_date ||= Date.parse(@xml_data.xpath('BookgDt/Dt/text()').text)
     end
 
-    def creditor
-      @creditor ||= CamtParser::Creditor.new(@xml_data.xpath('NtryDtls'))
+    def transactions
+      @transactions ||= parse_transactions
     end
 
     def credit?
       !debit
     end
 
-    def debitor
-      @debitor ||= CamtParser::Debitor.new(@xml_data.xpath('NtryDtls'))
-    end
-
     def debit?
       debit
     end
@@ -54,58 +50,20 @@ module CamtParser
     end
     alias_method :description, :additional_information
 
-    def remittance_information
-      @remittance_information ||= begin
-        if (x = @xml_data.xpath('NtryDtls/TxDtls/RmtInf/Ustrd')).empty?
-          nil
-        else
-          x.collect(&:content).join(' ')
-        end
-      end
-    end
-
-    def name
-      credit? ? debitor.name : creditor.name
-    end
-
-    def iban
-      credit? ? debitor.iban : creditor.iban
-    end
-
-    def bic
-      credit? ? debitor.bic : creditor.bic
-    end
-
-    def swift_code
-      @swift_code ||= @xml_data.xpath('NtryDtls/TxDtls/BkTxCd/Prtry/Cd/text()').text.split('+')[0]
-    end
-
-    def reference
-      @reference ||= @xml_data.xpath('NtryDtls/TxDtls/Refs/InstrId/text()').text
-    end
+    private
 
-    def bank_reference # May be missing
-      @bank_reference ||= @xml_data.xpath('NtryDtls/TxDtls/Refs/AcctSvcrRef/text()').text
-    end
+    def parse_transactions
+      transaction_details = @xml_data.xpath('NtryDtls/TxDtls')
 
-    def end_to_end_reference # May be missing
-      @end_to_end_reference ||= @xml_data.xpath('NtryDtls/TxDtls/Refs/EndToEndId/text()').text
-    end
+      amt = nil
+      ccy = nil
 
-    def mandate_reference # May be missing
-      @mandate_reference ||= @xml_data.xpath('NtryDtls/TxDtls/Refs/MndtId/text()').text
-    end
-
-    def transaction_id # May be missing
-      @transaction_id ||= @xml_data.xpath('NtryDtls/TxDtls/Refs/TxId/text()').text
-    end
-
-    def creditor_identifier # May be missing
-      @creditor_identifier ||= @xml_data.xpath('NtryDtls/TxDtls/RltdPties/Cdtr/Id/PrvtId/Othr/Id/text()').text
-    end
+      if transaction_details.length == 1
+        amt = @xml_data.xpath('Amt/text()').text
+        ccy = @xml_data.xpath('Amt/@Ccy').text
+      end
 
-    def payment_information # May be missing
-      @payment_information ||= @xml_data.xpath('NtryDtls/TxDtls/Refs/PmtInfId/text()').text
+      @xml_data.xpath('NtryDtls/TxDtls').map { |x| Transaction.new(x, debit?, amt, ccy) }
     end
   end
 end

data/lib/camt_parser/general/transaction.rb

@@ -0,0 +1,100 @@
+module CamtParser
+  class Transaction
+    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
+    end
+
+    def amount
+      CamtParser::Misc.to_amount(@amount)
+    end
+
+    def amount_in_cents
+      CamtParser::Misc.to_amount_in_cents(@amount)
+    end
+
+    def currency
+      @currency
+    end
+
+    def creditor
+      @creditor ||= CamtParser::Creditor.new(@xml_data)
+    end
+
+    def debitor
+      @debitor ||= CamtParser::Debitor.new(@xml_data)
+    end
+
+    def name
+      credit? ? debitor.name : creditor.name
+    end
+
+    def iban
+      credit? ? debitor.iban : creditor.iban
+    end
+
+    def bic
+      credit? ? debitor.bic : creditor.bic
+    end
+
+    def credit?
+      !debit
+    end
+
+    def debit?
+      debit
+    end
+
+    def debit
+      @debit
+    end
+
+    def sign
+      credit? ? 1 : -1
+    end
+
+    def remittance_information
+      @remittance_information ||= begin
+        if (x = @xml_data.xpath('RmtInf/Ustrd')).empty?
+          nil
+        else
+          x.collect(&:content).join(' ')
+        end
+      end
+    end
+
+    def swift_code
+      @swift_code ||= @xml_data.xpath('BkTxCd/Prtry/Cd/text()').text.split('+')[0]
+    end
+
+    def reference
+      @reference ||= @xml_data.xpath('Refs/InstrId/text()').text
+    end
+
+    def bank_reference # May be missing
+      @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
+
+    def mandate_reference # May be missing
+      @mandate_reference ||= @xml_data.xpath('Refs/MndtId/text()').text
+    end
+
+    def transaction_id # May be missing
+      @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
+    end
+
+    def payment_information # May be missing
+      @payment_information ||= @xml_data.xpath('Refs/PmtInfId/text()').text
+    end
+  end
+end

data/lib/camt_parser/version.rb

@@ -1,3 +1,3 @@
 module CamtParser
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/lib/camt_parser.rb

@@ -13,6 +13,7 @@ require_relative "camt_parser/general/debitor"
 require_relative "camt_parser/general/entry"
 require_relative "camt_parser/general/account"
 require_relative "camt_parser/general/group_header"
+require_relative "camt_parser/general/transaction"
 require_relative "camt_parser/052/report"
 require_relative "camt_parser/052/base"
 require_relative "camt_parser/053/statement"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camt_parser
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tobias Schoknecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,6 +100,7 @@ files:
 - lib/camt_parser/general/debitor.rb
 - lib/camt_parser/general/entry.rb
 - lib/camt_parser/general/group_header.rb
+- lib/camt_parser/general/transaction.rb
 - lib/camt_parser/misc.rb
 - lib/camt_parser/string.rb
 - lib/camt_parser/version.rb
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gem for parsing camt files into a speaking object.