reckon 0.2.3 → 0.3.0

data/.gitignore

@@ -21,3 +21,4 @@ pkg
 ## PROJECT::SPECIFIC
 .idea
 reckon_local
+private_tests

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/lib/reckon/app.rb

@@ -1,7 +1,6 @@
 module Reckon
   class App
     VERSION = "Reckon 0.1"
-
     attr_accessor :options, :csv_data, :accounts, :tokens, :money_column_indices, :date_column_index, :description_column_indices, :seen
 
     def initialize(options = {})
@@ -155,6 +154,7 @@ module Reckon
 
     def money_for(index)
       value = money_column_indices.inject("") { |m, i| m + columns[i][index] }
+      value = value.gsub(/\./, '').gsub(/,/, '.') if options[:comma_separates_cents]
       cleaned_value = value.gsub(/[^\d\.]/, '').to_f
       cleaned_value *= -1 if value =~ /[\(\-]/
       cleaned_value
@@ -184,7 +184,7 @@ module Reckon
     end
 
     def description_for(index)
-      description_column_indices.map { |i| columns[i][index] }.join("; ").squeeze(" ")
+      description_column_indices.map { |i| columns[i][index] }.join("; ").squeeze(" ").gsub(/(;\s+){2,}/, '').strip
     end
 
     def output_table
@@ -202,11 +202,14 @@ module Reckon
       found_likely_money_column = false
       cols.each_with_index do |column, index|
         money_score = date_score = possible_neg_money_count = possible_pos_money_count = 0
-        column.each do |entry|
+        last = nil
+        column.reverse.each_with_index do |entry, row_from_bottom|
+          row = csv_data[csv_data.length - 1 - row_from_bottom]
           entry = entry.strip
-          money_score += 10 if entry[/^[\-\+\(]{0,2}\$/]
-          money_score += entry.gsub(/[^\d\.\-\+,\(\)]/, '').length
-          money_score -= 100 if entry.length > 17
+          money_score += 20 if entry[/^[\-\+\(]{0,2}\$/]
+          money_score += 20 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\(\)]+$/
           possible_neg_money_count += 1 if entry =~ /^\$?[\-\(]\$?\d+/
           possible_pos_money_count += 1 if entry =~ /^\+?\$?\+?\d+/
@@ -216,6 +219,19 @@ module Reckon
           date_score -= entry.gsub(/[\-\/\.\d:\[\]]/, '').length
           date_score += 30 if entry =~ /^\d+[:\/\.]\d+[:\/\.]\d+([ :]\d+[:\/\.]\d+)?$/
           date_score += 10 if entry =~ /^\d+\[\d+:GMT\]$/i
+
+          # Try to determine if this is a balance column
+          entry_as_num = entry.gsub(/[^\-\d\.]/, '').to_f
+          if last && entry_as_num != 0 && last != 0 
+            row.each do |row_entry|
+              row_entry = row_entry.to_s.gsub(/[^\-\d\.]/, '').to_f
+              if row_entry != 0 && last + row_entry == entry_as_num
+                 money_score -= 10
+                 break
+              end
+            end
+          end
+          last = entry_as_num
         end
 
         if possible_neg_money_count > (column.length / 5.0) && possible_pos_money_count > (column.length / 5.0)
@@ -235,7 +251,7 @@ module Reckon
         if index == a
           new_column = []
           column.each_with_index do |row, row_index|
-            new_column << row + " " + columns[b][row_index]
+            new_column << row + " " + (columns[b][row_index] || '')
           end
           output_columns << new_column
         elsif index == b
@@ -247,29 +263,37 @@ module Reckon
       output_columns
     end
 
+    require 'pp'
     def detect_columns
       results, found_likely_money_column = evaluate_columns(columns)
+      self.money_column_indices = [ results.sort { |a, b| b[:money_score] <=> a[:money_score] }.first[:index] ]
 
-      if found_likely_money_column
-        self.money_column_indices = [ results.sort { |a, b| b[:money_score] <=> a[:money_score] }.first[:index] ]
-      else
+      if !found_likely_money_column
+        found_likely_double_money_columns = false
         0.upto(columns.length - 2) do |i|
-          _, found_likely_money_column = evaluate_columns(merge_columns(i, i+1))
+          _, found_likely_double_money_columns = evaluate_columns(merge_columns(i, i+1))
 
-          if found_likely_money_column
+          if found_likely_double_money_columns
             self.money_column_indices = [ i, i+1 ]
+            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
             break
           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}."
+        end
       end
 
-      if money_column_indices
-        results.reject! {|i| money_column_indices.include?(i[:index]) }
-        self.date_column_index = results.sort { |a, b| b[:date_score] <=> a[:date_score] }.first[:index]
-        results.reject! {|i| i[:index] == date_column_index }
+      results.reject! {|i| money_column_indices.include?(i[:index]) }
+      self.date_column_index = results.sort { |a, b| b[:date_score] <=> a[:date_score] }.first[:index]
+      results.reject! {|i| i[:index] == date_column_index }
 
-        self.description_column_indices = results.map { |i| i[:index] }
-      end
+      self.description_column_indices = results.map { |i| i[:index] }
     end
 
     def each_row_backwards
@@ -288,7 +312,7 @@ module Reckon
       @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
+          # 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] ||= []
@@ -303,7 +327,7 @@ module Reckon
 
     def parse
       data = options[:string] || File.read(options[:file])
-      self.csv_data = FasterCSV.parse(data.strip)
+      self.csv_data = FasterCSV.parse(data.strip, :col_sep => options[:csv_separator] || ',')
     end
 
     def self.parse_opts(args = ARGV)
@@ -336,6 +360,14 @@ module Reckon
           options[:ignore_columns] = ignore.split(",").map { |i| i.to_i }
         end
 
+        opts.on("", "--csv-separator ';'", "Separator for parsing the CSV - default is comma.") do |csv_separator|
+          options[:csv_separator] = csv_separator
+        end
+
+        opts.on("", "--comma-separates-cents", "Use comma instead of period to deliminate dollars from cents when parsing ($100,50 instead of $100.50)") do |c|
+          options[:comma_separates_cents] = c
+        end
+
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit
@@ -367,5 +399,16 @@ module Reckon
 
       options
     end
+
+    @settings = { :testing => false }
+
+    def self.settings
+      @settings
+    end
+    
+    def settings
+      self.class.settings
+    end
   end
 end
+  

data/reckon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reckon}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Cantino"]
-  s.date = %q{2010-11-10}
+  s.date = %q{2010-11-12}
   s.default_executable = %q{reckon}
   s.description = %q{Reckon automagically converts CSV files for use with the command-line accounting tool Ledger.  It also helps you to select the correct accounts associated with the CSV data using Bayesian machine learning.}
   s.email = %q{andrew@iterationlabs.com}

data/spec/reckon/app_spec.rb

@@ -4,6 +4,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'rubygems'
 require 'reckon'
 
+Reckon::App.settings[:testing] = true
+
 describe Reckon::App do
   before do
     @chase = Reckon::App.new(:string => CHASE_CSV)
@@ -11,6 +13,15 @@ describe Reckon::App do
     @two_money_columns = Reckon::App.new(:string => TWO_MONEY_COLUMNS_BANK)
     @simple_csv = Reckon::App.new(:string => SIMPLE_CSV)
   end
+  
+  it "should be in testing mode" do
+    @chase.settings[:testing].should be_true
+    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']]
+  end
 
   describe "columns" do
     it "should return the csv transposed" do
@@ -74,6 +85,12 @@ describe Reckon::App do
       @two_money_columns.money_for(3).should == -88.55
       @two_money_columns.money_for(4).should == 88.55
     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
   end
 
   describe "date_for" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: reckon
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Andrew Cantino
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 -08:00
+date: 2010-11-12 00:00:00 -08:00
 default_executable: reckon
 dependencies: 
 - !ruby/object:Gem::Dependency