cmxl 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17647ffc105205636501d05c46e1d1cdc83b555b
-  data.tar.gz: ad00025468ad564d309959ff9da3b598e1f98f92
+  metadata.gz: 42504a4554682fd712473e3e744db2892083965e
+  data.tar.gz: 3830a7a989cb7f5d490122d2079e67a45dcc75a3
 SHA512:
-  metadata.gz: e9bee8eb300a2c5bd3154d02316ff627d6c51fbf0ab9f1ee030928c1a8e1f767180f4553e7f21dcf1f4dbebf14f4f53a4d3828729adf56f5602649b7aa563640
-  data.tar.gz: a113db66a2a5b835254d4c1b1d88f0fead6f00c0866bebfefa6f353b3114c44f4bc7bccbe1c94164e778ead94171c1fed3922ee9f89f37ecc72ede0facd12107
+  metadata.gz: 4fc0b6927125e065f9c5b9f8c15f2e6ee7d35feb938a72f9bfde9e059e672389e2a00c6e747e81dacf50ca062a8eb1dd39cac7c30272d40fd282022124ddd56a
+  data.tar.gz: f64a53ecbf51cedbaf80fdcad20a9e0e1aa47bd9780cb05768401d3449756344ad4956e4bb4eaef10bfe2851409b72c95cdc6ba0298582a95a51ce1568c1d766

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -7,6 +7,11 @@ rvm:
   - 2.2.4
   - 2.3.0
   - jruby
+matrix:
+  allow_failures:
+    - rvm: 1.9.3
+after_success:
+  - bundle exec codeclimate-test-reporter
 addons:
   code_climate:
     repo_token: 149f0d20e17ace00c44be432a4194bc441ba805da89a7708fca0f4a2c3f2aed7

data/CHANGELOG.mdown

@@ -1,3 +1,8 @@
+# 0.2.0
+  * added several balance related accessors (#7)
+  * configuration option for `statement separator` (#5)
+  * improvement for general compatibility
+
 # 0.1.3
 
   * [BUGFIX] fixed the statement details parser. It failed in case of empty values in the SEPA details

data/cmxl.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", '~>3.0'
+  spec.add_development_dependency "simplecov"
 
   spec.add_dependency "rchardet19"
 end

data/lib/cmxl.rb

@@ -4,14 +4,13 @@ require "rchardet19"
 
 require 'cmxl/field'
 require 'cmxl/statement'
-require 'cmxl/transaction'
 Dir[File.join(File.dirname(__FILE__), 'cmxl/fields', '*.rb')].each { |f| require f; }
 
 module Cmxl
   def self.config
     @config
   end
-  @config = { :statement_separator => /\n-.\n/m, :raise_line_format_errors => true }
+  @config = { :statement_separator => /\n-\s*\n/m, :raise_line_format_errors => true }
 
   # Public: Parse a MT940 string
   #
@@ -27,6 +26,7 @@ module Cmxl
   # Returns an array of Statement objects
   def self.parse(data, options={})
     options[:universal_newline] ||= true
+    options[:statement_separator] ||= self.config[:statement_separator]
     # if no encoding is provided we try to guess using CharDet
     if options[:encoding].nil? && cd = CharDet.detect(data, silent: true)
       options[:encoding] = cd.encoding
@@ -38,6 +38,6 @@ module Cmxl
       data.encode!('UTF-8', options) if !options.empty?
     end
 
-    data.split(self.config[:statement_separator]).reject { |s| s.strip.empty? }.collect {|s| Cmxl::Statement.new(s.strip) }
+    data.split(options[:statement_separator]).reject { |s| s.strip.empty? }.collect {|s| Cmxl::Statement.new(s.strip) }
   end
 end

data/lib/cmxl/field.rb

@@ -65,6 +65,10 @@ module Cmxl
       end
     end
 
+    def add_meta_data(content)
+      # Override if the field supports it
+    end
+
     def to_h
       self.data.merge('tag' => self.tag)
     end

data/lib/cmxl/fields/{statement_line.rb → transaction.rb}

@@ -1,9 +1,19 @@
 module Cmxl
   module Fields
-    class StatementLine < Field
+    class Transaction < Field
       self.tag = 61
       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
 
+      attr_accessor :details
+
+      def add_meta_data(content)
+        self.details = Cmxl::Fields::StatementDetails.parse(content) unless content.nil?
+      end
+
+      def sha
+        Digest::SHA2.new.update(source).to_s
+      end
+
       def credit?
         self.data['funds_code'].to_s.upcase == 'C'
       end
@@ -31,8 +41,33 @@ module Cmxl
         to_date(self.data['entry_date'], self.date.year) if self.data['entry_date'] && self.date
       end
 
+      # Fields from details
+
+      def description
+        details.description if details
+      end
+      def information
+        details.information if details
+      end
+      def bic
+        details.bic if details
+      end
+      def name
+        details.name if details
+      end
+      def iban
+        details.iban if details
+      end
+      def sepa
+        details.sepa if details
+      end
+      def sub_fields
+        details.sub_fields if details
+      end
+
       def to_h
         {
+          'sha' => sha,
           'date' => date,
           'entry_date' => entry_date,
           'amount' => amount,
@@ -45,7 +80,15 @@ module Cmxl
           'reference' => reference,
           'bank_reference' => bank_reference,
           'currency_letter' => currency_letter
-        }
+        }.merge(details ? details.to_h : {})
+      end
+
+      def to_hash
+        to_h
+      end
+
+      def to_json(*args)
+        to_h.to_json(*args)
       end
     end
   end

data/lib/cmxl/statement.rb

@@ -1,7 +1,7 @@
 require 'digest/sha2'
 module Cmxl
   class Statement
-    attr_accessor :source, :collection, :transactions, :fields, :lines
+    attr_accessor :source, :collection, :fields, :lines
 
     # Public: Initiate a new Statement and parse a provided single statement string
     # It directly parses the source and initiates file and transaction objects.
@@ -13,10 +13,13 @@ module Cmxl
       self.source = source
       self.fields = []
       self.lines = []
-      self.transactions = []
       self.parse!
     end
 
+    def transactions
+      self.fields.select { |field| field.kind_of?(Fields::Transaction) }
+    end
+
     # Internal: Parse a single MT940 statement and extract the line data
     #
     def parse!
@@ -28,17 +31,33 @@ module Cmxl
           self.lines.last << line.strip
         end
       end
-      # Now we check each line for its content ans structure it for further use. If it is part of a transaction we initate or update a transaction else we parse the field and add it to the fields collection
-      self.lines.each do |line|
-        if line.match(/\A:61:/)
-          self.transactions << Cmxl::Transaction.new(line)
-        elsif line.match(/\A:86:/) && !self.transactions.last.nil?
-          self.transactions.last.details = line
+
+      self.fields = []
+      lines.each do |line|
+        if line.match(/\A:86:/)
+          if field = fields.last
+            field.add_meta_data(line)
+          end
         else
           field = Field.parse(line)
           self.fields << field unless field.nil?
         end
       end
+
+      # puts "Fixed Fields"
+      # puts fields.inspect
+      #
+      # # Now we check each line for its content ans structure it for further use. If it is part of a transaction we initate or update a transaction else we parse the field and add it to the fields collection
+      # self.lines.each do |line|
+      #   if line.match(/\A:61:/)
+      #     self.transactions << Cmxl::Transaction.new(line)
+      #   elsif line.match(/\A:86:/) && !self.transactions.last.nil?
+      #     self.transactions.last.details = line
+      #   else
+      #     field = Field.parse(line)
+      #     self.fields << field unless field.nil?
+      #   end
+      # end
     end
 
     # Public: SHA2 of the provided source
@@ -65,14 +84,26 @@ module Cmxl
       self.field(60, 'F')
     end
 
+    def opening_or_intermediary_balance
+      self.field(60)
+    end
+
     def closing_balance
       self.field(62, 'F')
     end
 
+    def closing_or_intermediary_balance
+      self.field(62)
+    end
+
     def available_balance
       self.field(64)
     end
 
+    def legal_sequence_number
+      self.field(28).source
+    end
+
     def to_h
       {
         'reference' => reference,

data/lib/cmxl/version.rb

@@ -1,3 +1,3 @@
 module Cmxl
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/fields/{statment_line_spec.rb → transaction_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Cmxl::Fields::StatementLine do
+describe Cmxl::Fields::Transaction do
 
-  subject { Cmxl::Fields::StatementLine.parse(fixture_line(:statement_line)) }
+  subject { Cmxl::Fields::Transaction.parse(fixture_line(:statement_line)) }
 
   it { expect(subject.date).to eql(Date.new(2014,9,1)) }
   it { expect(subject.entry_date).to eql(Date.new(2014,9,2)) }

data/spec/fixtures/mt940-deutsche_bank.txt

@@ -0,0 +1,70 @@
+:20:131110
+:25:45050050/76198810
+:28:27/01
+:60F:C131016DEM84349,74
+:61:131017D6800,NCHK16703074
+:86:999PN5477SCHECK-NR. 0000016703074
+:61:131017D620,3NSTON
+:86:999PN0911DAUERAUFTR.NR. 14
+:61:131017C18500,NCLRN
+:86:999PN2406SCHECK
+:61:131015D14220,NBOEN
+:86:999PN0920WECHSEL
+:61:131017D1507,NTRFN
+:86:999PN0920SCHNELLUEB
+:61:131024C4200,NMSCN
+:86:999PN2506AUSSENH. NR. 1
+:61:131017D19900,NTRFN
+:86:999PN0907UEBERTRAG
+:61:131017D400,NTRFN
+:86:999PN0891BTX
+:61:131018C3656,74NMSCN
+:86:999PN0850EINZAHLG.N
+:61:131019C23040,NMSCN
+:86:999PN0812LT.ANLAGE
+:61:131027D5862,14NCHKN
+:86:999PN5329AUSLSCHECK
+:62F:C131017DEM84437,04
+-
+:20:1234567
+:21:9876543210
+:25:10020030/1234567
+:28C:5/1
+:60F:C021101EUR2187,95
+:61:0211011102DR800,NSTONONREF//55555
+:86:008?00DAUERAUFTRAG?100599?20Miete November?3010020030?31234567?32MUELLER?34339
+:61:0211021102CR3000,NTRFNONREF//55555
+:86:051?00UEBERWEISUNG?100599?20Gehalt Oktob
+er
+?21Firma
+Mustermann
+GmbH?3050060400?31084756
+4700?32MUELLER?34339
+:62F:C021131EUR4387,95
+-
+:20:TELEWIZORY S.A.
+:25:BPHKPLPK/320000546101
+:28C:00084/001
+:60F:C031002PLN40000,00
+:61:0310201020C20000,00FMSCNONREF//8327000090031789
+Card transaction
+:86: 020?00Wyplata-(dysp/przel)?2008106000760000777777777777?2115617?
+22INFO INFO INFO INFO INFO INFO 1 END?23INFO INFO INFO INFO INFO
+INFO 2 END?24ZAPLATA ZA FABRYKATY DO TUB?25 - 200 S ZTUK, TRANZY
+STORY-?26300 SZT GR544 I OPORNIKI-5?2700 SZT GTX847 FAKTURA 333/
+2?28003.?3010600076?310000777777777777?32HUTA SZKLA TOPIC UL
+PRZEMY?33SLOWA 67 32-669 WROCLAW?38PL081060007600007777777
+77777
+:61:0310201020D10000,00FTRFREF 25611247//8327000090031790
+Transfer
+:86: 020?00Wyplata-(dysp/przel)?2008106000760000777777777777?2115617?
+22INFO INFO INFO INFO INFO INFO 1 END?23INFO INFO INFO INFO INFO
+INFO 2 END?24ZAPLATA ZA FABRYKATY DO TUB?25 - 200 S ZTUK, TRANZY
+STORY-?26300 SZT GR544 I OPORNIKI-5?2700 SZT GTX847 FAKTURA 333/
+2?28003.?3010600076?310000777777777777?38PL081060007600007777777
+77777
+:61:0310201020C40,00FTRFNONREF//8327000090031791
+Interest credit
+:86: 844?00Uznanie kwotą odsetek?20Odsetki od lokaty nr 101000?21022086
+:62F:C020325PLN50040,00 
+-

data/spec/fixtures/mt940-with-detailed-end-balance.txt

@@ -0,0 +1,8 @@
+:20:STARTUMS
+:25:45050050/76198810
+:28C:00001/00001
+:60F:C160101EUR10,00
+:61:1601010222CR1,00NTRFNONREF//CT16-01-01-08.32
+:86:008?00DAUERAUFTRAG?100599?20Miete Dezember?3010020030?31234567?32MUELLER?34339
+:62F:C160222EUR15,00
+:86:Some random addition to it

data/spec/fixtures/statement-details-mt940.txt

@@ -0,0 +1,2 @@
+:61:1409010902DR000000000001,62NTRF0000549855700010//025498557/000001
+:86:171?00SEPA LASTSCHRIFT KUNDE?10281?20KREF+EREF+TRX-0A4A47C3-F846-4729?21-8A1B-5DF620F?22MREF+CAC97D2144174318AC18D9?23BF815BD4FB?24CRED+DE98ZZZ09999999999?25SVWZ+FOO TRX-0A4A47C3-F84?266-4729-8A1B-5DF620F?30HYVEDEMMXXX?31HUkkbbbsssskcccccccccccccccx?32Peter Pan?99?34171

data/spec/fixtures/statement-mt940.txt

@@ -0,0 +1 @@
+:61:1409010902DR000000000001,62NTRF0000549855700010//025498557/000001

data/spec/mt940_parsing_spec.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
-
 require 'spec_helper'
 
 describe 'parsing a statement' do
-
   context 'ISO 8859-1' do
     subject { Cmxl.parse(mt940_file('mt940-iso8859-1'))[0] }
+
     it { expect(subject.reference).to eql('1234567') }
     it { expect(subject.opening_balance.amount_in_cents).to eql(218795) }
     it { expect(subject.closing_balance.amount_in_cents).to eql(438795) }
@@ -17,12 +16,12 @@ describe 'parsing a statement' do
 
   context 'first example' do
     subject { Cmxl.parse(mt940_file(), :encoding => 'ISO-8859-1', :universal_newline => true)[0] }
+
     it { expect(subject.reference).to eql('131110') }
     it { expect(subject.opening_balance.amount_in_cents).to eql(8434974) }
     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({}) }
@@ -31,6 +30,7 @@ describe 'parsing a statement' do
 
   context 'second example' do
     subject { Cmxl.parse(mt940_file(), :encoding => 'ISO-8859-1', :universal_newline => true)[1] }
+
     it { expect(subject.reference).to eql('1234567') }
     it { expect(subject.opening_balance.amount_in_cents).to eql(218795) }
     it { expect(subject.closing_balance.amount_in_cents).to eql(438795) }
@@ -44,10 +44,9 @@ describe 'parsing a statement' do
     it { expect(subject.transactions.first.iban).to eql('234567') }
   end
 
-
-
   context 'third example' do
     subject { Cmxl.parse(mt940_file(), :encoding => 'ISO-8859-1', :universal_newline => true)[2] }
+
     it { expect(subject.reference).to eql('TELEWIZORY S.A.') }
     it { expect(subject.opening_balance.amount_in_cents).to eql(4000000) }
     it { expect(subject.closing_balance.amount_in_cents).to eql(5004000) }
@@ -59,7 +58,21 @@ describe 'parsing a statement' do
     it { expect(subject.transactions.first.bic).to eql('10600076') }
     it { expect(subject.transactions.first.iban).to eql('PL08106000760000777777777777') }
     it { expect(subject.transactions.first.sepa).to eql({}) }
-end
+  end
 
+  context 'statement separator as used by most banks' do
+    subject { Cmxl.parse(mt940_file('mt940')) }
 
+    it 'detects all statements by default' do
+      expect(subject.size).to eq(3)
+    end
+  end
+
+  context 'statement separator as used by Deutsche Bank' do
+    subject { Cmxl.parse(mt940_file('mt940-deutsche_bank')) }
+
+    it 'detects all statements by default' do
+      expect(subject.size).to eq(3)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require 'cmxl'
 

data/spec/{transaction_spec.rb → statement_spec.rb}

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe Cmxl::Transaction do
+describe Cmxl do
 
   context 'with details' do
-    subject { Cmxl::Transaction.new( fixture_line(:statement_line), fixture_line(:statement_details) ) }
+    subject { Cmxl.parse( mt940_file('statement-details-mt940') ).first.transactions.first }
+
     it { expect(subject).to be_debit }
     it { expect(subject).to_not be_credit }
     it { expect(subject.funds_code).to eql('D') }
-    it { expect(subject.date).to eql(Date.new(2014,9,1))}
-    it { expect(subject.entry_date).to eql(Date.new(2014,9,2))}
-    it { expect(subject.amount).to eql(1.62)}
-    it { expect(subject.statement_line.amount).to eql(1.62)}
-    it { expect(subject.amount_in_cents).to eql(162)}
+    it { expect(subject.date).to eql(Date.new(2014,9,1)) }
+    it { expect(subject.entry_date).to eql(Date.new(2014,9,2)) }
+    it { expect(subject.amount).to eql(1.62) }
+    it { expect(subject.amount_in_cents).to eql(162) }
     it { expect(subject.to_h).to eql(
       {
         "date" => Date.new(2014,9,1),
@@ -63,14 +63,42 @@ describe Cmxl::Transaction do
   end
 
   context 'without details' do
-    subject { Cmxl::Transaction.new( fixture_line(:statement_line) ) }
+    subject { Cmxl.parse( mt940_file('statement-mt940') ).first.transactions.first }
+
     it { expect(subject).to be_debit }
     it { expect(subject).to_not be_credit }
     it { expect(subject.date).to eql(Date.new(2014,9,1))}
-    it { expect(subject.entry_date).to eql(Date.new(2014,9,2))}
-    it { expect(subject.amount).to eql(1.62)}
-    it { expect(subject.amount_in_cents).to eql(162)}
-    it { expect(subject.to_h).to eql({"date" => Date.new(2014,9,1),
-        "sha" => "3c5e65aa3d3878b06b58b6f1ae2f3693004dfb04e3ab7119a1c1244e612293da", "entry_date"=>Date.new(2014,9,2), "funds_code"=>"D", "currency_letter"=>"R", "amount"=>1.62, "swift_code"=>"NTRF", "reference"=>"0000549855700010", "bank_reference"=>"025498557/000001", "amount_in_cents"=>162, "sign"=>-1, "debit"=>true, "credit"=>false}) }
+    it { expect(subject.entry_date).to eql(Date.new(2014,9,2)) }
+    it { expect(subject.amount).to eql(1.62) }
+    it { expect(subject.amount_in_cents).to eql(162) }
+    it 'does not include any details in its hash representation' do
+      expect(subject.to_h).to eql({
+        "date" => Date.new(2014,9,1),
+        "sha" => "3c5e65aa3d3878b06b58b6f1ae2f3693004dfb04e3ab7119a1c1244e612293da",
+        "entry_date"=>Date.new(2014,9,2),
+        "funds_code" => "D",
+        "currency_letter" => "R",
+        "amount" => 1.62,
+        "swift_code" => "NTRF",
+        "reference" => "0000549855700010",
+        "bank_reference" => "025498557/000001",
+        "amount_in_cents" => 162,
+        "sign" => -1,
+        "debit" => true,
+        "credit" => false
+      })
+    end
+  end
+
+  describe 'statement with detailed end balance' do
+    subject { Cmxl.parse( mt940_file('mt940-with-detailed-end-balance') ).first.transactions.first }
+
+    it 'includes correct iban' do
+      expect(subject.iban).to eq('234567')
+    end
+
+    it 'includes correct bic' do
+      expect(subject.bic).to eq('10020030')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmxl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Bumann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rchardet19
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CHANGELOG.mdown
 - Gemfile
@@ -90,10 +105,9 @@ files:
 - lib/cmxl/fields/closing_balance.rb
 - lib/cmxl/fields/reference.rb
 - lib/cmxl/fields/statement_details.rb
-- lib/cmxl/fields/statement_line.rb
 - lib/cmxl/fields/statement_number.rb
+- lib/cmxl/fields/transaction.rb
 - lib/cmxl/statement.rb
-- lib/cmxl/transaction.rb
 - lib/cmxl/version.rb
 - spec/field_spec.rb
 - spec/fields/account_balance_spec.rb
@@ -103,7 +117,7 @@ files:
 - spec/fields/reference_spec.rb
 - spec/fields/statement_details_spec.rb
 - spec/fields/statement_number_spec.rb
-- spec/fields/statment_line_spec.rb
+- spec/fields/transaction_spec.rb
 - spec/fields/unknown_spec.rb
 - spec/fixtures/lines/account_balance_credit.txt
 - spec/fixtures/lines/account_balance_debit.txt
@@ -115,12 +129,16 @@ files:
 - spec/fixtures/lines/statement_details.txt
 - spec/fixtures/lines/statement_line.txt
 - spec/fixtures/lines/statement_number.txt
+- spec/fixtures/mt940-deutsche_bank.txt
 - spec/fixtures/mt940-iso8859-1.txt
+- spec/fixtures/mt940-with-detailed-end-balance.txt
 - spec/fixtures/mt940.txt
+- spec/fixtures/statement-details-mt940.txt
+- spec/fixtures/statement-mt940.txt
 - spec/mt940_parsing_spec.rb
 - spec/spec_helper.rb
+- spec/statement_spec.rb
 - spec/support/fixtures.rb
-- spec/transaction_spec.rb
 homepage: https://github.com/railslove/cmxl
 licenses:
 - MIT
@@ -143,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Cmxl is your friendly MT940 bank statement parser
@@ -156,7 +174,7 @@ test_files:
 - spec/fields/reference_spec.rb
 - spec/fields/statement_details_spec.rb
 - spec/fields/statement_number_spec.rb
-- spec/fields/statment_line_spec.rb
+- spec/fields/transaction_spec.rb
 - spec/fields/unknown_spec.rb
 - spec/fixtures/lines/account_balance_credit.txt
 - spec/fixtures/lines/account_balance_debit.txt
@@ -168,9 +186,13 @@ test_files:
 - spec/fixtures/lines/statement_details.txt
 - spec/fixtures/lines/statement_line.txt
 - spec/fixtures/lines/statement_number.txt
+- spec/fixtures/mt940-deutsche_bank.txt
 - spec/fixtures/mt940-iso8859-1.txt
+- spec/fixtures/mt940-with-detailed-end-balance.txt
 - spec/fixtures/mt940.txt
+- spec/fixtures/statement-details-mt940.txt
+- spec/fixtures/statement-mt940.txt
 - spec/mt940_parsing_spec.rb
 - spec/spec_helper.rb
+- spec/statement_spec.rb
 - spec/support/fixtures.rb
-- spec/transaction_spec.rb

data/lib/cmxl/transaction.rb

@@ -1,98 +0,0 @@
-module Cmxl
-  class Transaction
-    attr_accessor :statement_line, :details
-
-    def initialize(statement_line, details = nil)
-      self.statement_line = statement_line
-      self.details = details
-    end
-
-    def statement_line=(line)
-      @statement_line = Cmxl::Fields::StatementLine.parse(line) unless line.nil?
-    end
-
-    def details=(line)
-      @details = Cmxl::Fields::StatementDetails.parse(line) unless line.nil?
-    end
-
-    def sha
-      Digest::SHA2.new.update(self.statement_line.source).to_s
-    end
-
-    def debit?
-      self.statement_line.debit?
-    end
-    def credit?
-      self.statement_line.credit?
-    end
-    def amount
-      self.statement_line.amount
-    end
-    def sign
-      self.statement_line.sign
-    end
-    def funds_code
-      self.statement_line.funds_code
-    end
-    def amount_in_cents
-      self.statement_line.amount_in_cents
-    end
-    def date
-      self.statement_line.date
-    end
-    def entry_date
-      self.statement_line.entry_date
-    end
-    def funds_code
-      self.statement_line.funds_code
-    end
-    def currency_letter
-      self.statement_line.currency_letter
-    end
-    def swift_code
-      self.statement_line.swift_code
-    end
-    def reference
-      self.statement_line.reference
-    end
-    def bank_reference
-      self.statement_line.bank_reference
-    end
-    def description
-      self.details.description if self.details
-    end
-    def information
-      self.details.information if self.details
-    end
-    def bic
-      self.details.bic if self.details
-    end
-    def name
-      self.details.name if self.details
-    end
-    def iban
-      self.details.iban if self.details
-    end
-    def sepa
-      self.details.sepa if self.details
-    end
-    def sub_fields
-      self.details.sub_fields if self.details
-    end
-
-    def to_h
-      {}.tap do |h|
-        h['sha'] = self.sha
-        h.merge!(self.statement_line.to_h)
-        h.merge!(self.details.to_h) if self.details
-      end
-    end
-    def to_hash
-      to_h
-    end
-    def to_json(*args)
-      to_h.to_json(*args)
-    end
-  end
-
-end