reckon 0.5.2 → 0.6.2

data/spec/integration/regression/issue_51_account_tokens/output.ledger

@@ -0,0 +1,32 @@
+2015-01-09	05354 SUBWAY
+	Assets:Chequing			 $8.19
+	Expenses:Dining:Resturant			
+
+2015-02-18	WENDY'S #6338
+	Assets:Chequing			 $8.55
+	Expenses:Dining:Resturant			
+
+2015-02-25	WENDY'S #6338
+	Assets:Chequing			 $9.14
+	Expenses:Dining:Resturant			
+
+2015-02-25	WENDY'S #6338
+	Assets:Chequing			 $8.55
+	Expenses:Dining:Resturant			
+
+2015-02-27	WENDY'S #6338
+	Assets:Chequing			 $5.85
+	Expenses:Dining:Resturant			
+
+2015-03-09	WENDY'S #6338
+	Assets:Chequing			 $17.70
+	Expenses:Dining:Resturant			
+
+2015-03-16	WENDY'S #6338
+	Assets:Chequing			 $11.15
+	Expenses:Dining:Resturant			
+
+2015-03-23	WENDY'S
+	Assets:Chequing			 $10.12
+	Expenses:Dining:Resturant			
+

data/spec/integration/regression/issue_51_account_tokens/test_args

@@ -0,0 +1,4 @@
+-f input.csv --unattended --account Assets:Chequing \
+   --ignore-columns 5 \
+   --account-tokens tokens.yml
+

data/spec/integration/regression/issue_51_account_tokens/tokens.yml

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

data/spec/integration/regression/issue_64_date_column/input.csv

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

data/spec/integration/regression/issue_64_date_column/output.ledger

@@ -0,0 +1,8 @@
+2012-03-22	DEPOSIT
+	Assets:Bank:Checking			 $50.00
+	Income:Unknown			
+
+2012-03-23	TRANSFER TO SAVINGS
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$10.00
+

data/spec/integration/regression/issue_64_date_column/test_args

@@ -0,0 +1 @@
+-f input.csv --unattended --account Assets:Bank:Checking 

data/spec/integration/regression/issue_73_account_token_matching/input.csv

@@ -0,0 +1,2 @@
+Transaction Date,Description,Amount,Category
+07/06/2017,TRIPLE T CAR WASH CHAMPAIGN    IL,$27.00,Automotive

data/spec/integration/regression/issue_73_account_token_matching/output.ledger

@@ -0,0 +1,4 @@
+2017-07-06	TRIPLE T CAR WASH CHAMPAIGN IL
+	Liabilities:Credit Cards:Visa			 $27.00
+	Expenses:Automotive:Car Wash			
+

data/spec/integration/regression/issue_73_account_token_matching/test_args

@@ -0,0 +1,6 @@
+-f input.csv --unattended --account 'Liabilities:Credit Cards:Visa' \
+   --contains-header 1 \
+   --ignore-columns 4 \
+   --date-format %m/%d/%Y \
+   --account-tokens tokens.yml
+

data/spec/integration/regression/issue_73_account_token_matching/tokens.yml

@@ -0,0 +1,8 @@
+Expenses:
+  Automotive:
+    Car Wash:
+      - 'TRIPLE T CAR WASH CHAMPAIGN IL'
+      - "BIG T's CAR WASH"
+    Maintenance:
+      - 'Autozone'
+      - "O'Reillys auto parts"

data/spec/integration/regression/issue_85_date_example/input.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/integration/regression/issue_85_date_example/output.ledger

@@ -0,0 +1,8 @@
+2020-02-20	Visa; 4514010000000000; GOJEK SINGAPORE; 6.00 SGD @ .976600000000; D
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$5.86
+
+2020-02-20	Visa; 4514010000000000; GOJEK SINGAPORE; 8.10 SGD @ .976500000000; D
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$7.91
+

data/spec/integration/regression/issue_85_date_example/test_args

@@ -0,0 +1 @@
+-f input.csv --unattended --account Assets:Bank:Checking

data/spec/integration/spanish_date_example/input.csv

@@ -0,0 +1,3 @@
+02/12/2009,Check - 0000000122,122,-$76.00,"","$1,750.06"
+02/12/2009,BLARG    R SH 456930,"","",+$327.49,"$1,826.06"
+02/12/2009,Check - 0000000112,112,-$800.00,"","$1,498.57"

data/spec/integration/spanish_date_example/output.ledger

@@ -0,0 +1,12 @@
+2009-12-02	BLARG R SH 456930; $1,826.06
+	Assets:Bank:Checking			 $327.49
+	Income:Unknown			
+
+2009-12-02	Check - 0000000122; 122; $1,750.06
+	Income:Unknown			
+	Assets:Bank:Checking			-$76.00
+
+2009-12-02	Check - 0000000112; 112; $1,498.57
+	Income:Unknown			
+	Assets:Bank:Checking			-$800.00
+

data/spec/integration/spanish_date_example/test_args

@@ -0,0 +1 @@
+-f input.csv --unattended --account Assets:Bank:Checking --date-format '%d/%m/%Y'

data/spec/integration/suntrust/input.csv

@@ -0,0 +1,7 @@
+11/01/2014,0, Deposit,0,500.00,500.00
+11/02/2014,101,Check,100.00,0,400.00
+11/03/2014,102,Check,100.00,0,300.00
+11/04/2014,103,Check,100.00,0,200.00
+11/05/2014,104,Check,100.00,0,100.00
+11/06/2014,105,Check,100.00,0,0.00
+11/17/2014,0, Deposit,0,700.00,700.00

data/spec/integration/suntrust/output.ledger

@@ -0,0 +1,28 @@
+2014-11-01	0; Deposit; 500.00
+	Assets:Bank:Checking			 $500.00
+	Income:Unknown			
+
+2014-11-02	101; Check; 400.00
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$100.00
+
+2014-11-03	102; Check; 300.00
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$100.00
+
+2014-11-04	103; Check; 200.00
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$100.00
+
+2014-11-05	104; Check; 100.00
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$100.00
+
+2014-11-06	105; Check; 0.00
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$100.00
+
+2014-11-17	0; Deposit; 700.00
+	Assets:Bank:Checking			 $700.00
+	Income:Unknown			
+

data/spec/integration/suntrust/test_args

@@ -0,0 +1 @@
+-f input.csv --unattended --account Assets:Bank:Checking

data/spec/integration/test.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# set -x
+
+set -Euo pipefail
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+TEST_DIFF=""
+OUTPUT=""
+RECKON_CMD="env RUBYLIB=$SCRIPT_DIR/../../lib:$RUBYLIB reckon -v"
+
+main () {
+    trap test_fail EXIT
+
+    if [[ $# -eq 1 ]]; then
+        TESTS=$1/test_args
+    else
+        TESTS=$(find "$SCRIPT_DIR" -name 'test_args')
+    fi
+
+    echo > test.log
+
+    for t in $TESTS; do
+        OUTPUT_FILE=$(mktemp)
+        TEST_DIR=$(dirname "$t")
+        pushd "$TEST_DIR" >/dev/null || exit 1
+        echo "$TEST_DIR Running..."
+        TEST_CMD="$RECKON_CMD -o $OUTPUT_FILE $(cat test_args)"
+        TEST_LOG=$(eval "$TEST_CMD" 2>&1)
+        ERROR=0
+
+        compare_output "$OUTPUT_FILE"
+
+        popd >/dev/null || exit 1
+        # have to save output after popd
+        echo -e "\n\n======>$TEST_DIR" >> test.log
+        echo -e "TEST_CMD\n$TEST_LOG" >> test.log
+
+        if [[ $ERROR -ne 0 ]]; then
+            exit 1
+        fi
+    done
+}
+
+test_fail () {
+    STATUS=$?
+    if [[ $STATUS -ne 0 ]]; then
+        echo -e "FAILED!!!\n$TEST_DIFF\nTest output saved to $OUTPUT_FILE\n"
+        exit $STATUS
+    fi
+}
+
+compare_output_for () {
+    OUTPUT_FILE=$1
+    LEDGER=$2
+
+    TEST_DIFF=$(diff -u <($LEDGER -f output.ledger r --date-format %F 2>&1) <($LEDGER -f "$OUTPUT_FILE" r --date-format %F 2>&1) )
+
+    # ${#} is character length, test that there was no output from diff
+    if [ ${#TEST_DIFF} -eq 0 ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+compare_output () {
+    OUTPUT_FILE=$1
+
+    for n in {ledger,hledger}; do
+        echo -n "  - $n..."
+        if compare_output_for "$OUTPUT_FILE" "$n"; then
+            echo "SUCCESS!"
+        else
+            echo "FAILED!"
+            ERROR=1
+            return 0
+        fi
+    done
+}
+
+main "$@"

data/spec/integration/test_money_column/input.csv

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

data/spec/integration/test_money_column/output.ledger

@@ -0,0 +1,8 @@
+2012-03-22	DEPOSIT
+	Assets:Bank:Checking			 $50.00
+	Income:Unknown			
+
+2012-03-23	TRANSFER TO SAVINGS
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$10.00
+

data/spec/integration/test_money_column/test_args

@@ -0,0 +1 @@
+-f input.csv --unattended --account Assets:Bank:Checking

data/spec/integration/two_money_columns/input.csv

@@ -0,0 +1,5 @@
+4/1/2008,Check - 0000000122,122,-$76.00,"","$1,750.06"
+3/28/2008,BLARG    R SH 456930,"","",+$327.49,"$1,826.06"
+3/27/2008,Check - 0000000112,112,-$800.00,"","$1,498.57"
+3/26/2008,Check - 0000000251,251,-$88.55,"","$1,298.57"
+3/26/2008,Check - 0000000251,251,"","+$88.55","$1,298.57"

data/spec/integration/two_money_columns/output.ledger

@@ -0,0 +1,20 @@
+2008-03-26	Check - 0000000251; 251; $1,298.57
+	Assets:Bank:Checking			 $88.55
+	Income:Unknown			
+
+2008-03-26	Check - 0000000251; 251; $1,298.57
+	Income:Unknown			
+	Assets:Bank:Checking			-$88.55
+
+2008-03-27	Check - 0000000112; 112; $1,498.57
+	Income:Unknown			
+	Assets:Bank:Checking			-$800.00
+
+2008-03-28	BLARG R SH 456930; $1,826.06
+	Assets:Bank:Checking			 $327.49
+	Income:Unknown			
+
+2008-04-01	Check - 0000000122; 122; $1,750.06
+	Income:Unknown			
+	Assets:Bank:Checking			-$76.00
+

data/spec/integration/two_money_columns/test_args

@@ -0,0 +1 @@
+-f input.csv --unattended --account Assets:Bank:Checking

data/spec/integration/yyyymmdd_date_example/input.csv

@@ -0,0 +1 @@
+DEBIT,20121231,"ODESK***BAL-27DEC12 650-12345 CA 12/28",-123.45

data/spec/integration/yyyymmdd_date_example/output.ledger

@@ -0,0 +1,4 @@
+2012-12-31	DEBIT; ODESK***BAL-27DEC12 650-12345 CA 12/28
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$123.45
+

data/spec/integration/yyyymmdd_date_example/test_args

@@ -0,0 +1 @@
+-f input.csv --unattended --account Assets:Bank:Checking

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
@@ -86,6 +86,22 @@ describe Reckon::App do
         expect(output_file.string.scan('Expenses:Websites').count).to eq(2)
       end
     end
+
+    describe 'csv from STDIN' do
+      it 'should assign to :string option' do
+        options = Reckon::App.parse_opts(
+          %w[-f - --unattended --account bank],
+          StringIO.new('foo,bar,baz')
+        )
+        expect(options[:string]).to eq('foo,bar,baz')
+      end
+
+      it 'should require --unattended flag' do
+        expect {Reckon::App.parse_opts(%w[-f - --account bank])}.to(
+          raise_error(RuntimeError, "--unattended is required to use STDIN as CSV source.")
+        )
+      end
+    end
   end
 
   context "Issue #73 - regression test" do

data/spec/reckon/csv_parser_spec.rb

@@ -232,6 +232,11 @@ describe Reckon::CSVParser do
       parser = Reckon::CSVParser.new(:string => '01/09/2015,05354 SUBWAY,8.19,,',:date_format => '%d/%m/%Y')
       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

data/spec/reckon/ledger_parser_spec.rb

@@ -20,14 +20,16 @@ describe Reckon::LedgerParser do
       formats = ["%Y/%m/%d", "%Y-%m-%d"]
       types = [' ! ', ' * ', ' ']
       delimiters = ["  ", "\t", "\t\t"]
+      comment_chars = ';#%*|'
       currency_delimiters = delimiters + ['']
       currencies = ['', '$', '£']
       property_of do
         Rantly do
           description = Proc.new do
-            sized(15){string}.tr(%q{'`:*\\},'').gsub(/\s+/, ' ').gsub(/^[!;<\[( ]+/, '')
+            sized(15){string}.tr(%q{'`:*\\},'').gsub(/\s+/, ' ').gsub(/^[!;<\[( #{comment_chars}]+/, '')
           end
           currency = choose(*currencies) # to be consistent within the transaction
+          single_line_comments = ";#|%*".split('').map { |n| "#{n} #{call(description)}" }
           comments = ['', ';   ', "\t;#{call(description)}", "  ; #{call(description)}"]
           date = Time.at(range(0, 1_581_389_644)).strftime(choose(*formats))
           codes = [' ', " (#{string(:alnum).tr('()', '')}) "]
@@ -48,23 +50,58 @@ describe Reckon::LedgerParser do
             ledger += "#{call(account_line)}\n"
           end
           ledger += "#{call(account)}\n"
+          ledger += choose(*single_line_comments) + "\n"
           ledger
         end
       end.check(1000) do |s|
         filter_format = lambda { |n| [n['date'], n['desc'], n['name'], sprintf("%.02f", n['amount'])] }
         headers = %w[date code desc name currency amount type commend]
         safe_s = Shellwords.escape(s)
-        ledger_csv = `echo #{safe_s} | ledger csv --date-format '%Y-%m-%d' -f - `
-        ledger_parser_csv = Reckon::LedgerParser.new(s, date_format: '%Y/%m/%d').to_csv.join("\n")
 
-        expected = CSV.parse(ledger_csv.gsub('\"', '""'), headers: headers).map &filter_format
-        actual = CSV.parse(ledger_parser_csv, headers: headers).map &filter_format
+        lp_csv = Reckon::LedgerParser.new(s, date_format: '%Y/%m/%d').to_csv.join("\n")
+        actual = CSV.parse(lp_csv, headers: headers).map(&filter_format)
+
+        ledger_csv = `echo #{safe_s} | ledger csv --date-format '%Y/%m/%d' -f - `
+        expected = CSV.parse(ledger_csv.gsub('\"', '""'), headers: headers).map(&filter_format)
         expected.length.times do |i|
           expect(actual[i]).to eq(expected[i])
         end
       end
     end
 
+    it 'should filter block comments' do
+      ledger = <<HERE
+1970/11/01 Dinner should show up
+  Assets:Checking  -123.00
+  Expenses:Restaurants
+
+comment
+
+1970/11/01 Lunch should NOT show up
+  Assets:Checking  -12.00
+  Expenses:Restaurants
+
+end comment
+HERE
+      l = Reckon::LedgerParser.new(ledger)
+      expect(l.entries.length).to eq(1)
+      expect(l.entries.first[:desc]).to eq('Dinner should show up')
+
+    end
+
+    it 'should transaction comments' do
+      ledger = <<HERE
+2020-03-27      AMZN Mktp USX999H3203; Shopping; Sale
+    Expenses:Household                                      $82.77
+    Liabilities:ChaseSapphire                                       -$81.77
+    # END FINANCE SCRIPT OUTPUT Thu 02 Apr 2020 12:05:54 PM EDT
+HERE
+      l = Reckon::LedgerParser.new(ledger)
+      expect(l.entries.first[:accounts].map { |n| n[:name] }).to eq(['Expenses:Household', 'Liabilities:ChaseSapphire'])
+      expect(l.entries.first[:accounts].size).to eq(2)
+      expect(l.entries.length).to eq(1)
+    end
+
     it "should ignore non-standard entries" do
       @ledger.entries.length.should == 7
     end