reckon 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: def2132cbd39a44c0aece86b0ffa5f47c1be645e
-  data.tar.gz: 0d8b5e4458577817812a7f35dc62a0afc9e696e2
+  metadata.gz: cf1d814fe911f299cf58401c3b36734e29a172f1
+  data.tar.gz: 9130495690de1f73cfa3570a6e3386f38df86830
 SHA512:
-  metadata.gz: 836a0e77e93157362465452ff7ff2760c1a2bee8c5181cbe2a850e2229caf7bdc75b986f87465f61a5c8d34ae66e942985341d3d80d3eb6941e68d79f3217bcd
-  data.tar.gz: 1065704ac1fba78cf115cd9406ddf18eb0bf93650d61fee2439b93e1d691fc304637d9742ae88e37050a472297466a375d76fc41261a9a8398a6015a0017328d
+  metadata.gz: b7c3e23f96983cd79844ba37524f1b843a1dbba230198cf813b83c7c65a076506fb2c66ab663dee0970db2d42e1d3e0b03adf41ee163d08f3b38dbb163c373a6
+  data.tar.gz: d74ab72db15d54bc0bfe548369ec9a8b3903760bc09fbc16340a6f64c929a69d595c4840900e8a425996bc580e5924321ece84b10d3e033b193b066f2520f7c2

data/Gemfile.lock

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

data/README.md

@@ -90,6 +90,8 @@ Expenses:
     - 'MasterCard'
   Rent:
     - '0011223344' # Landlord bank number
+  Hosting:
+    - /hosting/i # This regexp will catch descriptions such as WebHosting or filehosting
 '[Internal:Transfer]': # Virtual account
   - '4433221100' # Your own account number
 ```

data/lib/reckon/app.rb

@@ -4,12 +4,13 @@ require 'yaml'
 
 module Reckon
   class App
-    VERSION = "Reckon 0.4.3"
-    attr_accessor :options, :accounts, :tokens, :seen, :csv_parser
+    VERSION = "Reckon 0.4.4"
+    attr_accessor :options, :accounts, :tokens, :seen, :csv_parser, :regexps
 
     def initialize(options = {})
       self.options = options
       self.tokens = {}
+      self.regexps = {}
       self.accounts = {}
       self.seen = {}
       self.options[:currency] ||= '$'
@@ -54,7 +55,7 @@ module Reckon
       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) }
+          tokens.each { |t| learn_about_account(account, t, true) }
         end
       end
       return unless options[:existing_ledger_file]
@@ -63,13 +64,27 @@ module Reckon
       learn_from(ledger_data)
     end
 
-    def learn_about_account(account, data)
+    def learn_about_account(account, data, parse_regexps = false)
       accounts[account] ||= 0
-      tokenize(data).each do |token|
-        tokens[token] ||= {}
-        tokens[token][account] ||= 0
-        tokens[token][account] += 1
-        accounts[account] += 1
+      if parse_regexps && data.start_with?('/')
+        # https://github.com/tenderlove/psych/blob/master/lib/psych/visitors/to_ruby.rb
+        match = data.match(/^\/(.*)\/([ix]*)$/m)
+        fail "failed to parse regexp #{data}" unless match
+        options = 0
+        (match[2] || '').split('').each do |option|
+          case option
+          when 'x' then options |= Regexp::EXTENDED
+          when 'i' then options |= Regexp::IGNORECASE
+          end
+        end
+        regexps[Regexp.new(match[1], options)] = account
+      else
+        tokenize(data).each do |token|
+          tokens[token] ||= {}
+          tokens[token][account] ||= 0
+          tokens[token][account] += 1
+          accounts[account] += 1
+        end
       end
     end
 
@@ -92,7 +107,8 @@ module Reckon
           seen_anything_new = true
         end
 
-        possible_answers = weighted_account_match( row ).map! { |a| a[:account] }
+        possible_answers = most_specific_regexp_match(row)
+        possible_answers = weighted_account_match( row ).map! { |a| a[:account] } if possible_answers.empty?
 
         ledger = if row[:money] > 0
           if options[:unattended]
@@ -151,6 +167,15 @@ module Reckon
       options[:output_file].flush
     end
 
+    def most_specific_regexp_match( row )
+      matches = regexps.map { |regexp, account|
+        if match = regexp.match(row[:description])
+          [account, match[0]]
+        end
+      }.compact
+      matches.sort_by! { |account, matched_text| matched_text.length }.map(&:first)
+    end
+
     # Weigh accounts by how well they match the row
     def weighted_account_match( row )
       query_tokens = tokenize(row[:description])

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.4.3"
+  s.version = "0.4.4"
   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

@@ -5,9 +5,11 @@ Income:
 Expenses:
   Bank:
     - 'Comission'
-    - 'MasterCard'
+    - /mastercard/i
   Rent:
     - '0011223344' # Landlord bank number
+  Websites:
+    - /web/i
   Books:
     - 'Book'
 '[Internal:Transfer]': # Virtual account

data/spec/reckon/app_spec.rb

@@ -62,13 +62,14 @@ describe Reckon::App do
         @output_file.string.scan('Expenses:Books').count.should == 1
       end
 
-      it 'should learn from an account tokens file' do
+      it 'should learn from an account tokens file and parse regexps' 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
+        @output_file.string.scan('Expenses:Websites').count.should == 2
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Andrew Cantino
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec