money 4.0.2 → 5.0.0.rc1

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 5.0.0
+- Minor bugfix - incorrect use of character range resulted in 
+  botched results for Money::Parsing#extract_cents (GH-162)
+- Money::Currency::TABLE removed. Use Money::Currency.register to add
+  additional currencies (GH-143)
+- Fix rounding error in Numeric.to_money (GH-145)
+- Allow on-the-fly calculation of decimal places if not known already
+  (GH-146,GH-147,GH-148)
+- Move Euro symbol ahead of amount (GH-151)
+- Changed settings for Polish currency (GH-152)
+- Fall back to symbol if there is no html_entity present (GH-153)
+- Optionally Allow parsing of money values prefixed by symbols in key
+  currencies (GH-155)
+- Fix bug where rates exported to a file from VariableExchange leave the File
+  object open (GH-154)
+- Added Money#positive? and Money#negative? methods (GH-157)
+- Fix format function output for custom currencies (GH-156)
+- Fix parsing of strings with 3 decimal digits (GH-158)
 
 ## 4.0.2
 

data/README.md

@@ -2,6 +2,12 @@
 
 [![Build Status](http://travis-ci.org/RubyMoney/money.png)](http://travis-ci.org/RubyMoney/money)
 
+## Contributing
+
+When contributing, please make sure to update the CHANGELOG and AUTHORS files
+when you submit your pull request. Upon merging of your first pull request,
+you will be given commit access to the repository.
+
 ## Introduction
 
 This library aids one in handling money and different currencies.
@@ -64,6 +70,12 @@ Money.new(1000, "USD") - Money.new(200, "USD") == Money.new(800, "USD")
 Money.new(1000, "USD") / 5                     == Money.new(200, "USD")
 Money.new(1000, "USD") * 5                     == Money.new(5000, "USD")
 
+# Assumptive Currencies
+Money.assume_from_symbol = true
+Money.new("$100") == Money.new(10000, "USD") 
+Money.new("€100") == Money.new(10000, "EUR") 
+Money.new("£100") == Money.new(10000, "GBP") 
+
 # Currency conversions
 some_code_to_setup_exchange_rates
 Money.new(1000, "USD").exchange_to("EUR") == Money.new(some_value, "EUR")
@@ -89,12 +101,11 @@ currency.iso_code #=> "USD"
 currency.name     #=> "United States Dollar"
 ```
 
-To define a new `Money::Currency` simply add a new item to the
-`Money::Currency::TABLE` hash, where the key is the identifier for the currency
-object and the value is a hash containing all the currency attributes.
+To define a new `Money::Currency` use `Money::Currency.register` as shown
+below.
 
 ``` ruby
- Money::Currency::TABLE[:usd] = {
+curr = {
   :priority        => 1,
   :iso_code        => "USD",
   :iso_numeric     => "840",
@@ -105,6 +116,8 @@ object and the value is a hash containing all the currency attributes.
   :separator       => ".",
   :delimiter       => ","
 }
+
+Money::Currency.register(curr)
 ```
 
 The pre-defined set of attributes includes:
@@ -154,10 +167,10 @@ def all_currencies(hash)
   hash.keys
 end
 
-major_currencies(Money::Currency::TABLE)
+major_currencies(Money::Currency.table)
 # => [ :usd, :eur, :bgp, :cad ]
 
-all_currencies(Money::Currency::TABLE)
+all_currencies(Money::Currency.table)
 # => [ :aed, :afn, all, ... ]
 ```
 
@@ -217,6 +230,9 @@ implementations.
 
 ## Ruby on Rails
 
+To integrate money in a rails application use [money-rails](http://github.com/RubyMoney/money-rails)
+gem or follow the instructions below.
+
 Use the `composed_of` helper to let Active Record deal with embedding the money
 object in your models. The following example requires 2 columns:
 
@@ -241,7 +257,7 @@ definition:
 ``` ruby
 composed_of :price,
   :class_name => "Money",
-  :mapping => [%w(cents cents), %w(currency currency)],
+  :mapping => [%w(price_cents cents), %w(currency currency)],
   :constructor => Proc.new { |cents, currency| Money.new(cents || 0, currency || Money.default_currency) }
 ```
 

data/config/currency.json

@@ -565,7 +565,7 @@
     "symbol": "€",
     "subunit": "Cent",
     "subunit_to_unit": 100,
-    "symbol_first": false,
+    "symbol_first": true,
     "html_entity": "€",
     "decimal_mark": ",",
     "thousands_separator": ".",
@@ -1451,8 +1451,8 @@
     "subunit_to_unit": 100,
     "symbol_first": false,
     "html_entity": "",
-    "decimal_mark": ".",
-    "thousands_separator": ",",
+    "decimal_mark": ",",
+    "thousands_separator": " ",
     "iso_numeric": "985"
   },
   "pyg": {

data/lib/money/bank/variable_exchange.rb

@@ -194,7 +194,7 @@ class Money
               end
 
           unless file.nil?
-            File.open(file, "w").write(s)
+            File.open(file, "w") {|f| f.write(s) }
           end
         }
         s

data/lib/money/currency.rb

@@ -12,24 +12,81 @@ class Money
     # Thrown when an unknown currency is requested.
     class UnknownCurrency < StandardError; end
 
-    # List of known currencies.
-    #
-    # == monetary unit
-    # The standard unit of value of a currency, as the dollar in the United States or the peso in Mexico.
-    # http://www.answers.com/topic/monetary-unit
-    # == fractional monetary unit, subunit
-    # A monetary unit that is valued at a fraction (usually one hundredth) of the basic monetary unit
-    # http://www.answers.com/topic/fractional-monetary-unit-subunit
-    #
-    # See http://en.wikipedia.org/wiki/List_of_circulating_currencies and
-    # http://search.cpan.org/~tnguyen/Locale-Currency-Format-1.28/Format.pm
+    class << self
 
-    TABLE = load_currencies
+      # Lookup a currency with given +id+ an returns a +Currency+ instance on
+      # success, +nil+ otherwise.
+      #
+      # @param [String, Symbol, #to_s] id Used to look into +table+ and
+      # retrieve the applicable attributes.
+      #
+      # @return [Money::Currency]
+      #
+      # @example
+      #   Money::Currency.find(:eur) #=> #<Money::Currency id: eur ...>
+      #   Money::Currency.find(:foo) #=> nil
+      def find(id)
+        id = id.to_s.downcase.to_sym
+        new(id) if self.table[id]
+      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
-    STRINGIFIED_KEYS = TABLE.keys.map{|k| k.to_s.downcase }
+      # Wraps the object in a +Currency+ unless it's already a +Currency+
+      # object.
+      #
+      # @param [Object] object The object to attempt and wrap as a +Currency+
+      # object.
+      #
+      # @return [Money::Currency]
+      #
+      # @example
+      #   c1 = Money::Currency.new(:usd)
+      #   Money::Currency.wrap(nil)   #=> nil
+      #   Money::Currency.wrap(c1)    #=> #<Money::Currency id: usd ...>
+      #   Money::Currency.wrap("usd") #=> #<Money::Currency id: usd ...>
+      def wrap(object)
+        if object.nil?
+          nil
+        elsif object.is_a?(Currency)
+          object
+        else
+          Currency.new(object)
+        end
+      end
+
+      # List of known currencies.
+      #
+      # == monetary unit
+      # The standard unit of value of a currency, as the dollar in the United States or the peso in Mexico.
+      # http://www.answers.com/topic/monetary-unit
+      # == fractional monetary unit, subunit
+      # A monetary unit that is valued at a fraction (usually one hundredth) of the basic monetary unit
+      # http://www.answers.com/topic/fractional-monetary-unit-subunit
+      #
+      # See http://en.wikipedia.org/wiki/List_of_circulating_currencies and
+      # http://search.cpan.org/~tnguyen/Locale-Currency-Format-1.28/Format.pm
+      def table
+        @table ||= load_currencies
+      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
+      def stringified_keys
+        @stringified_keys ||= stringify_keys
+      end
+
+      def register(curr)
+        key = curr[:iso_code].downcase.to_sym
+        @table[key] = curr
+        @stringified_keys = stringify_keys
+      end
+
+      private
+
+      def stringify_keys
+        table.keys.map{|k| k.to_s.downcase}
+      end
+    end
 
     # The symbol used to identify the currency, usually the lowercase
     # +iso_code+ attribute.
@@ -94,53 +151,9 @@ class Money
     # @return [boolean]
     attr_reader :symbol_first
 
-
-    class << self
-
-      # Lookup a currency with given +id+ an returns a +Currency+ instance on
-      # success, +nil+ otherwise.
-      #
-      # @param [String, Symbol, #to_s] id Used to look into +TABLE+ and
-      # retrieve the applicable attributes.
-      #
-      # @return [Money::Currency]
-      #
-      # @example
-      #   Money::Currency.find(:eur) #=> #<Money::Currency id: eur ...>
-      #   Money::Currency.find(:foo) #=> nil
-      def find(id)
-        id = id.to_s.downcase.to_sym
-        new(id) if self::TABLE[id]
-      end
-
-      # Wraps the object in a +Currency+ unless it's already a +Currency+
-      # object.
-      #
-      # @param [Object] object The object to attempt and wrap as a +Currency+
-      # object.
-      #
-      # @return [Money::Currency]
-      #
-      # @example
-      #   c1 = Money::Currency.new(:usd)
-      #   Money::Currency.wrap(nil)   #=> nil
-      #   Money::Currency.wrap(c1)    #=> #<Money::Currency id: usd ...>
-      #   Money::Currency.wrap("usd") #=> #<Money::Currency id: usd ...>
-      def wrap(object)
-        if object.nil?
-          nil
-        elsif object.is_a?(Currency)
-          object
-        else
-          Currency.new(object)
-        end
-      end
-    end
-
-
     # Create a new +Currency+ object.
     #
-    # @param [String, Symbol, #to_s] id Used to look into +TABLE+ and retrieve
+    # @param [String, Symbol, #to_s] id Used to look into +table+ and retrieve
     #  the applicable attributes.
     #
     # @return [Money::Currency]
@@ -149,10 +162,10 @@ class Money
     #   Money::Currency.new(:usd) #=> #<Money::Currency id: usd ...>
     def initialize(id)
       id = id.to_s.downcase
-      raise(UnknownCurrency, "Unknown currency `#{id}'") unless STRINGIFIED_KEYS.include?(id)
+      raise(UnknownCurrency, "Unknown currency `#{id}'") unless self.class.stringified_keys.include?(id)
 
       @id  = id.to_sym
-      data = TABLE[@id]
+      data = self.class.table[@id]
       data.each_pair do |key, value|
         instance_variable_set(:"@#{key}", value)
       end
@@ -263,18 +276,41 @@ class Money
       !!@symbol_first
     end
 
+    # Cache decimal places for subunit_to_unit values.  Common ones pre-cached.
+    def self.decimal_places_cache
+      @decimal_places_cache ||= {
+        1 => 0,
+        10 => 1,
+        100 => 2,
+        1000 => 3
+      }
+    end
+
     # The number of decimal places needed.
     #
     # @return [Integer]
     def decimal_places
-      if subunit_to_unit == 1
-        0
-      elsif subunit_to_unit % 10 == 0
-        Math.log10(subunit_to_unit).to_s.to_i
-      else
-        Math.log10(subunit_to_unit).to_s.to_i+1
+      cache = self.class.decimal_places_cache
+      places  = cache[subunit_to_unit]
+      unless places
+        places = calculate_decimal_places(subunit_to_unit)
+        cache[subunit_to_unit] = places
+      end
+      places
+    end
+
+    # If we need to figure out how many decimal places we need we
+    # use repeated integer division.
+    def calculate_decimal_places(num)
+      return 0 if num == 1
+      i = 1
+      while num >= 10
+        num /= 10
+        i += 1 if num >= 10
       end
+      i
     end
+    private :calculate_decimal_places
 
   end
 end

data/lib/money/money.rb

@@ -30,7 +30,7 @@ class Money
   class << self
     # 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 if
+    # bank object. The default value for this property is an instance of
     # +Bank::VariableExchange.+ It allows one to specify custom exchange rates.
     #
     # @return [Money::Bank::*]
@@ -47,6 +47,11 @@ class Money
     #
     # @return [true,false]
     attr_accessor :use_i18n
+
+    # Use this to enable the ability to assume the currency from a passed symbol
+    #
+    # @return [true,false]
+    attr_accessor :assume_from_symbol
   end
 
   # Set the default bank for creating new +Money+ objects.
@@ -58,6 +63,9 @@ class Money
   # Default to using i18n
   self.use_i18n = true
 
+  # Default to not using currency symbol assumptions when parsing
+  self.assume_from_symbol = false
+
   # Create a new money object with value 0.
   #
   # @param [Currency, String, Symbol] currency The currency to use.

data/lib/money/money/arithmetic.rb

@@ -56,6 +56,32 @@ class Money
       end
     end
 
+    # Test if the amount is positive. Returns +true+ if the money amount is
+    # greater than 0, +false+ otherwise.
+    #
+    # @return [Boolean]
+    #
+    # @example
+    #   Money.new(1).positive?  #=> true
+    #   Money.new(0).positive?  #=> false
+    #   Money.new(-1).positive? #=> false
+    def positive?
+      cents > 0
+    end
+
+    # Test if the amount is negative. Returns +true+ if the money amount is
+    # less than 0, +false+ otherwise.
+    #
+    # @return [Boolean]
+    #
+    # @example
+    #   Money.new(-1).negative? #=> true
+    #   Money.new(0).negative?  #=> false
+    #   Money.new(1).negative?  #=> false
+    def negative?
+      cents < 0
+    end
+
     # Returns a new Money object containing the sum of the two operands' monetary
     # values. If +other_money+ has a different currency then its monetary value
     # is automatically exchanged to this object's currency using +exchange_to+.

data/lib/money/money/formatting.rb

@@ -163,13 +163,13 @@ class Money
             ""
           end
         elsif rules[:html]
-          currency.html_entity
+          currency.html_entity == '' ? currency.symbol : currency.html_entity
         else
           symbol
         end
 
       formatted = rules[:no_cents] ? "#{self.to_s.to_i}" : self.to_s
-                  
+
       if rules[:no_cents_if_whole] && cents % currency.subunit_to_unit == 0
         formatted = "#{self.to_s.to_i}"
       end
@@ -204,7 +204,13 @@ class Money
       end
 
       # Apply thousands_separator
-      formatted.gsub!(/(\d)(?=(?:\d{3})+(?:[^\d]|$))/, "\\1#{thousands_separator_value}")
+      regexp_decimal = Regexp.escape(decimal_mark)
+      regexp_format  = if formatted =~ /#{regexp_decimal}/
+           /(\d)(?=(?:\d{3})+(?:#{regexp_decimal}))/
+         else
+           /(\d)(?=(?:\d{3})+(?:[^\d]{1}|$))/
+         end
+      formatted.gsub!(regexp_format, "\\1#{thousands_separator_value}")
 
       if rules[:with_currency]
         formatted << " "

data/lib/money/money/parsing.rb

@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 class Money
   module Parsing
     def self.included(base)
@@ -32,11 +34,21 @@ class Money
       # @see Money.from_string
       #
       def parse(input, currency = nil)
-        i = input.to_s
+        i = input.to_s.strip
+
+        # raise Money::Currency.table.collect{|c| c[1][:symbol]}.inspect
 
-        # Get the currency.
-        m = i.scan /([A-Z]{2,3})/
-          c = m[0] ? m[0][0] : nil
+        # Check the first character for a currency symbol, alternatively get it
+        # from the stated currency string
+        c = if Money.assume_from_symbol && i =~ /^(\$|€|£)/
+          case i
+          when /^$/ then "USD"
+          when /^€/ then "EUR"
+          when /^£/ then "GBP"
+          end
+        else
+          i[/[A-Z]{2,3}/]
+        end
 
         # check that currency passed and embedded currency are the same,
         # and negotiate the final currency
@@ -172,7 +184,7 @@ class Money
       def from_bigdecimal(value, currency = Money.default_currency)
         currency = Money::Currency.wrap(currency)
         amount   = value * currency.subunit_to_unit
-        new(amount.fix, currency)
+        new(amount.round, currency)
       end
 
       # Converts a Numeric value into a Money object treating the +value+
@@ -227,11 +239,14 @@ class Money
       #
       def extract_cents(input, currency = Money.default_currency)
         # remove anything that's not a number, potential thousands_separator, or minus sign
-        num = input.gsub(/[^\d|\.|,|\'|\-]/, '').strip
+        num = input.gsub(/[^\d.,'-]/, '')
 
         # set a boolean flag for if the number is negative or not
         negative = num =~ /^-|-$/ ? true : false
 
+        # decimal mark character
+        decimal_char = currency.decimal_mark
+
         # if negative, remove the minus sign from the number
         # if it's not negative, the hyphen makes the value invalid
         if negative
@@ -279,41 +294,47 @@ class Money
             # assign first decimal_mark for reusability
             decimal_mark = used_decimal_marks.first
 
-            # 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
-              # 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"
+            # When we have identified the decimal mark character
+            if decimal_char == decimal_mark
+              major, minor = num.split(decimal_char)
 
-              # 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
+              # 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
-                # minor length is three
-                # let's try to figure out intent of the thousands_separator
+                # 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"
 
-                # the major length is greater than three, which means
-                # the comma or period is used as a thousands_separator
+                # if the minor (cents) length isn't 3, assign major/minor from the possibles
                 # e.g.
-                #   1000,000
-                #   100000,000
-                if possible_major.length > 3
+                #   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
-                  # number is in format ###{sep}### or ##{sep}### or #{sep}###
-                  # handle as , is sep, . is thousands_separator
-                  if decimal_mark == '.'
+                  # 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
                     major, minor = possible_major, possible_minor
                   else
-                    major, minor = "#{possible_major}#{possible_minor}", 0
+                    # 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
                   end
                 end
               end
@@ -344,7 +365,6 @@ class Money
         # if negative, multiply by -1; otherwise, return positive cents
         negative ? cents * -1 : cents
       end
-
     end
   end
 end

data/money.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "money"
-  s.version     = "4.0.2"
+  s.version     = "5.0.0.rc1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tobias Luetke", "Hongli Lai", "Jeremy McNevin",
                    "Shane Emmons", "Simone Carletti"]

data/spec/bank/variable_exchange_spec.rb

@@ -146,7 +146,7 @@ describe Money::Bank::VariableExchange do
     context "with :file provided" do
       it "writes rates to file" do
         f = mock('IO')
-        File.should_receive(:open).with('null', 'w').and_return(f)
+        File.should_receive(:open).with('null', 'w').and_yield(f)
         f.should_receive(:write).with(@rates.to_json)
 
         subject.export_rates(:json, 'null')

data/spec/currency_spec.rb

@@ -4,18 +4,17 @@ require "spec_helper"
 
 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
-      with_custom_definitions do
-        Money::Currency::TABLE[:usd] = JSON.parse(%Q({ "priority": 1, "iso_code": "USD", "iso_numeric": "840", "name": "United States Dollar", "symbol": "$", "subunit": "Cent", "subunit_to_unit": 100, "symbol_first": true, "html_entity": "$", "decimal_mark": ".", "thousands_separator": "," }))
-        Money::Currency::TABLE[:eur] = JSON.parse(%Q({ "priority": 2, "iso_code": "EUR", "iso_numeric": "978", "name": "Euro", "symbol": "€", "subunit": "Cent", "subunit_to_unit": 100, "symbol_first": false, "html_entity": "€", "decimal_mark": ",", "thousands_separator": "." }))
+      Money::Currency.register(JSON.parse(FOO, :symbolize_names => true))
 
-        expected = Money::Currency.new(:eur)
-        Money::Currency.find(:eur).should  == expected
-        Money::Currency.find(:EUR).should  == expected
-        Money::Currency.find("eur").should == expected
-        Money::Currency.find("EUR").should == expected
-      end
+      expected = Money::Currency.new(:foo)
+      Money::Currency.find(:foo).should  == expected
+      Money::Currency.find(:FOO).should  == expected
+      Money::Currency.find("foo").should == expected
+      Money::Currency.find("FOO").should == expected
     end
 
     it "returns nil unless currency matching given id" do
@@ -123,17 +122,15 @@ describe Money::Currency do
     end
   end
 
+  describe "#decimal_places" do
+    it "proper places for known currency" do
+      Money::Currency.new(:mro).decimal_places == 1
+      Money::Currency.new(:usd).decimal_places == 2
+    end
 
-  def with_custom_definitions(&block)
-    begin
-      old = Money::Currency::TABLE.dup
-      Money::Currency::TABLE.clear
-      yield
-    ensure
-      silence_warnings do
-        Money::Currency.const_set("TABLE", old)
-      end
+    it "proper places for custom currency" do
+      Money::Currency.register(JSON.parse(FOO, :symbolize_names => true))
+      Money::Currency.new(:foo).decimal_places == 3
     end
   end
-
 end

data/spec/money/arithmetic_spec.rb

@@ -164,6 +164,34 @@ describe Money do
     end
   end
 
+  describe "#positive?" do
+    it "returns true if the amount is greater than 0" do
+      Money.new(1).should be_positive
+    end
+
+    it "returns false if the amount is 0" do
+      Money.new(0).should_not be_positive
+    end
+
+    it "returns false if the amount is negative" do
+      Money.new(-1).should_not be_positive
+    end
+  end
+
+  describe "#negative?" do
+    it "returns true if the amount is less than 0" do
+      Money.new(-1).should be_negative
+    end
+
+    it "returns false if the amount is 0" do
+      Money.new(0).should_not be_negative
+    end
+
+    it "returns false if the amount is greater than 0" do
+      Money.new(1).should_not be_negative
+    end
+  end
+
   describe "#+" do
     it "adds other amount to current amount (same currency)" do
       (Money.new(10_00, "USD") + Money.new(90, "USD")).should == Money.new(10_90, "USD")

data/spec/money/formatting_spec.rb

@@ -4,6 +4,9 @@ require "spec_helper"
 
 describe Money, "formatting" do
 
+  BAR = '{ "priority": 1, "iso_code": "BAR", "iso_numeric": "840", "name": "Dollar with 4 decimal places", "symbol": "$", "subunit": "Cent", "subunit_to_unit": 10000, "symbol_first": true, "html_entity": "$", "decimal_mark": ".", "thousands_separator": "," }'
+  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": "." }'
+
   context "without i18n" do
     subject { Money.empty("USD") }
 
@@ -117,7 +120,7 @@ describe Money, "formatting" do
       one_thousand["CNY"].should == "¥1,000.00"
 
       # Euro
-      one_thousand["EUR"].should == "1.000,00 €"
+      one_thousand["EUR"].should == "€1.000,00"
 
       # Rupees
       one_thousand["INR"].should == "₨1,000.00"
@@ -139,8 +142,8 @@ describe Money, "formatting" do
     end
 
     it "inserts thousands separator into the result if the amount is sufficiently large and the currency symbol is at the end" do
-      Money.euro(1_234_567_12).format.should == "1.234.567,12 €"
-      Money.euro(1_234_567_12).format(:no_cents => true).should == "1.234.567 €"
+      Money.euro(1_234_567_12).format.should == "€1.234.567,12"
+      Money.euro(1_234_567_12).format(:no_cents => true).should == "€1.234.567"
     end
 
     describe ":with_currency option" do
@@ -216,7 +219,7 @@ describe Money, "formatting" do
         one["CNY"].should == "¥1.00"
 
         # Euro
-        one["EUR"].should == "1,00 €"
+        one["EUR"].should == "€1,00"
 
         # Rupees
         one["INR"].should == "₨1.00"
@@ -235,12 +238,12 @@ describe Money, "formatting" do
       specify "(:symbol => true) returns $ when currency code is not recognized" do
         currency = Money::Currency.new("EUR")
         currency.should_receive(:symbol).and_return(nil)
-        Money.new(100, currency).format(:symbol => true).should == "1,00 ¤"
+        Money.new(100, currency).format(:symbol => true).should == "¤1,00"
       end
 
       specify "(:symbol => some non-Boolean value that evaluates to true) returns symbol based on the given currency code" do
         Money.new(100, "GBP").format(:symbol => true).should == "£1.00"
-        Money.new(100, "EUR").format(:symbol => true).should == "1,00 €"
+        Money.new(100, "EUR").format(:symbol => true).should == "€1,00"
         Money.new(100, "SEK").format(:symbol => true).should == "kr1.00"
       end
 
@@ -259,7 +262,7 @@ describe Money, "formatting" do
         money.format.should == "£1.00"
 
         money = Money.new(100, "EUR")
-        money.format.should == "1,00 €"
+        money.format.should == "€1,00"
       end
     end
 
@@ -310,6 +313,11 @@ describe Money, "formatting" do
         string = Money.ca_dollar(570).format(:html => true, :with_currency => true)
         string.should == "$5.70 <span class=\"currency\">CAD</span>"
       end
+
+      specify "should fallback to symbol if entity is not available" do
+        string = Money.new(570, 'DKK').format(:html => true)
+        string.should == "5,70 kr"
+      end
     end
 
     describe ":symbol_position option" do
@@ -398,5 +406,41 @@ describe Money, "formatting" do
     end
   end
 
+  context "custom currencies with 4 decimal places" do
+    before :each do
+      Money::Currency.register(JSON.parse(BAR, :symbolize_names => true))
+      Money::Currency.register(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"
+
+      Money.new(24, "BAR").format.should == "$0.0024"
+      Money.new(24, "EU4").format.should == "€0,0024"
+
+      Money.new(324, "BAR").format.should == "$0.0324"
+      Money.new(324, "EU4").format.should == "€0,0324"
+
+      Money.new(5324, "BAR").format.should == "$0.5324"
+      Money.new(5324, "EU4").format.should == "€0,5324"
+
+      Money.new(65324, "BAR").format.should == "$6.5324"
+      Money.new(65324, "EU4").format.should == "€6,5324"
+
+      Money.new(865324, "BAR").format.should == "$86.5324"
+      Money.new(865324, "EU4").format.should == "€86,5324"
+
+      Money.new(1865324, "BAR").format.should == "$186.5324"
+      Money.new(1865324, "EU4").format.should == "€186,5324"
+
+      Money.new(33310034, "BAR").format.should == "$3,331.0034"
+      Money.new(33310034, "EU4").format.should == "€3.331,0034"
+
+      Money.new(88833310034, "BAR").format.should == "$8,883,331.0034"
+      Money.new(88833310034, "EU4").format.should == "€8.883.331,0034"
+    end
+
+  end
 end
 

data/spec/money/parsing_spec.rb

@@ -4,6 +4,9 @@ require "spec_helper"
 
 describe Money, "parsing" do
 
+  bar = '{ "priority": 1, "iso_code": "BAR", "iso_numeric": "840", "name": "Dollar with 4 decimal places", "symbol": "$", "subunit": "Cent", "subunit_to_unit": 10000, "symbol_first": true, "html_entity": "$", "decimal_mark": ".", "thousands_separator": "," }'
+  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 "parses european-formatted inputs under 10EUR" do
       five_ninety_five = Money.new(595, 'EUR')
@@ -19,6 +22,38 @@ describe Money, "parsing" do
       Money.parse('EUR 1.111.234.567,89').should == Money.new(111123456789, 'EUR')
     end
 
+    describe 'currency assumption' do
+      context 'opted in' do
+        before do
+          Money.assume_from_symbol = true
+        end
+        it "parses formatted inputs with the currency passed as a symbol" do
+          Money.parse("$5.95").should == Money.new(595, 'USD')
+          Money.parse("€5.95").should == Money.new(595, 'EUR')
+          Money.parse(" €5.95 ").should == Money.new(595, 'EUR')
+          Money.parse("£9.99").should == Money.new(999, 'GBP')
+        end
+        it 'should assume default currency if not a recognised symbol' do
+          Money.parse("L9.99").should == Money.new(999, 'USD')
+        end
+       end
+      context 'opted out' do
+        before do
+          Money.assume_from_symbol = false
+        end
+        it "parses formatted inputs with the currency passed as a symbol but ignores the symbol" do
+          Money.parse("$5.95").should == Money.new(595, 'USD')
+          Money.parse("€5.95").should == Money.new(595, 'USD')
+          Money.parse(" €5.95 ").should == Money.new(595, 'USD')
+          Money.parse("£9.99").should == Money.new(999, 'USD')
+
+        end
+      end
+      it 'should opt out by default' do
+        Money.assume_from_symbol.should be_false
+      end
+    end
+
     it "parses USD-formatted inputs under $10" do
       five_ninety_five = Money.new(595, 'USD')
 
@@ -63,6 +98,56 @@ describe Money, "parsing" do
     it "raises ArgumentError when unable to detect polarity" do
       lambda { Money.parse('-$5.95-') }.should raise_error ArgumentError
     end
+
+    it "parses correctly strings with exactly 3 decimal digits" do
+      Money.parse("6,534", "EUR").should == Money.new(653, "EUR")
+    end
+
+    context "custom currencies with 4 decimal places" do
+      before :each do
+        Money::Currency.register(JSON.parse(bar, :symbolize_names => true))
+        Money::Currency.register(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")
+        "€0,4".to_money("EU4").should == Money.new(4000, "EU4")
+
+        "$0.04".to_money("BAR").should == Money.new(400, "BAR")
+        "€0,04".to_money("EU4").should == Money.new(400, "EU4")
+
+        "$0.004".to_money("BAR").should == Money.new(40, "BAR")
+        "€0,004".to_money("EU4").should == Money.new(40, "EU4")
+
+        "$0.0004".to_money("BAR").should == Money.new(4, "BAR")
+        "€0,0004".to_money("EU4").should == Money.new(4, "EU4")
+
+        "$0.0024".to_money("BAR").should == Money.new(24, "BAR")
+        "€0,0024".to_money("EU4").should == Money.new(24, "EU4")
+
+        "$0.0324".to_money("BAR").should == Money.new(324, "BAR")
+        "€0,0324".to_money("EU4").should == Money.new(324, "EU4")
+
+        "$0.5324".to_money("BAR").should == Money.new(5324, "BAR")
+        "€0,5324".to_money("EU4").should == Money.new(5324, "EU4")
+
+        "$6.5324".to_money("BAR").should == Money.new(65324, "BAR")
+        "€6,5324".to_money("EU4").should == Money.new(65324, "EU4")
+
+        "$86.5324".to_money("BAR").should == Money.new(865324, "BAR")
+        "€86,5324".to_money("EU4").should == Money.new(865324, "EU4")
+
+        "$186.5324".to_money("BAR").should == Money.new(1865324, "BAR")
+        "€186,5324".to_money("EU4").should == Money.new(1865324, "EU4")
+
+        "$3,331.0034".to_money("BAR").should == Money.new(33310034, "BAR")
+        "€3.331,0034".to_money("EU4").should == Money.new(33310034, "EU4")
+
+        "$8,883,331.0034".to_money("BAR").should == Money.new(88833310034, "BAR")
+        "€8.883.331,0034".to_money("EU4").should == Money.new(88833310034, "EU4")
+      end
+    end
   end
 
   describe ".from_string" do
@@ -207,4 +292,16 @@ describe Money, "parsing" do
     end
   end
 
+  describe ".extract_cents" do
+    it "correctly treats pipe marks '|' in input (regression test)" do
+      Money.extract_cents('100|0').should == Money.extract_cents('100!0')
+    end
+  end
+
+  context "given the same inputs to .parse and .from_*" do
+    it "gives the same results" do
+      4.635.to_money.should == "4.635".to_money
+    end
+  end
+
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 4.0.2
-  prerelease: 
+  version: 5.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Tobias Luetke
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70234938554880 !ruby/object:Gem::Requirement
+  requirement: &70315360313800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -25,10 +25,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70234938554880
+  version_requirements: *70315360313800
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70234938553840 !ruby/object:Gem::Requirement
+  requirement: &70315360313420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,10 +36,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234938553840
+  version_requirements: *70315360313420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70234938547740 !ruby/object:Gem::Requirement
+  requirement: &70315360312880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +47,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70234938547740
+  version_requirements: *70315360312880
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70234938546720 !ruby/object:Gem::Requirement
+  requirement: &70315360328840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -58,7 +58,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234938546720
+  version_requirements: *70315360328840
 description: This library aids one in handling money and different currencies.
 email:
 - semmons99+RubyMoney@gmail.com