money 6.0.0 → 6.0.1.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c0f9be74337dc06f899a38e9016dd937cdb404ad
+  data.tar.gz: 2b2bdc6e10c1d900dace7dde6a6082bfffc546be
+SHA512:
+  metadata.gz: 92b2ceb3e06cac33d2720dceed0d333901c0323748210f98e78d3599a674f6320443d482174bbc440a8385d5c8249f90d6d0d14a91448d00c51626858880a45e
+  data.tar.gz: 5b3675798dd15208d40cabf1c1e7f5454c64ae8f061113434b3a9a183d6d9fcf357f8ee0bf5e8b48f27d4da6cbbcb40ab21cdcdf20f3d6dd7a850630f671c688

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,5 @@
+source "https://rubygems.org"
+
+gem "json", :platform => [:jruby, :mri_18]
+
+gemspec

data/README.md

@@ -4,6 +4,8 @@
 
 :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)

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/lib/money.rb

@@ -3,5 +3,15 @@ require "bigdecimal/util"
 require "i18n" rescue LoadError
 require "money/currency"
 require "money/money"
-require "money/core_extensions"
+require "money/core_extensions/numeric"
+require "money/core_extensions/string"
+require "money/core_extensions/symbol"
 require "money/deprecations"
+
+class Money
+  class << self
+    attr_accessor :silence_core_extensions_deprecations
+  end
+
+  self.silence_core_extensions_deprecations = false
+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."
 
-  # 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

data/lib/money/core_extensions/numeric.rb

@@ -0,0 +1,9 @@
+class Numeric
+  alias_method :_to_money, :to_money
+  def to_money(*args)
+    unless Money.silence_core_extensions_deprecations
+      Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to use Numeric#to_money."
+    end
+    _to_money(*args)
+  end
+end

data/lib/money/core_extensions/string.rb

@@ -0,0 +1,15 @@
+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."
+    _to_money(*args)
+  end
+
+  alias_method :_to_currency, :to_currency
+  def to_currency(*args)
+    unless Money.silence_core_extensions_deprecations
+      Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to use String#to_currency."
+    end
+    _to_currency(*args)
+  end
+end

data/lib/money/core_extensions/symbol.rb

@@ -0,0 +1,9 @@
+class Symbol
+  alias_method :_to_currency, :to_currency
+  def to_currency(*args)
+    unless Money.silence_core_extensions_deprecations
+      Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to use Symbol#to_currency."
+    end
+    _to_currency(*args)
+  end
+end

data/lib/money/currency.rb

@@ -300,6 +300,35 @@ class Money
       id.to_s.upcase
     end
 
+    # Returns a string representation corresponding to the upcase +id+
+    # attribute. Useful in cases where only implicit conversions are made.
+    #
+    # @return [String]
+    #
+    # @example
+    #   Money::Currency.new(:usd).to_str #=> "USD"
+    #   Money::Currency.new(:eur).to_str #=> "EUR"
+    def to_str
+      id.to_s.upcase
+    end
+    
+    # Returns a symbol representation corresponding to the upcase +id+
+    # attribute.
+    #
+    # @return [Symbol]
+    #
+    # @example
+    #   Money::Currency.new(:usd).to_sym #=> :USD
+    #   Money::Currency.new(:eur).to_sym #=> :EUR
+    def to_sym
+      if id.respond_to?(:upcase)
+        id.upcase
+      else
+        # Ruby <= 1.8.7 doesn't support Symbol#upcase
+        id.to_s.upcase.to_sym
+      end
+    end
+
     # Conversation to +self+.
     #
     # @return [self]

data/lib/money/deprecations.rb

@@ -5,6 +5,9 @@ class Money
   #
   # @return [nil]
   def self.deprecate(message)
-    warn "DEPRECATION WARNING: #{message}"
+    file, line = caller(2).first.split(':', 2)
+    line = line.to_i
+
+    warn "DEPRECATION WARNING: #{message} (called from: #{file}:#{line})"
   end
 end

data/lib/money/money.rb

@@ -1,4 +1,7 @@
 # encoding: utf-8
+require "monetize"
+require "monetize/core_extensions"
+
 require "money/bank/variable_exchange"
 require "money/bank/single_currency"
 require "money/money/arithmetic"
@@ -118,9 +121,7 @@ class Money
     attr_accessor :infinite_precision
 
     # Use this to specify the rounding mode
-    #
-    # @return [BigDecimal::ROUND_MODE]
-    attr_accessor :rounding_mode
+    attr_writer :rounding_mode
 
     # Use this to specify precision for converting Rational to BigDecimal
     #
@@ -157,6 +158,27 @@ class Money
 
   setup_defaults
 
+  # Use this to return the rounding mode.  You may also pass a
+  # rounding mode and a block to temporatly change it.  It will
+  # then return the results of the block instead.
+  #
+  # @param [BigDecimal::ROUND_MODE] optional
+  #
+  # @return [BigDecimal::ROUND_MODE,Yield] rounding mode or block results
+  #
+  # @example
+  #   fee = Money.rounding_mode(BigDecimal::ROUND_HALF_UP) do
+  #     Money.new(1200) * BigDecimal.new('0.029')
+  #   end
+  def self.rounding_mode(mode=nil)
+    return Thread.current[:money_rounding_mode] || @rounding_mode if mode.nil?
+
+    Thread.current[:money_rounding_mode] = mode
+    yield
+  ensure
+    Thread.current[:money_rounding_mode] = nil
+  end
+
   # Create a new money object with value 0.
   #
   # @param [Currency, String, Symbol] currency The currency to use.