Merge pull request #11 from zebh/currencies

Updated the sources to allow for custom curreny

lib/reckon/app.rb

@@ -10,6 +10,7 @@ def initialize(options = {})
       self.tokens = {}
       self.accounts = {}
       self.seen = {}
+      self.options[:currency] ||= '$'
       learn!
       parse
       filter_csv
@@ -168,7 +169,12 @@ def pretty_money_for(index, negate = false)
     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)
@@ -403,6 +409,14 @@ def self.parse_opts(args = ARGV)
           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

lib/reckon/ledger_parser.rb

@@ -56,7 +56,7 @@ def balance(accounts)
 
     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

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 @@
       @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

spec/reckon/ledger_parser_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#encoding: utf-8
 
 require "spec_helper"
 require 'rubygems'
@@ -12,7 +13,7 @@
 
   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
@@ -76,6 +77,14 @@
   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