reckon 0.3.6 → 0.3.7

data/CHANGES.md

@@ -1,3 +1,5 @@
 # Changes
 
+* 6/26/13 - Multi-currency support contributed by @zebh.
+* 4/27/13 - Add --account commandline option
 * 3/24/13 - Force encoding to UTF-8 when unknown characters are encountered.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reckon (0.3.6)
+    reckon (0.3.7)
       chronic (>= 0.3.0)
       fastercsv (>= 1.5.1)
       highline (>= 1.5.2)
@@ -13,7 +13,7 @@ GEM
     chronic (0.9.1)
     diff-lcs (1.1.3)
     fastercsv (1.5.5)
-    highline (1.6.18)
+    highline (1.6.19)
     rake (10.0.4)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)

data/lib/reckon/app.rb

@@ -10,6 +10,7 @@ module Reckon
       self.tokens = {}
       self.accounts = {}
       self.seen = {}
+      self.options[:currency] ||= '$'
       learn!
       parse
       filter_csv
@@ -168,7 +169,12 @@ module Reckon
     end
 
     def pretty_money(amount, negate = false)
-      (amount >= 0 ? " " : "") + sprintf("%0.2f", amount * (negate ? -1 : 1)).gsub(/^((\-)|)(?=\d)/, '\1$')
+      currency = options[:currency]
+      if options[:suffixed]
+        (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
 
     def date_for(index)
@@ -359,6 +365,10 @@ module Reckon
           options[:file] = file
         end
 
+        opts.on("-a", "--account name", "The Ledger Account this file is for") do |a|
+          options[:bank_account] = a
+        end
+
         opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
           options[:verbose] = v
         end
@@ -399,6 +409,14 @@ module Reckon
           options[:encoding] = e
         end
 
+        opts.on("-c", "--currency", "Currency symbol to use, defaults to $. ex.) $, EUR") do |e|
+          options[:currency] = e
+        end
+
+        opts.on("", "--suffixed", "If --currency should be used as a suffix. Defaults to false.") do |e|
+          options[:suffixed] = e
+        end
+
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit

data/lib/reckon/ledger_parser.rb

@@ -18,7 +18,7 @@ module Reckon
       accounts = []
       ledger.strip.split("\n").each do |entry|
         next if entry =~ /^\s*$/ || entry =~ /^[^ \t\d]/
-        if entry =~ /^([\d\/]+)(\=[\d\/]+)?(\s+[\*!]?\s*.*?)$/
+        if entry =~ /^([\d\/-]+)(\=[\d\/-]+)?(\s+[\*!]?\s*.*?)$/
           @entries << { :date => date.strip, :desc => desc.strip, :accounts => balance(accounts) } if date
           date = $1
           desc = $3
@@ -56,7 +56,7 @@ module Reckon
 
     def clean_money(money)
       return nil if money.nil? || money.length == 0
-      money.gsub(/[\$,]/, '').to_f
+      money.gsub(/[^0-9.-]/, '').to_f
     end
   end
 end

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

data/spec/reckon/app_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 require "spec_helper"
 require 'rubygems'
@@ -158,6 +159,24 @@ describe Reckon::App do
       @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
+      euro_bank = Reckon::App.new(:string => SOME_OTHER_CSV, :currency => "€", :suffixed => false )
+      euro_bank.pretty_money_for(1).should == "-€20.00"
+      euro_bank.pretty_money_for(4).should == " €1558.52"
+      euro_bank.pretty_money_for(7).should == "-€116.22"
+      euro_bank.pretty_money_for(5).should == " €0.23"
+      euro_bank.pretty_money_for(6).should == "-€0.96"
+    end
+
+    it "work with suffixed currencies such as SEK" do
+      swedish_bank = Reckon::App.new(:string => SOME_OTHER_CSV, :currency => 'SEK', :suffixed => true )
+      swedish_bank.pretty_money_for(1).should == "-20.00 SEK"
+      swedish_bank.pretty_money_for(4).should == " 1558.52 SEK"
+      swedish_bank.pretty_money_for(7).should == "-116.22 SEK"
+      swedish_bank.pretty_money_for(5).should == " 0.23 SEK"
+      swedish_bank.pretty_money_for(6).should == "-0.96 SEK"
+    end
   end
 
   describe "merge_columns" do

data/spec/reckon/ledger_parser_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#encoding: utf-8
 
 require "spec_helper"
 require 'rubygems'
@@ -12,12 +13,12 @@ describe Reckon::LedgerParser do
 
   describe "parse" do
     it "should ignore non-standard entries" do
-      @ledger.entries.length.should == 5
+      @ledger.entries.length.should == 7
     end
 
     it "should parse entries correctly" do
       @ledger.entries.first[:desc].should == "* Checking balance"
-      @ledger.entries.first[:date].should == "2004/05/01"
+      @ledger.entries.first[:date].should == "2004-05-01"
       @ledger.entries.first[:accounts].first[:name].should == "Assets:Bank:Checking"
       @ledger.entries.first[:accounts].first[:amount].should == 1000
       @ledger.entries.first[:accounts].last[:name].should == "Equity:Opening Balances"
@@ -72,10 +73,18 @@ describe Reckon::LedgerParser do
   Assets:Bank:Checking          $500.00
   Income:Salary
 
-2004/05/01 * Checking balance
+2004-05-01 * Checking balance
   Assets:Bank:Checking        $1,000.00
   Equity:Opening Balances
 
+2004-05-01 * Checking balance
+  Assets:Bank:Checking        €1,000.00
+  Equity:Opening Balances
+
+2004-05-01 * Checking balance
+  Assets:Bank:Checking        1,000.00 SEK
+  Equity:Opening Balances
+
 2004/05/01 * Investment balance
   Assets:Brokerage              50 AAPL @ $30.00
   Equity:Opening Balances

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3416374461755206032
+      hash: 989806142141775865
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3416374461755206032
+      hash: 989806142141775865
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25