mumboe-currency 0.5.2 → 0.6

data/lib/currency.rb

@@ -124,6 +124,7 @@ end
 
 $:.unshift(File.expand_path(File.dirname(__FILE__))) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'bigdecimal'
 require 'currency/currency_version'
 require 'currency/config'
 require 'currency/exception'

data/lib/currency/config.rb

@@ -61,8 +61,8 @@ class Currency::Config
     result
   end
 
-  
-  @@identity = Proc.new { |x| x } # :nodoc:
+  # using BigDecimal to avoid floating point rounding errors.
+  @@identity = Proc.new { |x| BigDecimal.new(x.to_s) } # :nodoc:
   
   # Returns the current Float conversion filter.
   # Can be used to set rounding or truncation policies when converting

data/lib/currency/currency/factory.rb

@@ -9,7 +9,7 @@ class Currency::Currency::Factory
 
     # Returns the default Currency::Factory.
     def self.default
-      @@default ||= self.new
+      @@default = self.new
     end
     # Sets the default Currency::Factory.
     def self.default=(x)

data/lib/currency/currency_version.rb

@@ -1,5 +1,5 @@
 module Currency
-  CurrencyVersion = '0.5'
+  CurrencyVersion = '0.6'
 end
 # DO NOT EDIT
 # This file is auto-generated by build scripts.

data/lib/currency/money.rb

@@ -213,7 +213,7 @@ class Currency::Money
     #
     # Right side must be Number.
     def *(x)
-       new_rep(@rep * x)
+      new_rep(@rep * x)
     end
 
     #    Money / Money => Float (ratio)

data/lib/currency/parser.rb

@@ -83,7 +83,7 @@ class Currency::Parser
       whole = md[2]
       part = md[3]
       
-      if part.length != currency.scale
+      if part.length != currency.scale_exp
         currency.scale = 10**part.length if part.length > 1
         
         # Pad decimal places with additional '0'

data/test/string_test.rb

@@ -1,7 +1,6 @@
 # various tests to verify latest revisions
 require "test/test_base"
 require 'currency'
-
 module Currency
 
   class StringTest < TestBase
@@ -49,6 +48,84 @@ module Currency
       assert_equal "$0.50", "0.5".money.to_s
     end
   
+    def test_string_number
+      m = "10.12".money*100
+      assert_equal "$1,012.00", m.to_s
+    end
+    
+    def test_float_number
+      m = 10.12.money*100
+      assert_equal "$1,012.00", m.to_s
+    end
+    
+    def test_bigdecimal
+      assert (BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2")
+    end
+   
+    def test_side_effects
+      m = "1000.00".money
+      s = "500.000".money
+      assert_equal "$1,000.00", m.to_s
+    end
+    
+    def test_app_string_not_money
+      value = "xxxx"
+      assert_raise(::Currency::Exception::InvalidMoneyString) {
+        ::Currency.Money(value).to_s(:symbol => false, :code => true).split
+      }
+    end
+    
+    def test_app_money_string
+      value = "1000"
+      arr = ::Currency.Money(value).to_s(:symbol => false, :code => true).split
+      assert_equal 'USD', arr[0]
+      assert_equal '1,000.00', arr[1]
+    end
+    
+    def test_app_money_string_with_decimals
+      value = "1000.234"
+      arr = ::Currency.Money(value).to_s(:symbol => false, :code => true).split
+      assert_equal 'USD', arr[0]
+      assert_equal '1,000.234', arr[1]
+    end
+    
+    def test_app_money_string_with_dollar
+      value = "$1000.234"
+      arr = ::Currency.Money(value).to_s(:symbol => false, :code => true).split
+      assert_equal 'USD', arr[0]
+      assert_equal '1,000.234', arr[1]
+    end
+    
+    def test_app_money_string_with_yuan
+      value = "¥1000.234"
+      arr = ::Currency.Money(value).to_s(:symbol => false, :code => true).split
+      assert_equal 'CNY', arr[0]
+      assert_equal '1,000.234', arr[1]
+    end
+    
+    def test_money_string_to_f
+      value = "1000.234"
+      f =::Currency.Money(value).to_f
+      assert_equal 1000.234, f
+    end
+    
+    def test_money_int_to_f
+      value = 1000
+      f =::Currency.Money(value).to_f
+      assert_equal 1000.0, f
+    end
+    
+    def test_money_to_f
+      value = "$1000.234"
+      f =::Currency.Money(value).to_f
+      assert_equal 1000.234, f
+    end
+    
+    def test_money_with_1_decimal_to_f
+      value = "$1000.2"
+      f =::Currency.Money(value).to_f
+      assert_equal 1000.2, f
+    end
   end
 
 end

metadata

@@ -1,20 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: mumboe-currency
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  hash: 7
+  prerelease: 
+  segments: 
+  - 0
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
-- "Mike Bradford (modifier: 47primes)"
+- John Liu & Eric Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 -06:00
-default_executable: 
+date: 2011-04-26 00:00:00 Z
 dependencies: []
 
 description: 
-email: mbradford@47primes.com
+email: johnl@mumboe.com
 executables: 
 - currency_historical_rate_load
 extensions: []
@@ -58,7 +62,6 @@ files:
 - lib/currency.rb
 - test/string_test.rb
 - test/test_base.rb
-has_rdoc: true
 homepage: http://rubyforge.org/projects/currency/
 licenses: []
 
@@ -68,23 +71,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: Extends the RubyForge version to handle all currency symbols listed on xe.com/symbols.php.
+summary: Fixed unwanted side-effects by avoiding shared factory and floating point rounding errors
 test_files: 
 - test/test_base.rb