money 6.3.0 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e411b812d22d33e7ed9aef7342e9aa5803d9be9
-  data.tar.gz: 4ec3b0a561fedf1cc30c01c5e95cf76b50a68f31
+  metadata.gz: 5b17085ec48ad637f79d50632f0f33a940e17a22
+  data.tar.gz: 76f462a0d1b62562694324fb4f97d96d5c101765
 SHA512:
-  metadata.gz: 8fe9253717cc7b378dc8e4409afac6137331707f18a23ae6a329aaae4dabe40385e373b796cfdcfdf3ca88912e74d67dac6d0ca5d090134ab65122d519923561
-  data.tar.gz: 3d2d4e383818b3d085da7559ba87a7043484be25f09b931d16ed48a8b82d8ca46775620297c79f7a3747db6fe54ae3ef6eafb1d5b98e95a9424460801a52a824
+  metadata.gz: dd0bc7415006f620e9e5bea076d2248d63353c82cca3ca11e8c3c29ab6420b1ed6163b6042cc743035a017be2178f48ba07014594edda8b1e4ee3d133949d399
+  data.tar.gz: 742631af8dff373d776438ce74d99ac01437387046e87cb8a3ef68498fc3d2fe64860a4f9d6280fb70ccc4c94df8fb3c0b84e0ff4a4e5f6ca115e6d5beb4892a

data/.gitignore

@@ -17,3 +17,6 @@ doc/
 .rbx
 .rvmrc
 .ruby-version
+
+# Spec artifacts
+/coverage

data/AUTHORS

@@ -29,6 +29,7 @@ Exoth
 François Beausoleil
 François Klingler
 Francisco Trindade
+Gabriel Gilder
 Gee-Hsien Chuang
 Hakan Ensari
 Hongli Lai
@@ -56,6 +57,7 @@ kirillian
 Laurynas Butkus
 Marcel Scherf
 Marco Otte-Witte
+Mateus Gomes
 Mateusz Wolsza
 Matias Korhonen
 Matt Jankowski
@@ -90,6 +92,7 @@ Shane Emmons
 Simone Carletti
 Spencer Rinehart
 Steve Morris
+Yok
 Thomas E Enebo
 Thomas Weymuth
 Ticean Bennett
@@ -107,3 +110,4 @@ Tien Nguyen
 Wei Zhu
 Zubin Henner
 Troels Knak-Nielsen
+Edwin Vlieg

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Next release
  - Add method to round a given amount of money to the nearest possible value in cash (aka Swedish rounding).
+ - Fixed the subunit_to_unit values of the CLP and KRW currencies
+ - Add option for `disambiguate` symbols for formatting
+ - Fixed the subunit_to_unit values of the VND currency
+ - Fix formatting of NGN - show symbol before amount
+ - Switch default and alternate symbols for RUB currency
+ - Fix symbol for TRY currency
+ - Add `Money.default_formatting_rules` hash, meant to define default rules for everytime `Money#format` is called. They can be overwritten if provided on method call
 
 ## 6.2.1
  - Ensure set is loaded

data/README.md

@@ -295,6 +295,8 @@ If you wish to disable this feature:
 Money.use_i18n = false
 ```
 
+*Note: There are several formatting rules for when `Money#format` is called. For more information, check out the [formatting module](https://github.com/RubyMoney/money/blob/master/lib/money/money/formatting.rb).*
+
 ## Migration Notes
 
 #### Version 6.0.0

data/Rakefile

@@ -1,6 +1,7 @@
 require "rubygems"
 require "bundler/gem_tasks"
 require "rake/clean"
+require "rspec/core/rake_task"
 
 CLOBBER.include('doc', '.yardoc')
 
@@ -9,3 +10,8 @@ require "yard"
 YARD::Rake::YardocTask.new do |t|
   t.options << "--files" << "CHANGELOG.md,LICENSE"
 end
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.fail_on_error = false
+end
+

data/config/currency_backwards_compatible.json

@@ -19,6 +19,7 @@
     "iso_code": "GHS",
     "name": "Ghanaian Cedi",
     "symbol": "₵",
+    "disambiguate_symbol": "GH₵",
     "alternate_symbols": ["GH₵"],
     "subunit": "Pesewa",
     "subunit_to_unit": 100,
@@ -64,6 +65,7 @@
     "iso_code": "JPY",
     "name": "Japanese Yen",
     "symbol": "¥",
+    "disambiguate_symbol": "JPY",
     "alternate_symbols": ["円", "圓"],
     "subunit": "Sen",
     "subunit_to_unit": 100,
@@ -79,6 +81,7 @@
     "iso_code": "ZWD",
     "name": "Zimbabwean Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "ZWD",
     "alternate_symbols": ["Z$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -94,6 +97,7 @@
     "iso_code": "ZWL",
     "name": "Zimbabwean Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "ZWL",
     "alternate_symbols": ["Z$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -109,6 +113,7 @@
     "iso_code": "ZWN",
     "name": "Zimbabwean Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "ZWN",
     "alternate_symbols": ["Z$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -124,6 +129,7 @@
     "iso_code": "ZWR",
     "name": "Zimbabwean Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "ZWR",
     "alternate_symbols": ["Z$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,

data/config/currency_iso.json

@@ -34,6 +34,7 @@
     "iso_code": "ALL",
     "name": "Albanian Lek",
     "symbol": "L",
+    "disambiguate_symbol": "Lek",
     "alternate_symbols": ["Lek"],
     "subunit": "Qintar",
     "subunit_to_unit": 100,
@@ -94,6 +95,7 @@
     "iso_code": "ARS",
     "name": "Argentine Peso",
     "symbol": "$",
+    "disambiguate_symbol": "$m/n",
     "alternate_symbols": ["$m/n", "m$n"],
     "subunit": "Centavo",
     "subunit_to_unit": 100,
@@ -109,6 +111,7 @@
     "iso_code": "AUD",
     "name": "Australian Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "A$",
     "alternate_symbols": ["A$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -169,6 +172,7 @@
     "iso_code": "BBD",
     "name": "Barbadian Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "Bds$",
     "alternate_symbols": ["Bds$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -229,6 +233,7 @@
     "iso_code": "BIF",
     "name": "Burundian Franc",
     "symbol": "Fr",
+    "disambiguate_symbol": "FBu",
     "alternate_symbols": ["FBu"],
     "subunit": "Centime",
     "subunit_to_unit": 100,
@@ -244,6 +249,7 @@
     "iso_code": "BMD",
     "name": "Bermudian Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "BD$",
     "alternate_symbols": ["BD$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -259,6 +265,7 @@
     "iso_code": "BND",
     "name": "Brunei Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "BND",
     "alternate_symbols": ["B$"],
     "subunit": "Sen",
     "subunit_to_unit": 100,
@@ -303,6 +310,7 @@
     "iso_code": "BSD",
     "name": "Bahamian Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "BSD",
     "alternate_symbols": ["B$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -348,6 +356,7 @@
     "iso_code": "BYR",
     "name": "Belarusian Ruble",
     "symbol": "Br",
+    "disambiguate_symbol": "BYR",
     "alternate_symbols": [""],
     "subunit": "Kapyeyka",
     "subunit_to_unit": 100,
@@ -363,6 +372,7 @@
     "iso_code": "BZD",
     "name": "Belize Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "BZ$",
     "alternate_symbols": ["BZ$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -378,6 +388,7 @@
     "iso_code": "CAD",
     "name": "Canadian Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "C$",
     "alternate_symbols": ["C$", "CAD$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -393,6 +404,7 @@
     "iso_code": "CDF",
     "name": "Congolese Franc",
     "symbol": "Fr",
+    "disambiguate_symbol": "FC",
     "alternate_symbols": ["FC"],
     "subunit": "Centime",
     "subunit_to_unit": 100,
@@ -437,9 +449,10 @@
     "iso_code": "CLP",
     "name": "Chilean Peso",
     "symbol": "$",
+    "disambiguate_symbol": "CLP",
     "alternate_symbols": [],
     "subunit": "Peso",
-    "subunit_to_unit": 1,
+    "subunit_to_unit": 100,
     "symbol_first": true,
     "html_entity": "$",
     "decimal_mark": ",",
@@ -456,7 +469,7 @@
     "subunit": "Fen",
     "subunit_to_unit": 100,
     "symbol_first": true,
-    "html_entity": "元",
+    "html_entity": "￥",
     "decimal_mark": ".",
     "thousands_separator": ",",
     "iso_numeric": "156",
@@ -467,6 +480,7 @@
     "iso_code": "COP",
     "name": "Colombian Peso",
     "symbol": "$",
+    "disambiguate_symbol": "COL$",
     "alternate_symbols": ["COL$"],
     "subunit": "Centavo",
     "subunit_to_unit": 100,
@@ -497,6 +511,7 @@
     "iso_code": "CUC",
     "name": "Cuban Convertible Peso",
     "symbol": "$",
+    "disambiguate_symbol": "CUC$",
     "alternate_symbols": ["CUC$"],
     "subunit": "Centavo",
     "subunit_to_unit": 100,
@@ -512,6 +527,7 @@
     "iso_code": "CUP",
     "name": "Cuban Peso",
     "symbol": "$",
+    "disambiguate_symbol": "$MN",
     "alternate_symbols": ["$MN"],
     "subunit": "Centavo",
     "subunit_to_unit": 100,
@@ -527,6 +543,7 @@
     "iso_code": "CVE",
     "name": "Cape Verdean Escudo",
     "symbol": "$",
+    "disambiguate_symbol": "Esc",
     "alternate_symbols": ["Esc"],
     "subunit": "Centavo",
     "subunit_to_unit": 100,
@@ -545,7 +562,7 @@
     "alternate_symbols": [],
     "subunit": "Haléř",
     "subunit_to_unit": 100,
-    "symbol_first": true,
+    "symbol_first": false,
     "html_entity": "",
     "decimal_mark": ",",
     "thousands_separator": ".",
@@ -572,6 +589,7 @@
     "iso_code": "DKK",
     "name": "Danish Krone",
     "symbol": "kr",
+    "disambiguate_symbol": "DKK",
     "alternate_symbols": [",-"],
     "subunit": "Øre",
     "subunit_to_unit": 100,
@@ -587,6 +605,7 @@
     "iso_code": "DOP",
     "name": "Dominican Peso",
     "symbol": "$",
+    "disambiguate_symbol": "RD$",
     "alternate_symbols": ["RD$"],
     "subunit": "Centavo",
     "subunit_to_unit": 100,
@@ -647,6 +666,7 @@
     "iso_code": "ETB",
     "name": "Ethiopian Birr",
     "symbol": "Br",
+    "disambiguate_symbol": "ETB",
     "alternate_symbols": [],
     "subunit": "Santim",
     "subunit_to_unit": 100,
@@ -677,6 +697,7 @@
     "iso_code": "FJD",
     "name": "Fijian Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "FJ$",
     "alternate_symbols": ["FJ$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -692,6 +713,7 @@
     "iso_code": "FKP",
     "name": "Falkland Pound",
     "symbol": "£",
+    "disambiguate_symbol": "FK£",
     "alternate_symbols": ["FK£"],
     "subunit": "Penny",
     "subunit_to_unit": 100,
@@ -752,6 +774,7 @@
     "iso_code": "GIP",
     "name": "Gibraltar Pound",
     "symbol": "£",
+    "disambiguate_symbol": "GIP",
     "alternate_symbols": [],
     "subunit": "Penny",
     "subunit_to_unit": 100,
@@ -782,6 +805,7 @@
     "iso_code": "GNF",
     "name": "Guinean Franc",
     "symbol": "Fr",
+    "disambiguate_symbol": "FG",
     "alternate_symbols": ["FG", "GFr"],
     "subunit": "Centime",
     "subunit_to_unit": 100,
@@ -812,6 +836,7 @@
     "iso_code": "GYD",
     "name": "Guyanese Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "G$",
     "alternate_symbols": ["G$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -827,6 +852,7 @@
     "iso_code": "HKD",
     "name": "Hong Kong Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "HK$",
     "alternate_symbols": ["HK$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -842,6 +868,7 @@
     "iso_code": "HNL",
     "name": "Honduran Lempira",
     "symbol": "L",
+    "disambiguate_symbol": "HNL",
     "alternate_symbols": [],
     "subunit": "Centavo",
     "subunit_to_unit": 100,
@@ -992,6 +1019,7 @@
     "iso_code": "JMD",
     "name": "Jamaican Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "J$",
     "alternate_symbols": ["J$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -1082,6 +1110,7 @@
     "iso_code": "KMF",
     "name": "Comorian Franc",
     "symbol": "Fr",
+    "disambiguate_symbol": "CF",
     "alternate_symbols": ["CF"],
     "subunit": "Centime",
     "subunit_to_unit": 100,
@@ -1113,7 +1142,7 @@
     "name": "South Korean Won",
     "symbol": "₩",
     "subunit": null,
-    "subunit_to_unit": 1,
+    "subunit_to_unit": 100,
     "alternate_symbols": [],
     "symbol_first": true,
     "html_entity": "₩",
@@ -1142,6 +1171,7 @@
     "iso_code": "KYD",
     "name": "Cayman Islands Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "CI$",
     "alternate_symbols": ["CI$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -1202,6 +1232,7 @@
     "iso_code": "LKR",
     "name": "Sri Lankan Rupee",
     "symbol": "₨",
+    "disambiguate_symbol": "SLRs",
     "alternate_symbols": ["රු", "ரூ", "SLRs", "/-"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -1217,6 +1248,7 @@
     "iso_code": "LRD",
     "name": "Liberian Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "L$",
     "alternate_symbols": ["L$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -1232,6 +1264,7 @@
     "iso_code": "LSL",
     "name": "Lesotho Loti",
     "symbol": "L",
+    "disambiguate_symbol": "M",
     "alternate_symbols": ["M"],
     "subunit": "Sente",
     "subunit_to_unit": 100,
@@ -1352,6 +1385,7 @@
     "iso_code": "MMK",
     "name": "Myanmar Kyat",
     "symbol": "K",
+    "disambiguate_symbol": "MMK",
     "alternate_symbols": [],
     "subunit": "Pya",
     "subunit_to_unit": 100,
@@ -1457,6 +1491,7 @@
     "iso_code": "MXN",
     "name": "Mexican Peso",
     "symbol": "$",
+    "disambiguate_symbol": "MEX$",
     "alternate_symbols": ["MEX$"],
     "subunit": "Centavo",
     "subunit_to_unit": 100,
@@ -1502,6 +1537,7 @@
     "iso_code": "NAD",
     "name": "Namibian Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "N$",
     "alternate_symbols": ["N$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -1520,7 +1556,7 @@
     "alternate_symbols": [],
     "subunit": "Kobo",
     "subunit_to_unit": 100,
-    "symbol_first": false,
+    "symbol_first": true,
     "html_entity": "₦",
     "decimal_mark": ".",
     "thousands_separator": ",",
@@ -1547,6 +1583,7 @@
     "iso_code": "NOK",
     "name": "Norwegian Krone",
     "symbol": "kr",
+    "disambiguate_symbol": "NOK",
     "alternate_symbols": [",-"],
     "subunit": "Øre",
     "subunit_to_unit": 100,
@@ -1562,6 +1599,7 @@
     "iso_code": "NPR",
     "name": "Nepalese Rupee",
     "symbol": "₨",
+    "disambiguate_symbol": "NPR",
     "alternate_symbols": ["Rs", "रू"],
     "subunit": "Paisa",
     "subunit_to_unit": 100,
@@ -1577,6 +1615,7 @@
     "iso_code": "NZD",
     "name": "New Zealand Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "NZ$",
     "alternate_symbols": ["NZ$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -1637,6 +1676,7 @@
     "iso_code": "PGK",
     "name": "Papua New Guinean Kina",
     "symbol": "K",
+    "disambiguate_symbol": "PGK",
     "alternate_symbols": [],
     "subunit": "Toea",
     "subunit_to_unit": 100,
@@ -1667,6 +1707,7 @@
     "iso_code": "PKR",
     "name": "Pakistani Rupee",
     "symbol": "₨",
+    "disambiguate_symbol": "PKR",
     "alternate_symbols": ["Rs"],
     "subunit": "Paisa",
     "subunit_to_unit": 100,
@@ -1756,8 +1797,8 @@
     "priority": 100,
     "iso_code": "RUB",
     "name": "Russian Ruble",
-    "symbol": "р.",
-    "alternate_symbols": ["руб"],
+    "symbol": "руб",
+    "alternate_symbols": ["р.", "₽"],
     "subunit": "Kopek",
     "subunit_to_unit": 100,
     "symbol_first": false,
@@ -1802,6 +1843,7 @@
     "iso_code": "SBD",
     "name": "Solomon Islands Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "SI$",
     "alternate_symbols": ["SI$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -1817,6 +1859,7 @@
     "iso_code": "SCR",
     "name": "Seychellois Rupee",
     "symbol": "₨",
+    "disambiguate_symbol": "SRe",
     "alternate_symbols": ["SRe", "SR"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -1832,6 +1875,7 @@
     "iso_code": "SDG",
     "name": "Sudanese Pound",
     "symbol": "£",
+    "disambiguate_symbol": "SDG",
     "alternate_symbols": [],
     "subunit": "Piastre",
     "subunit_to_unit": 100,
@@ -1847,6 +1891,7 @@
     "iso_code": "SEK",
     "name": "Swedish Krona",
     "symbol": "kr",
+    "disambiguate_symbol": "SEK",
     "alternate_symbols": [":-"],
     "subunit": "Öre",
     "subunit_to_unit": 100,
@@ -1862,6 +1907,7 @@
     "iso_code": "SGD",
     "name": "Singapore Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "S$",
     "alternate_symbols": ["S$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -1877,6 +1923,7 @@
     "iso_code": "SHP",
     "name": "Saint Helenian Pound",
     "symbol": "£",
+    "disambiguate_symbol": "SHP",
     "alternate_symbols": [],
     "subunit": "Penny",
     "subunit_to_unit": 100,
@@ -1937,6 +1984,7 @@
     "iso_code": "SRD",
     "name": "Surinamese Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "SRD",
     "alternate_symbols": [],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -1952,6 +2000,7 @@
     "iso_code": "SSP",
     "name": "South Sudanese Pound",
     "symbol": "£",
+    "disambiguate_symbol": "SSP",
     "alternate_symbols": [],
     "subunit": "piaster",
     "subunit_to_unit": 100,
@@ -2012,6 +2061,7 @@
     "iso_code": "SZL",
     "name": "Swazi Lilangeni",
     "symbol": "L",
+    "disambiguate_symbol": "SZL",
     "alternate_symbols": ["E"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -2101,8 +2151,8 @@
     "priority": 100,
     "iso_code": "TRY",
     "name": "Turkish Lira",
-    "symbol": "TL",
-    "alternate_symbols": [],
+    "symbol": "₺",
+    "alternate_symbols": ["TL"],
     "subunit": "kuruş",
     "subunit_to_unit": 100,
     "symbol_first": false,
@@ -2117,6 +2167,7 @@
     "iso_code": "TTD",
     "name": "Trinidad and Tobago Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "TT$",
     "alternate_symbols": ["TT$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -2132,6 +2183,7 @@
     "iso_code": "TWD",
     "name": "New Taiwan Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "NT$",
     "alternate_symbols": ["NT$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -2254,13 +2306,13 @@
     "symbol": "₫",
     "alternate_symbols": [],
     "subunit": "Hào",
-    "subunit_to_unit": 10,
+    "subunit_to_unit": 1,
     "symbol_first": true,
     "html_entity": "₫",
     "decimal_mark": ",",
     "thousands_separator": ".",
     "iso_numeric": "704",
-    "smallest_denomination": 2000
+    "smallest_denomination": 100
   },
   "vuv": {
     "priority": 100,
@@ -2282,6 +2334,7 @@
     "iso_code": "WST",
     "name": "Samoan Tala",
     "symbol": "T",
+    "disambiguate_symbol": "WS$",
     "alternate_symbols": ["WS$", "SAT", "ST"],
     "subunit": "Sene",
     "subunit_to_unit": 100,
@@ -2297,6 +2350,7 @@
     "iso_code": "XAF",
     "name": "Central African Cfa Franc",
     "symbol": "Fr",
+    "disambiguate_symbol": "FCFA",
     "alternate_symbols": ["FCFA"],
     "subunit": "Centime",
     "subunit_to_unit": 100,
@@ -2312,6 +2366,7 @@
     "iso_code": "XAG",
     "name": "Silver (Troy Ounce)",
     "symbol": "oz t",
+    "disambiguate_symbol": "XAG",
     "alternate_symbols": [],
     "subunit": "oz",
     "subunit_to_unit": 1,
@@ -2326,6 +2381,7 @@
     "iso_code": "XAU",
     "name": "Gold (Troy Ounce)",
     "symbol": "oz t",
+    "disambiguate_symbol": "XAU",
     "alternate_symbols": [],
     "subunit": "oz",
     "subunit_to_unit": 1,
@@ -2340,6 +2396,7 @@
     "iso_code": "XCD",
     "name": "East Caribbean Dollar",
     "symbol": "$",
+    "disambiguate_symbol": "EX$",
     "alternate_symbols": ["EC$"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
@@ -2369,6 +2426,7 @@
     "iso_code": "XOF",
     "name": "West African Cfa Franc",
     "symbol": "Fr",
+    "disambiguate_symbol": "CFA",
     "alternate_symbols": ["CFA"],
     "subunit": "Centime",
     "subunit_to_unit": 100,
@@ -2429,6 +2487,7 @@
     "iso_code": "ZMK",
     "name": "Zambian Kwacha",
     "symbol": "ZK",
+    "disambiguate_symbol": "ZMK",
     "alternate_symbols": [],
     "subunit": "Ngwee",
     "subunit_to_unit": 100,
@@ -2444,6 +2503,7 @@
     "iso_code": "ZMW",
     "name": "Zambian Kwacha",
     "symbol": "ZK",
+    "disambiguate_symbol": "ZMW",
     "alternate_symbols": [],
     "subunit": "Ngwee",
     "subunit_to_unit": 100,

data/config/currency_non_iso.json

@@ -18,6 +18,7 @@
     "iso_code": "JEP",
     "name": "Jersey Pound",
     "symbol": "£",
+    "disambiguate_symbol": "JEP",
     "alternate_symbols": [],
     "subunit": "Penny",
     "subunit_to_unit": 100,

data/lib/money/currency.rb

@@ -141,6 +141,7 @@ class Money
     # defined by the ISO 4217 standard.
     # @attr_reader [String] name The currency name.
     # @attr_reader [String] symbol The currency symbol (UTF-8 encoded).
+    # @attr_reader [String] disambiguate_symbol Alternative currency used if symbol is ambiguous
     # @attr_reader [String] html_entity The html entity for the currency symbol
     # @attr_reader [String] subunit The name of the fractional monetary unit.
     # @attr_reader [Integer] subunit_to_unit The proportion between the unit
@@ -155,7 +156,7 @@ class Money
     # possible (in the subunit of this currency)
 
     attr_reader :id, :priority, :iso_code, :iso_numeric, :name, :symbol,
-      :html_entity, :subunit, :subunit_to_unit, :decimal_mark,
+      :disambiguate_symbol, :html_entity, :subunit, :subunit_to_unit, :decimal_mark,
       :thousands_separator, :symbol_first, :smallest_denomination
 
     alias_method :separator, :decimal_mark
@@ -180,6 +181,7 @@ class Money
         @iso_code = data[:iso_code]
         @name = data[:name]
         @symbol = data[:symbol]
+        @disambiguate_symbol = data[:disambiguate_symbol]
         @alternate_symbols = data[:alternate_symbols]
         @subunit = data[:subunit]
         @subunit_to_unit = data[:subunit_to_unit]

data/lib/money/money.rb

@@ -15,7 +15,7 @@ require "money/money/formatting"
 # @see http://en.wikipedia.org/wiki/Money
 class Money
   include Comparable, Money::Arithmetic, Money::Formatting
-  
+
   # Raised when smallest denomination of a currency is not defined
   class UndefinedSmallestDenomination < StandardError; end
 
@@ -52,7 +52,7 @@ class Money
 
     return_value(fractional)
   end
-  
+
   # Round a given amount of money to the nearest possible amount in cash value. For
   # example, in Swiss francs (CHF), the smallest possible amount of cash value is
   # CHF 0.05. Therefore, this method rounds CHF 0.07 to CHF 0.05, and CHF 0.08 to
@@ -66,11 +66,11 @@ class Money
     unless self.currency.smallest_denomination
       raise UndefinedSmallestDenomination, 'Smallest denomination of this currency is not defined'
     end
-    
+
     fractional = as_d(@fractional)
     smallest_denomination = as_d(self.currency.smallest_denomination)
     rounded_value = (fractional / smallest_denomination).round(0, self.class.rounding_mode) * smallest_denomination
-    
+
     return_value(rounded_value)
   end
 
@@ -86,18 +86,34 @@ class Money
     # This property allows you to specify the default bank object. The default
     # value for this property is an instance of +Bank::VariableExchange.+ It
     # allows one to specify custom exchange rates.
+    #
     # @attr_accessor [Money::Currency] default_currency The default currency,
     # which is used when +Money.new+ is called without an explicit currency
     # argument. The default value is Currency.new("USD"). The value must be a
     # valid +Money::Currency+ instance.
+    #
+    # @attr_accessor [Hash] default_formatting_rules Use this to define a default
+    # hash of rules for everytime +Money#format+ is called.
+    # Rules provided on method call will be merged with the default ones.
+    # To overwrite a rule, just provide the intended value while calling +format+.
+    #
+    # @see +Money::Formatting#format+ for more details.
+    #
+    # @example
+    #   Money.default_formatting_rules = { :display_free => true }
+    #   Money.new(0, "USD").format                          # => "free"
+    #   Money.new(0, "USD").format(:display_free => false)  # => "$0.00"
+    #
     # @attr_accessor [true, false] use_i18n Use this to disable i18n even if
     # it's used by other objects in your app.
+    #
     # @attr_accessor [true, false] infinite_precision Use this to enable
     # infinite precision cents
+    #
     # @attr_accessor [Integer] conversion_precision Use this to specify
     # precision for converting Rational to BigDecimal
-    attr_accessor :default_bank, :default_currency, :use_i18n,
-      :infinite_precision, :conversion_precision
+    attr_accessor :default_bank, :default_currency, :default_formatting_rules,
+      :use_i18n, :infinite_precision, :conversion_precision
 
     # @attr_writer rounding_mode Use this to specify the rounding mode
     attr_writer :rounding_mode
@@ -260,7 +276,7 @@ class Money
   def initialize(obj, currency = Money.default_currency, bank = Money.default_bank)
     @fractional = obj.respond_to?(:fractional) ? obj.fractional : as_d(obj)
     @currency   = obj.respond_to?(:currency) ? obj.currency : Currency.wrap(currency)
-    @currency ||= Money.default_currency 
+    @currency ||= Money.default_currency
     @bank       = obj.respond_to?(:bank) ? obj.bank : bank
   end
 
@@ -618,7 +634,7 @@ class Money
       index < remainder ? high : low
     end
   end
-  
+
   def return_value(value)
     if self.class.infinite_precision
       value

data/lib/money/money/formatting.rb

@@ -13,12 +13,11 @@ class Money
     def self.define_i18n_method(method, name, character)
       define_method(method) do
         if self.class.use_i18n
-          I18n.t(
-            :"number.currency.format.#{name}", :default => I18n.t(
-              :"number.format.#{name}",
-              :default => (currency.send(method) || character)
-            )
-          )
+          begin
+            I18n.t name, :scope => "number.currency.format", :raise => true
+          rescue I18n::MissingTranslationData => e
+            I18n.t name, :scope =>"number.format", :default => (currency.send(method) || character)
+          end
         else
           currency.send(method) || character
         end
@@ -180,10 +179,25 @@ class Money
     #   Money.new(100, "GBP").format(:sign_positive => false, :sign_before_symbol => true)  #=> "£1.00"
     #   Money.new(100, "GBP").format(:sign_positive => false, :sign_before_symbol => false) #=> "£1.00"
     #   Money.new(100, "GBP").format                               #=> "£+1.00"
+    #
+    # @option *rules [Boolean] :disambiguate (false) Prevents the result from being ambiguous
+    #  due to equal symbols for different currencies. Uses the `disambiguate_symbol`.
+    #
+    # @example
+    #   Money.new(100, "USD").format(:disambiguate => false)   #=> "$100.00"
+    #   Money.new(100, "CAD").format(:disambiguate => false)   #=> "$100.00"
+    #   Money.new(100, "USD").format(:disambiguate => true)    #=> "$100.00"
+    #   Money.new(100, "CAD").format(:disambiguate => true)    #=> "C$100.00"
+    #
+    # Note that the default rules can be defined through +Money.default_formatting_rules+ hash.
+    #
+    # @see +Money.default_formatting_rules+ for more information.
 
     def format(*rules)
       # support for old format parameters
       rules = normalize_formatting_rules(rules)
+
+      rules = default_formatting_rules.merge(rules)
       rules = localize_formatting_rules(rules)
 
       if fractional == 0
@@ -298,6 +312,10 @@ class Money
     end
   end
 
+  def default_formatting_rules
+    self.class.default_formatting_rules || {}
+  end
+
   def regexp_format(formatted, rules, decimal_mark, symbol_value)
     regexp_decimal = Regexp.escape(decimal_mark)
     if rules[:south_asian_number_formatting]
@@ -332,6 +350,8 @@ class Money
       end
     elsif rules[:html]
       currency.html_entity == '' ? currency.symbol : currency.html_entity
+    elsif rules[:disambiguate] and currency.disambiguate_symbol
+      currency.disambiguate_symbol
     else
       symbol
     end

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "6.3.0"
+  VERSION = "6.4.0"
 end

data/money.gemspec

@@ -25,7 +25,7 @@ and choose the migration that best suits your application.
 Test responsibly :-)
 MSG
 
-  s.add_dependency 'i18n', ['>= 0.6.4', '<= 0.7.0.dev']
+  s.add_dependency 'i18n', ['>= 0.6.4', '<= 0.7.0.beta1']
 
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"

data/spec/money/formatting_spec.rb

@@ -120,7 +120,7 @@ describe Money, "formatting" do
     end
 
     it "does not display a decimal when :subunit_to_unit is 1" do
-      expect(Money.new(10_00, "CLP").format).to eq "$1.000"
+      expect(Money.new(10_00, "VUV").format).to eq "Vt1,000"
     end
 
     it "respects the thousands_separator and decimal_mark defaults" do
@@ -169,6 +169,40 @@ describe Money, "formatting" do
       expect(Money.euro(1_234_567_12).format(:no_cents => true)).to eq "€1.234.567"
     end
 
+    context 'when default_formatting_rules defines (display_free: true)' do
+      before do
+        Money.default_formatting_rules = { :display_free => "you won't pay a thing" }
+      end
+
+      after do
+        Money.default_formatting_rules = nil
+      end
+
+      context 'with no rule provided' do
+        it 'acknowledges default rule' do
+          expect(Money.new(0, 'USD').format).to eq "you won't pay a thing"
+        end
+      end
+
+      context 'with rule (display_free: false) provided' do
+        it 'acknowledges provided rule' do
+          expect(Money.new(0, 'USD').format(:display_free => false)).to eq '$0.00'
+        end
+      end
+    end
+
+    context 'when default_formatting_rules is not defined' do
+      before do
+        Money.default_formatting_rules = nil
+      end
+
+      context 'acknowledges provided rule' do
+        it 'acknowledges provided rule' do
+          expect(Money.new(100, 'USD').format(:with_currency => true)).to eq '$1.00 USD'
+        end
+      end
+    end
+
     describe ":with_currency option" do
       specify "(:with_currency option => true) works as documented" do
         expect(Money.ca_dollar(100).format(:with_currency => true)).to eq "$1.00 CAD"
@@ -191,7 +225,7 @@ describe Money, "formatting" do
       it "inserts thousand separators if symbol contains decimal mark and no_cents is true" do
         expect(Money.new(100000000, "AMD").format(:no_cents => true)).to eq "1,000,000 դր."
         expect(Money.new(100000000, "USD").format(:no_cents => true)).to eq "$1,000,000"
-        expect(Money.new(100000000, "RUB").format(:no_cents => true)).to eq "1.000.000 р."
+        expect(Money.new(100000000, "RUB").format(:no_cents => true)).to eq "1.000.000 руб"
       end
 
       it "doesn't incorrectly format HTML" do
@@ -207,8 +241,8 @@ describe Money, "formatting" do
         expect(Money.new(10034, "VUV").format(:no_cents_if_whole => true, :symbol => false)).to eq "10,034"
         expect(Money.new(10000, "MGA").format(:no_cents_if_whole => true, :symbol => false)).to eq "2,000"
         expect(Money.new(10034, "MGA").format(:no_cents_if_whole => true, :symbol => false)).to eq "2,006.4"
-        expect(Money.new(10000, "VND").format(:no_cents_if_whole => true, :symbol => false)).to eq "1.000"
-        expect(Money.new(10034, "VND").format(:no_cents_if_whole => true, :symbol => false)).to eq "1.003,4"
+        expect(Money.new(10000, "VND").format(:no_cents_if_whole => true, :symbol => false)).to eq "10.000"
+        expect(Money.new(10034, "VND").format(:no_cents_if_whole => true, :symbol => false)).to eq "10.034"
         expect(Money.new(10000, "USD").format(:no_cents_if_whole => true, :symbol => false)).to eq "100"
         expect(Money.new(10034, "USD").format(:no_cents_if_whole => true, :symbol => false)).to eq "100.34"
         expect(Money.new(10000, "IQD").format(:no_cents_if_whole => true, :symbol => false)).to eq "10"
@@ -220,8 +254,8 @@ describe Money, "formatting" do
         expect(Money.new(10034, "VUV").format(:no_cents_if_whole => false, :symbol => false)).to eq "10,034"
         expect(Money.new(10000, "MGA").format(:no_cents_if_whole => false, :symbol => false)).to eq "2,000.0"
         expect(Money.new(10034, "MGA").format(:no_cents_if_whole => false, :symbol => false)).to eq "2,006.4"
-        expect(Money.new(10000, "VND").format(:no_cents_if_whole => false, :symbol => false)).to eq "1.000,0"
-        expect(Money.new(10034, "VND").format(:no_cents_if_whole => false, :symbol => false)).to eq "1.003,4"
+        expect(Money.new(10000, "VND").format(:no_cents_if_whole => false, :symbol => false)).to eq "10.000"
+        expect(Money.new(10034, "VND").format(:no_cents_if_whole => false, :symbol => false)).to eq "10.034"
         expect(Money.new(10000, "USD").format(:no_cents_if_whole => false, :symbol => false)).to eq "100.00"
         expect(Money.new(10034, "USD").format(:no_cents_if_whole => false, :symbol => false)).to eq "100.34"
         expect(Money.new(10000, "IQD").format(:no_cents_if_whole => false, :symbol => false)).to eq "10.000"
@@ -586,4 +620,44 @@ describe Money, "formatting" do
     end
 
   end
+
+  context "currencies with ambiguous signs" do
+
+    it "returns ambiguous signs when disambiguate is not set" do
+      expect(Money.new(1999_98, "USD").format).to eq("$1,999.98")
+      expect(Money.new(1999_98, "CAD").format).to eq("$1,999.98")
+      expect(Money.new(1999_98, "DKK").format).to eq("1.999,98 kr")
+      expect(Money.new(1999_98, "NOK").format).to eq("1.999,98 kr")
+      expect(Money.new(1999_98, "SEK").format).to eq("1 999,98 kr")
+    end
+
+    it "returns ambiguous signs when disambiguate is false" do
+      expect(Money.new(1999_98, "USD").format(disambiguate: false)).to eq("$1,999.98")
+      expect(Money.new(1999_98, "CAD").format(disambiguate: false)).to eq("$1,999.98")
+      expect(Money.new(1999_98, "DKK").format(disambiguate: false)).to eq("1.999,98 kr")
+      expect(Money.new(1999_98, "NOK").format(disambiguate: false)).to eq("1.999,98 kr")
+      expect(Money.new(1999_98, "SEK").format(disambiguate: false)).to eq("1 999,98 kr")
+    end
+
+    it "returns disambiguate signs when disambiguate: true" do
+      expect(Money.new(1999_98, "USD").format(disambiguate: true)).to eq("$1,999.98")
+      expect(Money.new(1999_98, "CAD").format(disambiguate: true)).to eq("C$1,999.98")
+      expect(Money.new(1999_98, "DKK").format(disambiguate: true)).to eq("1.999,98 DKK")
+      expect(Money.new(1999_98, "NOK").format(disambiguate: true)).to eq("1.999,98 NOK")
+      expect(Money.new(1999_98, "SEK").format(disambiguate: true)).to eq("1 999,98 SEK")
+    end
+
+    it "should never return an ambiguous format with disambiguate: true" do
+      formatted_results = {}
+
+      # When we format the same amount in all known currencies, disambiguate should return
+      # all different values
+      Money::Currency.all.each do |currency|
+        format = Money.new(1999_98, currency).format(disambiguate: true)
+        expect(formatted_results.keys).not_to include(format), "Format '#{format}' for #{currency} is ambiguous with currency #{formatted_results[format]}."
+        formatted_results[format] = currency
+      end
+    end
+
+  end
 end

data/spec/money_spec.rb

@@ -385,7 +385,7 @@ YAML
     it "respects :subunit_to_unit currency property" do
       expect(Money.new(1_00,  "USD").amount).to eq 1
       expect(Money.new(1_000, "TND").amount).to eq 1
-      expect(Money.new(1,     "CLP").amount).to eq 1
+      expect(Money.new(1,     "VUV").amount).to eq 1
     end
 
     it "does not loose precision" do
@@ -473,7 +473,7 @@ YAML
     end
 
     it "does not have decimal when :subunit_to_unit == 1" do
-      expect(Money.new(10_00, "CLP").to_s).to eq "1000"
+      expect(Money.new(10_00, "VUV").to_s).to eq "1000"
     end
 
     it "does not work when :subunit_to_unit == 5" do
@@ -502,7 +502,7 @@ YAML
       end
 
       it "shows fractional if needed when :subunut_to_unit == 1" do
-        expect(Money.new(10_00.1, "CLP").to_s).to eq "1000,1"
+        expect(Money.new(10_00.1, "VUV").to_s).to eq "1000.1"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -19,7 +19,7 @@ dependencies:
         version: 0.6.4
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.7.0.dev
+        version: 0.7.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.6.4
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.7.0.dev
+        version: 0.7.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement