money 5.1.1 → 6.0.0.pre

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 88dd59a388f0deda85a64606f284c552825752ee
+  data.tar.gz: 95521d4753cb2dd4d03d8f17860b65457c96e40b
+SHA512:
+  metadata.gz: 29413cd78ec039b35a772c0c12b1161b023f83a5fd4ce6ec54e30fd11709a1ab58e457f476a59e5bdd757bc144c44d8b2a321a08240037763a1fc3d2ca2afad4
+  data.tar.gz: 9b08dea3b163c0c655454143adb0f59d865de445b7b9cc328a3679069de4ab945d49efe8c0ff648b5619a79278c21bab1aef4dab4aed5895d2be1400955156c6

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## master
+- Fix typo
+- Wrap the currency symbol in a span if :html is specified in the rules
+- Added Money::Currency.all method
+- Allow combined comparison operator to handle zero values without rates
+- Added Money::Currency.unregister method
+- Works on Ruby 1.8.7
+- Update deps
+- Depreciate Money.parse
+
 ## 5.1.1
 
 - Added :sign_before_symbol option to format negative numbers as -£1 rather than £-1
@@ -42,6 +52,7 @@
 - TravisBot is now watching Pull Request!!! (GH-171)
 - Minor code cleaning
 - Remove subunit from South Korean won (KRW)
+- Fixed bug where bankers rounding wasn't being used everywhere.
 
 ## 5.0.0
 

data/README.md

@@ -34,7 +34,7 @@ This library aids one in handling money and different currencies.
 
 - Your app must use UTF-8 to function with this library. There are a
   number of non-ASCII currency attributes.
-- This app requires Ruby 1.9 and JSON. If you're using JRuby < 1.7.0
+- This app requires JSON. If you're using JRuby < 1.7.0
   you'll need to add `gem "json"` to your Gemfile or similar.
 
 ## Downloading
@@ -112,7 +112,7 @@ curr = {
   :iso_numeric     => "840",
   :name            => "United States Dollar",
   :symbol          => "$",
-  :subunit         => "Cent"
+  :subunit         => "Cent",
   :subunit_to_unit => 100,
   :separator       => ".",
   :delimiter       => ","
@@ -254,4 +254,4 @@ implementations.
 
 To integrate money in a Rails application use [money-rails](http://github.com/RubyMoney/money-rails).
 
-For depreceated methods of integrating with Rails, check [the wiki](https://github.com/RubyMoney/money/wiki).
+For deprecated methods of integrating with Rails, check [the wiki](https://github.com/RubyMoney/money/wiki).

data/config/{currency_bc.json → currency_backwards_compatible.json}

@@ -27,6 +27,20 @@
     "thousands_separator": ",",
     "iso_numeric": "288"
   },
+  "mtl": {
+    "priority": 100,
+    "iso_code": "MTL",
+    "name": "Maltese Lira",
+    "symbol": "₤",
+    "alternate_symbols": ["Lm"],
+    "subunit": "Cent",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "£",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "470"
+  },
   "tmm": {
     "priority": 100,
     "iso_code": "TMM",

data/config/{currency.json → currency_iso.json}

@@ -390,6 +390,20 @@
     "thousands_separator": ",",
     "iso_numeric": "756"
   },
+  "clf": {
+    "priority": 100,
+    "iso_code": "CLF",
+    "name": "Unidad de Fomento",
+    "symbol": "UF",
+    "alternate_symbols": [],
+    "subunit": "Peso",
+    "subunit_to_unit": 1,
+    "symbol_first": true,
+    "html_entity": "₱",
+    "decimal_mark": ",",
+    "thousands_separator": ".",
+    "iso_numeric": "990"
+  },
   "clp": {
     "priority": 100,
     "iso_code": "CLP",
@@ -1561,7 +1575,7 @@
     "subunit": "Grosz",
     "subunit_to_unit": 100,
     "symbol_first": false,
-    "html_entity": "",
+    "html_entity": "zł",
     "decimal_mark": ",",
     "thousands_separator": " ",
     "iso_numeric": "985"
@@ -1598,9 +1612,9 @@
     "priority": 100,
     "iso_code": "RON",
     "name": "Romanian Leu",
-    "symbol": "L",
-    "alternate_symbols": ["lei"],
-    "subunit": "Ban",
+    "symbol": "Lei",
+    "alternate_symbols": [],
+    "subunit": "Bani",
     "subunit_to_unit": 100,
     "symbol_first": true,
     "html_entity": "",
@@ -1804,6 +1818,20 @@
     "thousands_separator": ",",
     "iso_numeric": "968"
   },
+  "ssp": {
+    "priority": 100,
+    "iso_code": "SHP",
+    "name": "South Sudanese Pound",
+    "symbol": "£",
+    "alternate_symbols": [],
+    "subunit": "piaster",
+    "subunit_to_unit": 100,
+    "symbol_first": false,
+    "html_entity": "£",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "728"
+  },
   "std": {
     "priority": 100,
     "iso_code": "STD",
@@ -1940,8 +1968,8 @@
     "subunit_to_unit": 100,
     "symbol_first": false,
     "html_entity": "",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
+    "decimal_mark": ",",
+    "thousands_separator": ".",
     "iso_numeric": "949"
   },
   "ttd": {
@@ -2126,6 +2154,34 @@
     "thousands_separator": ",",
     "iso_numeric": "950"
   },
+  "xag": {
+    "priority": 100,
+    "iso_code": "XAG",
+    "name": "Silver (Troy Ounce)",
+    "symbol": "oz t",
+    "alternate_symbols": [],
+    "subunit": "oz",
+    "subunit_to_unit": 1,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "961"
+  },
+  "xau": {
+    "priority": 100,
+    "iso_code": "XAU",
+    "name": "Gold (Troy Ounce)",
+    "symbol": "oz t",
+    "alternate_symbols": [],
+    "subunit": "oz",
+    "subunit_to_unit": 1,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "959"
+  },
   "xcd": {
     "priority": 100,
     "iso_code": "XCD",
@@ -2140,6 +2196,20 @@
     "thousands_separator": ",",
     "iso_numeric": "951"
   },
+  "xdr": {
+    "priority": 100,
+    "iso_code": "XDR",
+    "name": "Special Drawing Rights",
+    "symbol": "SDR",
+    "alternate_symbols": ["XDR"],
+    "subunit": "",
+    "subunit_to_unit": 1,
+    "symbol_first": false,
+    "html_entity": "$",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "960"
+  },
   "xof": {
     "priority": 100,
     "iso_code": "XOF",
@@ -2209,5 +2279,19 @@
     "decimal_mark": ".",
     "thousands_separator": ",",
     "iso_numeric": "894"
+  },
+  "zmw": {
+    "priority": 100,
+    "iso_code": "ZMW",
+    "name": "Zambian Kwacha",
+    "symbol": "ZK",
+    "alternate_symbols": [],
+    "subunit": "Ngwee",
+    "subunit_to_unit": 100,
+    "symbol_first": false,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": "967"
   }
 }

data/config/currency_non_iso.json

@@ -0,0 +1,30 @@
+{
+  "btc": {
+    "priority": 100,
+    "iso_code": "BTC",
+    "name": "Bitcoin",
+    "symbol": "B⃦",
+    "alternate_symbols": [],
+    "subunit": "Satoshi",
+    "subunit_to_unit": 10000000,
+    "symbol_first": true,
+    "html_entity": "",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": ""
+  },
+  "jep": {
+    "priority": 100,
+    "iso_code": "JEP",
+    "name": "Jersey Pound",
+    "symbol": "£",
+    "alternate_symbols": [],
+    "subunit": "Penny",
+    "subunit_to_unit": 100,
+    "symbol_first": true,
+    "html_entity": "£",
+    "decimal_mark": ".",
+    "thousands_separator": ",",
+    "iso_numeric": ""
+  }
+}

data/lib/money.rb

@@ -4,3 +4,4 @@ require "i18n" rescue LoadError
 require "money/currency"
 require "money/money"
 require "money/core_extensions"
+require "money/deprecations"

data/lib/money/currency.rb

@@ -48,7 +48,7 @@ class Money
       #   Money::Currency.find_by_iso_numeric('001') #=> nil
       def find_by_iso_numeric(num)
         num = num.to_s
-        id, garbage = self.table.find{|key, currency| currency[:iso_numeric] == num}
+        id, _ = self.table.find{|key, currency| currency[:iso_numeric] == num}
         new(id) if self.table[id]
       end
 
@@ -90,6 +90,16 @@ class Money
         @table ||= load_currencies
       end
 
+      # List the currencies imported and registered
+      # @return [Array]
+      #
+      # @example
+      #   Money::Currency.iso_codes()
+      #   [#<Currency ..USD>, 'CAD', 'EUR']...
+      def all
+        table.keys.map {|curr| Currency.new(curr)}.sort_by(&:priority)
+      end
+
       # We need a string-based validator before creating an unbounded number of symbols.
       # http://www.randomhacks.net/articles/2007/01/20/13-ways-of-looking-at-a-ruby-symbol#11
       # https://github.com/RubyMoney/money/issues/132
@@ -103,6 +113,12 @@ class Money
         @stringified_keys = stringify_keys
       end
 
+      def unregister(curr)
+        key = curr[:iso_code].downcase.to_sym
+        @table.delete(key)
+        @stringified_keys = stringify_keys
+      end
+
       private
 
       def stringify_keys
@@ -156,11 +172,6 @@ class Money
     # @return [Integer]
     attr_reader :subunit_to_unit
 
-    # The number of digits after the decimal separator.
-    #
-    # @return [Float]
-    attr_reader :exponent
-
     # The decimal mark, or character used to separate the whole unit from the subunit.
     #
     # @return [String]
@@ -175,7 +186,7 @@ class Money
 
     # Should the currency symbol precede the amount, or should it come after?
     #
-    # @return [boolean]
+    # @return [Boolean]
     attr_reader :symbol_first
 
     # Create a new +Currency+ object.
@@ -229,7 +240,7 @@ class Money
     #   c1 == c2 #=> false
     def ==(other_currency)
       self.equal?(other_currency) ||
-      self.id == other_currency.id
+      self.id.to_s.downcase == (other_currency.is_a?(Currency) ? other_currency.id.to_s.downcase : other_currency.to_s.downcase)
     end
 
     # Compares +self+ with +other_currency+ and returns +true+ if the are the

data/lib/money/currency/loader.rb

@@ -7,8 +7,9 @@ module Money::Currency::Loader
   #
   # @return [Hash]
   def load_currencies
-    currencies = parse_currency_file("currency.json")
-    currencies.merge! parse_currency_file("currency_bc.json")
+    currencies = parse_currency_file("currency_iso.json")
+    currencies.merge! parse_currency_file("currency_non_iso.json")
+    currencies.merge! parse_currency_file("currency_backwards_compatible.json")
   end
 
   private

data/lib/money/deprecations.rb

@@ -0,0 +1,10 @@
+class Money
+  # Displays a deprecation warning message.
+  #
+  # @param [String] message The message to display.
+  #
+  # @return [nil]
+  def self.deprecate(message)
+    warn "DEPRECATION WARNING: #{message}"
+  end
+end

data/lib/money/money.rb

@@ -221,7 +221,7 @@ class Money
   # Alternatively you can use the convenience
   # methods like {Money.ca_dollar} and {Money.us_dollar}.
   #
-  # @param [Integer] The value given in the fractional unit.
+  # @param [Numeric] fractional The value given in the fractional unit.
   # @param [Currency, String, Symbol] currency The currency format.
   # @param [Money::Bank::*] bank The exchange bank to use.
   #
@@ -468,7 +468,7 @@ class Money
   # be distributed round-robin amongst the parties. This means that parties
   # listed first will likely recieve more pennies then ones that are listed later
   #
-  # @param [0.50, 0.25, 0.25] to give 50% of the cash to party1, 25% ot party2, and 25% to party3.
+  # @param [Array<Float, Float, Float>] splits [0.50, 0.25, 0.25] to give 50% of the cash to party1, 25% to party2, and 25% to party3.
   #
   # @return [Array<Money, Money, Money>]
   #
@@ -506,7 +506,7 @@ class Money
 
   # Split money amongst parties evenly without loosing pennies.
   #
-  # @param [2] number of parties.
+  # @param [Numeric] num number of parties.
   #
   # @return [Array<Money, Money, Money>]
   #

data/lib/money/money/arithmetic.rb

@@ -46,7 +46,7 @@ class Money
     def <=>(other_money)
       if other_money.respond_to?(:to_money)
         other_money = other_money.to_money
-        if self.currency == other_money.currency
+        if fractional == 0 || other_money.fractional == 0 || currency == other_money.currency
           fractional <=> other_money.fractional
         else
           fractional <=> other_money.exchange_to(currency).fractional

data/lib/money/money/formatting.rb

@@ -47,7 +47,7 @@ class Money
 
     # Creates a formatted price string according to several rules.
     #
-    # @param [Hash] *rules The options used to format the string.
+    # @param [Hash] rules The options used to format the string.
     #
     # @return [String]
     #
@@ -214,6 +214,16 @@ class Money
         formatted = "#{self.to_s.to_i}"
       end
 
+      thousands_separator_value = thousands_separator
+      # Determine thousands_separator
+      if rules.has_key?(:thousands_separator)
+        thousands_separator_value = rules[:thousands_separator] || ''
+      end
+
+      # Apply thousands_separator
+      formatted.gsub!(regexp_format(formatted, rules, decimal_mark, symbol_value),
+                      "\\1#{thousands_separator_value}")
+
       symbol_position =
         if rules.has_key?(:symbol_position)
           rules[:symbol_position]
@@ -230,6 +240,8 @@ class Money
       end
 
       if symbol_value && !symbol_value.empty?
+        symbol_value = "<span class=\"currency_symbol\">#{symbol_value}</span>" if rules[:html_wrap_symbol]
+
         formatted = if symbol_position == :before
           symbol_space = rules[:symbol_before_without_space] === false ? " " : ""
           "#{sign}#{symbol_value}#{symbol_space}#{formatted}"
@@ -244,16 +256,6 @@ class Money
         formatted.sub!(decimal_mark, rules[:decimal_mark])
       end
 
-      thousands_separator_value = thousands_separator
-      # Determine thousands_separator
-      if rules.has_key?(:thousands_separator)
-        thousands_separator_value = rules[:thousands_separator] || ''
-      end
-
-      # Apply thousands_separator
-      formatted.gsub!(regexp_format(formatted, rules, decimal_mark, symbol_value),
-                      "\\1#{thousands_separator_value}")
-
       if rules[:with_currency]
         formatted << " "
         formatted << '<span class="currency">' if rules[:html]
@@ -268,7 +270,7 @@ class Money
 
     # Cleans up formatting rules.
     #
-    # @param [Hash]
+    # @param [Hash] rules
     #
     # @return [Hash]
     def normalize_formatting_rules(rules)
@@ -294,7 +296,7 @@ class Money
       /(\d+?)(?=(\d\d)+(\d)(?:\.))/
     else
       # Symbols may contain decimal marks (E.g "դր.")
-      if formatted.sub(symbol_value, "") =~ /#{regexp_decimal}/
+      if formatted.sub(symbol_value.to_s, "") =~ /#{regexp_decimal}/
         /(\d)(?=(?:\d{3})+(?:#{regexp_decimal}))/
       else
         /(\d)(?=(?:\d{3})+(?:[^\d]{1}|$))/

data/lib/money/money/parsing.rb

@@ -31,9 +31,10 @@ class Money
       # @example Mismatching currencies
       #   'USD 2000'.to_money("EUR")    #=> ArgumentError
       #
-      # @see Money.from_string
+      # @see #from_string
       #
       def parse(input, currency = nil)
+        Money.deprecate ".parse is depreciated and will be remove in 6.1.0. Please write your own parsing methods."
         i = input.to_s.strip
 
         # raise Money::Currency.table.collect{|c| c[1][:symbol]}.inspect
@@ -73,7 +74,7 @@ class Money
       # according to +currency+ subunit property,
       # before instantiating the Money object.
       #
-      # Behind the scenes, this method relies on {Money.from_bigdecimal}
+      # Behind the scenes, this method relies on {#from_bigdecimal}
       # to avoid problems with string-to-numeric conversion.
       #
       # @param [String, #to_s] value The money amount, in dollars.
@@ -93,7 +94,7 @@ class Money
       #   #=> #<Money @fractional=100 @currency="BHD">
       #
       # @see String#to_money
-      # @see Money.parse
+      # @see #parse
       #
       def from_string(value, currency = Money.default_currency)
         from_bigdecimal(BigDecimal.new(value.to_s), currency)
@@ -120,7 +121,7 @@ class Money
       #   #=> #<Money @fractional=100 @currency="BHD">
       #
       # @see Fixnum#to_money
-      # @see Money.from_numeric
+      # @see #from_numeric
       #
       def from_fixnum(value, currency = Money.default_currency)
         currency = Money::Currency.wrap(currency)
@@ -152,7 +153,7 @@ class Money
       #   #=> #<Money @fractional=100 @currency="BHD">
       #
       # @see Float#to_money
-      # @see Money.from_numeric
+      # @see #from_numeric
       #
       def from_float(value, currency = Money.default_currency)
         from_bigdecimal(BigDecimal.new(value.to_s), currency)
@@ -179,7 +180,7 @@ class Money
       #   #=> #<Money @fractional=100 @currency="BHD">
       #
       # @see BigDecimal#to_money
-      # @see Money.from_numeric
+      # @see #from_numeric
       #
       def from_bigdecimal(value, currency = Money.default_currency)
         currency = Money::Currency.wrap(currency)
@@ -196,8 +197,8 @@ class Money
       # and tries to forwards the call to the most appropriate method
       # in order to reduce computation effort.
       # For instance, if +value+ is an Integer, this method calls
-      # {Money.from_fixnum} instead of using the default
-      # {Money.from_bigdecimal} which adds the overload to converts
+      # {#from_fixnum} instead of using the default
+      # {#from_bigdecimal} which adds the overload to converts
       # the value into a slower BigDecimal instance.
       #
       # @param [Numeric] value The money amount, in dollars.
@@ -216,9 +217,9 @@ class Money
       #   #=> ArgumentError
       #
       # @see Numeric#to_money
-      # @see Money.from_fixnum
-      # @see Money.from_float
-      # @see Money.from_bigdecimal
+      # @see #from_fixnum
+      # @see #from_float
+      # @see #from_bigdecimal
       #
       def from_numeric(value, currency = Money.default_currency)
         case value
@@ -260,89 +261,90 @@ class Money
         #save it from being mis-interpreted as a decimal.
         num.chop! if num.match(/[\.|,]$/)
 
-          # gather all decimal_marks within the result number
-          used_decimal_marks = num.scan(/[^\d]/)
+        # gather all decimal_marks within the result number
+        used_delimiters = num.scan(/[^\d]/)
 
-          # determine the number of unique decimal_marks within the number
-          #
-          # e.g.
-          # $1,234,567.89 would return 2 (, and .)
-          # $125,00 would return 1
-          # $199 would return 0
-          # $1 234,567.89 would raise an error (decimal_marks are space, comma, and period)
-          case used_decimal_marks.uniq.length
-            # no decimal_mark or thousands_separator; major (dollars) is the number, and minor (cents) is 0
-          when 0 then major, minor = num, 0
+        # determine the number of unique decimal_marks within the number
+        #
+        # e.g.
+        # $1,234,567.89 would return 2 (, and .)
+        # $125,00 would return 1
+        # $199 would return 0
+        # $1 234,567.89 would raise an error (decimal_marks are space, comma, and period)
+        case used_delimiters.uniq.length
+          # no decimal_mark or thousands_separator; major (dollars) is the number, and minor (cents) is 0
+        when 0 then major, minor = num, 0
+
+          # two decimal_marks, so we know the last item in this array is the
+          # major/minor thousands_separator and the rest are decimal_marks
+        when 2
+          thousands_separator, decimal_mark = used_delimiters.uniq
 
-            # two decimal_marks, so we know the last item in this array is the
-            # major/minor thousands_separator and the rest are decimal_marks
-          when 2
-            decimal_mark, thousands_separator = used_decimal_marks.uniq
-            # remove all decimal_marks, split on the thousands_separator
-            major, minor = num.gsub(decimal_mark, '').split(thousands_separator)
-            min = 0 unless min
-          when 1
-            # we can't determine if the comma or period is supposed to be a decimal_mark or a thousands_separator
-            # e.g.
-            # 1,00 - comma is a thousands_separator
-            # 1.000 - period is a thousands_separator
-            # 1,000 - comma is a decimal_mark
-            # 1,000,000 - comma is a decimal_mark
-            # 10000,00 - comma is a thousands_separator
-            # 1000,000 - comma is a thousands_separator
+          # remove all thousands_separator, split on the decimal_mark
+          major, minor = num.gsub(thousands_separator, '').split(decimal_mark)
+          min = 0 unless min
+        when 1
+          # we can't determine if the comma or period is supposed to be a decimal_mark or a thousands_separator
+          # e.g.
+          # 1,00 - comma is a thousands_separator
+          # 1.000 - period is a thousands_separator
+          # 1,000 - comma is a decimal_mark
+          # 1,000,000 - comma is a decimal_mark
+          # 10000,00 - comma is a thousands_separator
+          # 1000,000 - comma is a thousands_separator
 
-            # assign first decimal_mark for reusability
-            decimal_mark = used_decimal_marks.first
+          # assign first decimal_mark for reusability
+          decimal_mark = used_delimiters.first
 
-            # When we have identified the decimal mark character
-            if decimal_char == decimal_mark
-              major, minor = num.split(decimal_char)
+          # When we have identified the decimal mark character
+          if decimal_char == decimal_mark
+            major, minor = num.split(decimal_char)
 
+          else
+            # decimal_mark is used as a decimal_mark when there are multiple instances, always
+            if num.scan(decimal_mark).length > 1 # multiple matches; treat as decimal_mark
+              major, minor = num.gsub(decimal_mark, ''), 0
             else
-              # decimal_mark is used as a decimal_mark when there are multiple instances, always
-              if num.scan(decimal_mark).length > 1 # multiple matches; treat as decimal_mark
-                major, minor = num.gsub(decimal_mark, ''), 0
+              # ex: 1,000 - 1.0000 - 10001.000
+              # split number into possible major (dollars) and minor (cents) values
+              possible_major, possible_minor = num.split(decimal_mark)
+              possible_major ||= "0"
+              possible_minor ||= "00"
+
+              # if the minor (cents) length isn't 3, assign major/minor from the possibles
+              # e.g.
+              #   1,00 => 1.00
+              #   1.0000 => 1.00
+              #   1.2 => 1.20
+              if possible_minor.length != 3 # thousands_separator
+                major, minor = possible_major, possible_minor
               else
-                # ex: 1,000 - 1.0000 - 10001.000
-                # split number into possible major (dollars) and minor (cents) values
-                possible_major, possible_minor = num.split(decimal_mark)
-                possible_major ||= "0"
-                possible_minor ||= "00"
+                # minor length is three
+                # let's try to figure out intent of the thousands_separator
 
-                # if the minor (cents) length isn't 3, assign major/minor from the possibles
+                # the major length is greater than three, which means
+                # the comma or period is used as a thousands_separator
                 # e.g.
-                #   1,00 => 1.00
-                #   1.0000 => 1.00
-                #   1.2 => 1.20
-                if possible_minor.length != 3 # thousands_separator
+                #   1000,000
+                #   100000,000
+                if possible_major.length > 3
                   major, minor = possible_major, possible_minor
                 else
-                  # minor length is three
-                  # let's try to figure out intent of the thousands_separator
-
-                  # the major length is greater than three, which means
-                  # the comma or period is used as a thousands_separator
-                  # e.g.
-                  #   1000,000
-                  #   100000,000
-                  if possible_major.length > 3
+                  # number is in format ###{sep}### or ##{sep}### or #{sep}###
+                  # handle as , is sep, . is thousands_separator
+                  if decimal_mark == '.'
                     major, minor = possible_major, possible_minor
                   else
-                    # number is in format ###{sep}### or ##{sep}### or #{sep}###
-                    # handle as , is sep, . is thousands_separator
-                    if decimal_mark == '.'
-                      major, minor = possible_major, possible_minor
-                    else
-                      major, minor = "#{possible_major}#{possible_minor}", 0
-                    end
+                    major, minor = "#{possible_major}#{possible_minor}", 0
                   end
                 end
               end
             end
-          else
-            # TODO: ParseError
-            raise ArgumentError, "Invalid currency amount"
           end
+        else
+          # TODO: ParseError
+          raise ArgumentError, "Invalid currency amount"
+        end
 
         # build the string based on major/minor since decimal_mark/thousands_separator have been removed
         # avoiding floating point arithmetic here to ensure accuracy

data/money.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "money"
-  s.version     = "5.1.1"
+  s.version     = "6.0.0.pre"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tobias Luetke", "Hongli Lai", "Jeremy McNevin",
                    "Shane Emmons", "Simone Carletti"]
@@ -10,14 +10,15 @@ Gem::Specification.new do |s|
   s.summary     = "Money and currency exchange support library."
   s.description = "This library aids one in handling money and different currencies."
 
-  s.required_ruby_version     = ">= 1.9.2"
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_ruby_version     = ">= 1.8.7"
 
-  s.add_dependency "i18n",       "~> 0.6.0"
+  s.add_dependency "i18n",       "~> 0.6.4"
 
-  s.add_development_dependency "rspec",       "~> 2.11.0"
-  s.add_development_dependency "yard",        "~> 0.8.1"
-  s.add_development_dependency "kramdown",    "~> 0.14.0"
+  s.add_development_dependency "rspec",       "~> 2.14"
+  s.add_development_dependency "yard",        "~> 0.8"
+  s.add_development_dependency "kramdown",    "~> 1.1"
+
+  s.license = "MIT"
 
   s.files =  Dir.glob("{config,lib,spec}/**/*")
   s.files += %w(CHANGELOG.md LICENSE README.md)

data/spec/bank/variable_exchange_spec.rb

@@ -145,7 +145,7 @@ describe Money::Bank::VariableExchange do
 
     context "with :file provided" do
       it "writes rates to file" do
-        f = mock('IO')
+        f = double('IO')
         File.should_receive(:open).with('null', 'w').and_yield(f)
         f.should_receive(:write).with(JSON.dump(@rates))
 

data/spec/currency_spec.rb

@@ -7,8 +7,15 @@ describe Money::Currency do
   FOO = '{ "priority": 1, "iso_code": "FOO", "iso_numeric": "840", "name": "United States Dollar", "symbol": "$", "subunit": "Cent", "subunit_to_unit": 450, "symbol_first": true, "html_entity": "$", "decimal_mark": ".", "thousands_separator": "," }'
 
   describe ".find" do
-    it "returns currency matching given id" do
+    before :each do
       Money::Currency.register(JSON.parse(FOO, :symbolize_names => true))
+    end
+
+    after :each do
+      Money::Currency.unregister(JSON.parse(FOO, :symbolize_names => true))
+    end
+
+    it "returns currency matching given id" do
 
       expected = Money::Currency.new(:foo)
       Money::Currency.find(:foo).should  == expected
@@ -51,6 +58,19 @@ describe Money::Currency do
     end
   end
 
+  describe ".all" do
+    it "returns an array of currencies" do
+      Money::Currency.all.should include Money::Currency.new(:usd)
+    end
+    it "includes registered currencies" do
+      Money::Currency.register(JSON.parse(FOO, :symbolize_names => true))
+      Money::Currency.all.should include Money::Currency.new(:foo)
+      Money::Currency.unregister(JSON.parse(FOO, :symbolize_names => true))
+    end
+    it 'is sorted by priority' do
+      Money::Currency.all.first.priority.should == 1
+    end
+  end
 
   describe "#initialize" do
     it "lookups data from loaded config" do
@@ -84,10 +104,21 @@ describe Money::Currency do
       currency.should == currency
     end
 
-    it "returns true if the id is equal" do
+    it "returns true if the id is equal ignorning case" do
       Money::Currency.new(:eur).should     == Money::Currency.new(:eur)
+      Money::Currency.new(:eur).should     == Money::Currency.new(:EUR)
       Money::Currency.new(:eur).should_not == Money::Currency.new(:usd)
     end
+    
+    it "allows direct comparison of currencies and symbols/strings" do
+      Money::Currency.new(:eur).should     == 'eur'
+      Money::Currency.new(:eur).should     == :EUR
+      Money::Currency.new(:eur).should_not == 'usd'
+    end
+
+    it "allows comparison with nil and returns false" do
+      Money::Currency.new(:eur).should_not == nil
+    end
   end
 
   describe "#eql?" do
@@ -159,6 +190,7 @@ describe Money::Currency do
     it "proper places for custom currency" do
       Money::Currency.register(JSON.parse(FOO, :symbolize_names => true))
       Money::Currency.new(:foo).decimal_places == 3
+      Money::Currency.unregister(JSON.parse(FOO, :symbolize_names => true))
     end
   end
 end

data/spec/money/arithmetic_spec.rb

@@ -126,18 +126,42 @@ describe Money do
       (Money.new(100_00, "USD") <=> target).should > 0
     end
 
-    it "can be used to compare with a String money value" do
+    it "cannot compare objects with different currencies when no rate exists, unless one of the amounts is zero" do
+      expect { Money.new(100_00, "EUR") <=> Money.new(100_00, "USD") }.to raise_error(Money::Bank::UnknownRate)
+
+      (Money.new(100_00, "EUR") <=> Money.new(0, "USD")).should > 0
+      (Money.new(0, "EUR") <=> Money.new(100_00, "USD")).should < 0
+      (Money.new(0, "EUR") <=> Money.new(0, "USD")).should == 0
+    end
+
+    it "can be used to compare with a String money value when Money object is in default currency" do
       (Money.new(1_00) <=> "1.00").should == 0
       (Money.new(1_00) <=> ".99").should > 0
       (Money.new(1_00) <=> "2.00").should < 0
     end
 
-    it "can be used to compare with a Numeric money value" do
+    it "can be used to compare with a String money value when Money object is not in default currency if String evaluates to zero" do
+      expect { Money.new(1_00, "EUR") <=> "1.00" }.to raise_error(Money::Bank::UnknownRate)
+
+      (Money.new(1_00, "EUR") <=> "0.00").should > 0
+      (Money.new(0_00, "EUR") <=> "0.00").should == 0
+      (Money.new(-1_00, "EUR") <=> "0.00").should < 0
+    end
+
+    it "can be used to compare with a Numeric money value when Money object is in default currency" do
       (Money.new(1_00) <=> 1).should == 0
       (Money.new(1_00) <=> 0.99).should > 0
       (Money.new(1_00) <=> 2.00).should < 0
     end
 
+    it "can be used to compare with a Numeric money value when Money object is not in default currency if String evaluates to zero" do
+      expect { Money.new(1_00, "EUR") <=> 1 }.to raise_error(Money::Bank::UnknownRate)
+
+      (Money.new(1_00, "EUR") <=> 0).should > 0
+      (Money.new(0_00, "EUR") <=> 0).should == 0
+      (Money.new(-1_00, "EUR") <=> 0).should < 0
+    end
+
     it "can be used to compare with an object that responds to #to_money" do
       klass = Class.new do
         def initialize(money)

data/spec/money/formatting_spec.rb

@@ -167,9 +167,15 @@ describe Money, "formatting" do
       end
 
       it "inserts thousand separators if symbol contains decimal mark and no_cents is true" do
-        Money.new(100000000, "AMD").format(no_cents: true).should == "1,000,000 դր."
-        Money.new(100000000, "USD").format(no_cents: true).should == "$1,000,000"
-        Money.new(100000000, "RUB").format(no_cents: true).should == "1.000.000 р."
+        Money.new(100000000, "AMD").format(:no_cents => true).should == "1,000,000 դր."
+        Money.new(100000000, "USD").format(:no_cents => true).should == "$1,000,000"
+        Money.new(100000000, "RUB").format(:no_cents => true).should == "1.000.000 р."
+      end
+
+      it "doesn't incorrectly format HTML" do
+        money = ::Money.new(1999, "RUB")
+        output = money.format(:html => true, :no_cents => true)
+        output.should == "19 руб"
       end
     end
 
@@ -294,6 +300,10 @@ describe Money, "formatting" do
         Money::Currency.register(JSON.parse(INDIAN_BAR, :symbolize_names => true))
       end
 
+      after(:each) do
+        Money::Currency.unregister(JSON.parse(INDIAN_BAR, :symbolize_names => true))
+      end
+
       specify "(:south_asian_number_formatting => true) works as documented" do
         Money.new(10000000, 'INR').format(:south_asian_number_formatting => true, :symbol => false).should == "1,00,000.00"
         Money.new(1000000000, 'INDIAN_BAR').format(:south_asian_number_formatting => true, :symbol => false).should == "1,00,000.0000"
@@ -339,6 +349,14 @@ describe Money, "formatting" do
       end
     end
 
+    describe ":html_wrap_symbol option" do
+      specify "(:html_wrap_symbol => true) works as documented" do
+        string = Money.ca_dollar(570).format(:html_wrap_symbol => true)
+        string.should == "<span class=\"currency_symbol\">$</span>5.70"
+      end
+    end
+
+
     describe ":symbol_position option" do
       it "inserts currency symbol before the amount when set to :before" do
         Money.euro(1_234_567_12).format(:symbol_position => :before).should == "€1.234.567,12"
@@ -418,6 +436,11 @@ describe Money, "formatting" do
       Money::Currency.register(JSON.parse(EU4, :symbolize_names => true))
     end
 
+    after :each do
+      Money::Currency.unregister(JSON.parse(BAR, :symbolize_names => true))
+      Money::Currency.unregister(JSON.parse(EU4, :symbolize_names => true))
+    end
+
     it "respects custom subunit to unit, decimal and thousands separator" do
       Money.new(4, "BAR").format.should == "$0.0004"
       Money.new(4, "EU4").format.should == "€0,0004"

data/spec/money/parsing_spec.rb

@@ -8,6 +8,11 @@ describe Money, "parsing" do
   eu4 = '{ "priority": 1, "iso_code": "EU4", "iso_numeric": "841", "name": "Euro with 4 decimal places", "symbol": "€", "subunit": "Cent", "subunit_to_unit": 10000, "symbol_first": true, "html_entity": "€", "decimal_mark": ",", "thousands_separator": "." }'
 
   describe ".parse" do
+    it "is depreciated" do
+      Money.should_receive(:deprecate)
+      Money.parse("1.95")
+    end
+
     it "parses european-formatted inputs under 10EUR" do
       five_ninety_five = Money.new(595, 'EUR')
 
@@ -111,6 +116,11 @@ describe Money, "parsing" do
         Money::Currency.register(JSON.parse(eu4, :symbolize_names => true))
       end
 
+      after :each do
+        Money::Currency.unregister(JSON.parse(bar, :symbolize_names => true))
+        Money::Currency.unregister(JSON.parse(eu4, :symbolize_names => true))
+      end
+
       # String#to_money(Currency) is equivalent to Money.parse(String, Currency)
       it "parses strings respecting subunit to unit, decimal and thousands separator" do
         "$0.4".to_money("BAR").should == Money.new(4000, "BAR")

data/spec/money_spec.rb

@@ -118,6 +118,15 @@ describe Money do
   end
 
   describe ".add_rate" do
+    before do
+      @default_bank = Money.default_bank
+      Money.default_bank = Money::Bank::VariableExchange.new
+    end
+
+    after do
+      Money.default_bank = @default_bank
+    end
+
     it "saves rate into current bank" do
       Money.add_rate("EUR", "USD", 10)
       Money.new(10_00, "EUR").exchange_to("USD").should == Money.new(100_00, "USD")

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 5.1.1
-  prerelease: 
+  version: 6.0.0.pre
 platform: ruby
 authors:
 - Tobias Luetke
@@ -13,72 +12,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.1'
 description: This library aids one in handling money and different currencies.
 email:
 - semmons99+RubyMoney@gmail.com
@@ -86,58 +77,59 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- config/currency_bc.json
-- config/currency.json
-- lib/money.rb
-- lib/money/money.rb
+- config/currency_backwards_compatible.json
+- config/currency_iso.json
+- config/currency_non_iso.json
+- lib/money/bank/base.rb
+- lib/money/bank/variable_exchange.rb
 - lib/money/core_extensions.rb
-- lib/money/currency.rb
 - lib/money/currency/heuristics.rb
 - lib/money/currency/loader.rb
-- lib/money/money/formatting.rb
+- lib/money/currency.rb
+- lib/money/deprecations.rb
 - lib/money/money/arithmetic.rb
+- lib/money/money/formatting.rb
 - lib/money/money/parsing.rb
-- lib/money/bank/variable_exchange.rb
-- lib/money/bank/base.rb
-- spec/money_spec.rb
-- spec/spec_helper.rb
+- lib/money/money.rb
+- lib/money.rb
+- spec/bank/base_spec.rb
+- spec/bank/variable_exchange_spec.rb
+- spec/core_extensions_spec.rb
 - spec/currency/heuristics_spec.rb
 - spec/currency_spec.rb
 - spec/money/arithmetic_spec.rb
-- spec/money/parsing_spec.rb
 - spec/money/formatting_spec.rb
+- spec/money/parsing_spec.rb
+- spec/money_spec.rb
+- spec/spec_helper.rb
 - spec/support/default_currency_helper.rb
-- spec/bank/base_spec.rb
-- spec/bank/variable_exchange_spec.rb
-- spec/core_extensions_spec.rb
 - CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
 - money.gemspec
 homepage: http://rubymoney.github.com/money
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Money and currency exchange support library.
 test_files: []
-has_rdoc: