money 2.2.0 → 2.3.0

data/test/money_spec.rb

@@ -19,7 +19,7 @@ describe Money do
   end
   
   specify "#currency returns the currency passed to the constructor" do
-    Money.new(200_00, "USD").currency.should == "USD"
+    Money.new(200_00, "USD").currency.should == Money::Currency.new("USD")
   end
   
   specify "#zero? returns whether the amount is 0" do
@@ -32,13 +32,13 @@ describe Money do
   
   specify "#exchange_to exchanges the amount via its exchange bank" do
     money = Money.new(100_00, "USD")
-    money.bank.should_receive(:exchange).with(100_00, "USD", "EUR").and_return(200_00)
+    money.bank.should_receive(:exchange).with(100_00, Money::Currency.new("USD"), Money::Currency.new("EUR")).and_return(200_00)
     money.exchange_to("EUR")
   end
   
   specify "#exchange_to exchanges the amount properly" do
     money = Money.new(100_00, "USD")
-    money.bank.should_receive(:exchange).with(100_00, "USD", "EUR").and_return(200_00)
+    money.bank.should_receive(:exchange).with(100_00, Money::Currency.new("USD"), Money::Currency.new("EUR")).and_return(200_00)
     money.exchange_to("EUR").should == Money.new(200_00, "EUR")
   end
   
@@ -149,7 +149,7 @@ describe Money do
   
   specify "Money.new accepts { :currency => 'foo' } as the value for the 'currency' argument" do
     money = Money.new(20, :currency => "EUR")
-    money.currency.should == "EUR"
+    money.currency.should == Money::Currency.new("EUR")
     
     money = Money.new(20, :currency => nil)
     money.currency.should == Money.default_currency
@@ -186,7 +186,7 @@ describe Money do
       one_thousand["CAD"].should == "$1,000.00"
       one_thousand["AUD"].should == "$1,000.00"
       one_thousand["NZD"].should == "$1,000.00"
-      one_thousand["ZWD"].should == "Z$1,000.00"
+      one_thousand["ZWD"].should == "$1,000.00"
       
       # Yen
       one_thousand["JPY"].should == "¥1,000.00"      
@@ -206,7 +206,7 @@ describe Money do
       
       # Other
       one_thousand["SEK"].should == "kr1,000.00"
-      one_thousand["GHC"].should == "¢1,000.00"
+      one_thousand["GHC"].should == "₵1,000.00"
     end
     
     describe "if the monetary value is 0" do
@@ -228,7 +228,50 @@ describe Money do
         @money.format(:display_free => 'gratis').should == 'gratis'
       end
     end
+
+
+    specify "#symbol works as documented" do
+      currency = Money::Currency.new("EUR")
+      currency.should_receive(:symbol).and_return("€")
+      Money.empty(currency).symbol.should == "€"
+
+      currency = Money::Currency.new("EUR")
+      currency.should_receive(:symbol).and_return(nil)
+      Money.empty(currency).symbol.should == "$"
+    end
+
+    specify "#delimiter works as documented" do
+      begin
+        old = Money::DELIMITERS.dup
+        Money::DELIMITERS.clear
+        Money::DELIMITERS["EUR"] = "."
+
+        Money.empty("EUR").delimiter.should == "."
+        Money.empty("USD").delimiter.should == ","
+        Money.empty("GBP").delimiter.should == ","
+      ensure
+        silence_warnings do
+          Money::DELIMITERS = old
+        end
+      end
+    end
     
+    specify "#separator works as documented" do
+      begin
+        old = Money::SEPARATORS.dup
+        Money::SEPARATORS.clear
+        Money::SEPARATORS["EUR"] = "_"
+
+        Money.empty("EUR").separator.should == "_"
+        Money.empty("USD").separator.should == "."
+        Money.empty("GBP").separator.should == "."
+      ensure
+        silence_warnings do
+          Money::SEPARATORS = old
+        end
+      end
+    end
+
     specify "#format(:with_currency => true) works as documented" do
       Money.ca_dollar(100).format(:with_currency => true).should == "$1.00 CAD"
       Money.us_dollar(85).format(:with_currency => true).should == "$0.85 USD"
@@ -271,7 +314,7 @@ describe Money do
       one["CAD"].should == "$1.00"
       one["AUD"].should == "$1.00"
       one["NZD"].should == "$1.00"
-      one["ZWD"].should == "Z$1.00"
+      one["ZWD"].should == "$1.00"
       
       # Yen
       one["JPY"].should == "¥1.00"      
@@ -291,11 +334,13 @@ describe Money do
       
       # Other
       one["SEK"].should == "kr1.00"
-      one["GHC"].should == "¢1.00"
+      one["GHC"].should == "₵1.00"
     end
     
     specify "#format(:symbol => true) returns $ when currency code is not recognized" do
-      Money.new(100, "XYZ").format(:symbol => true).should == "$1.00"
+      currency = Money::Currency.new("EUR")
+      currency.should_receive(:symbol).and_return(nil)
+      Money.new(100, currency).format(:symbol => true).should == "$1.00"
     end
     
     specify "#format(:symbol => some non-Boolean value that evaluates to true) returs symbol based on the given currency code" do
@@ -318,8 +363,8 @@ describe Money do
       money = Money.new(100, "GBP")
       money.format.should == "£1.00"
       
-      money = Money.new(100, "XYZ")
-      money.format.should == "$1.00"
+      money = Money.new(100, "EUR")
+      money.format.should == "€1.00"
     end
 
     specify "#format(:separator => a separator string) works as documented" do
@@ -327,7 +372,7 @@ describe Money do
     end
 
     specify "#format will default separator to '.' if currency isn't recognized" do
-      Money.new(100, "FOO").format.should == "$1.00"
+      Money.new(100, "ZWD").format.should == "$1.00"
     end
 
     specify "#format(:delimiter => a delimiter string) works as documented" do
@@ -341,7 +386,7 @@ describe Money do
     end
 
     specify "#format will default delimiter to ',' if currency isn't recognized" do
-      Money.new(100000, "FOO").format.should == "$1,000.00"
+      Money.new(100000, "ZWD").format.should == "$1,000.00"
     end
     
     specify "#format(:html => true) works as documented" do
@@ -354,6 +399,22 @@ describe Money do
       Money.us_dollar(1_000_000_000_12).format(:no_cents => true).should == "$1,000,000,000"
     end
   end
+
+
+  # Sets $VERBOSE to nil for the duration of the block and back to its original value afterwards.
+  #
+  #   silence_warnings do
+  #     value = noisy_call # no warning voiced
+  #   end
+  #
+  #   noisy_call # warning voiced
+  def silence_warnings
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
+
 end
 
 describe "Actions involving two Money objects" do
@@ -380,33 +441,33 @@ describe "Actions involving two Money objects" do
   describe "if the other Money object has a different currency" do
     specify "#<=> compares the two objects' amount after converting the other object's amount to its own currency" do
       target = Money.new(200_00, "EUR")
-      target.should_receive(:exchange_to).with("USD").and_return(Money.new(300_00, "USD"))
+      target.should_receive(:exchange_to).with(Money::Currency.new("USD")).and_return(Money.new(300_00, "USD"))
       (Money.new(100_00, "USD") <=> target).should < 0
       
       target = Money.new(200_00, "EUR")
-      target.should_receive(:exchange_to).with("USD").and_return(Money.new(100_00, "USD"))
+      target.should_receive(:exchange_to).with(Money::Currency.new("USD")).and_return(Money.new(100_00, "USD"))
       (Money.new(100_00, "USD") <=> target).should == 0
       
       target = Money.new(200_00, "EUR")
-      target.should_receive(:exchange_to).with("USD").and_return(Money.new(99_00, "USD"))
+      target.should_receive(:exchange_to).with(Money::Currency.new("USD")).and_return(Money.new(99_00, "USD"))
       (Money.new(100_00, "USD") <=> target).should > 0
     end
     
     specify "#+ adds the other object's amount, converted to this object's currency, to this object's amount while retaining its currency" do
       other = Money.new(90, "EUR")
-      other.should_receive(:exchange_to).with("USD").and_return(Money.new(9_00, "USD"))
+      other.should_receive(:exchange_to).with(Money::Currency.new("USD")).and_return(Money.new(9_00, "USD"))
       (Money.new(10_00, "USD") + other).should == Money.new(19_00, "USD")
     end
     
     specify "#- substracts the other object's amount, converted to this object's currency, from this object's amount while retaining its currency" do
       other = Money.new(90, "EUR")
-      other.should_receive(:exchange_to).with("USD").and_return(Money.new(9_00, "USD"))
+      other.should_receive(:exchange_to).with(Money::Currency.new("USD")).and_return(Money.new(9_00, "USD"))
       (Money.new(10_00, "USD") - other).should == Money.new(1_00, "USD")
     end
 
     specify "#/ divides the this object's amount by the other objects's amount, converted to this object's currency, resulting in a float" do
       other = Money.new(1000, "EUR")
-      other.should_receive(:exchange_to).with("USD").and_return(Money.new(100_00, "USD"))
+      other.should_receive(:exchange_to).with(Money::Currency.new("USD")).and_return(Money.new(100_00, "USD"))
       (Money.new(10_00, "USD") / other).should == 0.1
     end
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: money
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  prerelease: false
+  segments: 
+  - 2
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -12,29 +17,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -05:00
+date: 2010-04-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hanna
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 12
         version: 0.1.12
-    version: 
+  type: :development
+  version_requirements: *id002
 description: Money and currency exchange support library.
 email: hongli@phusion.nl
 executables: []
@@ -42,23 +55,27 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 files: 
 - .document
 - .gitignore
+- CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/money.rb
 - lib/money/core_extensions.rb
+- lib/money/currency.rb
 - lib/money/defaults.rb
 - lib/money/errors.rb
 - lib/money/money.rb
 - lib/money/variable_exchange_bank.rb
 - money.gemspec
 - test/core_extensions_spec.rb
+- test/currency_spec.rb
 - test/exchange_bank_spec.rb
 - test/money_spec.rb
 has_rdoc: true
@@ -74,22 +91,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: money
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Money and currency exchange support library
 test_files: 
 - test/core_extensions_spec.rb
+- test/currency_spec.rb
 - test/exchange_bank_spec.rb
 - test/money_spec.rb