reckon 0.3.4 → 0.3.5

data/.gitignore

@@ -5,6 +5,9 @@
 *.tmproj
 tmtags
 
+## SUBLIME
+*.sublime-project
+
 ## EMACS
 *~
 \#*

data/CHANGES.md

@@ -0,0 +1,3 @@
+# Changes
+
+* 3/24/13 - Force encoding to UTF-8 when unknown characters are encountered.

data/README.md

@@ -1,10 +1,10 @@
 # Reckon
 
-Reckon automagically converts CSV files for use with the command-line accounting tool Ledger[https://github.com/jwiegley/ledger/wiki].  It also helps you to select the correct accounts associated with the CSV data using Bayesian machine learning.
+Reckon automagically converts CSV files for use with the command-line accounting tool [Ledger](https://github.com/jwiegley/ledger/wiki).  It also helps you to select the correct accounts associated with the CSV data using Bayesian machine learning.
 
 ## Installation
 
-Assuming you have Ruby and Rubygems[http://rubygems.org/pages/download] installed on your system, simply run
+Assuming you have Ruby and [Rubygems](http://rubygems.org/pages/download) installed on your system, simply run
 
     (sudo) gem install reckon
 
@@ -16,6 +16,8 @@ To see how the CSV parses:
   
     reckon -f bank.csv -p
 
+If your CSV file has a header on the first line, include `--contains-header`.
+
 To convert to ledger format and label everything, do:
   
     reckon -f bank.csv -o output.dat
@@ -24,11 +26,29 @@ To have reckon learn from an existing ledger file, provide it with -l:
   
     reckon -f bank.csv -l 2010.dat -o output.dat
 
-Learn more with
-
-    reckon -h
-
-If you find CSV files that it can't parse, send me examples and I'll try to fix it.
+Learn more:
+
+    > reckon -h
+    
+      Usage: Reckon.rb [options]
+
+      -f, --file FILE                  The CSV file to parse
+      -v, --[no-]verbose               Run verbosely
+      -p, --print-table                Print out the parsed CSV in table form
+      -o, --output-file FILE           The ledger file to append to
+      -l, --learn-from FILE            An existing ledger file to learn accounts from
+          --ignore-columns 1,2,5
+                                       Columns to ignore in the CSV file - the first column is column 1
+          --contains-header
+                                       The first row of the CSV is a header and should be skipped
+          --csv-separator ','
+                                       Separator for parsing the CSV - default is comma.
+          --comma-separates-cents
+                                       Use comma instead of period to deliminate dollars from cents when parsing ($100,50 instead of $100.50)
+      -h, --help                       Show this message
+          --version                    Show version
+
+If you find CSV files that it can't parse, send me examples or pull requests!
 
 ## Note on Patches/Pull Requests
 

data/lib/reckon/app.rb

@@ -159,6 +159,7 @@ module Reckon
       value = value.gsub(/\./, '').gsub(/,/, '.') if options[:comma_separates_cents]
       cleaned_value = value.gsub(/[^\d\.]/, '').to_f
       cleaned_value *= -1 if value =~ /[\(\-]/
+      cleaned_value = -(cleaned_value) if options[:inverse]
       cleaned_value
     end
 
@@ -334,7 +335,15 @@ module Reckon
 
     def parse
       data = options[:string] || File.read(options[:file])
-      @csv_data = (RUBY_VERSION =~ /^1\.9/ ? CSV : FasterCSV).parse(data.strip, :col_sep => options[:csv_separator] || ',')
+
+      if RUBY_VERSION =~ /^1\.9/ || RUBY_VERSION =~ /^2/
+        data = data.force_encoding(options[:encoding] || 'BINARY').encode('UTF-8', :invalid => :replace, :undef => :replace, :replace => '?')
+        csv_engine = CSV
+      else
+        csv_engine = FasterCSV
+      end
+
+      @csv_data = csv_engine.parse data.strip, :col_sep => options[:csv_separator] || ','
       csv_data.shift if options[:contains_header]
       csv_data
     end
@@ -353,6 +362,10 @@ module Reckon
           options[:verbose] = v
         end
 
+        opts.on("-i", "--inverse", "Use the negative of each amount") do |v|
+          options[:inverse] = v
+        end
+
         opts.on("-p", "--print-table", "Print out the parsed CSV in table form") do |p|
           options[:print_table] = p
         end
@@ -381,6 +394,10 @@ module Reckon
           options[:comma_separates_cents] = c
         end
 
+        opts.on("", "--encoding", "Specify an encoding for the CSV file") do |e|
+          options[:encoding] = e
+        end
+
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit

data/reckon.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{reckon}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
   s.authors = ["Andrew Cantino"]
   s.email = %q{andrew@iterationlabs.com}
   s.homepage = %q{https://github.com/cantino/reckon}

data/spec/data_fixtures/extratofake.csv

@@ -0,0 +1,24 @@
+"Data","Dependencia Origem","Hist�rico","Data do Balancete","N�mero do documento","Valor",
+"10/31/2012","","Saldo Anterior","","0","100.00",
+"11/01/2012","0000-9","Transfer�ncia on line - 01/11 4885     256620-6 XXXXXXXXXXXXX","","224885000256620","100.00",
+"11/01/2012","","Dep�sito COMPE - 033 0502    27588602104 XXXXXXXXXXXXXX","","101150","100.00",
+"11/01/2012","","Proventos","","496774","1000.00",
+"11/01/2012","","Benef�cio","","496775","100.00",
+"11/01/2012","0000-0","Compra com Cart�o - 01/11 09:45 XXXXXXXXXXX","","135102","-1.00",
+"11/01/2012","0000-0","Compra com Cart�o - 01/11 09:48    XXXXXXXXXXX","","235338","-10.00",
+"11/01/2012","0000-0","Compra com Cart�o - 01/11 12:35 XXXXXXXX","","345329","-10.00",
+"11/01/2012","0000-0","Compra com Cart�o - 01/11 23:57    XXXXXXXXXXXXXXXX","","686249","-10.00",
+"11/01/2012","0000-0","Saque com cart�o - 01/11 13:17 XXXXXXXXXXXXXXXX","","11317296267021","-10.00",
+"11/01/2012","","Pagto conta telefone - VIVO DF","","110101","-100.00",
+"11/01/2012","","Cobran�a de I.O.F.","","391100701","-1.00",
+"11/05/2012","0000-0","Compra com Cart�o - 02/11 16:57    XXXXXXXXXXXX","","161057","-10.00",
+"11/05/2012","0000-0","Compra com Cart�o - 03/11 18:57    XXXXXXXXXXXXXXX","","168279","-10.00",
+"11/05/2012","0000-0","Compra com Cart�o - 05/11 12:32    XXXXXXXXXXXXXXXXX","","245166","-10.00",
+"11/05/2012","0000-0","Compra com Cart�o - 02/11 17:18    XXXXXXXXXXXXX","","262318","-1.00",
+"11/05/2012","0000-0","Compra com Cart�o - 02/11 22:46    XXXXXXXXXXX","","382002","-100.00",
+"11/05/2012","0000-0","Compra com Cart�o - 02/11 23:19    XXXXXXXXXXX","","683985","-1.00",
+"11/05/2012","0000-0","Compra com Cart�o - 03/11 01:19    XXXXXXXXXXXXXXXX","","704772","-10.00",
+"11/05/2012","0000-0","Compra com Cart�o - 03/11 11:08 XXXXXXXX","","840112","-1.00",
+"11/05/2012","0000-0","Saque com cart�o - 05/11 19:24 XXXXXXXXXXXXXXXXX","","51924256267021","-10.00",
+"11/05/2012","0000-0","Transfer�ncia on line - 05/11 4885     256620-6 XXXXXXXXXXXXX","","224885000256620","-100.00",
+"11/05/2012","","Pagamento de T�tulo - XXXXXXXXXXXXXXXXXXX","","110501","-100.00",

data/spec/reckon/app_spec.rb

@@ -21,8 +21,16 @@ describe Reckon::App do
     Reckon::App.settings[:testing].should be_true
   end
   
-  it "should work with other separators" do
-    Reckon::App.new(:string => "one;two\nthree;four", :csv_separator => ';').columns.should == [['one', 'three'], ['two', 'four']]
+  describe "parse" do
+    it "should work with foreign character encodings" do
+      app = Reckon::App.new(:file => File.expand_path(File.join(File.dirname(__FILE__), "..", "data_fixtures", "extratofake.csv")))
+      app.columns[0][0..2].should == ["Data", "10/31/2012", "11/01/2012"]
+      app.columns[2].first.should == "Hist?rico"
+    end
+
+    it "should work with other separators" do
+      Reckon::App.new(:string => "one;two\nthree;four", :csv_separator => ';').columns.should == [['one', 'three'], ['two', 'four']]
+    end
   end
 
   describe "columns" do
@@ -96,12 +104,18 @@ describe Reckon::App do
       @danish_kroner_nordea.money_for(4).should == -3452.90
       @danish_kroner_nordea.money_for(5).should == -655.00
     end
-    
+
     it "should handle the comma_separates_cents option correctly" do
       european_csv = Reckon::App.new(:string => "$2,00;something\n1.025,67;something else", :csv_separator => ';', :comma_separates_cents => true)
       european_csv.money_for(0).should == 2.00
       european_csv.money_for(1).should == 1025.67
     end
+
+    it "should return negated values if the inverse option is passed" do
+      inversed_csv = Reckon::App.new(:string => INVERSED_CREDIT_CARD, :inverse => true)
+      inversed_csv.money_for(0).should == -30.00
+      inversed_csv.money_for(3).should == 500.00
+    end
   end
 
   describe "date_for" do
@@ -177,6 +191,25 @@ describe Reckon::App do
     CREDIT,2003/12/24,"Some Company vendorpymt                 PPD ID: 5KL3832735",$2105.00
   CSV
 
+  INVERSED_CREDIT_CARD = (<<-CSV).strip
+    2013/01/17,2013/01/16,2013011702,DEBIT,2226,"VODAFONE PREPAY VISA M   AUCKLAND      NZL",30.00
+    2013/01/18,2013/01/17,2013011801,DEBIT,2226,"WILSON PARKING           AUCKLAND      NZL",4.60
+    2013/01/18,2013/01/17,2013011802,DEBIT,2226,"AUCKLAND TRANSPORT       HENDERSON     NZL",2.00
+    2013/01/19,2013/01/19,2013011901,CREDIT,2226,"INTERNET PAYMENT RECEIVED                 ",-500.00
+    2013/01/26,2013/01/23,2013012601,DEBIT,2226,"ITUNES NZ                CORK          IRL",64.99
+    2013/01/26,2013/01/25,2013012602,DEBIT,2226,"VODAFONE FXFLNE BBND R   NEWTON        NZL",90.26
+    2013/01/29,2013/01/29,2013012901,CREDIT,2101,"PAYMENT RECEIVED THANK YOU                ",-27.75
+    2013/01/30,2013/01/29,2013013001,DEBIT,2226,"AUCKLAND TRANSPORT       HENDERSON     NZL",3.50
+    2013/02/05,2013/02/03,2013020501,DEBIT,2226,"Z BEACH RD               AUCKLAND      NZL",129.89
+    2013/02/05,2013/02/03,2013020502,DEBIT,2226,"TOURNAMENT KHYBER PASS   AUCKLAND      NZL",8.00
+    2013/02/05,2013/02/04,2013020503,DEBIT,2226,"VODAFONE PREPAY VISA M   AUCKLAND      NZL",30.00
+    2013/02/08,2013/02/07,2013020801,DEBIT,2226,"AKLD TRANSPORT PARKING   AUCKLAND      NZL",2.50
+    2013/02/08,2013/02/07,2013020802,DEBIT,2226,"AUCKLAND TRANSPORT       HENDERSON     NZL",3.50
+    2013/02/12,2013/02/11,2013021201,DEBIT,2226,"AKLD TRANSPORT PARKING   AUCKLAND      NZL",1.50
+    2013/02/17,2013/02/17,2013021701,CREDIT,2226,"INTERNET PAYMENT RECEIVED                 ",-12.00
+    2013/02/17,2013/02/17,2013021702,CREDIT,2226,"INTERNET PAYMENT RECEIVED                 ",-18.00
+  CSV
+
   TWO_MONEY_COLUMNS_BANK = (<<-CSV).strip
     4/1/2008,Check - 0000000122,122,-$76.00,"","$1,750.06"
     3/28/2008,BLARG    R SH 456930,"","",+$327.49,"$1,826.06"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -103,6 +103,7 @@ files:
 - .document
 - .gitignore
 - .rvmrc
+- CHANGES.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -114,6 +115,7 @@ files:
 - lib/reckon/app.rb
 - lib/reckon/ledger_parser.rb
 - reckon.gemspec
+- spec/data_fixtures/extratofake.csv
 - spec/reckon/app_spec.rb
 - spec/reckon/ledger_parser_spec.rb
 - spec/spec.opts
@@ -144,6 +146,7 @@ specification_version: 3
 summary: Utility for interactively converting and labeling CSV files for the Ledger
   accounting tool.
 test_files:
+- spec/data_fixtures/extratofake.csv
 - spec/reckon/app_spec.rb
 - spec/reckon/ledger_parser_spec.rb
 - spec/spec.opts