cmxl 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b17be399c322a9f5cc766a97e87e91911c7957e
-  data.tar.gz: 2450cd1657a24d0f751f14f2f00aa63f82fee42d
+  metadata.gz: e6c1cc630ddfa936396515babfa8c5d6ee77b0d0
+  data.tar.gz: 89940db8aa878f76b1658997702f690db182377d
 SHA512:
-  metadata.gz: bba37265a6a5560d1c2f23d1e2cb59dd33b14fead78c07a1c03e8e65a2ab369849c37f49336a82ce53c3ef19da2b8a639821a6a6c027d7eac4f55402d7c2f205
-  data.tar.gz: c700614ac6bba9ed30e334685129cbd006cc559e57f64bd9c487e46f9ac9bd7c35d635ba35695a368b5b44f5d52cad0f4cd8d7b72a505f8f59fd2819b73a77f2
+  metadata.gz: 8d6749415fb5ebee5f8e98f49a337d0000e19556500b5682546783de3835ec33e09fc59235dd87e800b792bd6928f6b1e05d204f8e705ef169f9f6e0c7231c74
+  data.tar.gz: 18358ac839e9cf4c65357b651c33cb5d6c670a334ae50a56c0e8060d3a9688bc5e63f3f24f64eba0cc8034f41389107675261fbeec73353151762a97a65903ac

data/lib/cmxl/field.rb

@@ -16,6 +16,8 @@ module Cmxl
     def self.parsers; @@parsers; end
 
     class << self; attr_accessor :parser; end
+    self.parser = /(?<source>.*)/ # default parser
+
     def self.tag=(tag)
       @tag = tag.to_s
       @@parsers[tag.to_s] = self
@@ -55,7 +57,7 @@ module Cmxl
     end
 
     def to_date(date, year=nil)
-      if match = date.match(DATE)
+      if match = date.to_s.match(DATE)
         year ||= "20#{match['year']}"
         month = match['month']
         day = match['day']
@@ -67,6 +69,14 @@ module Cmxl
       date
     end
 
+    def to_amount_in_cents(value)
+      value.gsub(/[,|\.](\d*)/) { $1.ljust(2, '0') }.to_i
+    end
+
+    def to_amount(value)
+      value.gsub(',','.').to_f
+    end
+
     def method_missing(m, *value)
       if m =~ /=\z/
         self.data[m] = value.first

data/lib/cmxl/fields/account_balance.rb

@@ -17,7 +17,7 @@ module Cmxl
       end
 
       def amount
-        self.data['amount'].gsub(',','.').to_f * self.sign
+        to_amount(self.data['amount'])
       end
 
       def sign
@@ -25,7 +25,7 @@ module Cmxl
       end
 
       def amount_in_cents
-        self.data['amount'].gsub(',', '').gsub('.','').to_i * self.sign
+        to_amount_in_cents(self.data['amount'])
       end
 
       def to_h

data/lib/cmxl/fields/statement_details.rb

@@ -5,15 +5,20 @@ module Cmxl
       self.parser = /(?<transaction_code>\w{3})(?<details>(?<seperator>.).*)/
 
       def sub_fields
-        @sub_fields ||= self.data['details'].split(/#{Regexp.escape(self.data['seperator'])}(\d{2})/).reject(&:empty?).each_slice(2).to_h
+        @sub_fields ||= if self.data['details'] =~ /#{Regexp.escape(self.data['seperator'])}(\d{2})/
+            self.data['details'].split(/#{Regexp.escape(self.data['seperator'])}(\d{2})/).reject(&:empty?).each_slice(2).to_h
+          else
+            {}
+          end
       end
 
       def description
-        self.sub_fields['00']
+        self.sub_fields['00'] || self.data['details']
       end
 
       def information
-        (20..29).to_a.collect {|i| self.sub_fields[i.to_s] }.join('')
+        info = (20..29).to_a.collect {|i| self.sub_fields[i.to_s] }.join('')
+        info.empty? ? self.description : info
       end
 
       def sepa

data/lib/cmxl/fields/statement_line.rb

@@ -2,7 +2,7 @@ module Cmxl
   module Fields
     class StatementLine < Field
       self.tag = 61
-      self.parser = /\A(?<date>\d{6})(?<entry_date>\d{4})?(?<funds_code>[a-zA-Z])(?<currency_letter>[a-zA-Z])\D?(?<amount>\d{1,12},\d{0,2})(?<swift_code>(?:N|F).{3})(?<reference>NONREF|.{0,16})(?:$|\/\/)(?<bank_reference>.*)/i
+      self.parser = /^(?<date>\d{6})(?<entry_date>\d{4})?(?<funds_code>[a-zA-Z])(?<currency_letter>[a-zA-Z])?(?<amount>\d{1,12},\d{0,2})(?<swift_code>(?:N|F).{3})(?<reference>NONREF|.{0,16})(?:$|\/\/)(?<bank_reference>.*)/i
 
       def credit?
         self.data['funds_code'].to_s.upcase == 'C'
@@ -28,7 +28,7 @@ module Cmxl
         to_date(self.data['date'])
       end
       def entry_date
-        to_date(self.data['entry_date'], self.date.year)
+        to_date(self.data['entry_date'], self.date.year) if self.data['entry_date'] && self.date
       end
 
       def to_h

data/lib/cmxl/version.rb

@@ -1,3 +1,3 @@
 module Cmxl
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/field_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Cmxl::Field do
+  subject { Cmxl::Field.new('D140829EUR000000000147,64') }
+
+  it { expect(Cmxl::Field.parser).to eql(/(?<source>.*)/) } # default must be set
+
+  it { expect(subject.to_amount('123.')).to eql(123.00) }
+  it { expect(subject.to_amount('123.1')).to eql(123.10) }
+  it { expect(subject.to_amount('123.11')).to eql(123.11) }
+  it { expect(subject.to_amount('123,1')).to eql(123.10) }
+  it { expect(subject.to_amount('123,11')).to eql(123.11) }
+
+  it { expect(subject.to_amount_in_cents('123.')).to eql(12300) }
+  it { expect(subject.to_amount_in_cents('123.1')).to eql(12310) }
+  it { expect(subject.to_amount_in_cents('123.11')).to eql(12311) }
+  it { expect(subject.to_amount_in_cents('123,1')).to eql(12310) }
+  it { expect(subject.to_amount_in_cents('123,11')).to eql(12311) }
+
+  it { expect(subject.to_date('invalid')).to eql('invalid') }
+  it { expect(subject.to_date('140914')).to eql(Date.new(2014,9,14)) }
+  it { expect(subject.to_date('140914', 2013)).to eql(Date.new(2013,9,14)) }
+
+end

data/spec/fields/account_balance_spec.rb

@@ -33,8 +33,8 @@ describe Cmxl::Fields::AccountBalance do
     it { expect(subject).to be_debit }
     it { expect(subject.currency).to eql('EUR') }
 
-    it { expect(subject.amount).to eql(-147.64) }
-    it { expect(subject.amount_in_cents).to eql(-14764) }
+    it { expect(subject.amount).to eql(147.64) }
+    it { expect(subject.amount_in_cents).to eql(14764) }
     it { expect(subject.sign).to eql(-1) }
   end
 

data/spec/fields/available_balance_spec.rb

@@ -9,8 +9,8 @@ describe Cmxl::Fields::AvailableBalance do
   it { expect(subject).to be_debit }
   it { expect(subject.currency).to eql('EUR') }
 
-  it { expect(subject.amount).to eql(-3.66) }
-  it { expect(subject.amount_in_cents).to eql(-366) }
+  it { expect(subject.amount).to eql(3.66) }
+  it { expect(subject.amount_in_cents).to eql(366) }
   it { expect(subject.sign).to eql(-1) }
 
 end

data/spec/mt940_parsing_spec.rb

@@ -8,6 +8,11 @@ describe 'parsing a statement' do
     it { expect(subject.closing_balance.amount_in_cents).to eql(8443704) }
     it { expect(subject.generation_date).to eql(Date.new(2013, 11, 10)) }
     it { expect(subject.transactions.count).to eql(11) }
+
+    it { expect(subject.transactions.first.description).to eql('PN5477SCHECK-NR. 0000016703074') }
+    it { expect(subject.transactions.first.information).to eql('PN5477SCHECK-NR. 0000016703074') }
+    it { expect(subject.transactions.first.sepa).to eql({}) }
+    it { expect(subject.transactions.first.bic).to eql(nil) }
   end
 
   context 'second example' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmxl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michael Bumann
@@ -79,6 +79,7 @@ files:
 - lib/cmxl/statement.rb
 - lib/cmxl/transaction.rb
 - lib/cmxl/version.rb
+- spec/field_spec.rb
 - spec/fields/account_balance_spec.rb
 - spec/fields/account_identification_spec.rb
 - spec/fields/available_balance_spec.rb
@@ -128,6 +129,7 @@ signing_key:
 specification_version: 4
 summary: Cmxl is your friendly MT940 bank statement parser
 test_files:
+- spec/field_spec.rb
 - spec/fields/account_balance_spec.rb
 - spec/fields/account_identification_spec.rb
 - spec/fields/available_balance_spec.rb