reckon 0.5.0 → 0.6.0

data/lib/reckon/ledger_parser.rb

@@ -121,8 +121,14 @@ module Reckon
     def parse(ledger)
       @entries = []
       new_entry = {}
+      in_comment = false
+      comment_chars = ';#%*|'
       ledger.strip.split("\n").each do |entry|
-        next if entry =~ /^\s*$/ || entry =~ /^\s*;/
+        # strip comment lines
+        in_comment = true if entry == 'comment'
+        in_comment = false if entry == 'end comment'
+        next if in_comment
+        next if entry =~ /^\s*[#{comment_chars}]/
 
         # (date, type, code, description), type and code are optional
         if (m = entry.match(%r{^(\d+[\d/-]+)\s+([*!])?\s*(\([^)]+\))?\s*(.*)$}))
@@ -134,7 +140,11 @@ module Reckon
             desc: m[4].strip,
             accounts: []
           }
+        elsif entry =~ /^\s*$/ && new_entry[:date]
+          add_entry(new_entry)
+          new_entry = {}
         elsif new_entry[:date] && entry =~ /^\s+/
+          LOGGER.info("Adding new account #{entry}")
           new_entry[:accounts] << parse_account_line(entry)
         else
           LOGGER.info("Unknown entry type: #{entry}")

data/lib/reckon/logger.rb

@@ -0,0 +1,4 @@
+module Reckon
+  LOGGER = Logger.new(STDERR)
+  LOGGER.level = Logger::WARN
+end

data/lib/reckon/money.rb

@@ -71,12 +71,13 @@ module Reckon
 
     def Money::likelihood( entry )
       money_score = 0
-      money_score += 20 if entry[/^[\-\+\(]{0,2}\$/]
+      # digits separated by , or . with no more than 2 trailing digits
+      money_score += 40 if entry.match(/\d+[,.]\d{2}[^\d]*$/)
       money_score += 10 if entry[/^\$?\-?\$?\d+[\.,\d]*?[\.,]\d\d$/]
       money_score += 10 if entry[/\d+[\.,\d]*?[\.,]\d\d$/]
       money_score += entry.gsub(/[^\d\.\-\+,\(\)]/, '').length if entry.length < 7
-      money_score -= entry.length if entry.length > 8
-      money_score -= 20 if entry !~ /^[\$\+\.\-,\d\(\)]+$/
+      money_score -= entry.length if entry.length > 12
+      money_score -= 20 if (entry !~ /^[\$\+\.\-,\d\(\)]+$/) && entry.length > 0
       money_score
     end
   end
@@ -112,60 +113,4 @@ module Reckon
       self
     end
   end
-
-  class DateColumn < Array
-    attr_accessor :endian_precedence
-    def initialize( arr = [], options = {} )
-      arr.each do |value|
-        if options[:date_format]
-          begin
-            value = Date.strptime(value, options[:date_format])
-          rescue
-            puts "I'm having trouble parsing #{value} with the desired format: #{options[:date_format]}"
-            exit 1
-          end
-        else
-          value = [$1, $2, $3].join("/") if value =~ /^(\d{4})(\d{2})(\d{2})\d+\[\d+\:GMT\]$/ # chase format
-          value = [$3, $2, $1].join("/") if value =~ /^(\d{2})\.(\d{2})\.(\d{4})$/            # german format
-          value = [$3, $2, $1].join("/") if value =~ /^(\d{2})\-(\d{2})\-(\d{4})$/            # nordea format
-          value = [$1, $2, $3].join("/") if value =~ /^(\d{4})\-(\d{2})\-(\d{2})$/            # yyyy-mm-dd format
-          value = [$1, $2, $3].join("/") if value =~ /^(\d{4})(\d{2})(\d{2})/                 # yyyymmdd format
-
-
-          unless @endian_precedence # Try to detect endian_precedence
-            reg_match = value.match( /^(\d\d)\/(\d\d)\/\d\d\d?\d?/ )
-            # If first one is not \d\d/\d\d/\d\d\d?\d set it to default
-            if !reg_match
-              @endian_precedence = [:middle, :little]
-            elsif reg_match[1].to_i > 12
-              @endian_precedence = [:little]
-            elsif reg_match[2].to_i > 12
-              @endian_precedence = [:middle]
-            end
-          end
-        end
-        self.push( value )
-      end
-      # if endian_precedence still nil, raise error
-      unless @endian_precedence || options[:date_format]
-        raise( "Unable to determine date format. Please specify using --date-format" )
-      end
-    end
-
-    def for( index )
-      value = self.at( index )
-      guess = Chronic.parse(value, :context => :past,
-                            :endian_precedence => @endian_precedence )
-      if guess.to_i < 953236800 && value =~ /\//
-        guess = Chronic.parse((value.split("/")[0...-1] + [(2000 + value.split("/").last.to_i).to_s]).join("/"), :context => :past,
-                              :endian_precedence => @endian_precedence)
-      end
-      guess
-    end
-
-    def pretty_for(index)
-      self.for(index).to_date.iso8601
-    end
-
-  end
 end

data/lib/reckon/version.rb

@@ -0,0 +1,3 @@
+module Reckon
+  VERSION="0.6.0"
+end

data/reckon.gemspec

@@ -1,5 +1,5 @@
 $:.push File.expand_path("../lib", __FILE__)
-require 'reckon/version'
+require_relative 'lib/reckon/version'
 
 Gem::Specification.new do |s|
   s.name = %q{reckon}
@@ -9,10 +9,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/cantino/reckon}
   s.description = %q{Reckon automagically converts CSV files for use with the command-line accounting tool Ledger.  It also helps you to select the correct accounts associated with the CSV data using Bayesian machine learning.}
   s.summary = %q{Utility for interactively converting and labeling CSV files for the Ledger accounting tool.}
+  s.licenses = ['MIT']
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rspec", ">= 1.2.9"
@@ -20,6 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rantly", "= 1.2.0"
   s.add_runtime_dependency "chronic", ">= 0.3.0"
   s.add_runtime_dependency "highline", ">= 1.5.2"
-  s.add_runtime_dependency "terminal-table", ">= 1.4.2"
   s.add_runtime_dependency "rchardet", ">= 1.8.0"
 end

data/spec/data_fixtures/51-sample.csv

@@ -0,0 +1,8 @@
+01/09/2015,05354 SUBWAY,8.19,,1000.00
+02/18/2015,WENDY'S #6338,8.55,,1000.00
+02/25/2015,WENDY'S #6338,8.55,,1000.00
+02/25/2015,WENDY'S #6338,9.14,,1000.00
+02/27/2015,WENDY'S #6338,5.85,,1000.00
+03/09/2015,WENDY'S #6338,17.70,,1000.00
+03/16/2015,WENDY'S #6338,11.15,,1000.00
+03/23/2015,WENDY'S,10.12,,1000.00

data/spec/data_fixtures/51-tokens.yml

@@ -0,0 +1,9 @@
+Expenses:
+  Dining:
+    Coffee:
+      - 'STARBUCKS'
+      - 'TIM HORTON'
+    Resturant:
+      - 'WENDY''S'
+      - 'SUBWAY'
+      - 'BARAKAT'

data/spec/data_fixtures/85-date-example.csv

@@ -0,0 +1,2 @@
+Visa, 4514010000000000, 2020-02-20, , GOJEK SINGAPORE, 8.10 SGD @ .976500000000, -7.91, D
+Visa, 4514010000000000, 2020-02-20, , GOJEK SINGAPORE, 6.00 SGD @ .976600000000, -5.86, D

data/spec/data_fixtures/test_money_column.csv

@@ -0,0 +1,3 @@
+"Date","Note","Amount"
+"2012/3/22","DEPOSIT","50.00"
+"2012/3/23","TRANSFER TO SAVINGS","-10.00"

data/spec/reckon/app_spec.rb

@@ -8,7 +8,7 @@ describe Reckon::App do
   context 'with chase csv input' do
     before do
       @chase = Reckon::App.new(string: BANK_CSV)
-      @chase.learn_from(BANK_LEDGER)
+      @chase.learn_from_ledger(BANK_LEDGER)
       @rows = []
       @chase.each_row_backwards { |row| @rows.push(row) }
     end
@@ -68,7 +68,7 @@ describe Reckon::App do
       end
 
       it 'should learn from a ledger file' do
-        chase.learn_from( BANK_LEDGER )
+        chase.learn_from_ledger(BANK_LEDGER)
         chase.walk_backwards
         output_file.string.scan('Expenses:Books').count.should == 1
       end
@@ -107,6 +107,36 @@ describe Reckon::App do
     end
   end
 
+  context "Issue #64 - regression test" do
+    it 'should work for simple file' do
+      rows = []
+      app =  Reckon::App.new(file: fixture_path('test_money_column.csv'))
+      expect { app.each_row_backwards { |n| rows << n } }
+        .to output(/Skipping row: 'Date, Note, Amount'/).to_stderr_from_any_process
+      expect(rows.length).to eq(2)
+      expect(rows[0][:pretty_date]).to eq('2012-03-22')
+      expect(rows[0][:pretty_money]).to eq(' $50.00')
+      expect(rows[1][:pretty_date]).to eq('2012-03-23')
+      expect(rows[1][:pretty_money]).to eq('-$10.00')
+    end
+  end
+
+  context 'Issue #51 - regression test' do
+    it 'should assign correct accounts with tokens' do
+      output = StringIO.new
+      Reckon::App.new(
+        file: fixture_path('51-sample.csv'),
+        unattended: true,
+        account_tokens_file: fixture_path('51-tokens.yml'),
+        ignore_columns: [5],
+        bank_account: 'Assets:Chequing',
+        output_file: output
+      ).walk_backwards
+      expect(output.string).not_to include('Income:Unknown')
+      expect(output.string.scan('Expenses:Dining:Resturant').size).to eq(8)
+    end
+  end
+
   #DATA
   BANK_CSV = (<<-CSV).strip
     DEBIT,20091224120000[0:GMT],"HOST 037196321563 MO        12/22SLICEHOST",-85.00

data/spec/reckon/csv_parser_spec.rb

@@ -5,38 +5,29 @@ require_relative "../spec_helper"
 require 'rubygems'
 require_relative '../../lib/reckon'
 
-Reckon::CSVParser.settings[:testing] = true
-
 describe Reckon::CSVParser do
-  before do
-    @chase = Reckon::CSVParser.new(file: fixture_path('chase.csv'))
-    @some_other_bank = Reckon::CSVParser.new(file: fixture_path('some_other.csv'))
-    @two_money_columns = Reckon::CSVParser.new(file: fixture_path('two_money_columns.csv'))
-    @suntrust_csv = Reckon::CSVParser.new(file: fixture_path('suntrust.csv'))
-    @simple_csv = Reckon::CSVParser.new(file: fixture_path('simple.csv'))
-    @nationwide = Reckon::CSVParser.new(file: fixture_path('nationwide.csv'), csv_separator: ',', suffixed: true, currency: "POUND")
-    @german_date = Reckon::CSVParser.new(file: fixture_path('german_date_example.csv'))
-    @danish_kroner_nordea = Reckon::CSVParser.new(file: fixture_path('danish_kroner_nordea_example.csv'), csv_separator: ';', comma_separates_cents: true)
-    @yyyymmdd_date = Reckon::CSVParser.new(file: fixture_path('yyyymmdd_date_example.csv'))
-    @spanish_date = Reckon::CSVParser.new(file: fixture_path('spanish_date_example.csv'), date_format: '%d/%m/%Y')
-    @english_date = Reckon::CSVParser.new(file: fixture_path('english_date_example.csv'))
-    @ing_csv = Reckon::CSVParser.new(file: fixture_path('ing.csv'), comma_separates_cents: true )
-    @austrian_csv = Reckon::CSVParser.new(file: fixture_path('austrian_example.csv'), comma_separates_cents: true, csv_separator: ';' )
-    @french_csv = Reckon::CSVParser.new(file: fixture_path('french_example.csv'), csv_separator: ';', comma_separates_cents: true)
-    @broker_canada = Reckon::CSVParser.new(file: fixture_path('broker_canada_example.csv'))
-    @intuit_mint = Reckon::CSVParser.new(file: fixture_path('intuit_mint_example.csv'))
-  end
-
-  it "should be in testing mode" do
-    @chase.settings[:testing].should be true
-    Reckon::CSVParser.settings[:testing].should be true
-  end
+  let(:chase) { Reckon::CSVParser.new(file: fixture_path('chase.csv')) }
+  let(:some_other_bank) { Reckon::CSVParser.new(file: fixture_path('some_other.csv')) }
+  let(:two_money_columns) { Reckon::CSVParser.new(file: fixture_path('two_money_columns.csv')) }
+  let(:suntrust_csv) { Reckon::CSVParser.new(file: fixture_path('suntrust.csv')) }
+  let(:simple_csv) { Reckon::CSVParser.new(file: fixture_path('simple.csv')) }
+  let(:nationwide) { Reckon::CSVParser.new(file: fixture_path('nationwide.csv'), csv_separator: ',', suffixed: true, currency: "POUND") }
+  let(:german_date) { Reckon::CSVParser.new(file: fixture_path('german_date_example.csv')) }
+  let(:danish_kroner_nordea) { Reckon::CSVParser.new(file: fixture_path('danish_kroner_nordea_example.csv'), csv_separator: ';', comma_separates_cents: true) }
+  let(:yyyymmdd_date) { Reckon::CSVParser.new(file: fixture_path('yyyymmdd_date_example.csv')) }
+  let(:spanish_date) { Reckon::CSVParser.new(file: fixture_path('spanish_date_example.csv'), date_format: '%d/%m/%Y') }
+  let(:english_date) { Reckon::CSVParser.new(file: fixture_path('english_date_example.csv')) }
+  let(:ing_csv) { Reckon::CSVParser.new(file: fixture_path('ing.csv'), comma_separates_cents: true ) }
+  let(:austrian_csv) { Reckon::CSVParser.new(file: fixture_path('austrian_example.csv'), comma_separates_cents: true, csv_separator: ';' ) }
+  let(:french_csv) { Reckon::CSVParser.new(file: fixture_path('french_example.csv'), csv_separator: ';', comma_separates_cents: true) }
+  let(:broker_canada) { Reckon::CSVParser.new(file: fixture_path('broker_canada_example.csv')) }
+  let(:intuit_mint) { Reckon::CSVParser.new(file: fixture_path('intuit_mint_example.csv')) }
 
   describe "parse" do
     it "should use binary encoding if none specified and chardet fails" do
       allow(CharDet).to receive(:detect).and_return({'encoding' => nil})
       app = Reckon::CSVParser.new(file: fixture_path("extratofake.csv"))
-      expect(app.try_encoding("foobarbaz")).to eq("BINARY")
+      expect(app.send(:try_encoding, "foobarbaz")).to eq("BINARY")
     end
 
     it "should work with foreign character encodings" do
@@ -76,8 +67,8 @@ describe Reckon::CSVParser do
 
   describe "columns" do
     it "should return the csv transposed" do
-      @simple_csv.columns.should == [["entry1", "entry4"], ["entry2", "entry5"], ["entry3", "entry6"]]
-      @chase.columns.length.should == 4
+      simple_csv.columns.should == [["entry1", "entry4"], ["entry2", "entry5"], ["entry3", "entry6"]]
+      chase.columns.length.should == 4
     end
 
     it "should be ok with empty lines" do
@@ -88,46 +79,44 @@ describe Reckon::CSVParser do
   end
 
   describe "detect_columns" do
-    before do
-      @harder_date_example_csv = Reckon::CSVParser.new(file: fixture_path('harder_date_example.csv'))
-    end
+    let(:harder_date_example_csv) { Reckon::CSVParser.new(file: fixture_path('harder_date_example.csv')) }
 
     it "should detect the money column" do
-      @chase.money_column_indices.should == [3]
-      @some_other_bank.money_column_indices.should == [3]
-      @two_money_columns.money_column_indices.should == [3, 4]
-      @suntrust_csv.money_column_indices.should == [3, 4]
-      @nationwide.money_column_indices.should == [3, 4]
-      @harder_date_example_csv.money_column_indices.should == [1]
-      @danish_kroner_nordea.money_column_indices.should == [3]
-      @yyyymmdd_date.money_column_indices.should == [3]
-      @ing_csv.money_column_indices.should == [6]
-      @austrian_csv.money_column_indices.should == [4]
-      @french_csv.money_column_indices.should == [4]
-      @broker_canada.money_column_indices.should == [8]
-      @intuit_mint.money_column_indices.should == [3]
+      chase.money_column_indices.should == [3]
+      some_other_bank.money_column_indices.should == [3]
+      two_money_columns.money_column_indices.should == [3, 4]
+      suntrust_csv.money_column_indices.should == [3, 4]
+      nationwide.money_column_indices.should == [3, 4]
+      harder_date_example_csv.money_column_indices.should == [1]
+      danish_kroner_nordea.money_column_indices.should == [3]
+      yyyymmdd_date.money_column_indices.should == [3]
+      ing_csv.money_column_indices.should == [6]
+      austrian_csv.money_column_indices.should == [4]
+      french_csv.money_column_indices.should == [4]
+      broker_canada.money_column_indices.should == [8]
+      intuit_mint.money_column_indices.should == [3]
     end
 
     it "should detect the date column" do
-      @chase.date_column_index.should == 1
-      @some_other_bank.date_column_index.should == 1
-      @two_money_columns.date_column_index.should == 0
-      @harder_date_example_csv.date_column_index.should == 0
-      @danish_kroner_nordea.date_column_index.should == 0
-      @yyyymmdd_date.date_column_index.should == 1
-      @french_csv.date_column_index.should == 1
-      @broker_canada.date_column_index.should == 0
-      @intuit_mint.date_column_index.should == 0
+      chase.date_column_index.should == 1
+      some_other_bank.date_column_index.should == 1
+      two_money_columns.date_column_index.should == 0
+      harder_date_example_csv.date_column_index.should == 0
+      danish_kroner_nordea.date_column_index.should == 0
+      yyyymmdd_date.date_column_index.should == 1
+      french_csv.date_column_index.should == 1
+      broker_canada.date_column_index.should == 0
+      intuit_mint.date_column_index.should == 0
       Reckon::CSVParser.new(:string => '2014-01-13,"22211100000",-10').date_column_index.should == 0
     end
 
     it "should consider all other columns to be description columns" do
-      @chase.description_column_indices.should == [0, 2]
-      @some_other_bank.description_column_indices.should == [0, 2]
-      @two_money_columns.description_column_indices.should == [1, 2, 5]
-      @harder_date_example_csv.description_column_indices.should == [2, 3, 4, 5, 6, 7]
-      @danish_kroner_nordea.description_column_indices.should == [1, 2, 4]
-      @yyyymmdd_date.description_column_indices.should == [0, 2]
+      chase.description_column_indices.should == [0, 2]
+      some_other_bank.description_column_indices.should == [0, 2]
+      two_money_columns.description_column_indices.should == [1, 2, 5]
+      harder_date_example_csv.description_column_indices.should == [2, 3, 4, 5, 6, 7]
+      danish_kroner_nordea.description_column_indices.should == [1, 2, 4]
+      yyyymmdd_date.description_column_indices.should == [0, 2]
     end
   end
 
@@ -143,36 +132,36 @@ describe Reckon::CSVParser do
 
   describe "money_for" do
     it "should return the appropriate fields" do
-      @chase.money_for(1).should == -20
-      @chase.money_for(4).should == 1558.52
-      @chase.money_for(7).should == -116.22
-      @some_other_bank.money_for(1).should == -20
-      @some_other_bank.money_for(4).should == 1558.52
-      @some_other_bank.money_for(7).should == -116.22
-      @two_money_columns.money_for(0).should == -76
-      @two_money_columns.money_for(1).should == 327.49
-      @two_money_columns.money_for(2).should == -800
-      @two_money_columns.money_for(3).should == -88.55
-      @two_money_columns.money_for(4).should == 88.55
-      @nationwide.money_for(0).should == 500.00
-      @nationwide.money_for(1).should == -20.00
-      @danish_kroner_nordea.money_for(0).should == -48.00
-      @danish_kroner_nordea.money_for(1).should == -79.00
-      @danish_kroner_nordea.money_for(2).should == 497.90
-      @danish_kroner_nordea.money_for(3).should == -995.00
-      @danish_kroner_nordea.money_for(4).should == -3452.90
-      @danish_kroner_nordea.money_for(5).should == -655.00
-      @yyyymmdd_date.money_for(0).should == -123.45
-      @ing_csv.money_for(0).should == -136.13
-      @ing_csv.money_for(1).should == 375.00
-      @austrian_csv.money_for(0).should == -18.00
-      @austrian_csv.money_for(2).should == 120.00
-      @french_csv.money_for(0).should == -10.00
-      @french_csv.money_for(1).should == -5.76
-      @broker_canada.money_for(0).should == 12.55
-      @broker_canada.money_for(1).should == -81.57
-      @intuit_mint.money_for(0).should == 0.01
-      @intuit_mint.money_for(1).should == -331.63
+      chase.money_for(1).should == -20
+      chase.money_for(4).should == 1558.52
+      chase.money_for(7).should == -116.22
+      some_other_bank.money_for(1).should == -20
+      some_other_bank.money_for(4).should == 1558.52
+      some_other_bank.money_for(7).should == -116.22
+      two_money_columns.money_for(0).should == -76
+      two_money_columns.money_for(1).should == 327.49
+      two_money_columns.money_for(2).should == -800
+      two_money_columns.money_for(3).should == -88.55
+      two_money_columns.money_for(4).should == 88.55
+      nationwide.money_for(0).should == 500.00
+      nationwide.money_for(1).should == -20.00
+      danish_kroner_nordea.money_for(0).should == -48.00
+      danish_kroner_nordea.money_for(1).should == -79.00
+      danish_kroner_nordea.money_for(2).should == 497.90
+      danish_kroner_nordea.money_for(3).should == -995.00
+      danish_kroner_nordea.money_for(4).should == -3452.90
+      danish_kroner_nordea.money_for(5).should == -655.00
+      yyyymmdd_date.money_for(0).should == -123.45
+      ing_csv.money_for(0).should == -136.13
+      ing_csv.money_for(1).should == 375.00
+      austrian_csv.money_for(0).should == -18.00
+      austrian_csv.money_for(2).should == 120.00
+      french_csv.money_for(0).should == -10.00
+      french_csv.money_for(1).should == -5.76
+      broker_canada.money_for(0).should == 12.55
+      broker_canada.money_for(1).should == -81.57
+      intuit_mint.money_for(0).should == 0.01
+      intuit_mint.money_for(1).should == -331.63
     end
 
     it "should handle the comma_separates_cents option correctly" do
@@ -200,59 +189,63 @@ describe Reckon::CSVParser do
 
   describe "date_for" do
     it "should return a parsed date object" do
-      @chase.date_for(1).year.should == Time.parse("2009/12/24").year
-      @chase.date_for(1).month.should == Time.parse("2009/12/24").month
-      @chase.date_for(1).day.should == Time.parse("2009/12/24").day
-      @some_other_bank.date_for(1).year.should == Time.parse("2010/12/24").year
-      @some_other_bank.date_for(1).month.should == Time.parse("2010/12/24").month
-      @some_other_bank.date_for(1).day.should == Time.parse("2010/12/24").day
-      @german_date.date_for(1).year.should == Time.parse("2009/12/24").year
-      @german_date.date_for(1).month.should == Time.parse("2009/12/24").month
-      @german_date.date_for(1).day.should == Time.parse("2009/12/24").day
-      @danish_kroner_nordea.date_for(0).year.should == Time.parse("2012/11/16").year
-      @danish_kroner_nordea.date_for(0).month.should == Time.parse("2012/11/16").month
-      @danish_kroner_nordea.date_for(0).day.should == Time.parse("2012/11/16").day
-      @yyyymmdd_date.date_for(0).year.should == Time.parse("2012/12/31").year
-      @yyyymmdd_date.date_for(0).month.should == Time.parse("2012/12/31").month
-      @yyyymmdd_date.date_for(0).day.should == Time.parse("2012/12/31").day
-      @spanish_date.date_for(1).year.should == Time.parse("2009/12/02").year
-      @spanish_date.date_for(1).month.should == Time.parse("2009/12/02").month
-      @spanish_date.date_for(1).day.should == Time.parse("2009/12/02").day
-      @english_date.date_for(1).year.should == Time.parse("2009/12/24").year
-      @english_date.date_for(1).month.should == Time.parse("2009/12/24").month
-      @english_date.date_for(1).day.should == Time.parse("2009/12/24").day
-      @nationwide.date_for(1).month.should == 10
-      @ing_csv.date_for(1).month.should == Time.parse("2012/11/12").month
-      @ing_csv.date_for(1).day.should == Time.parse("2012/11/12").day
-      @broker_canada.date_for(5).year.should == 2014
-      @broker_canada.date_for(5).month.should == 1
-      @broker_canada.date_for(5).day.should == 7
-      @intuit_mint.date_for(1).year.should == 2014
-      @intuit_mint.date_for(1).month.should == 2
-      @intuit_mint.date_for(1).day.should == 3
+      chase.date_for(1).year.should == Time.parse("2009/12/24").year
+      chase.date_for(1).month.should == Time.parse("2009/12/24").month
+      chase.date_for(1).day.should == Time.parse("2009/12/24").day
+      some_other_bank.date_for(1).year.should == Time.parse("2010/12/24").year
+      some_other_bank.date_for(1).month.should == Time.parse("2010/12/24").month
+      some_other_bank.date_for(1).day.should == Time.parse("2010/12/24").day
+      german_date.date_for(1).year.should == Time.parse("2009/12/24").year
+      german_date.date_for(1).month.should == Time.parse("2009/12/24").month
+      german_date.date_for(1).day.should == Time.parse("2009/12/24").day
+      danish_kroner_nordea.date_for(0).year.should == Time.parse("2012/11/16").year
+      danish_kroner_nordea.date_for(0).month.should == Time.parse("2012/11/16").month
+      danish_kroner_nordea.date_for(0).day.should == Time.parse("2012/11/16").day
+      yyyymmdd_date.date_for(0).year.should == Time.parse("2012/12/31").year
+      yyyymmdd_date.date_for(0).month.should == Time.parse("2012/12/31").month
+      yyyymmdd_date.date_for(0).day.should == Time.parse("2012/12/31").day
+      spanish_date.date_for(1).year.should == Time.parse("2009/12/02").year
+      spanish_date.date_for(1).month.should == Time.parse("2009/12/02").month
+      spanish_date.date_for(1).day.should == Time.parse("2009/12/02").day
+      english_date.date_for(1).year.should == Time.parse("2009/12/24").year
+      english_date.date_for(1).month.should == Time.parse("2009/12/24").month
+      english_date.date_for(1).day.should == Time.parse("2009/12/24").day
+      nationwide.date_for(1).month.should == 10
+      ing_csv.date_for(1).month.should == Time.parse("2012/11/12").month
+      ing_csv.date_for(1).day.should == Time.parse("2012/11/12").day
+      broker_canada.date_for(5).year.should == 2014
+      broker_canada.date_for(5).month.should == 1
+      broker_canada.date_for(5).day.should == 7
+      intuit_mint.date_for(1).year.should == 2014
+      intuit_mint.date_for(1).month.should == 2
+      intuit_mint.date_for(1).day.should == 3
     end
   end
 
   describe "description_for" do
     it "should return the combined fields that are not money for date fields" do
-      @chase.description_for(1).should == "CHECK; CHECK 2656"
-      @chase.description_for(7).should == "CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL"
+      chase.description_for(1).should == "CHECK; CHECK 2656"
+      chase.description_for(7).should == "CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL"
     end
 
     it "should not append empty description column" do
       parser = Reckon::CSVParser.new(:string => '01/09/2015,05354 SUBWAY,8.19,,',:date_format => '%d/%m/%Y')
-      parser.description_column_indices.should == [1, 4]
       parser.description_for(0).should == '05354 SUBWAY'
     end
+
+    it "should handle nil description" do
+      parser = Reckon::CSVParser.new(string: '2015-09-01,test,3.99')
+      expect(parser.description_for(1)).to eq("")
+    end
   end
 
   describe "pretty_money_for" do
     it "work with negative and positive numbers" do
-      @some_other_bank.pretty_money_for(1).should == "-$20.00"
-      @some_other_bank.pretty_money_for(4).should == " $1558.52"
-      @some_other_bank.pretty_money_for(7).should == "-$116.22"
-      @some_other_bank.pretty_money_for(5).should == " $0.23"
-      @some_other_bank.pretty_money_for(6).should == "-$0.96"
+      some_other_bank.pretty_money_for(1).should == "-$20.00"
+      some_other_bank.pretty_money_for(4).should == " $1558.52"
+      some_other_bank.pretty_money_for(7).should == "-$116.22"
+      some_other_bank.pretty_money_for(5).should == " $0.23"
+      some_other_bank.pretty_money_for(6).should == "-$0.96"
     end
 
     it "work with other currencies such as €" do
@@ -274,8 +267,15 @@ describe Reckon::CSVParser do
     end
 
     it "should work with merge columns" do
-      @nationwide.pretty_money_for(0).should == " 500.00 POUND"
-      @nationwide.pretty_money_for(1).should == "-20.00 POUND"
+      nationwide.pretty_money_for(0).should == " 500.00 POUND"
+      nationwide.pretty_money_for(1).should == "-20.00 POUND"
+    end
+  end
+
+  describe '85 regression test' do
+    it 'should detect correct date column' do
+      p = Reckon::CSVParser.new(file:fixture_path('85-date-example.csv'))
+      expect(p.date_column_index).to eq(2)
     end
   end
 end