nofxx-money 2.3.5 → 2.3.6

data/VERSION

@@ -1 +1 @@
-2.3.5
+2.3.6

data/lib/money/money.rb

@@ -88,7 +88,7 @@ class Money
   # Money.ca_dollar and Money.us_dollar
   def initialize(cents, currency = nil, bank = nil)
     @cents = cents.to_i
-    @currency = currency || Money.default_currency
+    @currency = (currency || Money.default_currency).upcase
     @bank = bank || Money.default_bank
   end
 
@@ -256,17 +256,20 @@ class Money
         symbol = ""
       end
     else
-      symbol = CURRENCIES[currency][:symbol]
+      symbol = (CURRENCIES[currency] ? CURRENCIES[currency][:symbol] : "$")
     end
     self.currency
 
+    delimiter = (CURRENCIES[currency] ? CURRENCIES[currency][:delimiter] : "," )
+    separator = (CURRENCIES[currency] ? CURRENCIES[currency][:separator] : "." )
+
     if rules[:no_cents]
       formatted = sprintf("#{symbol}%d", cents.to_f / 100)
-      formatted.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{CURRENCIES[currency][:delimiter]}")
+      formatted.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
     else
       formatted = sprintf("#{symbol}%.2f", cents.to_f / 100).split('.')
-      formatted[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{CURRENCIES[currency][:delimiter]}")
-      formatted = formatted.join(CURRENCIES[currency][:separator])
+      formatted[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
+      formatted = formatted.join(separator)
     end
 
     # Commify ("10000" => "10,000")
@@ -278,7 +281,7 @@ class Money
       formatted << currency
       formatted << '</span>' if rules[:html]
     end
-    formatted.gsub!(CURRENCIES[currency][:symbol],CURRENCIES[currency][:html]) if rules[:html]
+    formatted.gsub!(symbol,CURRENCIES[currency][:html]) if rules[:html]
     formatted
    end
 

data/money.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{money}
-  s.version = "2.3.5"
+  s.version = "2.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Money Team"]

data/spec/money/exchange_bank_spec.rb

@@ -100,7 +100,7 @@ describe Money::ExchangeBank do
     end
 
     it "should fetch data" do
-      Money.default_currency = "EUR"
+      Money.stub!(:default_currency).and_return("EUR")
       @bank.fetch_rates
       @bank.get_rate("DKK").should be_close(7.4453, 0.0001)
       @bank.get_rate("BRL").should be_close(2.832, 0.001)
@@ -108,7 +108,7 @@ describe Money::ExchangeBank do
     end
 
     it "should fetch diff than eur" do
-      Money.default_currency = "BRL"
+      Money.stub!(:default_currency).and_return("BRL")
       @bank.fetch_rates
       @bank.get_rate("DKK").should be_close(2.6289, 0.0001)
       @bank.get_rate("EEK").should be_close(5.5249, 0.0001)
@@ -116,13 +116,12 @@ describe Money::ExchangeBank do
     end
 
     it "should fetch for an unknown one" do
-      Money.default_currency = "XXX"
+      Money.stub!(:default_currency).and_return("XXX")
       @bank.fetch_rates
       @bank.get_rate("DKK").should be_nil
       @bank.get_rate("EUR", "USD").should be_close(1.4098, 0.001)
-      Money.default_currency = "USD"
-
     end
+
   end
 
   describe "Live Fetching" do

data/spec/money/money_spec.rb

@@ -158,9 +158,8 @@ describe Money do
     end
 
     it "Money.add_rate works" do
-      Money.add_rate("USD", 1.0)
-      Money.add_rate("EUR", 10)
-      Money.new(10_00, "EUR").exchange_to("USD").should == Money.new(1_00, "USD")
+      Money.add_rate("BGL", 10)
+      Money.new(10_00, "USD").exchange_to("BGL").should == Money.new(100_00, "BGL")
     end
 
     it "Money method missing exchange" do
@@ -217,6 +216,7 @@ describe Money do
     it { Money.new(800000).format.should eql("$8,000.00") }
     it { Money.new(-8000000, "JPY").format(:no_cents => true).should eql("¥-80.000") }
     it { Money.new(87654321, "BRL").format.should eql("R$876.543,21") }
+    it { Money.new(87654321, "brl").format.should eql("R$876.543,21") }
     it { Money.new(800000000, "BRL").format.should eql("R$8.000.000,00") }
     it { Money.new(8000000000, "BRL").format.should eql("R$80.000.000,00") }
     it { Money.new(80000000000, "CAD").format.should eql("$800,000,000.00") }
@@ -224,9 +224,8 @@ describe Money do
     it { Money.new(8800000000088, "EUR").format.should eql("€88,000,000,000.88") }
 
     it "should fail nicely if symbol can`t be found" do
-      Money.default_currency = "XXX"
+      Money.stub!(:default_currency).and_return("XXX")
       Money.new(800).format.should eql("$8.00")
-      Money.default_currency = "USD"
     end
 
     describe "Actions involving two Money objects" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-money
 version: !ruby/object:Gem::Version 
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors: 
 - Money Team