CurrencyString 0.0.1 → 0.0.2

data/Changelog

@@ -0,0 +1,5 @@
+2007-07-05 - 0.0.1
+	Initial release
+
+2007-07-05 - 0.0.2
+	Some fix on the million strings

data/lib/currencystring.rb

@@ -54,6 +54,7 @@ module CurrencyString
 		str			= []
 		escalas		= @@currencystr_config[lang]["scales"]
 		separators	= @@currencystr_config[lang]["separators"]
+		posts			= @@currencystr_config[lang]["post"] || []
 		currency		= integer.to_i > 1 ? escalas[1][1] : escalas[0][1]
 		currency.strip!
 
@@ -72,6 +73,10 @@ module CurrencyString
 			str << build_value(0,cents,lang)
 			str << (cents.to_i == 1 ? escalas[0][0] : escalas[1][0]).strip
 		end
-		str.join(" ").strip.gsub(/ ,/,",")
+		str = str.join(" ").strip.gsub(/ ,/,",")
+		for post in posts
+			str.sub!(post[0],post[1])
+		end
+		str
 	end
 end

data/lib/currencystring.yml

@@ -77,6 +77,13 @@ pt_BR:
       - ", " 
       - ", " 
       - ", " 
+   post:
+      -
+         - !ruby/regexp /(milh)(�o|�es)( )(reais)/ 
+         - "\\1\\2 de \\4"
+      -
+         - !ruby/regexp /(milh)(�es|�o)(,)( ?)(\w+)( reais)/  
+         - "\\1\\2 e\\4\\5\\6"       
 en_US:
    numbers:
       - " "
@@ -156,3 +163,7 @@ en_US:
       - ", " 
       - ", " 
       - ", " 
+   post:
+      -
+         - !ruby/regexp /(million)(,)( ?)(\w+)( dollars)/  
+         - "\\1 and\\3\\4\\5"       

data/test/test_currencystring.rb

@@ -54,8 +54,12 @@ class CurrencyTest < Test::Unit::TestCase
 		assert_equal("one hundred twenty three thousand, four hundred fifty six dollars and seventy eight cents",123_456.78.to_currency_s("en_US"))
 	end
 	def test_millions
-		assert_equal("um milh�o reais",1_000_000.00.to_currency_s("pt_BR"))
-		assert_equal("one million dollars",1_000_000.00.to_currency_s("en_US"))
+		assert_equal("um milh�o de reais"				,1_000_000.00.to_currency_s("pt_BR"))
+		assert_equal("one million dollars"				,1_000_000.00.to_currency_s("en_US"))
+		assert_equal("um milh�o e dez reais"			,1_000_010.00.to_currency_s("pt_BR"))
+		assert_equal("one million and ten dollars"	,1_000_010.00.to_currency_s("en_US"))
+		assert_equal("dois milh�es de reais",2_000_000.00.to_currency_s("pt_BR"))
+		assert_equal("two million dollars"	,2_000_000.00.to_currency_s("en_US"))
 		assert_equal("um milh�o, dez mil reais e dez centavos",1_010_000.10.to_currency_s("pt_BR"))
 		assert_equal("one million, ten thousand dollars and ten cents",1_010_000.10.to_currency_s("en_US"))
 		assert_equal("um milh�o, duzentos e trinta e quatro mil, quinhentos e sessenta e sete reais e oitenta e nove centavos",1_234_567.89.to_currency_s("pt_BR"))

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: CurrencyString
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 date: 2007-07-05 00:00:00 -03:00
 summary: Convert a Float into its String representation
 require_paths: 
@@ -52,6 +52,7 @@ files:
 - test/test_currencystring.rb
 - README
 - COPYING
+- Changelog
 test_files: 
 - test/test_currencystring.rb
 rdoc_options: []
@@ -59,6 +60,7 @@ rdoc_options: []
 extra_rdoc_files: 
 - README
 - COPYING
+- Changelog
 executables: []
 
 extensions: []