sepa_file_parser 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2538b348949805e79a4612d486d7c983b1254981b9d265cf95377b9f65f1ff84
-  data.tar.gz: f8b3f1f5c088107de2da1dc8342c7971eae4442b4902eeb6368d9e4ab69354ea
+  metadata.gz: 70e87263b0dc7f3a5c18d790aed0ed6be4502e070237d4ddb903a3135d9680be
+  data.tar.gz: 1784c3d48c7610d6f8b731739ff7d6e9feb244acf6322e8c233f12ba6d65d9db
 SHA512:
-  metadata.gz: 391584744f49b0e6e9dad59e8ea63d24a67c0970ea93adee87535d8084abcdd6df619d310cd30bf2cbbe0cc586e09d152686b791bd79dc23d27bc1e18ed39d85
-  data.tar.gz: 2f33ab86d70d63bd5a6b1af0f4a1257b07ae46a29ba7e8ce2c110e452faa59dc7a94b861b401240d05d7f21f85a2c94af9f29351a8a7678d980d26969c0f8567
+  metadata.gz: 61f0297ade7874f67ccf9545acc46693df4725816d5f1fc1ba22df6bf0dbb12fa0c1864525f5b8d1d87b2d3172311400c6a1c3ca1acccff463a878d4a014aeb9
+  data.tar.gz: cf02403d399711621b75c84ab9b6e24a9161002f23b95e6955a375a958c4a11e9da1b0fcdcb0c03e3d967c5b4209e0ace9ced94aafce45bdf4e20eaf316e1339

data/lib/sepa_file_parser/general/counter_value_amount.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module SepaFileParser
+  class CounterValueAmount
+
+    attr_reader :xml_data
+
+    def initialize(xml_data)
+      @xml_data = xml_data
+      @amount = xml_data.xpath('Amt/text()').text
+    end
+
+    def amount
+      SepaFileParser::Misc.to_amount(@amount)
+    end
+
+    def amount_in_cents
+      SepaFileParser::Misc.to_amount_in_cents(@amount)
+    end
+
+    def exchange_rate
+      @exchange_rate ||= SepaFileParser::Misc.to_amount(xml_data.xpath('CcyXchg/XchgRate/text()').text)
+    end
+
+    def source_currency
+      @source_currency ||= xml_data.xpath('CcyXchg/SrcCcy/text()').text
+    end
+
+    def target_currency
+      @target_currency ||= xml_data.xpath('CcyXchg/TrgtCcy/text()').text
+    end
+  end
+end

data/lib/sepa_file_parser/general/entry.rb

@@ -85,7 +85,13 @@ module SepaFileParser
 
     # @return [Boolean]
     def booked?
-      @booked ||= xml_data.xpath('Sts/text()').text.upcase == 'BOOK'
+      return @booked if defined?(@booked)
+
+      # Since .08 Sts is a choice (<Sts><Cd>BOOK</Cd></Sts>), before it was a plain code (<Sts>BOOK</Sts>)
+      status = xml_data.xpath('Sts/Cd/text()').text
+      status = xml_data.xpath('Sts/text()').text if status.empty?
+
+      @booked = status.strip.upcase == 'BOOK'
     end
 
     # @return [String]
@@ -98,6 +104,12 @@ module SepaFileParser
     def charges
       @charges ||= SepaFileParser::Charges.new(xml_data.xpath('Chrgs'))
     end
+
+    # @return [SepaFileParser::CounterValueAmount]
+    def counter_value_amount
+      @charges ||= SepaFileParser::CounterValueAmount.new(xml_data.xpath('AmtDtls/CntrValAmt'))
+    end
+
     # @return [SepaFileParser::BatchDetail, nil]
     def batch_detail
       @batch_detail ||= xml_data.xpath('NtryDtls/Btch').empty? ? nil : parse_batch_detail

data/lib/sepa_file_parser/general/transaction.rb

@@ -119,7 +119,7 @@ module SepaFileParser
     end
 
     def creditor_reference # May be missing
-      @creditor_reference ||= creditor_reference_information.creditor_reference
+      @creditor_reference ||= creditor_reference_information&.creditor_reference
     end
 
     def creditor_reference_information

data/lib/sepa_file_parser/misc.rb

@@ -2,17 +2,34 @@
 
 module SepaFileParser
   class Misc
+
     class << self
 
+      # Convert a string representation of an amount to an integer representation in cents.
+      # NOTE: This method does not handle amounts with more than 2 decimals.
+      #       For any value with 2 decimals or less, the result will be correct and formatted
+      #       to 2 decimals.
+      #       For amounts with more than 2 decimals, an exception will be raised.
+      #       The method is not currency aware and does not distinguish currencies without decimals.
+      #
       # @param value [nil, String]
       # @return [Integer, nil]
       def to_amount_in_cents(value)
         return nil if value == nil || value.strip == ''
 
         # Using dollars and cents as representation for parts before and after the decimal separator
-        dollars, cents = value.split(/,|\./)
+        # The decimal separator can be either a comma or a dot, depending on the locale.
+        # This assumes that there are no thousand separators in the value.
+        dollars, cents = value.split(/,|\./, 2)
         cents ||= '0'
-        format('%s%s', dollars, cents.ljust(2, '0')).to_i
+        if cents.length > 2
+          raise ArgumentError, "Amount has more than 2 decimals: #{value}"
+        end
+        format(
+          '%<dollars>s%<cents>s',
+          dollars: dollars,
+          cents:   cents.ljust(2, '0'),
+        ).to_i
       end
 
       # @param value [nil, String]
@@ -24,5 +41,6 @@ module SepaFileParser
       end
 
     end
+
   end
 end

data/lib/sepa_file_parser/version.rb

@@ -2,6 +2,6 @@
 
 module SepaFileParser
 
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 
 end

data/lib/sepa_file_parser.rb

@@ -15,6 +15,7 @@ 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/counter_value_amount'
 require_relative 'sepa_file_parser/general/account'
 require_relative 'sepa_file_parser/general/owner'
 require_relative 'sepa_file_parser/general/batch_detail'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sepa_file_parser
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Tobias Schoknecht
@@ -114,6 +114,7 @@ files:
 - 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/counter_value_amount.rb
 - lib/sepa_file_parser/general/creditor.rb
 - lib/sepa_file_parser/general/creditor_reference_information.rb
 - lib/sepa_file_parser/general/debitor.rb
@@ -162,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Gem for parsing camt, pain, ... files into a speaking object.
 test_files: []