money 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480b95f8096f52348bd524f899d7401a2668a05c
-  data.tar.gz: 632d434f8c8e2e3f849f8f45d512d627c0c06e05
+  metadata.gz: bf365d84238e2c9219749009e8564d3fa7de6a9c
+  data.tar.gz: 38d09517c0104b59a32035a1f22c33a78e3f106c
 SHA512:
-  metadata.gz: 6e1e62395c88cbeb0e369ea99499eef99f1fe7bfbc99d1e38d95c998298a2f64dfa197e965050b02abc3d6301bad8cdde601ba291220b4884ff6d46462daa799
-  data.tar.gz: 05dc6ca4711769270130edd4ec05b5a67c4a6023e6db6d12b3a41db65fd26af147553c37ae6f66ec342eaf27f169ef4359e9867862f88b3c0765bd9d419c34b1
+  metadata.gz: b7564da6464a9ff9e054bc552ff1de1e8394b0313de0e937363b66c53aa5efbedc3082439e44f5c8b4d3b23a5ab652dcc42c437544a23372a26b24e3671f44dd
+  data.tar.gz: 89edeaf1d8e4f7237c598ba6fba0ddeb69ca79a09e6b9b73e8812db15d2b71cde25f206749954982314712deda29ce297d0cc289416a86e426d07020382d72ee

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.2
+  - rbx-2
 script: bundle exec rspec spec
 notifications:
   recipients:

data/AUTHORS

@@ -16,6 +16,7 @@ Bodaniel Jeanes
 Brian Jones
 bUg.
 Casper Thomsen
+Chad Boyd
 Choongmin Lee
 Chris Kampmeier
 Christian Billen
@@ -59,6 +60,7 @@ Mateusz Wolsza
 Matias Korhonen
 Matt Jankowski
 Matthew McEachen
+Michael J. Cohen
 Michael Irwin
 Michael Reinsch
 Mikael Wikman
@@ -69,9 +71,11 @@ Nihad Abbasov
 Olek Janiszewski
 Orien Madgwick
 Paul McMahon
+Paulo Diniz
 Pavel Gabriel
 Pavan Sudarshan
 pconnor
+Pedro Nascimento
 Pelle Braendgaard
 Phil Cohen
 pivotal-cloudplanner
@@ -88,6 +92,7 @@ Spencer Rinehart
 Steve Morris
 Thomas E Enebo
 Ticean Bennett
+Tim Hart
 Tobias Luetke
 Tobias Schmidt
 Tom Lianza
@@ -100,3 +105,4 @@ Yuusuke Takizawa
 Tien Nguyen
 Wei Zhu
 Zubin Henner
+Troels Knak-Nielsen

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## Next release
+ - Fixes formatting error when both `thousands_separator` and `decimal_mark` was added to Money#format as options.
+ - Add Money#to_i which returns the whole part of the value. i.e.
+   Money.new(100, "USD").to_i # => 1
+ - Fix output on Ukrainian Hryvnia symbol in HTML.
+ - Add documentation about i18n in README.
+ - Update iso code, symbol, subunit for the new Turkmenistani manat (GH-181)
+ - Performance Improvements (1.99x faster on MRI, 1.85x on Rubinius, 41.4x faster on JRuby)
+ - Money can now add and subtract Fixnum 0
+ - Money#new uses Money.default_currency if currency arg is nil (GH-410)
+ - Fixed formatting of NOK, putting the symbol after numbers
+ - Fixed issue where rounded_infinite_precision formatting fails for some localized currencies (GH-422)
+
+## 6.1.1
+ - Remove lingering Monetize call
+
 ## 6.1.0
  - Remove deprecated methods.
  - Fix issue with block form of rounding_mode.

data/README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/RubyMoney/money.png?branch=master)](https://travis-ci.org/RubyMoney/money)
 [![Code Climate](https://codeclimate.com/github/RubyMoney/money.png)](https://codeclimate.com/github/RubyMoney/money)
 [![Coverage Status](https://coveralls.io/repos/RubyMoney/money/badge.png?branch=master)](https://coveralls.io/r/RubyMoney/money?branch=master)
-[![Inline docs](http://inch-pages.github.io/github/RubyMoney/money.png)](http://inch-pages.github.io/github/RubyMoney/money)
+[![Inline docs](http://inch-ci.org/github/RubyMoney/money.png)](http://inch-ci.org/github/RubyMoney/money)
 [![Dependency Status](https://gemnasium.com/RubyMoney/money.png)](https://gemnasium.com/RubyMoney/money)
 [![License](http://img.shields.io/license/MIT.png?color=green)](http://opensource.org/licenses/MIT)
 
@@ -266,6 +266,35 @@ To integrate money in a Rails application use [money-rails](http://github.com/Ru
 
 For deprecated methods of integrating with Rails, check [the wiki](https://github.com/RubyMoney/money/wiki).
 
+## I18n
+
+If you want thousands seperator and decimal mark to be same across all
+currencies this can be defined in your `I18n` translation files.
+
+In an rails application this may look like:
+```yml
+# config/locale/en.yml
+en:
+  number:
+    format:
+      delimeter: ","
+      separator: "."
+  # or
+  number:
+    currency:
+      format:
+        delimeter: ","
+        separator: "."
+```
+
+For this example `Money.new(123456789, "SEK").format` will return `1,234,567.89
+kr` which otherwise will return `1 234 567,89 kr`.
+
+If you wish to disable this feature:
+``` ruby
+Money.use_i18n = false
+```
+
 ## Migration Notes
 
 #### Version 6.0.0

data/config/currency_iso.json

@@ -129,7 +129,7 @@
     "priority": 100,
     "iso_code": "AZN",
     "name": "Azerbaijani Manat",
-    "symbol": null,
+    "symbol": "₼",
     "alternate_symbols": ["m", "man"],
     "subunit": "Qəpik",
     "subunit_to_unit": 100,
@@ -1448,7 +1448,7 @@
     "alternate_symbols": [",-"],
     "subunit": "Øre",
     "subunit_to_unit": 100,
-    "symbol_first": true,
+    "symbol_first": false,
     "html_entity": "kr",
     "decimal_mark": ",",
     "thousands_separator": ".",
@@ -1918,11 +1918,11 @@
   },
   "tmt": {
     "priority": 100,
-    "iso_code": "TMM",
+    "iso_code": "TMT",
     "name": "Turkmenistani Manat",
-    "symbol": "m",
+    "symbol": "T",
     "alternate_symbols": [],
-    "subunit": "Tennesi",
+    "subunit": "Tenge",
     "subunit_to_unit": 100,
     "symbol_first": false,
     "html_entity": "",
@@ -2023,7 +2023,7 @@
     "subunit": "Kopiyka",
     "subunit_to_unit": 100,
     "symbol_first": false,
-    "html_entity": "&#x20B4",
+    "html_entity": "₴",
     "decimal_mark": ".",
     "thousands_separator": ",",
     "iso_numeric": "980"

data/lib/money/currency.rb

@@ -71,7 +71,9 @@ class Money
       #   Money::Currency.wrap(c1)    #=> #<Money::Currency id: usd ...>
       #   Money::Currency.wrap("usd") #=> #<Money::Currency id: usd ...>
       def wrap(object)
-        if object.nil? || object.is_a?(Currency)
+        if object.nil?
+          nil
+        elsif object.is_a?(Currency)
           object
         else
           Currency.new(object)
@@ -125,7 +127,7 @@ class Money
       private
 
       def stringify_keys
-        table.keys.map{|k| k.to_s.downcase}
+        table.keys.each_with_object(Set.new) { |k, set| set.add(k.to_s.downcase) }
       end
     end
 
@@ -172,9 +174,18 @@ class Money
       if self.class.stringified_keys.include?(id)
         @id = id.to_sym
         data = self.class.table[@id]
-        data.each_pair do |key, value|
-          instance_variable_set(:"@#{key}", value)
-        end
+        @priority = data[:priority]
+        @iso_code = data[:iso_code]
+        @name = data[:name]
+        @symbol = data[: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]
       else
         raise UnknownCurrency, "Unknown currency '#{id}'"
       end

data/lib/money/money/arithmetic.rb

@@ -23,10 +23,12 @@ class Money
     #   Money.new(100) == Money.new(101) #=> false
     #   Money.new(100) == Money.new(100) #=> true
     def ==(other_money)
-      other_money = other_money.to_money
-      fractional == other_money.fractional && currency == other_money.currency
-    rescue NoMethodError
-      false
+      if other_money.respond_to?(:to_money)
+        other_money = other_money.to_money
+        fractional == other_money.fractional && currency == other_money.currency
+      else
+        false
+      end
     end
 
     # Synonymous with +#==+.
@@ -41,13 +43,15 @@ class Money
     end
 
     def <=>(val)
-      val = val.to_money
-      unless fractional == 0 || val.fractional == 0 || currency == val.currency
-        val = val.exchange_to(currency)
+      if val.respond_to?(:to_money)
+        val = val.to_money unless val.respond_to?(:fractional)
+        if fractional != 0 && val.fractional != 0 && currency != val.currency
+          val = val.exchange_to(currency)
+        end
+        fractional <=> val.fractional
+      else
+        raise ArgumentError, "Comparison of #{self.class} with #{val.inspect} failed"
       end
-      fractional <=> val.fractional
-    rescue NoMethodError
-      raise ArgumentError, "Comparison of #{self.class} with #{val.inspect} failed"
     end
 
     # Test if the amount is positive. Returns +true+ if the money amount is
@@ -87,6 +91,7 @@ class Money
     # @example
     #   Money.new(100) + Money.new(100) #=> #<Money @fractional=200>
     def +(other_money)
+      return self if other_money == 0
       other_money = other_money.exchange_to(currency)
       Money.new(fractional + other_money.fractional, currency)
     end
@@ -103,6 +108,7 @@ class Money
     # @example
     #   Money.new(100) - Money.new(99) #=> #<Money @fractional=1>
     def -(other_money)
+      return self if other_money == 0
       other_money = other_money.exchange_to(currency)
       Money.new(fractional - other_money.fractional, currency)
     end

data/lib/money/money/formatting.rb

@@ -3,8 +3,8 @@ class Money
   module Formatting
     def self.included(base)
       [
-        [:thousands_separator, :delimiter, "."],
-        [:decimal_mark, :separator, ","]
+        [:thousands_separator, :delimiter, ","],
+        [:decimal_mark, :separator, "."]
       ].each do |method, name, character|
         define_i18n_method(method, name, character)
       end
@@ -199,11 +199,13 @@ class Money
       formatted = self.abs.to_s
 
       if rules[:rounded_infinite_precision]
+        formatted.gsub!(/#{currency.decimal_mark}/, '.') unless '.' == currency.decimal_mark
         formatted = ((BigDecimal(formatted) * currency.subunit_to_unit).round / BigDecimal(currency.subunit_to_unit.to_s)).to_s("F")
         formatted.gsub!(/\..*/) do |decimal_part|
           decimal_part << '0' while decimal_part.length < (currency.decimal_places + 1)
           decimal_part
         end
+        formatted.gsub!(/\./, currency.decimal_mark) unless '.' == currency.decimal_mark
       end
 
       sign = self.negative? ? '-' : ''
@@ -247,10 +249,7 @@ class Money
         formatted="#{sign_before}#{sign}#{formatted}"
       end
 
-      if rules.has_key?(:decimal_mark) && rules[:decimal_mark] &&
-        rules[:decimal_mark] != decimal_mark
-        formatted.sub!(decimal_mark, rules[:decimal_mark])
-      end
+      apply_decimal_mark_from_rules(formatted, rules)
 
       if rules[:with_currency]
         formatted << " "
@@ -283,6 +282,20 @@ class Money
       end
       rules
     end
+
+    # Applies decimal mark from rules to formatted
+    #
+    # @param [String] formatted
+    # @param [Hash]   rules
+    def apply_decimal_mark_from_rules(formatted, rules)
+      if rules.has_key?(:decimal_mark) && rules[:decimal_mark] &&
+        rules[:decimal_mark] != decimal_mark
+
+        regexp_decimal = Regexp.escape(decimal_mark)
+        formatted.sub!(/(.*)(#{regexp_decimal})(.*)\Z/,
+                       "\\1#{rules[:decimal_mark]}\\3")
+      end
+    end
   end
 
   def regexp_format(formatted, rules, decimal_mark, symbol_value)

data/lib/money/money.rb

@@ -92,7 +92,7 @@ class Money
     #   Money.empty #=> #<Money @fractional=0>
     def empty(currency = default_currency)
       @empty ||= {}
-      @empty[currency] ||= Money.new(0, currency)
+      @empty[currency] ||= Money.new(0, currency).freeze
     end
     alias_method :zero, :empty
   end
@@ -238,13 +238,10 @@ class Money
   #   Money.new(100, "EUR") #=> #<Money @fractional=100 @currency="EUR">
   #
   def initialize(obj, currency = Money.default_currency, bank = Money.default_bank)
-    @fractional = obj.fractional
-    @currency   = obj.currency
-    @bank       = obj.bank
-  rescue NoMethodError
-    @fractional = as_d(obj)
-    @currency   = Currency.wrap(currency)
-    @bank       = bank
+    @fractional = obj.respond_to?(:fractional) ? obj.fractional : as_d(obj)
+    @currency   = obj.respond_to?(:currency) ? obj.currency : Currency.wrap(currency)
+    @currency ||= Money.default_currency 
+    @bank       = obj.respond_to?(:bank) ? obj.bank : bank
   end
 
   # Assuming using a currency using dollars:
@@ -362,6 +359,16 @@ class Money
     as_d(fractional) / as_d(currency.subunit_to_unit)
   end
 
+  # Return the amount of money as a Integer.
+  #
+  # @return [Integer]
+  #
+  # @example
+  #   Money.us_dollar(1_00).to_i #=> 1
+  def to_i
+    to_d.to_i
+  end
+
   # Return the amount of money as a float. Floating points cannot guarantee
   # precision. Therefore, this function should only be used when you no longer
   # need to represent currency or working with another system that requires
@@ -521,13 +528,11 @@ class Money
   private
 
   def as_d(num)
-    if num.is_a?(Rational)
-      num.to_d(self.class.conversion_precision)
+    if num.respond_to?(:to_d)
+      num.is_a?(Rational) ? num.to_d(self.class.conversion_precision) : num.to_d
     else
-      num.to_d
+      BigDecimal.new(num.to_s)
     end
-  rescue NoMethodError
-    BigDecimal.new(num.to_s)
   end
 
   def strings_from_fractional

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "6.1.1"
+  VERSION = "6.2.0"
 end

data/money.gemspec

@@ -25,11 +25,11 @@ and choose the migration that best suits your application.
 Test responsibly :-)
 MSG
 
-  s.add_dependency "i18n", "~> 0.6.4"
+  s.add_dependency 'i18n', ['>= 0.6.4', '<= 0.7.0.dev']
 
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2.14"
+  s.add_development_dependency "rspec", "~> 3.0.0"
   s.add_development_dependency "yard", "~> 0.8"
   s.add_development_dependency "kramdown", "~> 1.1"
 

data/spec/bank/base_spec.rb

@@ -6,7 +6,7 @@ describe Money::Bank::Base do
     it "is local to one class" do
       klass = Money::Bank::Base
       subclass = Class.new(Money::Bank::Base)
-      klass.instance.should_not == subclass.instance
+      expect(klass.instance).not_to eq subclass.instance
     end
   end
 
@@ -14,7 +14,7 @@ describe Money::Bank::Base do
     it "accepts a block and stores @rounding_method" do
       proc = Proc.new { |n| n.ceil }
       bank = Money::Bank::Base.new(&proc)
-      bank.rounding_method.should == proc
+      expect(bank.rounding_method).to eq proc
     end
   end
 
@@ -29,7 +29,7 @@ describe Money::Bank::Base do
       end
 
       bank = MyBank.new
-      bank.setup_called.should == true
+      expect(bank.setup_called).to eq true
     end
   end
 
@@ -57,17 +57,17 @@ describe Money::Bank::Base do
     end
 
     it "returns true when currencies match" do
-      subject.send(:same_currency?, 'USD', 'USD').should be_true
-      subject.send(:same_currency?, Money::Currency.wrap('USD'), 'USD').should be_true
-      subject.send(:same_currency?, 'USD', Money::Currency.wrap('USD')).should be_true
-      subject.send(:same_currency?, Money::Currency.wrap('USD'), Money::Currency.wrap('USD')).should be_true
+      expect(subject.send(:same_currency?, 'USD', 'USD')).to be true
+      expect(subject.send(:same_currency?, Money::Currency.wrap('USD'), 'USD')).to be true
+      expect(subject.send(:same_currency?, 'USD', Money::Currency.wrap('USD'))).to be true
+      expect(subject.send(:same_currency?, Money::Currency.wrap('USD'), Money::Currency.wrap('USD'))).to be true
     end
 
     it "returns false when currencies do not match" do
-      subject.send(:same_currency?, 'USD', 'EUR').should be_false
-      subject.send(:same_currency?, Money::Currency.wrap('USD'), 'EUR').should be_false
-      subject.send(:same_currency?, 'USD', Money::Currency.wrap('EUR')).should be_false
-      subject.send(:same_currency?, Money::Currency.wrap('USD'), Money::Currency.wrap('EUR')).should be_false
+      expect(subject.send(:same_currency?, 'USD', 'EUR')).to be false
+      expect(subject.send(:same_currency?, Money::Currency.wrap('USD'), 'EUR')).to be false
+      expect(subject.send(:same_currency?, 'USD', Money::Currency.wrap('EUR'))).to be false
+      expect(subject.send(:same_currency?, Money::Currency.wrap('USD'), Money::Currency.wrap('EUR'))).to be false
     end
 
     it "raises an UnknownCurrency exception when an unknown currency is passed" do