reckon 0.3.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17af5e887336c4c5b8a010ea22ad169c3df1efdd
-  data.tar.gz: 7b57480844bc08468e254b8b4633ff78e25a020e
+  metadata.gz: 701e85b9ec558657003c57d9d33744840fcdcb55
+  data.tar.gz: d343b374bf5375ec34a915a84b7a27724b53b995
 SHA512:
-  metadata.gz: 93ac7ab7c77cd1b411efc86fd7b373c644301d26dc468751a11ab536f4389c2b212437354e7f105ced0705943ecf196a692f5453345c4ddc4e1771376e49d134
-  data.tar.gz: e7fa2a91210cf228cb8b4f96789212f380e9723119c5d25d58a1b3115cde6b1a63cbe7f09adce4104e4a8b5a8480f8695cbe1702fcf3aa392e18dd8cdadabe46
+  metadata.gz: 8489408851bf979388afb2f0ed8da24d30d738b82c83116f1551d8d1f43aebf17f4aeb9ad05a835323ca73199568b74265a556bb25e05c5f4f4585508d4aa863
+  data.tar.gz: 1a6845f390988e12286716351029a015165fa5dc8230aa1d0021616aa4a4e108a8fea64b0249176698a0c8edf8b4e4b4991517028e6a156a2dfecfd04fe067a3

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p353
+ruby-2.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reckon (0.3.10)
+    reckon (0.4.0)
       chronic (>= 0.3.0)
       fastercsv (>= 1.5.1)
       highline (>= 1.5.2)

data/README.md

@@ -15,25 +15,26 @@ Assuming you have Ruby and [Rubygems](http://rubygems.org/pages/download) instal
 First, login to your bank and export your transaction data as a CSV file.
 
 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
 
 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:
 
     > reckon -h
-    
+
     Usage: Reckon.rb [options]
 
+
     -f, --file FILE                  The CSV file to parse
     -a, --account name               The Ledger Account this file is for
     -v, --[no-]verbose               Run verbosely
@@ -43,17 +44,23 @@ Learn more:
     -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
+        --contains-header [N]
+                                     The first row of the CSV is a header and should be skipped. Optionally add the number of rows to skip.
         --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)
-        --encoding
-                                     Specify an encoding for the CSV file
+        --encoding 'UTF-8'
+                                     Specify an encoding for the CSV file; not usually needed
     -c, --currency '$'               Currency symbol to use, defaults to $ (£, EUR)
         --date-format '%d/%m/%Y'
                                      Force the date format (see Ruby DateTime strftime)
+    -u, --unattended                 Don't ask questions and guess all the accounts automatically. Used with --learn-from or --account-tokens options.
+    -t, --account-tokens FILE        YAML file with manually-assigned tokens for each account (see README)
+        --default-into-account name
+                                     Default into account
+        --default-outof-account name
+                                     Default 'out of' account
         --suffixed
                                      If --currency should be used as a suffix. Defaults to false.
     -h, --help                       Show this message
@@ -61,6 +68,35 @@ Learn more:
 
 If you find CSV files that it can't parse, send me examples or pull requests!
 
+## Unattended mode
+
+You can run reckon in a non-interactive mode.
+To guess the accounts reckon can use an existing ledger file or a token file with keywords.
+
+`reckon --unattended -l 2010.dat -f bank.csv -o ledger.dat`
+
+`reckon --unattended --account-tokens tokens.yaml -f bank.csv -o ledger.dat`
+
+Here's an example of `tokens.yaml`:
+
+```
+Income:
+  Salary:
+    - 'LÖN'
+    - 'Salary'
+Expenses:
+  Bank:
+    - 'Comission'
+    - 'MasterCard'
+  Rent:
+    - '0011223344' # Landlord bank number
+'[Internal:Transfer]': # Virtual account
+  - '4433221100' # Your own account number
+```
+
+If reckon can not guess the accounts it will use `Income:Unknown` or `Expenses:Unknown` names.
+You can override them with `--default_outof_account` and `--default_into_account` options.
+
 ## Note on Patches/Pull Requests
 
 * Fork the project.

data/lib/reckon/app.rb

@@ -1,5 +1,6 @@
 #coding: utf-8
 require 'pp'
+require 'yaml'
 
 module Reckon
   class App
@@ -17,6 +18,11 @@ module Reckon
       learn!
     end
 
+    def interactive_output(str)
+      return if options[:unattended]
+      puts str
+    end
+
     def learn_from(ledger)
       LedgerParser.new(ledger).entries.each do |entry|
         entry[:accounts].each do |account|
@@ -32,12 +38,26 @@ module Reckon
       seen[row[:pretty_date]] && seen[row[:pretty_date]][row[:pretty_money]]
     end
 
+    def extract_account_tokens(subtree, account = nil)
+      if subtree.is_a?(Array)
+        { account => subtree }
+      else
+        at = subtree.map { |k, v| extract_account_tokens(v, [account, k].compact.join(':')) }
+        at.inject({}) { |k, v| k = k.merge(v)}
+      end
+    end
+
     def learn!
-      if options[:existing_ledger_file]
-        fail "#{options[:existing_ledger_file]} doesn't exist!" unless File.exists?(options[:existing_ledger_file])
-        ledger_data = File.read(options[:existing_ledger_file])
-        learn_from(ledger_data)
+      if options[:account_tokens_file]
+        fail "#{options[:account_tokens_file]} doesn't exist!" unless File.exists?(options[:account_tokens_file])
+        extract_account_tokens(YAML.load_file(options[:account_tokens_file])).each do |account, tokens|
+          tokens.each { |t| learn_about_account(account, t) }
+        end
       end
+      return unless options[:existing_ledger_file]
+      fail "#{options[:existing_ledger_file]} doesn't exist!" unless File.exists?(options[:existing_ledger_file])
+      ledger_data = File.read(options[:existing_ledger_file])
+      learn_from(ledger_data)
     end
 
     def learn_about_account(account, data)
@@ -57,23 +77,34 @@ module Reckon
     def walk_backwards
       seen_anything_new = false
       each_row_backwards do |row|
-        puts Terminal::Table.new(:rows => [ [ row[:pretty_date], row[:pretty_money], row[:description] ] ])
+        interactive_output Terminal::Table.new(:rows => [ [ row[:pretty_date], row[:pretty_money], row[:description] ] ])
 
         if already_seen?(row)
-          puts "NOTE: This row is very similar to a previous one!"
+          interactive_output "NOTE: This row is very similar to a previous one!"
           if !seen_anything_new
-            puts "Skipping..."
+            interactive_output "Skipping..."
             next
           end
         else
           seen_anything_new = true
         end
 
+        possible_answers = weighted_account_match( row ).map! { |a| a[:account] }
+
         ledger = if row[:money] > 0
-          out_of_account = ask("Which account provided this income? ([account]/[q]uit/[s]kip) ") { |q| q.default = guess_account(row) }
+          if options[:unattended]
+            out_of_account = possible_answers.first || options[:default_outof_account] || 'Income:Unknown'
+          else
+            out_of_account = ask("Which account provided this income? ([account]/[q]uit/[s]kip) ") { |q|
+              q.completion = possible_answers
+              q.readline = true
+              q.default = possible_answers.first
+            }
+          end
+
           finish if out_of_account == "quit" || out_of_account == "q"
           if out_of_account == "skip" || out_of_account == "s"
-            puts "Skipping"
+            interactive_output "Skipping"
             next
           end
 
@@ -81,10 +112,18 @@ module Reckon
                          [options[:bank_account], row[:pretty_money]],
                          [out_of_account, row[:pretty_money_negated]] )
         else
-          into_account = ask("To which account did this money go? ([account]/[q]uit/[s]kip) ") { |q| q.default = guess_account(row) }
+          if options[:unattended]
+            into_account = possible_answers.first || options[:default_into_account] || 'Expenses:Unknown'
+          else
+            into_account = ask("To which account did this money go? ([account]/[q]uit/[s]kip) ") { |q|
+              q.completion = possible_answers
+              q.readline = true
+              q.default = possible_answers.first
+            }
+          end
           finish if into_account == "quit" || into_account == 'q'
           if into_account == "skip" || into_account == 's'
-            puts "Skipping"
+            interactive_output "Skipping"
             next
           end
 
@@ -93,14 +132,14 @@ module Reckon
                          [options[:bank_account], row[:pretty_money]] )
         end
 
-        learn_from(ledger)
+        learn_from(ledger) unless options[:account_tokens_file]
         output(ledger)
       end
     end
 
     def finish
       options[:output_file].close unless options[:output_file] == STDOUT
-      puts "Exiting."
+      interactive_output "Exiting."
       exit
     end
 
@@ -109,7 +148,8 @@ module Reckon
       options[:output_file].flush
     end
 
-    def guess_account(row)
+    # Weigh accounts by how well they match the row
+    def weighted_account_match( row )
       query_tokens = tokenize(row[:description])
 
       search_vector = []
@@ -133,9 +173,16 @@ module Reckon
         { :cosine => (0...account_vector.length).to_a.inject(0) { |m, i| m + search_vector[i] * account_vector[i] },
           :account => account }
       end
-
       account_vectors.sort! {|a, b| b[:cosine] <=> a[:cosine] }
-      account_vectors.first && account_vectors.first[:account]
+
+      # Return empty set if no accounts matched so that we can fallback to the defaults in the unattended mode
+      if options[:unattended]
+        if account_vectors.first && account_vectors.first[:account]
+          account_vectors = [] if account_vectors.first[:cosine] == 0
+        end
+      end
+
+      return account_vectors
     end
 
     def ledger_format(row, line1, line2)
@@ -152,15 +199,15 @@ module Reckon
           t << [ row[:pretty_date], row[:pretty_money], row[:description] ]
         end
       end
-      puts output
+      interactive_output output
     end
 
     def each_row_backwards
       rows = []
       (0...@csv_parser.columns.first.length).to_a.each do |index|
-        rows << { :date => @csv_parser.date_for(index), 
+        rows << { :date => @csv_parser.date_for(index),
           :pretty_date => @csv_parser.pretty_date_for(index),
-          :pretty_money => @csv_parser.pretty_money_for(index), 
+          :pretty_money => @csv_parser.pretty_money_for(index),
           :pretty_money_negated => @csv_parser.pretty_money_for(index, :negate),
           :money => @csv_parser.money_for(index),
           :description => @csv_parser.description_for(index) }
@@ -221,7 +268,7 @@ module Reckon
           options[:comma_separates_cents] = c
         end
 
-        opts.on("", "--encoding e", "Specify an encoding for the CSV file") do |e|
+        opts.on("", "--encoding 'UTF-8'", "Specify an encoding for the CSV file; not usually needed") do |e|
           options[:encoding] = e
         end
 
@@ -233,6 +280,22 @@ module Reckon
           options[:date_format] = d
         end
 
+        opts.on("-u", "--unattended", "Don't ask questions and guess all the accounts automatically. Used with --learn-from or --account-tokens options.") do |n|
+          options[:unattended] = n
+        end
+
+        opts.on("-t", "--account-tokens FILE", "YAML file with manually-assigned tokens for each account (see README)") do |a|
+          options[:account_tokens_file] = a
+        end
+
+        opts.on("", "--default-into-account name", "Default into account") do |a|
+          options[:default_into_account] = a
+        end
+
+        opts.on("", "--default-outof-account name", "Default 'out of' account") do |a|
+          options[:default_outof_account] = a
+        end
+
         opts.on("", "--suffixed", "If --currency should be used as a suffix. Defaults to false.") do |e|
           options[:suffixed] = e
         end
@@ -260,7 +323,11 @@ module Reckon
       end
 
       unless options[:bank_account]
+
+        fail "Please specify --account for the unattended mode" if options[:unattended]
+
         options[:bank_account] = ask("What is the account name of this bank account in Ledger? ") do |q|
+          q.readline = true
           q.validate = /^.{2,}$/
           q.default = "Assets:Bank:Checking"
         end

data/lib/reckon/csv_parser.rb

@@ -2,7 +2,7 @@
 require 'pp'
 
 module Reckon
-  class CSVParser 
+  class CSVParser
     attr_accessor :options, :csv_data, :money_column_indices, :date_column_index, :description_column_indices, :money_column, :date_column
 
     def initialize(options = {})
@@ -63,7 +63,7 @@ module Reckon
           date_score += 5 if entry =~ /^[\-\/\.\d:\[\]]+$/
           date_score += entry.gsub(/[^\-\/\.\d:\[\]]/, '').length if entry.gsub(/[^\-\/\.\d:\[\]]/, '').length > 3
           date_score -= entry.gsub(/[\-\/\.\d:\[\]]/, '').length
-          date_score += 30 if entry =~ /^\d+[:\/\.]\d+[:\/\.]\d+([ :]\d+[:\/\.]\d+)?$/
+          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
@@ -132,7 +132,7 @@ module Reckon
         puts "please report this issue to us so we can take a look!\n"
       end
     end
-    
+
     # Some csv files negative/positive amounts are indicated in separate account
     def detect_sign_column
       return if columns[0].length <= 2 # This test needs requires more than two rows otherwise will lead to false positives
@@ -141,13 +141,13 @@ module Reckon
         column = columns[ @money_column_indices[0] - 1 ]
         signs = column.uniq
       end
-      if (signs.length != 2 && 
+      if (signs.length != 2 &&
           (@money_column_indices[0] + 1 < columns.length))
         column = columns[ @money_column_indices[0] + 1 ]
         signs = column.uniq
       end
       if signs.length == 2
-        negative_first = true 
+        negative_first = true
         negative_first = false if signs[0] == "Bij" || signs[0].downcase =~ /^cr/ # look for known debit indicators
         @money_column.each_with_index do |money, i|
           if negative_first && column[i] == signs[0]

data/lib/reckon/money.rb

@@ -39,7 +39,7 @@ module Reckon
         (@amount >= 0 ? " " : "") + sprintf("%0.2f #{@currency}", @amount * (negate ? -1 : 1))
       else
         (@amount >= 0 ? " " : "") + sprintf("%0.2f", @amount * (negate ? -1 : 1)).gsub(/^((\-)|)(?=\d)/, "\\1#{@currency}")
-      end      
+      end
     end
 
     def Money::from_s( value, options = {} )
@@ -108,11 +108,13 @@ module Reckon
           value = [$1, $2, $3].join("/") if value =~ /^(\d{4})(\d{2})(\d{2})\d+\[\d+\:GMT\]$/ # chase format
           value = [$3, $2, $1].join("/") if value =~ /^(\d{2})\.(\d{2})\.(\d{4})$/            # german format
           value = [$3, $2, $1].join("/") if value =~ /^(\d{2})\-(\d{2})\-(\d{4})$/            # nordea format
+          value = [$1, $2, $3].join("/") if value =~ /^(\d{4})\-(\d{2})\-(\d{2})$/            # yyyy-mm-dd format
           value = [$1, $2, $3].join("/") if value =~ /^(\d{4})(\d{2})(\d{2})/                 # yyyymmdd format
 
+
           unless @endian_precedence # Try to detect endian_precedence
             reg_match = value.match( /^(\d\d)\/(\d\d)\/\d\d\d?\d?/ )
-            # If first one is not \d\d/\d\d/\d\d\d?\d set it to default 
+            # If first one is not \d\d/\d\d/\d\d\d?\d set it to default
             if !reg_match
               @endian_precedence = [:middle, :little]
             elsif reg_match[1].to_i > 12
@@ -122,7 +124,7 @@ module Reckon
             end
           end
         end
-        self.push( value ) 
+        self.push( value )
       end
       # if endian_precedence still nil, raise error
       unless @endian_precedence || options[:date_format]
@@ -132,10 +134,10 @@ module Reckon
 
     def for( index )
       value = self.at( index )
-      guess = Chronic.parse(value, :context => :past, 
+      guess = Chronic.parse(value, :context => :past,
                             :endian_precedence => @endian_precedence )
       if guess.to_i < 953236800 && value =~ /\//
-        guess = Chronic.parse((value.split("/")[0...-1] + [(2000 + value.split("/").last.to_i).to_s]).join("/"), :context => :past, 
+        guess = Chronic.parse((value.split("/")[0...-1] + [(2000 + value.split("/").last.to_i).to_s]).join("/"), :context => :past,
                               :endian_precedence => @endian_precedence)
       end
       guess

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.10"
+  s.version = "0.4.0"
   s.authors = ["Andrew Cantino", "BlackEdder"]
   s.email = %q{andrew@iterationlabs.com}
   s.homepage = %q{https://github.com/cantino/reckon}

data/spec/data_fixtures/tokens.yaml

@@ -0,0 +1,14 @@
+Income:
+  Salary:
+    - 'LÖN'
+    - 'Salary'
+Expenses:
+  Bank:
+    - 'Comission'
+    - 'MasterCard'
+  Rent:
+    - '0011223344' # Landlord bank number
+  Books:
+    - 'Book'
+'[Internal:Transfer]': # Virtual account
+  - '4433221100' # Your own account number

data/spec/reckon/app_spec.rb

@@ -6,27 +6,77 @@ require 'rubygems'
 require 'reckon'
 
 describe Reckon::App do
-  before do
-    @chase = Reckon::App.new(:string => BANK_CSV)
-    @rows = []
-    @chase.each_row_backwards { |row| @rows.push( row ) }
+  context 'with chase csv input' do
+    before do
+      @chase = Reckon::App.new(:string => BANK_CSV)
+      @chase.learn_from( BANK_LEDGER )
+      @rows = []
+      @chase.each_row_backwards { |row| @rows.push( row ) }
+    end
+
+    describe "each_row_backwards" do
+      it "should return rows with hashes" do
+        @rows[0][:pretty_date].should == "2009/12/10"
+        @rows[0][:pretty_money].should == " $2105.00"
+        @rows[0][:description].should == "CREDIT; Some Company vendorpymt PPD ID: 5KL3832735"
+        @rows[1][:pretty_date].should == "2009/12/11"
+        @rows[1][:pretty_money].should == "-$116.22"
+        @rows[1][:description].should == "CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL"
+      end
+    end
+
+    describe "weighted_account_match" do
+      it "should guess the correct account" do
+        @chase.weighted_account_match( @rows[7] ).first[:account].should == "Expenses:Books"
+      end
+    end
   end
 
-  describe "each_row_backwards" do
-    it "should return rows with hashes" do
-      @rows[0][:pretty_date].should == "2009/12/10"
-      @rows[0][:pretty_money].should == " $2105.00"
-      @rows[0][:description].should == "CREDIT; Some Company vendorpymt PPD ID: 5KL3832735"
-      @rows[1][:pretty_date].should == "2009/12/11"
-      @rows[1][:pretty_money].should == "-$116.22"
-      @rows[1][:description].should == "CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL"
+  context 'unattended mode with chase csv input' do
+    before do
+      @output_file = StringIO.new
+      @chase = Reckon::App.new(:string => BANK_CSV, :unattended => true, :output_file => @output_file)
+    end
+
+    describe 'walk backwards' do
+      it 'should assign Income:Unknown and Expenses:Unknown by default' do
+        @chase.walk_backwards
+        @output_file.string.scan('Expenses:Unknown').count.should == 6
+        @output_file.string.scan('Income:Unknown').count.should == 3
+      end
+
+      it 'should change default account names' do
+        @chase = Reckon::App.new(:string => BANK_CSV,
+                                 :unattended => true,
+                                 :output_file => @output_file,
+                                 :default_into_account => 'Expenses:Default',
+                                 :default_outof_account => 'Income:Default')
+        @chase.walk_backwards
+        @output_file.string.scan('Expenses:Default').count.should == 6
+        @output_file.string.scan('Income:Default').count.should == 3
+      end
+
+      it 'should learn from a ledger file' do
+        @chase.learn_from( BANK_LEDGER )
+        @chase.walk_backwards
+        @output_file.string.scan('Expenses:Books').count.should == 1
+      end
+
+      it 'should learn from an account tokens file' do
+        @chase = Reckon::App.new(:string => BANK_CSV,
+                                 :unattended => true,
+                                 :output_file => @output_file,
+                                 :account_tokens_file => 'spec/data_fixtures/tokens.yaml')
+        @chase.walk_backwards
+        @output_file.string.scan('Expenses:Books').count.should == 1
+      end
     end
   end
-  
+
   #DATA
   BANK_CSV = (<<-CSV).strip
     DEBIT,20091224120000[0:GMT],"HOST 037196321563 MO        12/22SLICEHOST",-85.00
-    CHECK,20091224120000[0:GMT],"CHECK 2656",-20.00
+    CHECK,20091224120000[0:GMT],"Book Store",-20.00
     DEBIT,20091224120000[0:GMT],"GITHUB 041287430274 CA           12/22GITHUB 04",-7.00
     CREDIT,20091223120000[0:GMT],"Some Company vendorpymt                 PPD ID: 59728JSL20",3520.00
     CREDIT,20091223120000[0:GMT],"Blarg BLARG REVENUE                  PPD ID: 00jah78563",1558.52
@@ -35,4 +85,15 @@ describe Reckon::App do
     CREDIT,20091211120000[0:GMT],"PAYPAL           TRANSFER                   PPD ID: PAYPALSDSL",-116.22
     CREDIT,20091210120000[0:GMT],"Some Company vendorpymt                 PPD ID: 5KL3832735",2105.00
   CSV
+
+  BANK_LEDGER = (<<-LEDGER).strip
+2004/05/14 * Pay day
+  Assets:Bank:Checking          $500.00
+  Income:Salary
+
+2004/05/27 Book Store
+  Expenses:Books                 $20.00
+  Liabilities:MasterCard
+  LEDGER
+
 end

data/spec/reckon/csv_parser_spec.rb

@@ -30,7 +30,7 @@ describe Reckon::CSVParser do
     @chase.settings[:testing].should be_true
     Reckon::CSVParser.settings[:testing].should be_true
   end
-  
+
   describe "parse" do
     it "should work with foreign character encodings" do
       app = Reckon::CSVParser.new(:file => File.expand_path(File.join(File.dirname(__FILE__), "..", "data_fixtures", "extratofake.csv")))
@@ -48,7 +48,7 @@ describe Reckon::CSVParser do
       @simple_csv.columns.should == [["entry1", "entry4"], ["entry2", "entry5"], ["entry3", "entry6"]]
       @chase.columns.length.should == 4
     end
-    
+
     it "should be ok with empty lines" do
       lambda {
         Reckon::CSVParser.new(:string => "one,two\nthree,four\n\n\n\n\n").columns.should == [['one', 'three'], ['two', 'four']]
@@ -60,7 +60,7 @@ describe Reckon::CSVParser do
     before do
       @harder_date_example_csv = Reckon::CSVParser.new(:string => HARDER_DATE_EXAMPLE)
     end
-    
+
     it "should detect the money column" do
       @chase.money_column_indices.should == [3]
       @some_other_bank.money_column_indices.should == [3]
@@ -86,6 +86,7 @@ describe Reckon::CSVParser do
       @french_csv.date_column_index.should == 2
       @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
@@ -121,7 +122,7 @@ describe Reckon::CSVParser do
       @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 
+      @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
@@ -294,8 +295,8 @@ describe Reckon::CSVParser do
 
   ING_CSV = (<<-CSV).strip
     20121115,From1,Acc,T1,IC,Af,"136,13",Incasso,SEPA Incasso, Opm1
-    20121112,Names,NL28 INGB 1200 3244 16,21817,GT,Bij,"375,00", Opm2       
-    20091117,Names,NL28 INGB 1200 3244 16,21817,GT,Af,"257,50", Opm3      
+    20121112,Names,NL28 INGB 1200 3244 16,21817,GT,Bij,"375,00", Opm2
+    20091117,Names,NL28 INGB 1200 3244 16,21817,GT,Af,"257,50", Opm3
   CSV
 
   HARDER_DATE_EXAMPLE = (<<-CSV).strip
@@ -377,7 +378,7 @@ describe Reckon::CSVParser do
     2013-06-27,2013-06-27,Dividend,ICICI BK SPONSORED ADR,IBN,100,,,66.70,USD
     2013-06-19,2013-06-24,Buy,ISHARES S&P/TSX CAPPED REIT IN,XRE,300,15.90,CDN,-4779.95,CAD
     2013-06-17,2013-06-17,Contribution,CONTRIBUTION,,,,,600.00,CAD
-    2013-05-22,2013-05-22,Dividend,NATBK,NA,70,,,58.10,CAD 
+    2013-05-22,2013-05-22,Dividend,NATBK,NA,70,,,58.10,CAD
   CSV
 
   INTUIT_MINT_EXAMPLE = (<<-CSV).strip
@@ -390,4 +391,5 @@ describe Reckon::CSVParser do
 "1/30/2014","Costco","[PR]COSTCO WHOLESAL","559.96","debit","Business Services","Chequing","",""
   CSV
 
+
 end

data/spec/reckon/date_column_spec.rb

@@ -8,11 +8,11 @@ require 'reckon'
 describe Reckon::DateColumn do
   describe "initialize" do
     it "should detect us and world time" do
-      Reckon::DateColumn.new( ["01/02/2013", "01/14/2013"] ).endian_precedence.should == [:middle] 
-      Reckon::DateColumn.new( ["01/02/2013", "14/01/2013"] ).endian_precedence.should == [:little] 
+      Reckon::DateColumn.new( ["01/02/2013", "01/14/2013"] ).endian_precedence.should == [:middle]
+      Reckon::DateColumn.new( ["01/02/2013", "14/01/2013"] ).endian_precedence.should == [:little]
     end
     it "should set endian_precedence to default when date format cannot be misinterpreted" do
-      Reckon::DateColumn.new( ["2013/01/02"] ).endian_precedence.should == [:middle,:little] 
+      Reckon::DateColumn.new( ["2013/01/02"] ).endian_precedence.should == [:middle,:little]
     end
     it "should raise an error when in doubt" do
       expect{ Reckon::DateColumn.new( ["01/02/2013", "01/03/2013"] )}.to raise_error( StandardError )
@@ -20,20 +20,23 @@ describe Reckon::DateColumn do
   end
   describe "for" do
     it "should detect the date" do
-      Reckon::DateColumn.new( ["13/12/2013"] ).for( 0 ).should == 
-        Time.new( 2013, 12, 13, 12 ) 
-      Reckon::DateColumn.new( ["01/14/2013"] ).for( 0 ).should == 
-        Time.new( 2013, 01, 14, 12 ) 
-      Reckon::DateColumn.new( ["13/12/2013", "21/11/2013"] ).for( 1 ).should == 
-        Time.new( 2013, 11, 21, 12 ) 
+      Reckon::DateColumn.new( ["13/12/2013"] ).for( 0 ).should ==
+        Time.new( 2013, 12, 13, 12 )
+      Reckon::DateColumn.new( ["01/14/2013"] ).for( 0 ).should ==
+        Time.new( 2013, 01, 14, 12 )
+      Reckon::DateColumn.new( ["13/12/2013", "21/11/2013"] ).for( 1 ).should ==
+        Time.new( 2013, 11, 21, 12 )
+      Reckon::DateColumn.new( ["2013-11-21"] ).for( 0 ).should ==
+        Time.new( 2013, 11, 21, 12 )
+
     end
 
     it "should correctly use endian_precedence" do
-      Reckon::DateColumn.new( ["01/02/2013", "01/14/2013"] ).for(0).should == 
+      Reckon::DateColumn.new( ["01/02/2013", "01/14/2013"] ).for(0).should ==
         Time.new( 2013, 01, 02, 12 )
-      Reckon::DateColumn.new( ["01/02/2013", "14/01/2013"] ).for(0).should ==  
+      Reckon::DateColumn.new( ["01/02/2013", "14/01/2013"] ).for(0).should ==
         Time.new( 2013, 02, 01, 12 )
     end
   end
 end
- 
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - Andrew Cantino
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.2
 description: Reckon automagically converts CSV files for use with the command-line
@@ -90,11 +90,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - Gemfile.lock
@@ -109,6 +109,7 @@ files:
 - lib/reckon/money.rb
 - reckon.gemspec
 - spec/data_fixtures/extratofake.csv
+- spec/data_fixtures/tokens.yaml
 - spec/reckon/app_spec.rb
 - spec/reckon/csv_parser_spec.rb
 - spec/reckon/date_column_spec.rb
@@ -126,23 +127,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Utility for interactively converting and labeling CSV files for the Ledger
   accounting tool.
 test_files:
 - spec/data_fixtures/extratofake.csv
+- spec/data_fixtures/tokens.yaml
 - spec/reckon/app_spec.rb
 - spec/reckon/csv_parser_spec.rb
 - spec/reckon/date_column_spec.rb