money 6.5.0 → 6.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9de08a1673530ca427fb70f37d70526155a27d1
-  data.tar.gz: 2481e79b2b71853d316865cf7831d14b3738a67b
+  metadata.gz: 2e625dd2f1daa9df7fbe2c8c5ed8972c5bf69f9a
+  data.tar.gz: 50addb5ca7123aff716961c6e782d43846d90c55
 SHA512:
-  metadata.gz: 603c5318cff748cd533db8dbd596eebf448d7f040bb8fd6f6c43c97eddff07da74b039864e7faf75d3abe4ba06fa933912ae949c1e814a183ee861b1401f3906
-  data.tar.gz: 5ffd14941b9f53f33e3dd731472cd7f9fc4c4831c353f1c970ec12ea50ce6fa7d9f088952439d1d69e11ab61ebaaedf261b717fca0147ad812061742b3e03eae
+  metadata.gz: 51736bea340dca0e23da25018aad574380bdfea0281e20aaf0af90c306f50d48be15ffb15136daff9caac4c5c6a5f563042c6703dc6403c83ce32fee85d42e30
+  data.tar.gz: 2b32b72aa148550d672ae639b0c9c96a13c5d3c35676fdf7649f130bd79a4d41880444d2d1b0fdbe3d442d840518fcf2e35bdb3156ddd46a8f1490f68e6ada24

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
+  - 2.2.0
   - rbx-2
 script: bundle exec rspec spec
 notifications:

data/AUTHORS

@@ -35,6 +35,7 @@ François Klingler
 Francisco Trindade
 Gabriel Gilder
 Gee-Hsien Chuang
+George Millo
 Hakan Ensari
 Hongli Lai
 Ilia Lobsanov
@@ -47,6 +48,7 @@ Jell
 Jeremy McNevin
 Jérémy Lecour
 Jesse Cooke
+Jim Kingdon
 John Duff
 John Gakos
 Jonathon M. Abbott

data/CHANGELOG.md

@@ -1,6 +1,26 @@
 # Changelog
 
 ## Next release
+
+ - `Currency` implements `Enumerable`.
+ - `Currency#<=>` sorts alphabetically by `id` if the `priority`s are the same,
+   and no longer raises an error if one of the priorities is missing.
+ - `Money::Currency.unregister` can take an ISO code argument in addition
+   to a hash.
+ - `Money::Currency.unregister` returns `true` if the given currency
+   previously existed, and `false` if it didn't.
+ - Fix symbol for SZL currency
+ - Trying to create a Currency without an `iso_code` now raises a more
+   helpful error message.
+ - Add `Money.usd`, `.cad` and `.eur` as aliases for `.us_dollar`,
+   `.ca_dollar`, and `.euro`.
+ - Add helper methods for British pounds: `Money.pound_sterling` and
+   `Money.gbp`.
+
+## 6.5.1
+ - Fix format for BYR currency
+
+## 6.5.0
  - 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

data/README.md

@@ -135,10 +135,10 @@ The pre-defined set of attributes includes:
 - `:separator` character between the whole and fraction amounts
 - `:delimiter` character between each thousands place
 
-All attributes are optional. Some attributes, such as `:symbol`, are used by
-the Money class to print out a representation of the object. Other attributes,
-such as `:name` or `:priority`, exist to provide a basic API you can take
-advantage of to build your application.
+All attributes except `:iso_code` are optional. Some attributes, such as
+`:symbol`, are used by the Money class to print out a representation of the
+object. Other attributes, such as `:name` or `:priority`, exist to provide a
+basic API you can take advantage of to build your application.
 
 ### :priority
 

data/config/currency_iso.json

@@ -357,15 +357,15 @@
     "name": "Belarusian Ruble",
     "symbol": "Br",
     "disambiguate_symbol": "BYR",
-    "alternate_symbols": [""],
-    "subunit": "Kapyeyka",
-    "subunit_to_unit": 100,
+    "alternate_symbols": ["бел. руб.", "б.р.", "руб.", "р."],
+    "subunit": null,
+    "subunit_to_unit": 1,
     "symbol_first": false,
     "html_entity": "",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
+    "decimal_mark": ",",
+    "thousands_separator": " ",
     "iso_numeric": "974",
-    "smallest_denomination": 5000
+    "smallest_denomination": 50
   },
   "bzd": {
     "priority": 100,
@@ -1005,14 +1005,14 @@
     "name": "Icelandic Króna",
     "symbol": "kr",
     "alternate_symbols": ["Íkr"],
-    "subunit": "Eyrir",
-    "subunit_to_unit": 100,
+    "subunit": null,
+    "subunit_to_unit": 1,
     "symbol_first": true,
     "html_entity": "",
     "decimal_mark": ",",
     "thousands_separator": ".",
     "iso_numeric": "352",
-    "smallest_denomination": 100
+    "smallest_denomination": 1
   },
   "jmd": {
     "priority": 100,
@@ -2060,9 +2060,8 @@
     "priority": 100,
     "iso_code": "SZL",
     "name": "Swazi Lilangeni",
-    "symbol": "L",
+    "symbol": "E",
     "disambiguate_symbol": "SZL",
-    "alternate_symbols": ["E"],
     "subunit": "Cent",
     "subunit_to_unit": 100,
     "symbol_first": true,
@@ -2155,8 +2154,8 @@
     "alternate_symbols": ["TL"],
     "subunit": "kuruş",
     "subunit_to_unit": 100,
-    "symbol_first": false,
-    "html_entity": "",
+    "symbol_first": true,
+    "html_entity": "₺",
     "decimal_mark": ",",
     "thousands_separator": ".",
     "iso_numeric": "949",

data/lib/money/currency.rb

@@ -12,6 +12,7 @@ class Money
   # @see http://iso4217.net/
   class Currency
     include Comparable
+    extend Enumerable
     extend Money::Currency::Loader
     extend Money::Currency::Heuristics
 
@@ -105,25 +106,64 @@ class Money
         table.keys.map {|curr| Currency.new(curr)}.sort_by(&:priority)
       end
 
-      # We need a string-based validator before creating an unbounded number of symbols.
+      # 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
+      #
+      # @return [Set]
       def stringified_keys
         @stringified_keys ||= stringify_keys
       end
 
+      # Register a new currency
+      #
+      # @param curr [Hash] information about the currency
+      # @option priority [Numeric] a numerical value you can use to sort/group
+      #   the currency list
+      # @option iso_code [String] the international 3-letter code as defined
+      #   by the ISO 4217 standard
+      # @option iso_numeric [Integer] the international 3-digit code as
+      #   defined by the ISO 4217 standard
+      # @option name [String] the currency name
+      # @option symbol [String] the currency symbol (UTF-8 encoded)
+      # @option subunit [String] the name of the fractional monetary unit
+      # @option subunit_to_unit [Numeric] the proportion between the unit and
+      #   the subunit
+      # @option separator [String] character between the whole and fraction
+      #   amounts
+      # @option delimiter [String] character between each thousands place
       def register(curr)
-        key = curr[:iso_code].downcase.to_sym
+        key = curr.fetch(:iso_code).downcase.to_sym
         @table[key] = curr
         @stringified_keys = stringify_keys
       end
 
+
+      # Unregister a currency.
+      #
+      # @param [Object] curr A Hash with the key `:iso_code`, or the ISO code
+      #   as a String or Symbol.
+      #
+      # @return [Boolean] true if the currency previously existed, false
+      #   if it didn't.
       def unregister(curr)
-        key = curr[:iso_code].downcase.to_sym
-        @table.delete(key)
+        if curr.is_a?(Hash)
+          key = curr.fetch(:iso_code).downcase.to_sym
+        else
+          key = curr.downcase.to_sym
+        end
+        existed = @table.delete(key)
         @stringified_keys = stringify_keys
+        existed ? true : false
+      end
+
+
+      def each
+        all.each { |c| yield(c) }
       end
 
+
       private
 
       def stringify_keys
@@ -131,29 +171,42 @@ class Money
       end
     end
 
-    # @attr_reader [Symbol] id The symbol used to identify the currency,
-    # usually the lowercase +iso_code+ attribute.
-    # @attr_reader [Integer] priority A numerical value you can use to
-    # sort/group the currency list.
-    # @attr_reader [String] iso_code The international 3-letter code as defined
-    # by the ISO 4217 standard.
-    # @attr_reader [String] iso_numeric The international 3-numeric code as
-    # 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
-    # and the subunit
-    # @attr_reader [String] decimal_mark The decimal mark, or character used to
-    # separate the whole unit from the subunit.
-    # @attr_reader [String] The character used to separate thousands grouping
-    # of the whole unit.
-    # @attr_reader [Boolean] symbol_first Should the currency symbol precede
-    # the amount, or should it come after?
-    # @attr_reader [Integer] smallest_denomination Smallest amount of cash 
-    # possible (in the subunit of this currency)
+    # @!attribute [r] id 
+    #   @return [Symbol] The symbol used to identify the currency, usually THE
+    #     lowercase +iso_code+ attribute.
+    # @!attribute [r] priority 
+    #   @return [Integer] A numerical value you can use to sort/group the
+    #     currency list.
+    # @!attribute [r] iso_code 
+    #   @return [String] The international 3-letter code as defined by the ISO
+    #     4217 standard.
+    # @!attribute [r] iso_numeric 
+    #   @return [String] The international 3-numeric code as defined by the ISO
+    #     4217 standard.
+    # @!attribute [r] name 
+    #   @return [String] The currency name.
+    # @!attribute [r] symbol 
+    #   @return [String] The currency symbol (UTF-8 encoded).
+    # @!attribute [r] disambiguate_symbol 
+    #   @return [String] Alternative currency used if symbol is ambiguous
+    # @!attribute [r] html_entity 
+    #   @return [String] The html entity for the currency symbol
+    # @!attribute [r] subunit 
+    #   @return [String] The name of the fractional monetary unit.
+    # @!attribute [r] subunit_to_unit 
+    #   @return [Integer] The proportion between the unit and the subunit
+    # @!attribute [r] decimal_mark 
+    #   @return [String] The decimal mark, or character used to separate the
+    #     whole unit from the subunit.
+    # @!attribute [r] The 
+    #   @return [String] character used to separate thousands grouping of the
+    #     whole unit.
+    # @!attribute [r] symbol_first 
+    #   @return [Boolean] Should the currency symbol precede the amount, or
+    #     should it come after?
+    # @!attribute [r] smallest_denomination 
+    #   @return [Integer] Smallest amount of cash possible (in the subunit of
+    #     this currency)
 
     attr_reader :id, :priority, :iso_code, :iso_numeric, :name, :symbol,
       :disambiguate_symbol, :html_entity, :subunit, :subunit_to_unit, :decimal_mark,
@@ -173,27 +226,11 @@ class Money
     #   Money::Currency.new(:usd) #=> #<Money::Currency id: usd ...>
     def initialize(id)
       id = id.to_s.downcase
-
-      if self.class.stringified_keys.include?(id)
-        @id = id.to_sym
-        data = self.class.table[@id]
-        @priority = data[:priority]
-        @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]
-        @symbol_first = data[:symbol_first]
-        @html_entity = data[:html_entity]
-        @decimal_mark = data[:decimal_mark]
-        @thousands_separator = data[:thousands_separator]
-        @iso_numeric = data[:iso_numeric]
-        @smallest_denomination = data[:smallest_denomination]
-      else
+      unless self.class.stringified_keys.include?(id)
         raise UnknownCurrency, "Unknown currency '#{id}'"
       end
+      @id = id.to_sym
+      initialize_data!
     end
 
     # Compares +self+ with +other_currency+ against the value of +priority+
@@ -210,7 +247,14 @@ class Money
     #   c2 <=> c1 #=> -1
     #   c1 <=> c1 #=> 0
     def <=>(other_currency)
-      self.priority <=> other_currency.priority
+      # <=> returns nil when one of the values is nil
+      comparison = self.priority <=> other_currency.priority || 0
+
+      if comparison == 0
+        self.id <=> other_currency.id
+      else
+        comparison
+      end
     end
 
     # Compares +self+ with +other_currency+ and returns +true+ if the are the
@@ -352,10 +396,11 @@ class Money
       cache[subunit_to_unit] ||= calculate_decimal_places(subunit_to_unit)
     end
 
+    private
+
     def cache
       self.class.decimal_places_cache
     end
-    private :cache
 
     # If we need to figure out how many decimal places we need we
     # use repeated integer division.
@@ -367,6 +412,23 @@ class Money
       end
       i
     end
-    private :calculate_decimal_places
+
+    def initialize_data!
+      data = self.class.table[@id]
+      @alternate_symbols     = data[:alternate_symbols]
+      @decimal_mark          = data[:decimal_mark]
+      @disambiguate_symbol   = data[:disambiguate_symbol]
+      @html_entity           = data[:html_entity]
+      @iso_code              = data[:iso_code]
+      @iso_numeric           = data[:iso_numeric]
+      @name                  = data[:name]
+      @priority              = data[:priority]
+      @smallest_denomination = data[:smallest_denomination]
+      @subunit               = data[:subunit]
+      @subunit_to_unit       = data[:subunit_to_unit]
+      @symbol                = data[:symbol]
+      @symbol_first          = data[:symbol_first]
+      @thousands_separator   = data[:thousands_separator]
+    end
   end
 end

data/lib/money/money.rb

@@ -2,6 +2,7 @@
 require "money/bank/variable_exchange"
 require "money/bank/single_currency"
 require "money/money/arithmetic"
+require "money/money/constructors"
 require "money/money/formatting"
 
 # "Money is any object or record that is generally accepted as payment for
@@ -14,7 +15,8 @@ require "money/money/formatting"
 #
 # @see http://en.wikipedia.org/wiki/Money
 class Money
-  include Comparable, Money::Arithmetic, Money::Formatting
+  include Money::Arithmetic, Money::Formatting, Comparable
+  extend Constructors
 
   # Raised when smallest denomination of a currency is not defined
   class UndefinedSmallestDenomination < StandardError; end
@@ -74,63 +76,59 @@ class Money
     return_value(rounded_value)
   end
 
-  # @attr_reader [Currency] currency The currency the money is in.
-  # @attr_reader [Money::Bank::*] bank The +Money::Bank+ based object used to
-  # perform currency exchanges with.
+  # @!attribute [r] currency
+  #   @return [Currency] The money's currency.
+  # @!attribute [r] bank 
+  #   @return [Money::Bank::Base] The +Money::Bank+-based object which currency
+  #     exchanges are performed with.
+
   attr_reader :currency, :bank
 
   # Class Methods
   class << self
-    # @attr_accessor [Money::Bank::*] default_bank Each Money object is
-    # associated to a bank object, which is responsible for currency exchange.
-    # 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.
+
+    # @!attribute [rw] default_bank
+    #   @return [Money::Bank::Base] Each Money object is associated to a bank
+    #     object, which is responsible for currency exchange. 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.
+    # @!attribute default_currency
+    #   @return [Money::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+.
+    # @!attribute default_formatting_rules
+    #   @return [Hash] 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.
+    #   @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"
+    #   @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.
+    # @!attribute [rw] use_i18n
+    #   @return [Boolean] 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
+    # @!attribute [rw] infinite_precision
+    #   @return [Boolean] Use this to enable infinite precision cents
     #
-    # @attr_accessor [Integer] conversion_precision Use this to specify
-    # precision for converting Rational to BigDecimal
+    # @!attribute [rw] conversion_precision
+    #   @return [Fixnum] Use this to specify precision for converting Rational
+    #     to BigDecimal
     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
 
-    # Create a new money object with value 0.
-    #
-    # @param [Currency, String, Symbol] currency The currency to use.
-    #
-    # @return [Money]
-    #
-    # @example
-    #   Money.empty #=> #<Money @fractional=0>
-    def empty(currency = default_currency)
-      @empty ||= {}
-      @empty[currency] ||= Money.new(0, currency).freeze
-    end
-    alias_method :zero, :empty
   end
 
   def self.default_currency
@@ -171,7 +169,7 @@ class Money
   # rounding mode and a block to temporatly change it.  It will
   # then return the results of the block instead.
   #
-  # @param [BigDecimal::ROUND_MODE] optional
+  # @param [BigDecimal::ROUND_MODE] mode
   #
   # @return [BigDecimal::ROUND_MODE,Yield] rounding mode or block results
   #
@@ -192,49 +190,6 @@ class Money
     end
   end
 
-  # Creates a new Money object of the given value, using the Canadian
-  # dollar currency.
-  #
-  # @param [Integer] cents The cents value.
-  #
-  # @return [Money]
-  #
-  # @example
-  #   n = Money.ca_dollar(100)
-  #   n.cents    #=> 100
-  #   n.currency #=> #<Money::Currency id: cad>
-  def self.ca_dollar(cents)
-    Money.new(cents, "CAD")
-  end
-
-  # Creates a new Money object of the given value, using the American dollar
-  # currency.
-  #
-  # @param [Integer] cents The cents value.
-  #
-  # @return [Money]
-  #
-  # @example
-  #   n = Money.us_dollar(100)
-  #   n.cents    #=> 100
-  #   n.currency #=> #<Money::Currency id: usd>
-  def self.us_dollar(cents)
-    Money.new(cents, "USD")
-  end
-
-  # Creates a new Money object of the given value, using the Euro currency.
-  #
-  # @param [Integer] cents The cents value.
-  #
-  # @return [Money]
-  #
-  # @example
-  #   n = Money.euro(100)
-  #   n.cents    #=> 100
-  #   n.currency #=> #<Money::Currency id: eur>
-  def self.euro(cents)
-    Money.new(cents, "EUR")
-  end
 
   # Adds a new exchange rate to the default bank and return the rate.
   #
@@ -262,7 +217,10 @@ class Money
   # Alternatively you can use the convenience
   # methods like {Money.ca_dollar} and {Money.us_dollar}.
   #
-  # @param [Numeric] fractional The value given in the fractional unit.
+  # @param [Object] obj Either The fractional value of the money,
+  #   a Money object, or a currency. (If passed a currency as the first
+  #   argument, a Money will be created in that currency with fractional value
+  #   = 0.
   # @param [Currency, String, Symbol] currency The currency format.
   # @param [Money::Bank::*] bank The exchange bank to use.
   #

data/lib/money/money/arithmetic.rb

@@ -30,17 +30,7 @@ class Money
         false
       end
     end
-
-    # Synonymous with +#==+.
-    #
-    # @param [Money] other_money Value to compare with.
-    #
-    # @return [Money]
-    #
-    # @see #==
-    def eql?(other_money)
-      self == other_money
-    end
+    alias_method :eql?, :==
 
     def <=>(val)
       if val.respond_to?(:to_money)

data/lib/money/money/constructors.rb

@@ -0,0 +1,85 @@
+class Money
+  module Constructors
+
+    # Create a new money object with value 0.
+    #
+    # @param [Currency, String, Symbol] currency The currency to use.
+    #
+    # @return [Money]
+    #
+    # @example
+    #   Money.empty #=> #<Money @fractional=0>
+    def empty(currency = default_currency)
+      @empty ||= {}
+      @empty[currency] ||= Money.new(0, currency).freeze
+    end
+    alias_method :zero, :empty
+
+
+    # Creates a new Money object of the given value, using the Canadian
+    # dollar currency.
+    #
+    # @param [Integer] cents The cents value.
+    #
+    # @return [Money]
+    #
+    # @example
+    #   n = Money.ca_dollar(100)
+    #   n.cents    #=> 100
+    #   n.currency #=> #<Money::Currency id: cad>
+    def ca_dollar(cents)
+      Money.new(cents, "CAD")
+    end
+    alias_method :cad, :ca_dollar
+
+
+    # Creates a new Money object of the given value, using the American dollar
+    # currency.
+    #
+    # @param [Integer] cents The cents value.
+    #
+    # @return [Money]
+    #
+    # @example
+    #   n = Money.us_dollar(100)
+    #   n.cents    #=> 100
+    #   n.currency #=> #<Money::Currency id: usd>
+    def us_dollar(cents)
+      Money.new(cents, "USD")
+    end
+    alias_method :usd, :us_dollar
+
+
+    # Creates a new Money object of the given value, using the Euro currency.
+    #
+    # @param [Integer] cents The cents value.
+    #
+    # @return [Money]
+    #
+    # @example
+    #   n = Money.euro(100)
+    #   n.cents    #=> 100
+    #   n.currency #=> #<Money::Currency id: eur>
+    def euro(cents)
+      Money.new(cents, "EUR")
+    end
+    alias_method :eur, :euro
+
+
+    # Creates a new Money object of the given value, in British pounds.
+    #
+    # @param [Integer] pence The pence value.
+    #
+    # @return [Money]
+    #
+    # @example
+    #   n = Money.pound_sterling(100)
+    #   n.fractional    #=> 100
+    #   n.currency #=> #<Money::Currency id: gbp>
+    def pound_sterling(pence)
+      Money.new(pence, "GBP")
+    end
+    alias_method :gbp, :pound_sterling
+
+  end
+end

data/lib/money/money/formatting.rb

@@ -189,10 +189,23 @@ class Money
     #   Money.new(100, "USD").format(:disambiguate => true)    #=> "$100.00"
     #   Money.new(100, "CAD").format(:disambiguate => true)    #=> "C$100.00"
     #
+    # @option *rules [Boolean] :html_wrap_symbol (false) Wraps the currency symbol
+    #  in a html <span> tag.
+    #
+    # @example
+    #   Money.new(100, "USD").format(:disambiguate => false)
+    #   #=> "<span class=\"currency_symbol\">$100.00</span>
+    #
+    # @option *rules [Symbol] :symbol_position (:before) `:before` if the currency
+    #   symbol goes before the amount, `:after` if it goes after.
+    #
+    # @example
+    #   Money.new(100, "USD").format(:symbol_position => :before) #=> "$100.00"
+    #   Money.new(100, "USD").format(:symbol_position => :after)  #=> "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)
@@ -359,7 +372,11 @@ class Money
 
   def symbol_position_from(rules)
     if rules.has_key?(:symbol_position)
-      rules[:symbol_position]
+      if [:before, :after].include?(rules[:symbol_position])
+        return rules[:symbol_position]
+      else
+        raise ArgumentError, ":symbol_position must be ':before' or ':after'"
+      end
     elsif currency.symbol_first?
       :before
     else

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "6.5.0"
+  VERSION = "6.5.1"
 end

data/spec/currency_spec.rb

@@ -6,6 +6,13 @@ 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": ",", "smallest_denomination": 1 }'
 
+  def register_foo
+    Money::Currency.register(JSON.parse(FOO, :symbolize_names => true))
+  end
+
+  def unregister_foo
+    Money::Currency.unregister(JSON.parse(FOO, :symbolize_names => true))
+  end
 
   describe "UnknownMoney::Currency" do
     it "is a subclass of ArgumentError" do
@@ -14,16 +21,10 @@ describe Money::Currency do
   end
 
   describe ".find" 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
+    before { register_foo }
+    after  { unregister_foo }
 
     it "returns currency matching given id" do
-
       expected = Money::Currency.new(:foo)
       expect(Money::Currency.find(:foo)).to eq  expected
       expect(Money::Currency.find(:FOO)).to eq  expected
@@ -70,15 +71,92 @@ describe Money::Currency do
       expect(Money::Currency.all).to include Money::Currency.new(:usd)
     end
     it "includes registered currencies" do
-      Money::Currency.register(JSON.parse(FOO, :symbolize_names => true))
+      register_foo
       expect(Money::Currency.all).to include Money::Currency.new(:foo)
-      Money::Currency.unregister(JSON.parse(FOO, :symbolize_names => true))
+      unregister_foo
     end
     it 'is sorted by priority' do
       expect(Money::Currency.all.first.priority).to eq 1
     end
   end
 
+
+  describe ".register" do
+    after { Money::Currency.unregister(iso_code: "XXX") if Money::Currency.find("XXX") }
+
+    it "registers a new currency" do
+      Money::Currency.register(
+        iso_code: "XXX",
+        name: "Golden Doubloon",
+        symbol: "%",
+        subunit_to_unit: 100
+      )
+      new_currency = Money::Currency.find("XXX")
+      expect(new_currency).not_to be_nil
+      expect(new_currency.name).to eq "Golden Doubloon"
+      expect(new_currency.symbol).to eq "%"
+    end
+
+    specify ":iso_code must be present" do
+      expect {
+        Money::Currency.register(name: "New Currency")
+      }.to raise_error(KeyError)
+    end
+  end
+
+
+  describe ".unregister" do
+    it "unregisters a currency" do
+      Money::Currency.register(iso_code: "XXX")
+      expect(Money::Currency.find("XXX")).not_to be_nil # Sanity check
+      Money::Currency.unregister(iso_code: "XXX")
+      expect(Money::Currency.find("XXX")).to be_nil
+    end
+
+    it "returns true iff the currency existed" do
+      Money::Currency.register(iso_code: "XXX")
+      expect(Money::Currency.unregister(iso_code: "XXX")).to be_truthy
+      expect(Money::Currency.unregister(iso_code: "XXX")).to be_falsey
+    end
+
+    it "can be passed an ISO code" do
+      Money::Currency.register(iso_code: "XXX")
+      Money::Currency.register(iso_code: "YYZ")
+      # Test with string:
+      Money::Currency.unregister("XXX")
+      expect(Money::Currency.find("XXX")).to be_nil
+      # Test with symbol:
+      Money::Currency.unregister(:yyz)
+      expect(Money::Currency.find(:yyz)).to be_nil
+    end
+  end
+
+
+  describe ".each" do
+    it "yields each currency to the block" do
+      expect(Money::Currency).to respond_to(:each)
+      currencies = []
+      Money::Currency.each do |currency|
+        currencies.push(currency)
+      end
+
+      # Don't bother testing every single currency
+      expect(currencies[0]).to eq Money::Currency.all[0]
+      expect(currencies[1]).to eq Money::Currency.all[1]
+      expect(currencies[-1]).to eq Money::Currency.all[-1]
+    end
+  end
+
+
+  it "implements Enumerable" do
+    expect(Money::Currency).to respond_to(:all?)
+    expect(Money::Currency).to respond_to(:each_with_index)
+    expect(Money::Currency).to respond_to(:map)
+    expect(Money::Currency).to respond_to(:select)
+    expect(Money::Currency).to respond_to(:reject)
+  end
+
+
   describe "#initialize" do
     it "lookups data from loaded config" do
       currency = Money::Currency.new("USD")
@@ -104,6 +182,30 @@ describe Money::Currency do
       expect(Money::Currency.new(:cad)).to be > Money::Currency.new(:usd)
       expect(Money::Currency.new(:usd)).to be < Money::Currency.new(:eur)
     end
+
+    it "compares by id when priority is the same" do
+      Money::Currency.register(iso_code: "ABD", priority: 15)
+      Money::Currency.register(iso_code: "ABC", priority: 15)
+      Money::Currency.register(iso_code: "ABE", priority: 15)
+      abd = Money::Currency.find("ABD")
+      abc = Money::Currency.find("ABC")
+      abe = Money::Currency.find("ABE")
+      expect(abd).to be > abc
+      expect(abe).to be > abd
+      Money::Currency.unregister("ABD")
+      Money::Currency.unregister("ABC")
+      Money::Currency.unregister("ABE")
+    end
+
+    context "when one of the currencies has no 'priority' set" do
+      it "compares by id" do
+        Money::Currency.register(iso_code: "ABD") # No priority
+        abd = Money::Currency.find(:abd)
+        usd = Money::Currency.find(:usd)
+        expect(abd).to be < usd
+        Money::Currency.unregister(iso_code: "ABD")
+      end
+    end
   end
 
   describe "#==" do
@@ -211,9 +313,9 @@ describe Money::Currency do
     end
 
     it "proper places for custom currency" do
-      Money::Currency.register(JSON.parse(FOO, :symbolize_names => true))
+      register_foo
       Money::Currency.new(:foo).decimal_places == 3
-      Money::Currency.unregister(JSON.parse(FOO, :symbolize_names => true))
+      unregister_foo
     end
   end
 end

data/spec/money/constructors_spec.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Money::Constructors do
+
+  describe "::empty" do
+    it "creates a new Money object of 0 cents" do
+      expect(Money.empty).to eq Money.new(0)
+    end
+
+    it "memoizes the result" do
+      expect(Money.empty.object_id).to eq Money.empty.object_id
+    end
+
+    it "memoizes a result for each currency" do
+      expect(Money.empty(:cad).object_id).to eq Money.empty(:cad).object_id
+    end
+
+    it "doesn't allow money to be modified for a currency" do
+      expect(Money.empty).to be_frozen
+    end
+  end
+
+
+  describe "::zero" do
+    subject { Money.zero }
+    it { is_expected.to eq Money.empty }
+  end
+
+
+  describe "::ca_dollar" do
+    it "creates a new Money object of the given value in CAD" do
+      expect(Money.ca_dollar(50)).to eq Money.new(50, "CAD")
+    end
+
+    it "is aliased to ::cad" do
+      expect(Money.cad(50)).to eq Money.ca_dollar(50)
+    end
+  end
+
+
+  describe "::us_dollar" do
+    it "creates a new Money object of the given value in USD" do
+      expect(Money.us_dollar(50)).to eq Money.new(50, "USD")
+    end
+
+    it "is aliased to ::usd" do
+      expect(Money.usd(50)).to eq Money.us_dollar(50)
+    end
+  end
+
+
+  describe "::euro" do
+    it "creates a new Money object of the given value in EUR" do
+      expect(Money.euro(50)).to eq Money.new(50, "EUR")
+    end
+
+    it "is aliased to ::eur" do
+      expect(Money.eur(50)).to eq Money.euro(50)
+    end
+  end
+
+
+  describe "::pound_sterling" do
+    it "creates a new Money object of the given value in GBP" do
+      expect(Money.pound_sterling(50)).to eq Money.new(50, "GBP")
+    end
+
+    it "is aliased to ::gbp" do
+      expect(Money.gbp(50)).to eq Money.pound_sterling(50)
+    end
+  end
+
+end

data/spec/money/formatting_spec.rb

@@ -439,6 +439,10 @@ describe Money, "formatting" do
       it "inserts currency symbol after the amount when set to :after" do
         expect(Money.us_dollar(1_000_000_000_12).format(:symbol_position => :after)).to eq "1,000,000,000.12 $"
       end
+
+      it "raises an ArgumentError when passed an invalid option" do
+        expect{Money.euro(0).format(:symbol_position => :befor)}.to raise_error(ArgumentError)
+      end
     end
 
     describe ":sign_before_symbol option" do

data/spec/money_spec.rb

@@ -90,47 +90,6 @@ describe Money do
     end
   end
 
-  describe ".empty" do
-    it "creates a new Money object of 0 cents" do
-      expect(Money.empty).to eq Money.new(0)
-    end
-
-    it "memoizes the result" do
-      expect(Money.empty.object_id).to eq Money.empty.object_id
-    end
-
-    it "memoizes a result for each currency" do
-      expect(Money.empty(:cad).object_id).to eq Money.empty(:cad).object_id
-    end
-
-    it "doesn't allow money to be modified for a currency" do
-      expect(Money.empty).to be_frozen
-    end
-  end
-
-  describe ".zero" do
-    subject { Money.zero }
-    it { is_expected.to eq Money.empty }
-  end
-
-  describe ".ca_dollar" do
-    it "creates a new Money object of the given value in CAD" do
-      expect(Money.ca_dollar(50)).to eq Money.new(50, "CAD")
-    end
-  end
-
-  describe ".us_dollar" do
-    it "creates a new Money object of the given value in USD" do
-      expect(Money.us_dollar(50)).to eq Money.new(50, "USD")
-    end
-  end
-
-  describe ".euro" do
-    it "creates a new Money object of the given value in EUR" do
-      expect(Money.euro(50)).to eq Money.new(50, "EUR")
-    end
-  end
-
   describe ".add_rate" do
     before do
       @default_bank = Money.default_bank
@@ -162,13 +121,15 @@ describe Money do
     end
   end
 
-  describe "#cents" do
-    it "is a synonym of #fractional" do
-      expectation = Money.new(0)
-      def expectation.fractional
-        "expectation"
+  %w[cents pence].each do |units|
+    describe "##{units}" do
+      it "is a synonym of #fractional" do
+        expectation = Money.new(0)
+        def expectation.fractional
+          "expectation"
+        end
+        expect(expectation.cents).to eq "expectation"
       end
-      expect(expectation.cents).to eq "expectation"
     end
   end
 
@@ -300,55 +261,55 @@ YAML
       expect(money.round_to_nearest_cash_value).to eq 2350
       
       money = Money.new(-2350, "AED")
-      expect(money.round_to_nearest_cash_value).to eq -2350
+      expect(money.round_to_nearest_cash_value).to eq(-2350)
       
       money = Money.new(2213, "AED")
       expect(money.round_to_nearest_cash_value).to eq 2225
       
       money = Money.new(-2213, "AED")
-      expect(money.round_to_nearest_cash_value).to eq -2225
+      expect(money.round_to_nearest_cash_value).to eq(-2225)
       
       money = Money.new(2212, "AED")
       expect(money.round_to_nearest_cash_value).to eq 2200
       
       money = Money.new(-2212, "AED")
-      expect(money.round_to_nearest_cash_value).to eq -2200
+      expect(money.round_to_nearest_cash_value).to eq(-2200)
     
       money = Money.new(178, "CHF")
       expect(money.round_to_nearest_cash_value).to eq 180
       
       money = Money.new(-178, "CHF")
-      expect(money.round_to_nearest_cash_value).to eq -180
+      expect(money.round_to_nearest_cash_value).to eq(-180)
       
       money = Money.new(177, "CHF")
       expect(money.round_to_nearest_cash_value).to eq 175
       
       money = Money.new(-177, "CHF")
-      expect(money.round_to_nearest_cash_value).to eq -175
+      expect(money.round_to_nearest_cash_value).to eq(-175)
       
       money = Money.new(175, "CHF")
       expect(money.round_to_nearest_cash_value).to eq 175
       
       money = Money.new(-175, "CHF")
-      expect(money.round_to_nearest_cash_value).to eq -175
+      expect(money.round_to_nearest_cash_value).to eq(-175)
       
       money = Money.new(299, "USD")
       expect(money.round_to_nearest_cash_value).to eq 299
       
       money = Money.new(-299, "USD")
-      expect(money.round_to_nearest_cash_value).to eq -299
+      expect(money.round_to_nearest_cash_value).to eq(-299)
       
       money = Money.new(300, "USD")
       expect(money.round_to_nearest_cash_value).to eq 300
       
       money = Money.new(-300, "USD")
-      expect(money.round_to_nearest_cash_value).to eq -300
+      expect(money.round_to_nearest_cash_value).to eq(-300)
       
       money = Money.new(301, "USD")
       expect(money.round_to_nearest_cash_value).to eq 301
       
       money = Money.new(-301, "USD")
-      expect(money.round_to_nearest_cash_value).to eq -301
+      expect(money.round_to_nearest_cash_value).to eq(-301)
     end
     
     it "raises an exception if smallest denomination is not defined" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.5.1
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -129,6 +129,7 @@ files:
 - lib/money/currency/loader.rb
 - lib/money/money.rb
 - lib/money/money/arithmetic.rb
+- lib/money/money/constructors.rb
 - lib/money/money/formatting.rb
 - lib/money/version.rb
 - money.gemspec
@@ -138,6 +139,7 @@ files:
 - spec/currency/heuristics_spec.rb
 - spec/currency_spec.rb
 - spec/money/arithmetic_spec.rb
+- spec/money/constructors_spec.rb
 - spec/money/formatting_spec.rb
 - spec/money_spec.rb
 - spec/spec_helper.rb
@@ -180,6 +182,7 @@ test_files:
 - spec/currency/heuristics_spec.rb
 - spec/currency_spec.rb
 - spec/money/arithmetic_spec.rb
+- spec/money/constructors_spec.rb
 - spec/money/formatting_spec.rb
 - spec/money_spec.rb
 - spec/spec_helper.rb