reckon 0.5.1 → 0.6.1

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
@@ -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,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

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