money 6.0.0 → 6.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2d0dc5b8be2189ee718cbe2cf9a981997283de43
+  data.tar.gz: fc919e76acc75c0ff838207f939442aea963f793
+SHA512:
+  metadata.gz: e394b1d687d093cbb2651ad073a09ee2de5896b5e16681f601141c8b353d2efca668a14af20a025734f9694cfddb4c2e2254278e56c64ebcb4af44cfabbd1f82
+  data.tar.gz: 7856ca8d8c8a15828c237d26c7c9c9a55be1d2dd0127cf9817f163116ff1a5a00fe17f8a34978113793588a0450c57d7ad2a8a2fa5a4a65b32f46ea79408c294

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: lUJ1iIe2hjtyIFZm413PZ38saqD5UOLXo

data/.gitignore

@@ -0,0 +1,19 @@
+# Bundler
+.bundle
+Gemfile.lock
+pkg/*
+bin/
+
+# Rubinius
+*.rbc
+
+# YARD
+.yardoc
+yardoc/
+doc/
+
+# Project
+.rbenv-version
+.rbx
+.rvmrc
+.ruby-version

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+script: bundle exec rspec spec
+notifications:
+  recipients:
+    - semmons99@gmail.com
+    - andreas@aloop.org
+    - weppos@weppos.net

data/AUTHORS

@@ -0,0 +1,101 @@
+Abhay Kumar
+Alex Speller
+Alexander Ross
+Andreas Loupasakis
+Andrei
+Andrew White
+Andrius Chamentauskas
+Anthony Hristov
+Anthony Sellitti
+banjerluke
+Bartosz Dz
+bbozo
+Benjamin Grössing
+Bill DeRusha
+Bodaniel Jeanes
+Brian Jones
+bUg.
+Casper Thomsen
+Choongmin Lee
+Chris Kampmeier
+Christian Billen
+Dave Kroondyk
+Doug Droper
+Ed Saunders
+Eloy
+Evan Alter
+Exoth
+François Beausoleil
+François Klingler
+Francisco Trindade
+Gee-Hsien Chuang
+Hakan Ensari
+Hongli Lai
+Ilia Lobsanov
+Ingo Wichmann
+Jacob Atzen
+James Cotterill
+James Hunt
+Jean-Louis Giordano
+Jell
+Jeremy McNevin
+Jérémy Lecour
+Jesse Cooke
+John Duff
+John Gakos
+Josh Delsman
+Joshua Clayton
+Josh Hepworth
+Julien Boyer
+Kaleem Ullah
+Kenichi Kamiya
+Kenn Ejima
+kirillian
+Laurynas Butkus
+Marcel Scherf
+Marco Otte-Witte
+Mateusz Wolsza
+Matias Korhonen
+Matt Jankowski
+Matthew McEachen
+Michael Irwin
+Michael Reinsch
+Mikael Wikman
+Mike Połétyn
+Musannif Zahir
+Neil Middleton
+Nihad Abbasov
+Olek Janiszewski
+Orien Madgwick
+Paul McMahon
+Pavel Gabriel
+Pavan Sudarshan
+pconnor
+Pelle Braendgaard
+Phil Cohen
+pivotal-cloudplanner
+Prathan Thananart
+Robert Starsi
+Romain Gérard
+Ryan Bigg
+sankaranarayanan
+Semyon Perepelitsa
+Scott Pierce
+Shane Emmons
+Simone Carletti
+Spencer Rinehart
+Steve Morris
+Thomas E Enebo
+Ticean Bennett
+Tobias Luetke
+Tobias Schmidt
+Tom Lianza
+tommeier
+Бродяной Александр
+Adrian Longley
+Daniel Sherson
+Clarke Brunsdon
+Yuusuke Takizawa
+Tien Nguyen
+Wei Zhu
+Zubin Henner

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 6.0.1.beta1
+ - Deprecated methods lists caller on print out for easier updating.
+ - Added support for Money::Currency#to_str and Money::Currency#to_sym
+ - Added ability to temporally change the rounding methond inside a given block
+ - Replaced parsing and core extensions with the monetize gem
+
 ## 6.0.0
 - Fix BTC subunit
 - New option :sign_positive to add a + sign to positive numbers

data/CONTRIBUTING.md

@@ -0,0 +1,17 @@
+# Contribution Guidelines
+
+## Steps
+
+1. Fork [the repo](https://github.com/RubyMoney/money)
+2. Grab dependencies: `bundle install`
+3. Make sure everything is working: `bundle exec rake spec`
+4. Make your changes
+5. Test your changes
+5. Create a Pull Request
+6. Celebrate!!!!!
+
+## Notes
+
+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.

data/Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "coveralls", :require => false
+gem "json", :platform => [:jruby, :mri_18]
+
+gemspec

data/README.md

@@ -1,16 +1,23 @@
 # RubyMoney - Money
 
-[![Gem Version](https://badge.fury.io/rb/money.png)](http://badge.fury.io/rb/money) [![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)
+[![Gem Version](https://badge.fury.io/rb/money.png)](http://badge.fury.io/rb/money)
+[![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)
+[![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)
 
 :warning: Please read the [migration notes](#migration-notes) before upgrading to a new major version.
 
+If you miss String parsing, check out the new [monetize gem](https://github.com/RubyMoney/monetize).
+
 ## Contributing
 
 See the [Contribution Guidelines](https://github.com/RubyMoney/money/blob/master/CONTRIBUTING.md)
 
 ## Introduction
 
-This library aids one in handling money and different currencies.
+A Ruby Library for dealing with money and currency conversion.
 
 ### Features
 
@@ -23,8 +30,6 @@ This library aids one in handling money and different currencies.
 - Represents currency as `Money::Currency` instances providing an high level of
   flexibility.
 - Provides APIs for exchanging money from one currency to another.
-- Has the ability to parse a money and currency strings
-  into the corresponding Money/Currency object.
 
 ### Resources
 
@@ -73,12 +78,6 @@ 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.parse("$100") == Money.new(10000, "USD")
-Money.parse("€100") == Money.new(10000, "EUR")
-Money.parse("£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")

data/Rakefile

@@ -1,52 +1,11 @@
-require 'rubygems'
-require 'rake/clean'
+require "rubygems"
+require "bundler/gem_tasks"
+require "rake/clean"
 
 CLOBBER.include('doc', '.yardoc')
 
-def gemspec
-  @gemspec ||= begin
-    file = File.expand_path("../money.gemspec", __FILE__)
-    eval(File.read(file), binding, file)
-  end
-end
-
-
-task :default => :spec
-task :test => :spec
-
-
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new
-
-
-require 'yard'
+require "yard"
 
 YARD::Rake::YardocTask.new do |t|
   t.options << "--files" << "CHANGELOG.md,LICENSE"
 end
-
-
-require 'rubygems/package_task'
-
-Gem::PackageTask.new(gemspec) do |pkg|
-  pkg.gem_spec = gemspec
-end
-
-task :gem => :gemspec
-
-desc "Install the gem locally"
-task :install => :gem do
-  sh "gem install pkg/#{gemspec.full_name}.gem"
-end
-
-desc "Validate the gemspec"
-task :gemspec do
-  gemspec.validate
-end
-
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -I lib -r money.rb"
-end

data/config/currency_iso.json

@@ -427,7 +427,7 @@
     "subunit": "Fen",
     "subunit_to_unit": 100,
     "symbol_first": true,
-    "html_entity": "圓",
+    "html_entity": "元",
     "decimal_mark": ".",
     "thousands_separator": ",",
     "iso_numeric": "156"

data/lib/money/bank/variable_exchange.rb

@@ -30,7 +30,7 @@ class Money
     #   bank.exchange_with(c2, "USD") #=> #<Money @fractional=803115>
     class VariableExchange < Base
 
-      attr_reader :rates
+      attr_reader :rates, :mutex
 
       # Available formats for importing/exporting rates.
       RATE_FORMATS = [:json, :ruby, :yaml]
@@ -84,27 +84,38 @@ class Money
       #
       #   # Exchange 100 CAD to USD:
       #   bank.exchange_with(c2, "USD") #=> #<Money @fractional=803115>
-      def exchange_with(from, to_currency)
-        return from if same_currency?(from.currency, to_currency)
+      def exchange_with(from, to_currency, &block)
+        to_currency = Currency.wrap(to_currency)
+        if from.currency == to_currency
+          from
+        else
+          if rate = get_rate(from.currency, to_currency)
+            fractional = calculate_fractional(from, to_currency)
+            Money.new(
+              exchange(fractional, rate, &block), to_currency
+            )
+          else
+            raise UnknownRate, "No conversion rate known for '#{from.currency.iso_code}' -> '#{to_currency}'"
+          end
+        end
+      end
+
+      def calculate_fractional(from, to_currency)
+        BigDecimal.new(from.fractional.to_s) / (
+          BigDecimal.new(from.currency.subunit_to_unit.to_s) /
+          BigDecimal.new(to_currency.subunit_to_unit.to_s)
+        )
+      end
 
-        rate = get_rate(from.currency, to_currency)
-        unless rate
-          raise UnknownRate, "No conversion rate known for '#{from.currency.iso_code}' -> '#{to_currency}'"
+      def exchange(fractional, rate, &block)
+        ex = (fractional * BigDecimal.new(rate.to_s)).to_f
+        if block_given?
+          yield ex
+        elsif @rounding_method
+          @rounding_method.call(ex)
+        else
+          ex.to_s.to_i
         end
-        _to_currency_  = Currency.wrap(to_currency)
-
-        fractional = BigDecimal.new(from.fractional.to_s) / (BigDecimal.new(from.currency.subunit_to_unit.to_s) / BigDecimal.new(_to_currency_.subunit_to_unit.to_s))
-
-        ex = fractional * BigDecimal.new(rate.to_s)
-        ex = ex.to_f
-        ex = if block_given?
-               yield ex
-             elsif @rounding_method
-               @rounding_method.call(ex)
-             else
-               ex.to_s.to_i
-             end
-        Money.new(ex, _to_currency_)
       end
 
       # Registers a conversion rate and returns it (uses +#set_rate+).
@@ -129,6 +140,8 @@ class Money
       # @param [Currency, String, Symbol] from Currency to exchange from.
       # @param [Currency, String, Symbol] to Currency to exchange to.
       # @param [Numeric] rate Rate to use when exchanging currencies.
+      # @param [Hash] opts Options hash to set special parameters
+      # @option opts [Boolean] :without_mutex disables the usage of a mutex
       #
       # @return [Numeric]
       #
@@ -136,8 +149,13 @@ class Money
       #   bank = Money::Bank::VariableExchange.new
       #   bank.set_rate("USD", "CAD", 1.24515)
       #   bank.set_rate("CAD", "USD", 0.803115)
-      def set_rate(from, to, rate)
-        @mutex.synchronize { @rates[rate_key_for(from, to)] = rate }
+      def set_rate(from, to, rate, opts = {})
+        fn = -> { @rates[rate_key_for(from, to)] = rate }
+        if opts[:without_mutex]
+          fn.call
+        else
+          @mutex.synchronize { fn.call }
+        end
       end
 
       # Retrieve the rate for the given currencies. Uses +Mutex+ to synchronize
@@ -145,6 +163,8 @@ class Money
       #
       # @param [Currency, String, Symbol] from Currency to exchange from.
       # @param [Currency, String, Symbol] to Currency to exchange to.
+      # @param [Hash] opts Options hash to set special parameters
+      # @option opts [Boolean] :without_mutex disables the usage of a mutex
       #
       # @return [Numeric]
       #
@@ -155,8 +175,13 @@ class Money
       #
       #   bank.get_rate("USD", "CAD") #=> 1.24515
       #   bank.get_rate("CAD", "USD") #=> 0.803115
-      def get_rate(from, to)
-        @mutex.synchronize { @rates[rate_key_for(from, to)] }
+      def get_rate(from, to, opts = {})
+        fn = -> { @rates[rate_key_for(from, to)] }
+        if opts[:without_mutex]
+          fn.call
+        else
+          @mutex.synchronize { fn.call }
+        end
       end
 
       # Return the known rates as a string in the format specified. If +file+
@@ -165,6 +190,8 @@ class Money
       #
       # @param [Symbol] format Request format for the resulting string.
       # @param [String] file Optional file location to write the rates to.
+      # @param [Hash] opts Options hash to set special parameters
+      # @option opts [Boolean] :without_mutex disables the usage of a mutex
       #
       # @return [String]
       #
@@ -177,12 +204,12 @@ class Money
       #
       #   s = bank.export_rates(:json)
       #   s #=> "{\"USD_TO_CAD\":1.24515,\"CAD_TO_USD\":0.803115}"
-      def export_rates(format, file=nil)
+      def export_rates(format, file = nil, opts = {})
         raise Money::Bank::UnknownRateFormat unless
           RATE_FORMATS.include? format
 
         s = ""
-        @mutex.synchronize {
+        fn = -> {
           s = case format
               when :json
                 JSON.dump(@rates)
@@ -196,6 +223,11 @@ class Money
             File.open(file, "w") {|f| f.write(s) }
           end
         }
+        if opts[:without_mutex]
+          fn.call
+        else
+          @mutex.synchronize { fn.call }
+        end
         s
       end
 
@@ -204,6 +236,8 @@ class Money
       #
       # @param [Symbol] format The format of +s+.
       # @param [String] s The rates string.
+      # @param [Hash] opts Options hash to set special parameters
+      # @option opts [Boolean] :without_mutex disables the usage of a mutex
       #
       # @return [self]
       #
@@ -216,11 +250,11 @@ class Money
       #
       #   bank.get_rate("USD", "CAD") #=> 1.24515
       #   bank.get_rate("CAD", "USD") #=> 0.803115
-      def import_rates(format, s)
+      def import_rates(format, s, opts = {})
         raise Money::Bank::UnknownRateFormat unless
           RATE_FORMATS.include? format
 
-        @mutex.synchronize {
+        fn = -> {
           @rates = case format
                    when :json
                      JSON.load(s)
@@ -230,6 +264,11 @@ class Money
                      YAML.load(s)
                    end
         }
+        if opts[:without_mutex]
+          fn.call
+        else
+          @mutex.synchronize { fn.call }
+        end
         self
       end
 

data/lib/money/core_extensions/numeric.rb

@@ -0,0 +1,7 @@
+class Numeric
+  alias_method :_to_money, :to_money
+  def to_money(*args)
+    Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to use Numeric#to_money. Please start using the Monetize gem from https://github.com/RubyMoney/monetize if you are not already doing so"
+    _to_money(*args)
+  end
+end

data/lib/money/core_extensions/string.rb

@@ -0,0 +1,13 @@
+class String
+  alias_method :_to_money, :to_money
+  def to_money(*args)
+    Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to use String#to_money. Please start using the Monetize gem from https://github.com/RubyMoney/monetize if you are not already doing so"
+    _to_money(*args)
+  end
+
+  alias_method :_to_currency, :to_currency
+  def to_currency(*args)
+    Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to use String#to_currency. Please start using the Monetize gem from https://github.com/RubyMoney/monetize if you are not already doing so"
+    _to_currency(*args)
+  end
+end

data/lib/money/core_extensions/symbol.rb

@@ -0,0 +1,7 @@
+class Symbol
+  alias_method :_to_currency, :to_currency
+  def to_currency(*args)
+    Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to use Symbol#to_currency. Please start using the Monetize gem from https://github.com/RubyMoney/monetize if you are not already doing so"
+    _to_currency(*args)
+  end
+end

data/lib/money/core_extensions.rb

@@ -1,80 +1,7 @@
-# Open +Numeric+ to add new method.
-class Numeric
-  # Converts this numeric into a +Money+ object in the given +currency+.
-  #
-  # @param [Currency, String, Symbol] currency
-  #   The currency to set the resulting +Money+ object to.
-  #
-  # @return [Money]
-  #
-  # @example
-  #   100.to_money                   #=> #<Money @fractional=10000>
-  #   100.37.to_money                #=> #<Money @fractional=10037>
-  #   BigDecimal.new('100').to_money #=> #<Money @fractional=10000>
-  #
-  # @see Money.from_numeric
-  #
-  def to_money(currency = nil)
-    Money.deprecate "as of Money 6.1.0 you must `require 'money/core_extension'` to use Numeric#to_money."
-    Money.from_numeric(self, currency || Money.default_currency)
-  end
-end
+require "money/core_extensions/numeric"
+require "money/core_extensions/string"
+require "money/core_extensions/symbol"
 
-# Open +String+ to add new methods.
-class String
-  # Parses the current string and converts it to a +Money+ object.
-  # Excess characters will be discarded.
-  #
-  # @param [Currency, String, Symbol] currency
-  #   The currency to set the resulting +Money+ object to.
-  #
-  # @return [Money]
-  #
-  # @example
-  #   '100'.to_money                #=> #<Money @fractional=10000>
-  #   '100.37'.to_money             #=> #<Money @fractional=10037>
-  #   '100 USD'.to_money            #=> #<Money @fractional=10000, @currency=#<Money::Currency id: usd>>
-  #   'USD 100'.to_money            #=> #<Money @fractional=10000, @currency=#<Money::Currency id: usd>>
-  #   '$100 USD'.to_money           #=> #<Money @fractional=10000, @currency=#<Money::Currency id: usd>>
-  #   'hello 2000 world'.to_money   #=> #<Money @fractional=200000 @currency=#<Money::Currency id: usd>>
-  #
-  # @see Money.from_string
-  #
-  def to_money(currency = nil)
-    Money.deprecate "String#to_money is depreciated and will be remove in 6.1.0. Please write your own parsing methods."
-    Money.parse(self, currency)
-  end
+Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to use core extensions. Please start using the Monetize gem from https://github.com/RubyMoney/monetize if you are not already doing so."
 
-  # Converts the current string into a +Currency+ object.
-  #
-  # @return [Money::Currency]
-  #
-  # @raise [Money::Currency::UnknownCurrency]
-  #   If this String reference an unknown currency.
-  #
-  # @example
-  #   "USD".to_currency #=> #<Money::Currency id: usd>
-  #
-  def to_currency
-    Money.deprecate "as of Money 6.1.0 you must `require 'money/core_extension'` to use String#to_currency."
-    Money::Currency.new(self)
-  end
-end
-
-# Open +Symbol+ to add new methods.
-class Symbol
-  # Converts the current symbol into a +Currency+ object.
-  #
-  # @return [Money::Currency]
-  #
-  # @raise [Money::Currency::UnknownCurrency]
-  #   If this String reference an unknown currency.
-  #
-  # @example
-  #   :ars.to_currency #=> #<Money::Currency id: ars>
-  #
-  def to_currency
-    Money.deprecate "as of Money 6.1.0 you must `require 'money/core_extension'` to use Symbol#to_currency."
-    Money::Currency.new(self)
-  end
-end
+Money.silence_core_extensions_deprecations = true