reckon 0.6.0 → 0.6.1

data/spec/integration/regression/issue_51_account_tokens/input.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/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/money_column_spec.rb

@@ -8,13 +8,13 @@ require 'reckon'
 describe Reckon::MoneyColumn do
   describe "initialize" do
     it "should convert strings into Money" do
-      Reckon::MoneyColumn.new( ["1.00", "-2.00"] ).should == [ 
+      Reckon::MoneyColumn.new( ["1.00", "-2.00"] ).should == [
         Reckon::Money.new( 1.00 ), Reckon::Money.new( -2.00 ) ]
     end
     it "should convert empty string into nil" do
-      Reckon::MoneyColumn.new( ["1.00", ""] ).should == [ 
+      Reckon::MoneyColumn.new( ["1.00", ""] ).should == [
         Reckon::Money.new( 1.00 ), nil ]
-      Reckon::MoneyColumn.new( ["", "-2.00"] ).should == [ 
+      Reckon::MoneyColumn.new( ["", "-2.00"] ).should == [
         nil, Reckon::Money.new( -2.00 ) ]
     end
   end
@@ -32,33 +32,33 @@ describe Reckon::MoneyColumn do
 
   describe "merge" do
     it "should merge two columns" do
-      Reckon::MoneyColumn.new( ["1.00", ""] ).merge!( 
-        Reckon::MoneyColumn.new( ["", "-2.00"] ) ).should == [ 
-          Reckon::Money.new( 1.00 ), Reckon::Money.new( -2.00 ) ]
-      Reckon::MoneyColumn.new( ["1.00", "0"] ).merge!( 
-        Reckon::MoneyColumn.new( ["0", "-2.00"] ) ).should == [ 
-          Reckon::Money.new( 1.00 ), Reckon::Money.new( -2.00 ) ]
-      Reckon::MoneyColumn.new( ["AB1.00C", ""] ).merge!( 
-        Reckon::MoneyColumn.new( ["", "AB-2.00C"] ) ).should == [ 
-          Reckon::Money.new( 1.00 ), Reckon::Money.new( -2.00 ) ]
-      Reckon::MoneyColumn.new( ["AB1.00C", "AB0C"] ).merge!( 
-        Reckon::MoneyColumn.new( ["AB0C", "AB-2.00C"] ) ).should == [ 
-          Reckon::Money.new( 1.00 ), Reckon::Money.new( -2.00 ) ]
-     end
+      m1 = Reckon::MoneyColumn.new(["1.00", ""])
+      m2 = Reckon::MoneyColumn.new(["", "-2.00"])
+      expect(m1.merge!(m2)).to(
+        eq([Reckon::Money.new(1.00), Reckon::Money.new(-2.00)])
+      )
+
+      m1 = Reckon::MoneyColumn.new(["1.00", "0"])
+      m2 = Reckon::MoneyColumn.new(["0", "-2.00"])
+      expect(m1.merge!(m2)).to(
+        eq([Reckon::Money.new(1.00), Reckon::Money.new(-2.00)])
+      )
+    end
 
     it "should return nil if columns cannot be merged" do
-      Reckon::MoneyColumn.new( ["1.00", ""] ).merge!( 
-        Reckon::MoneyColumn.new( ["1.00", "-2.00"] ) ).should == nil
+      m1 = Reckon::MoneyColumn.new(["1.00", ""])
+      m2 = Reckon::MoneyColumn.new(["1.00", "-2.00"])
+      expect(m1.merge!(m2)).to eq([Reckon::Money.new(0), Reckon::Money.new(-2)])
 
-      Reckon::MoneyColumn.new( ["From1", "Names"] ).merge!( 
-          Reckon::MoneyColumn.new( ["Acc", "NL28 INGB 1200 3244 16,21817"] ) ).should == nil
+      m1 = Reckon::MoneyColumn.new(["From1", "Names"])
+      m2 = Reckon::MoneyColumn.new(["Acc", "NL28 INGB 1200 3244 16,21817"])
+      expect(m1.merge!(m2)).to eq([Reckon::Money.new(-1), Reckon::Money.new("NL28 INGB 1200 3244 16,21817")])
     end
 
     it "should invert first column if both positive" do
-      Reckon::MoneyColumn.new( ["1.00", ""] ).merge!( 
-        Reckon::MoneyColumn.new( ["", "2.00"] ) ).should == [ 
-          Reckon::Money.new( -1.00 ), Reckon::Money.new( 2.00 ) ]
+      expect(
+        Reckon::MoneyColumn.new(["1.00", ""]).merge!(Reckon::MoneyColumn.new( ["", "2.00"]))
+      ).to eq([Reckon::Money.new(-1.00), Reckon::Money.new(2.00)])
     end
   end
 end
- 

data/spec/reckon/money_spec.rb

@@ -6,45 +6,26 @@ require 'rubygems'
 require 'reckon'
 
 describe Reckon::Money do
-  describe "from_s" do
+  describe "parse" do
     it "should handle currency indicators" do
-      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)
+      expect(Reckon::Money.new( "$2.00" )).to eq(2.00)
+      expect(Reckon::Money.new("-$1025.67")).to eq(-1025.67)
+      expect(Reckon::Money.new("$-1025.67")).to eq(-1025.67)
     end
 
     it "should handle the comma_separates_cents option correctly" do
-      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)
+      expect(Reckon::Money.new("$2,00", comma_separates_cents: true)).to eq(2.00)
+      expect(Reckon::Money.new("-$1025,67", comma_separates_cents: true)).to eq(-1025.67)
+      expect(Reckon::Money.new("$-1025,67", comma_separates_cents: true)).to eq(-1025.67)
     end
 
     it "should return 0 for an empty string" do
-      expect(Reckon::Money::from_s("")).to eq(0)
+      expect(Reckon::Money.new("")).to eq(0)
     end
 
     it "should handle 1000 indicators correctly" do
-      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
-      expect(Reckon::Money::from_s("1A1")).to eq(1)
-    end
-
-    it "should prefer numbers with precision of two" do
-      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
-      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
-      expect(Reckon::Money::from_s("BAC")).to be_nil()
+      expect(Reckon::Money.new("$2.000,00", comma_separates_cents: true)).to eq(2000.00)
+      expect(Reckon::Money.new("-$1,025.67")).to eq(-1025.67)
     end
   end
 
@@ -60,14 +41,14 @@ describe Reckon::Money do
     end
 
     it "work with suffixed currencies such as SEK" do
-      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")
+      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
-      expect(Reckon::Money::likelihood( "$20.00" )).to eq(65)
+      expect(Reckon::Money::likelihood("$20.00")).to eq(65)
     end
 
     it "should return neutral for empty string" do