reckon 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7e9512d0b15c14548a04e80f5dd3a87f50ae9ff2654827b5970def94e174667
-  data.tar.gz: f858c96b4b5f2a7b2c85845803109e566281c0fc945c46ba39758121701d0e9a
+  metadata.gz: 70bc1d3d98a4ba08a3bca57069073f165e68041a5e628475b6c6076550f6e419
+  data.tar.gz: 99daf95abf45fd4dd5549d08bb9f3816af596cd3790667ca224baf7d46053ed0
 SHA512:
-  metadata.gz: 15526cfe3504d50859de7b652285b31f639b11daecd8536732b97e1f84d03814cb8040c8db830386f803de7836e11712b7069758a77bf290fab26699436440f2
-  data.tar.gz: 99ae732793adeaa40f5c7235e690dfb80d839a31ecba52f989e0dea2d339cf012623f858c926261e4bd5eb731e2a3ff508370509d03560c64c2bd7cf4a737a7e
+  metadata.gz: 6c0790695ec045e5210d20de85e17da49868b396ad78e334f24fdae7511969552a72df90b649b781c8b0e7ddf046cf8f84e2b47e212c576048f86798389bb449
+  data.tar.gz: 18babc20d956315d9abed0cec59503f0859844a48e3cf5ee59d743dda487de762a9ab9787074e7553128d41834938f5eedeb2f92e5fda4fb1ab73939f81d0eb2

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [v0.5.2](https://github.com/cantino/reckon/tree/v0.5.2) (2020-03-07)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.5.1...v0.5.2)
+
+**Closed issues:**
+
+- \[BUG\] Reckon appears not to be parsing ISO standard date yyyy-mm-dd? [\#85](https://github.com/cantino/reckon/issues/85)
+- \[Bug\]? Reckon fails to run on ruby 2.7.0 on Catalina  [\#83](https://github.com/cantino/reckon/issues/83)
+- --account-tokens issue [\#51](https://github.com/cantino/reckon/issues/51)
+
+## [v0.5.1](https://github.com/cantino/reckon/tree/v0.5.1) (2020-02-25)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.5.0...v0.5.1)
+
+**Closed issues:**
+
+- Error Importing [\#64](https://github.com/cantino/reckon/issues/64)
+
+**Merged pull requests:**
+
+- guard against rows that don't parse dates [\#82](https://github.com/cantino/reckon/pull/82) ([benprew](https://github.com/benprew))
+
 ## [v0.5.0](https://github.com/cantino/reckon/tree/v0.5.0) (2020-02-19)
 
 [Full Changelog](https://github.com/cantino/reckon/compare/v0.4.4...v0.5.0)

data/lib/reckon/cosine_similarity.rb

@@ -1,4 +1,5 @@
 require 'matrix'
+require 'set'
 
 # Implementation of consine similarity using TF-IDF for vectorization.
 # Used to suggest which account a transaction should be assigned to

data/lib/reckon/csv_parser.rb

@@ -12,24 +12,39 @@ module Reckon
       detect_columns
     end
 
-    def row(index)
-      csv_data[index].join(", ")
+    def columns
+      @columns ||=
+        begin
+          last_row_length = nil
+          csv_data.inject([]) do |memo, row|
+            unless row.all? { |i| i.nil? || i.length == 0 }
+              row.each_with_index do |entry, index|
+                memo[index] ||= []
+                memo[index] << (entry || '').strip
+              end
+              last_row_length = row.length
+            end
+            memo
+          end
+        end
     end
 
-    def filter_csv
-      if options[:ignore_columns]
-        new_columns = []
-        columns.each_with_index do |column, index|
-          new_columns << column unless options[:ignore_columns].include?(index + 1)
-        end
-        @columns = new_columns
-      end
+    def date_for(index)
+      @date_column.for(index)
+    end
+
+    def pretty_date_for(index)
+      @date_column.pretty_for( index )
     end
 
     def money_for(index)
       @money_column[index]
     end
 
+    def pretty_money(amount, negate = false)
+      Money.new( amount, @options ).pretty( negate )
+    end
+
     def pretty_money_for(index, negate = false)
       money = money_for(index)
       return 0 if money.nil?
@@ -37,20 +52,24 @@ module Reckon
       money.pretty(negate)
     end
 
-    def pretty_money(amount, negate = false)
-      Money.new( amount, @options ).pretty( negate )
+    def description_for(index)
+      description_column_indices.map { |i| columns[i][index] }.reject(&:empty?).join("; ").squeeze(" ").gsub(/(;\s+){2,}/, '').strip
     end
 
-    def date_for(index)
-      @date_column.for(index)
+    def row(index)
+      csv_data[index].join(", ")
     end
 
-    def pretty_date_for(index)
-      @date_column.pretty_for( index )
-    end
+    private
 
-    def description_for(index)
-      description_column_indices.map { |i| columns[i][index] }.reject(&:empty?).join("; ").squeeze(" ").gsub(/(;\s+){2,}/, '').strip
+    def filter_csv
+      if options[:ignore_columns]
+        new_columns = []
+        columns.each_with_index do |column, index|
+          new_columns << column unless options[:ignore_columns].include?(index + 1)
+        end
+        @columns = new_columns
+      end
     end
 
     def evaluate_columns(cols)
@@ -94,48 +113,24 @@ module Reckon
         results << { :index => index, :money_score => money_score, :date_score => date_score }
       end
 
-      return [results, found_likely_money_column]
-    end
+      results.sort_by! { |n| -n[:money_score] }
 
-    def merge_columns(a, b)
-      output_columns = []
-      columns.each_with_index do |column, index|
-        if index == a
-          new_column = MoneyColumn.new( column )
-            .merge!( MoneyColumn.new( columns[b] ) )
-            .map { |m| m.amount.to_s }
-          output_columns << new_column
-        elsif index == b
-          # skip
-        else
-          output_columns << column
-        end
+      # check if it looks like a 2-column file with a balance field
+      if results.length >= 3 && results[1][:money_score] + results[2][:money_score] >= results[0][:money_score]
+        results[1][:is_money_column] = true
+        results[2][:is_money_column] = true
+      else
+        results[0][:is_money_column] = true
       end
-      output_columns
-    end
 
-    def evaluate_two_money_columns( columns, id1, id2, unmerged_results )
-      merged_columns = merge_columns( id1, id2 )
-      results, found_likely_money_column = evaluate_columns( merged_columns )
-      if !found_likely_money_column
-        new_res = results.find { |el| el[:index] == id1 }
-        old_res1 = unmerged_results.find { |el| el[:index] == id1 }
-        old_res2 = unmerged_results.find { |el| el[:index] == id2 }
-        if new_res[:money_score] > old_res1[:money_score] &&
-          new_res[:money_score] > old_res2[:money_score]
-          found_likely_money_column = true
-        end
-      end
-      [results, found_likely_money_column]
+      return results.sort_by { |n| n[:index] }
     end
 
-    def found_double_money_column( id1, id2 )
-      self.money_column_indices = [ id1, id2 ]
-      unless settings[:testing]
-        puts "It looks like this CSV has two seperate columns for money, one of which shows positive"
-        puts "changes and one of which shows negative changes.  If this is true, great.  Otherwise,"
-        puts "please report this issue to us so we can take a look!\n"
-      end
+    def found_double_money_column(id1, id2)
+      self.money_column_indices = [id1, id2]
+      puts "It looks like this CSV has two seperate columns for money, one of which shows positive"
+      puts "changes and one of which shows negative changes.  If this is true, great.  Otherwise,"
+      puts "please report this issue to us so we can take a look!\n"
     end
 
     # Some csv files negative/positive amounts are indicated in separate account
@@ -165,41 +160,18 @@ module Reckon
     end
 
     def detect_columns
-      results, found_likely_money_column = evaluate_columns(columns)
+      results = evaluate_columns(columns)
+
       if options[:money_column]
-        found_likely_money_column = true
         self.money_column_indices = [ options[:money_column] - 1 ]
       else
-        self.money_column_indices = [ results.max_by { |n| n[:money_score] }[:index] ]
-      end
-
-      if !found_likely_money_column
-        found_likely_double_money_columns = false
-        0.upto(columns.length - 2) do |i|
-          if MoneyColumn.new( columns[i] ).merge!( MoneyColumn.new( columns[i+1] ) )
-            _, found_likely_double_money_columns = evaluate_columns(merge_columns(i, i+1))
-            if found_likely_double_money_columns
-              found_double_money_column( i, i + 1 )
-              break
-            end
-          end
-        end
-
-        if !found_likely_double_money_columns
-          0.upto(columns.length - 2) do |i|
-            if MoneyColumn.new( columns[i] ).merge!( MoneyColumn.new( columns[i+1] ) )
-              # Try a more specific test
-              _, found_likely_double_money_columns = evaluate_two_money_columns( columns, i, i+1, results )
-              if found_likely_double_money_columns
-                found_double_money_column( i, i + 1 )
-                break
-              end
-            end
-          end
-        end
-
-        if !found_likely_double_money_columns && !settings[:testing]
-          puts "I didn't find a high-likelyhood money column, but I'm taking my best guess with column #{money_column_indices.first + 1}."
+        self.money_column_indices = results.select { |n| n[:is_money_column] }.map { |n| n[:index] }
+        if self.money_column_indices.length == 1
+          puts "Using column #{money_column_indices.first + 1} as the money column.  Use --money-colum to specify a different one."
+        elsif self.money_column_indices.length == 2
+          found_double_money_column(*self.money_column_indices)
+        else
+          puts "Unable to determine a money column, use --money-column to specify the column reckon should use."
         end
       end
 
@@ -223,23 +195,6 @@ module Reckon
       self.description_column_indices = results.map { |i| i[:index] }
     end
 
-    def columns
-      @columns ||= begin
-        last_row_length = nil
-        csv_data.inject([]) do |memo, row|
-          # fail "Input CSV must have consistent row lengths." if last_row_length && row.length != last_row_length
-          unless row.all? { |i| i.nil? || i.length == 0 }
-            row.each_with_index do |entry, index|
-              memo[index] ||= []
-              memo[index] << (entry || '').strip
-            end
-            last_row_length = row.length
-          end
-          memo
-        end
-      end
-    end
-
     def parse(data, filename=nil)
       # Use force_encoding to convert the string to utf-8 with as few invalid characters
       # as possible.
@@ -281,15 +236,5 @@ module Reckon
       end
       m && m[1]
     end
-
-    @settings = { :testing => false }
-
-    def self.settings
-      @settings
-    end
-
-    def settings
-      self.class.settings
-    end
   end
 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

data/lib/reckon/version.rb

@@ -1,3 +1,3 @@
 module Reckon
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 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/reckon/app_spec.rb

@@ -121,6 +121,22 @@ describe Reckon::App do
     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,58 @@ 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
   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 +262,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

data/spec/reckon/money_spec.rb

@@ -8,79 +8,92 @@ require 'reckon'
 describe Reckon::Money do
   describe "from_s" do
     it "should handle currency indicators" do
-      Reckon::Money::from_s( "$2.00" ).should == 2.00
-      Reckon::Money::from_s( "-$1025.67" ).should == -1025.67 
-      Reckon::Money::from_s( "$-1025.67" ).should == -1025.67 
+      expect(Reckon::Money::from_s( "$2.00" )).to eq(2.00)
+      expect(Reckon::Money::from_s("-$1025.67")).to eq(-1025.67)
+      expect(Reckon::Money::from_s("$-1025.67")).to eq(-1025.67)
     end
 
     it "should handle the comma_separates_cents option correctly" do
-      Reckon::Money::from_s( "$2,00", :comma_separates_cents => true ).should == 2.00
-      Reckon::Money::from_s( "-$1025,67", :comma_separates_cents => true ).should == -1025.67 
-      Reckon::Money::from_s( "$-1025,67", :comma_separates_cents => true ).should == -1025.67 
+      expect(Reckon::Money::from_s("$2,00", :comma_separates_cents => true)).to eq(2.00)
+      expect(Reckon::Money::from_s("-$1025,67", :comma_separates_cents => true )).to eq(-1025.67)
+      expect(Reckon::Money::from_s("$-1025,67", :comma_separates_cents => true )).to eq(-1025.67)
     end
 
     it "should return 0 for an empty string" do
-      Reckon::Money::from_s( "" ).should == 0
+      expect(Reckon::Money::from_s("")).to eq(0)
     end
 
     it "should handle 1000 indicators correctly" do
-      Reckon::Money::from_s( "$2.000,00", :comma_separates_cents => true ).should == 2000.00
-      Reckon::Money::from_s( "-$1,025.67" ).should == -1025.67 
+      expect(Reckon::Money::from_s("$2.000,00", :comma_separates_cents => true)).to eq(2000.00)
+      expect(Reckon::Money::from_s("-$1,025.67")).to eq(-1025.67)
     end
 
     it "should keep numbers together" do
-      Reckon::Money::from_s( "1A1" ).should == 1
+      expect(Reckon::Money::from_s("1A1")).to eq(1)
     end
 
     it "should prefer numbers with precision of two" do
-      Reckon::Money::from_s( "1A2.00" ).should == 2
-      Reckon::Money::from_s( "2.00A1" ).should == 2
+      expect(Reckon::Money::from_s("1A2.00")).to eq(2)
+      expect(Reckon::Money::from_s("2.00A1")).to eq(2)
     end
 
     it "should handle arbitrary prefixes and postfixes" do
-      Reckon::Money::from_s( "AB1.00C" ).should == 1
-      Reckon::Money::from_s( "AB0C" ).should == 0
-      Reckon::Money::from_s( "AB-2.00C" ).should == -2
+      expect(Reckon::Money::from_s("AB1.00C")).to eq(1)
+      expect(Reckon::Money::from_s("AB0C")).to eq(0)
+      expect(Reckon::Money::from_s("AB-2.00C")).to eq(-2)
     end
 
     it "should return nil if no numbers are found" do
-      Reckon::Money::from_s( "BAC" ).should == nil
+      expect(Reckon::Money::from_s("BAC")).to be_nil()
     end
   end
 
   describe "pretty" do
     it "work with negative and positive numbers" do
-      Reckon::Money.new( -20.00 ).pretty.should == "-$20.00"
-      Reckon::Money.new( 1558.52 ).pretty.should == " $1558.52"
+      expect(Reckon::Money.new(-20.00).pretty).to eq("-$20.00")
+      expect(Reckon::Money.new(1558.52).pretty).to eq(" $1558.52")
     end
 
     it "work with other currencies such as €" do
-      Reckon::Money.new( -20.00, :currency => "€", :suffixed => false ).pretty.should == "-€20.00"
-      Reckon::Money.new( 1558.52, :currency => "€", :suffixed => false ).pretty.should == " €1558.52"
+      expect(Reckon::Money.new(-20.00, currency: "€", suffixed: false).pretty).to eq("-€20.00")
+      expect(Reckon::Money.new(1558.52, currency: "€", suffixed: false).pretty).to eq(" €1558.52")
     end
 
     it "work with suffixed currencies such as SEK" do
-      Reckon::Money.new( -20.00, :currency => "SEK", :suffixed => true ).pretty.should == "-20.00 SEK"
-      Reckon::Money.new( 1558.52, :currency => "SEK", :suffixed => true ).pretty.should == " 1558.52 SEK"
+      expect(Reckon::Money.new( -20.00, :currency => "SEK", :suffixed => true ).pretty).to eq("-20.00 SEK")
+      expect(Reckon::Money.new( 1558.52, :currency => "SEK", :suffixed => true ).pretty).to eq(" 1558.52 SEK")
     end
   end
 
   describe "likelihood" do
     it "should return the likelihood that a string represents money" do
-      Reckon::Money::likelihood( "$20.00" ).should == 45
+      expect(Reckon::Money::likelihood( "$20.00" )).to eq(65)
+    end
+
+    it "should return neutral for empty string" do
+      expect(Reckon::Money::likelihood("")).to eq(0)
+    end
+
+    it "should recognize non-us currencies" do
+      expect(Reckon::Money::likelihood("£480.00")).to eq(30)
+      expect(Reckon::Money::likelihood("£1.480,00")).to eq(30)
+    end
+
+    it 'should not identify date columns as money' do
+      expect(Reckon::Money::likelihood("22.01.2014")).to eq(0)
     end
   end
 
   describe "equality" do
     it "should be comparable to other money" do
-      Reckon::Money.new( 2.0 ).should == Reckon::Money.new( 2.0 )
-      Reckon::Money.new( 1.0 ).should <= Reckon::Money.new( 2.0 )
-      Reckon::Money.new( 3.0 ).should > Reckon::Money.new( 2.0 )
+      expect(Reckon::Money.new(2.0)).to eq(Reckon::Money.new(2.0))
+      expect(Reckon::Money.new(1.0)).to be <= Reckon::Money.new(2.0)
+      expect(Reckon::Money.new(3.0)).to be > Reckon::Money.new(2.0)
     end
     it "should be comparable to other float" do
-      Reckon::Money.new( 2.0 ).should == 2.0
-      Reckon::Money.new( 1.0 ).should <= 2.0
-      Reckon::Money.new( 3.0 ).should > 2.0
+      expect(Reckon::Money.new(2.0)).to eq(2.0)
+      expect(Reckon::Money.new(1.0)).to be <= 2.0
+      expect(Reckon::Money.new(3.0)).to be > 2.0
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,26 @@ require 'rspec'
 require 'reckon'
 
 RSpec.configure do |config|
+  config.before(:all, &:silence_output)
+  config.after(:all,  &:enable_output)
   def fixture_path(file)
     File.expand_path(File.join(File.dirname(__FILE__), "data_fixtures", file))
   end
 end
+
+public
+
+# Redirects stderr and stout to /dev/null.txt
+def silence_output
+  # Store the original stderr and stdout in order to restore them later
+  @original_stdout = $stdout
+
+  # Redirect stderr and stdout
+  $stdout = File.new(File.join(File.dirname(__FILE__), 'test_log.txt'), 'w')
+end
+
+# Replace stderr and stdout so anything else is output correctly
+def enable_output
+  $stdout = @original_stdout
+  @original_stdout = nil
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Andrew Cantino
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -140,9 +140,12 @@ files:
 - lib/reckon/money.rb
 - lib/reckon/version.rb
 - reckon.gemspec
+- spec/data_fixtures/51-sample.csv
+- spec/data_fixtures/51-tokens.yml
 - spec/data_fixtures/73-sample.csv
 - spec/data_fixtures/73-tokens.yml
 - spec/data_fixtures/73-transactions.ledger
+- spec/data_fixtures/85-date-example.csv
 - spec/data_fixtures/austrian_example.csv
 - spec/data_fixtures/bom_utf8_file.csv
 - spec/data_fixtures/broker_canada_example.csv
@@ -193,8 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Utility for interactively converting and labeling CSV files for the Ledger