money 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d0dc5b8be2189ee718cbe2cf9a981997283de43
-  data.tar.gz: fc919e76acc75c0ff838207f939442aea963f793
+  metadata.gz: 5160af002d878da8e074fe1408852b40dcede5a5
+  data.tar.gz: 1a991c73c08d6667d8225e0fda638d651e1de914
 SHA512:
-  metadata.gz: e394b1d687d093cbb2651ad073a09ee2de5896b5e16681f601141c8b353d2efca668a14af20a025734f9694cfddb4c2e2254278e56c64ebcb4af44cfabbd1f82
-  data.tar.gz: 7856ca8d8c8a15828c237d26c7c9c9a55be1d2dd0127cf9817f163116ff1a5a00fe17f8a34978113793588a0450c57d7ad2a8a2fa5a4a65b32f46ea79408c294
+  metadata.gz: 374f0da1e1a52400556add531216a0e840a811e398ea4e53a20916e6a2466265b34f0326083c3cf70e683be4b3484fdf80a446eda80f5b9e3633cdacc494932a
+  data.tar.gz: 795336612e1a73c7338b4bb042e44bac2cddfe7f3030223caf661f9f369e967de6fdb8a9ff30a4b8058599aa5820e424794ec6a9c7f4acff26bf6c70d69d1744

data/AUTHORS

@@ -43,6 +43,7 @@ Jérémy Lecour
 Jesse Cooke
 John Duff
 John Gakos
+Jonathon M. Abbott
 Josh Delsman
 Joshua Clayton
 Josh Hepworth

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 6.0.1.beta1
+## 6.1.0
+ - Remove deprecated methods.
+ - Fix issue with block form of rounding_mode.
+
+## 6.0.1
  - 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
@@ -112,12 +116,10 @@
 - Fixed position of Philippine peso sign (GH-124)
 - Fixed position of Danish currency sign (GH-127)
 
-
 ## 4.0.1
 
 - Add missing config dir.
 
-
 Money 4.0.0
 ===========
 
@@ -305,7 +307,6 @@ Bugfixes
  - Use BigDecimal when floating point calculations are needed.
  - Ruby 1.9.2 compatibility enhancements.
 
-
 Money 3.1.0
 ===========
 

data/Gemfile

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

data/README.md

@@ -4,6 +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)
 [![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)
 

data/config/currency_iso.json

@@ -269,7 +269,7 @@
     "priority": 100,
     "iso_code": "BRL",
     "name": "Brazilian Real",
-    "symbol": "R$ ",
+    "symbol": "R$",
     "subunit": "Centavo",
     "subunit_to_unit": 100,
     "symbol_first": true,
@@ -413,7 +413,7 @@
     "subunit": "Peso",
     "subunit_to_unit": 1,
     "symbol_first": true,
-    "html_entity": "₱",
+    "html_entity": "$",
     "decimal_mark": ",",
     "thousands_separator": ".",
     "iso_numeric": "152"
@@ -1820,7 +1820,7 @@
   },
   "ssp": {
     "priority": 100,
-    "iso_code": "SHP",
+    "iso_code": "SSP",
     "name": "South Sudanese Pound",
     "symbol": "£",
     "alternate_symbols": [],

data/lib/money/bank/single_currency.rb

@@ -17,7 +17,7 @@ class Money
       # Raises a DifferentCurrencyError to remove possibility of accidentally
       # exchanging currencies
       def exchange_with(from, to_currency, &block)
-        raise DifferentCurrencyError, "No exchanging of currencies allowed: #{from} to #{to_currency}"
+        raise DifferentCurrencyError, "No exchanging of currencies allowed: #{from} #{from.currency} to #{to_currency}"
       end
     end
   end

data/lib/money/money/arithmetic.rb

@@ -23,15 +23,10 @@ class Money
     #   Money.new(100) == Money.new(101) #=> false
     #   Money.new(100) == Money.new(100) #=> true
     def ==(other_money)
-      if other_money.respond_to?(:to_money)
-        unless other_money.is_a?(Money)
-          Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to compare Money to core classes. Please start using the Monetize gem from https://github.com/RubyMoney/monetize if you are not already doing so"
-        end
-        other_money = other_money.to_money
-        fractional == other_money.fractional && currency == other_money.currency
-      else
-        false
-      end
+      other_money = other_money.to_money
+      fractional == other_money.fractional && currency == other_money.currency
+    rescue NoMethodError
+      false
     end
 
     # Synonymous with +#==+.
@@ -46,8 +41,6 @@ class Money
     end
 
     def <=>(val)
-      check_compare_deprecate(val)
-
       val = val.to_money
       unless fractional == 0 || val.fractional == 0 || currency == val.currency
         val = val.exchange_to(currency)
@@ -57,12 +50,6 @@ class Money
       raise ArgumentError, "Comparison of #{self.class} with #{val.inspect} failed"
     end
 
-    def check_compare_deprecate(val)
-      unless val.is_a?(Money)
-        Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to compare Money to core classes. Please start using the Monetize gem from https://github.com/RubyMoney/monetize if you are not already doing so"
-      end
-    end
-
     # Test if the amount is positive. Returns +true+ if the money amount is
     # greater than 0, +false+ otherwise.
     #

data/lib/money/money/formatting.rb

@@ -241,8 +241,10 @@ class Money
           "#{sign_before}#{symbol_value}#{symbol_space}#{sign}#{formatted}"
         else
           symbol_space = rules[:symbol_after_without_space] ? "" : " "
-          "#{sign_before}#{formatted}#{symbol_space}#{sign}#{symbol_value}"
+          "#{sign_before}#{sign}#{formatted}#{symbol_space}#{symbol_value}"
         end
+      else
+        formatted="#{sign_before}#{sign}#{formatted}"
       end
 
       if rules.has_key?(:decimal_mark) && rules[:decimal_mark] &&

data/lib/money/money.rb

@@ -1,11 +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"
-require "money/money/parsing"
 require "money/money/formatting"
 
 # "Money is any object or record that is generally accepted as payment for
@@ -18,7 +14,7 @@ require "money/money/formatting"
 #
 # @see http://en.wikipedia.org/wiki/Money
 class Money
-  include Comparable, Money::Arithmetic, Money::Formatting, Money::Parsing
+  include Comparable, Money::Arithmetic, Money::Formatting
 
   # Convenience method for fractional part of the amount. Synonym of #fractional
   #
@@ -42,12 +38,6 @@ class Money
   # Money representation of one Kuwaiti Dinar, the fractional interpretation is
   # 1000.
   #
-  # @example
-  #   Money.new_with_amount(1, "USD").fractional      #=> 100
-  #   Money.new_with_amount(1, "KWD").fractional      #=> 1000
-  #   Money.new_with_amount(105.50, "USD").fractional #=> 10550
-  #   Money.new_with_amount(15.763, 'KWD').fractional #=> 15763
-  #
   # @return [Integer] when inifinte_precision is false
   # @return [BigDecimal] when inifinte_precision is true
   #
@@ -82,15 +72,12 @@ class Money
     # valid +Money::Currency+ instance.
     # @attr_accessor [true, false] use_i18n Use this to disable i18n even if
     # it's used by other objects in your app.
-    # @attr_accessor [true, false] assume_from_symbol Use this to enable the
-    # ability to assume the currency from a passed symbol
     # @attr_accessor [true, false] infinite_precision Use this to enable
     # infinite precision cents
     # @attr_accessor [Integer] conversion_precision Use this to specify
     # precision for converting Rational to BigDecimal
     attr_accessor :default_bank, :default_currency, :use_i18n,
-      :assume_from_symbol, :infinite_precision, :conversion_precision,
-      :silence_core_extensions_deprecations
+      :infinite_precision, :conversion_precision
 
     # @attr_writer rounding_mode Use this to specify the rounding mode
     attr_writer :rounding_mode
@@ -110,6 +97,30 @@ class Money
     alias_method :zero, :empty
   end
 
+  # Set the ability to assume the currency from a passed symbol. (Wrapper for
+  # Monetize.assume_from_symbol.)
+  #
+  # @param [true, false]
+  def self.assume_from_symbol=(value)
+    Monetize.assume_from_symbol = value
+  end
+
+  # Return the ability to assume the currency from a passed symbol. (Wrapper for
+  # Monetize.assume_from_symbol.)
+  #
+  # @param [true, false]
+  def self.assume_from_symbol
+    Monetize.assume_from_symbol
+  end
+
+  def self.default_currency
+    if @default_currency.respond_to?(:call)
+      Money::Currency.new(@default_currency.call)
+    else
+      Money::Currency.new(@default_currency)
+    end
+  end
+
   def self.setup_defaults
     # Set the default bank for creating new +Money+ objects.
     self.default_bank = Bank::VariableExchange.instance
@@ -120,9 +131,6 @@ class Money
     # Default to using i18n
     self.use_i18n = true
 
-    # Default to not using currency symbol assumptions when parsing
-    self.assume_from_symbol = false
-
     # Default to not using infinite precision cents
     self.infinite_precision = false
 
@@ -131,9 +139,6 @@ class Money
 
     # Default the conversion of Rationals precision to 16
     self.conversion_precision = 16
-
-    # Default alerting about deprecations
-    self.silence_core_extensions_deprecations = false
   end
 
   def self.inherited(base)
@@ -158,11 +163,13 @@ class Money
     if mode.nil?
       Thread.current[:money_rounding_mode] || @rounding_mode
     else
-      Thread.current[:money_rounding_mode] = mode
-      yield
+      begin
+        Thread.current[:money_rounding_mode] = mode
+        yield
+      ensure
+        Thread.current[:money_rounding_mode] = nil
+      end
     end
-  ensure
-    Thread.current[:money_rounding_mode] = nil
   end
 
   # Creates a new Money object of the given value, using the Canadian
@@ -209,39 +216,6 @@ class Money
     Money.new(cents, "EUR")
   end
 
-  # Creates a new Money object of +amount+ value ,
-  # with given +currency+.
-  #
-  # The amount value is expressed in the main monetary unit,
-  # opposite to the subunit-based representation
-  # used internally by this library called +cents+.
-  #
-  # @param [Numeric] amount The money amount, in main monetary unit.
-  # @param [Currency, String, Symbol] currency The currency format.
-  # @param [Money::Bank::*] bank The exchange bank to use.
-  #
-  # @return [Money]
-  #
-  # @example
-  #   Money.new_with_amount(100)        #=> #<Money @fractional=10000 @currency="USD">
-  #   Money.new_with_amount(100, "USD") #=> #<Money @fractional=10000 @currency="USD">
-  #   Money.new_with_amount(100, "EUR") #=> #<Money @fractional=10000 @currency="EUR">
-  #
-  # @see Money.new
-  #
-  def self.new_with_amount(amount, currency = Money.default_currency, bank = Money.default_bank)
-    from_numeric(amount, currency).tap do |money|
-      money.instance_variable_set("@bank", bank) # Hack! You can't change a bank
-    end
-  end
-
-  # Synonym of #new_with_amount
-  #
-  # @see Money.new_with_amount
-  def self.new_with_dollars(*args)
-    self.new_with_amount(*args)
-  end
-
   # Adds a new exchange rate to the default bank and return the rate.
   #
   # @param [Currency, String, Symbol] from_currency Currency to exchange from.
@@ -279,8 +253,6 @@ class Money
   #   Money.new(100, "USD") #=> #<Money @fractional=100 @currency="USD">
   #   Money.new(100, "EUR") #=> #<Money @fractional=100 @currency="EUR">
   #
-  # @see Money.new_with_dollars
-  #
   def initialize(obj, currency = Money.default_currency, bank = Money.default_bank)
     @fractional = obj.fractional
     @currency   = obj.currency
@@ -301,7 +273,6 @@ class Money
   #
   # @example
   #   Money.new(1_00, "USD").dollars   # => BigDecimal.new("1.00")
-  #   Money.new_with_dollars(1).dollar # => BigDecimal.new("1.00")
   #
   # @see #amount
   # @see #to_d
@@ -317,7 +288,6 @@ class Money
   #
   # @example
   #   Money.new(1_00, "USD").amount    # => BigDecimal.new("1.00")
-  #   Money.new_with_amount(1).amount  # => BigDecimal.new("1.00")
   #
   # @see #to_d
   # @see #fractional
@@ -437,14 +407,25 @@ class Money
   #
   # @param [Currency, String, Symbol] other_currency Currency to exchange to.
   #
+  # @yield [n] Optional block to use when rounding after exchanging one currency
+  #  for another.
+  # @yieldparam [Float] n The resulting float after exchanging one currency for
+  #  another.
+  # @yieldreturn [Integer]
+  #
   # @return [Money]
   #
   # @example
   #   Money.new(2000, "USD").exchange_to("EUR")
+  #   Money.new(2000, "USD").exchange_to("EUR") {|x| x.round}
   #   Money.new(2000, "USD").exchange_to(Currency.new("EUR"))
-  def exchange_to(other_currency)
+  def exchange_to(other_currency, &rounding_method)
     other_currency = Currency.wrap(other_currency)
-    @bank.exchange_with(self, other_currency)
+    if self.currency == other_currency
+      self
+    else
+      @bank.exchange_with(self, other_currency, &rounding_method)
+    end
   end
 
   # Receive a money object with the same amount as the current Money object

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "6.0.1"
+  VERSION = "6.1.0"
 end

data/lib/money.rb

@@ -3,7 +3,3 @@ require "bigdecimal/util"
 require "i18n"
 require "money/currency"
 require "money/money"
-require "money/core_extensions/numeric"
-require "money/core_extensions/string"
-require "money/core_extensions/symbol"
-require "money/deprecations"

data/money.gemspec

@@ -26,7 +26,6 @@ Test responsibly :-)
 MSG
 
   s.add_dependency "i18n", "~> 0.6.4"
-  s.add_dependency "monetize", "~> 0.1.3"
 
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"

data/spec/bank/single_currency_spec.rb

@@ -5,7 +5,7 @@ describe Money::Bank::SingleCurrency do
     it "raises when called" do
       expect {
         subject.exchange_with(Money.new(100, 'USD'), 'EUR')
-      }.to raise_exception(Money::Bank::DifferentCurrencyError, "No exchanging of currencies allowed: 1.00 to EUR")
+      }.to raise_exception(Money::Bank::DifferentCurrencyError, "No exchanging of currencies allowed: 1.00 USD to EUR")
     end
   end
 end

data/spec/money/arithmetic_spec.rb

@@ -27,19 +27,6 @@ describe Money do
       Money.new(1_00, "USD").should_not == nil
     end
 
-    it "can be used to compare with a String money value" do
-      Money.new(1_00, "USD").should == "1.00"
-      Money.new(1_00, "USD").should_not == "2.00"
-      Money.new(1_00, "GBP").should_not == "1.00"
-    end
-
-    it "can be used to compare with a Numeric money value" do
-      Money.new(1_00, "USD").should == 1
-      Money.new(1_57, "USD").should == 1.57
-      Money.new(1_00, "USD").should_not == 2
-      Money.new(1_00, "GBP").should_not == 1
-    end
-
     it "can be used to compare with an object that responds to #to_money" do
       klass = Class.new do
         def initialize(money)
@@ -74,19 +61,6 @@ describe Money do
       Money.new(1_00, "USD").eql?(nil).should be false
     end
 
-    it "can be used to compare with a String money value" do
-      Money.new(1_00, "USD").eql?("1.00").should be true
-      Money.new(1_00, "USD").eql?("2.00").should be false
-      Money.new(1_00, "GBP").eql?("1.00").should be false
-    end
-
-    it "can be used to compare with a Numeric money value" do
-      Money.new(1_00, "USD").eql?(1).should be true
-      Money.new(1_57, "USD").eql?(1.57).should be true
-      Money.new(1_00, "USD").eql?(2).should be false
-      Money.new(1_00, "GBP").eql?(1).should be false
-    end
-
     it "can be used to compare with an object that responds to #to_money" do
       klass = Class.new do
         def initialize(money)
@@ -126,42 +100,6 @@ describe Money do
       (Money.new(100_00, "USD") <=> target).should > 0
     end
 
-    it "cannot compare objects with different currencies when no rate exists, unless one of the amounts is zero" do
-      expect { Money.new(100_00, "EUR") <=> Money.new(100_00, "USD") }.to raise_error(Money::Bank::UnknownRate)
-
-      (Money.new(100_00, "EUR") <=> Money.new(0, "USD")).should > 0
-      (Money.new(0, "EUR") <=> Money.new(100_00, "USD")).should < 0
-      (Money.new(0, "EUR") <=> Money.new(0, "USD")).should == 0
-    end
-
-    it "can be used to compare with a String money value when Money object is in default currency" do
-      (Money.new(1_00) <=> "1.00").should == 0
-      (Money.new(1_00) <=> ".99").should > 0
-      (Money.new(1_00) <=> "2.00").should < 0
-    end
-
-    it "can be used to compare with a String money value when Money object is not in default currency if String evaluates to zero" do
-      expect { Money.new(1_00, "EUR") <=> "1.00" }.to raise_error(Money::Bank::UnknownRate)
-
-      (Money.new(1_00, "EUR") <=> "0.00").should > 0
-      (Money.new(0_00, "EUR") <=> "0.00").should == 0
-      (Money.new(-1_00, "EUR") <=> "0.00").should < 0
-    end
-
-    it "can be used to compare with a Numeric money value when Money object is in default currency" do
-      (Money.new(1_00) <=> 1).should == 0
-      (Money.new(1_00) <=> 0.99).should > 0
-      (Money.new(1_00) <=> 2.00).should < 0
-    end
-
-    it "can be used to compare with a Numeric money value when Money object is not in default currency if String evaluates to zero" do
-      expect { Money.new(1_00, "EUR") <=> 1 }.to raise_error(Money::Bank::UnknownRate)
-
-      (Money.new(1_00, "EUR") <=> 0).should > 0
-      (Money.new(0_00, "EUR") <=> 0).should == 0
-      (Money.new(-1_00, "EUR") <=> 0).should < 0
-    end
-
     it "can be used to compare with an object that responds to #to_money" do
       klass = Class.new do
         def initialize(money)
@@ -576,31 +514,6 @@ describe Money do
         t[:a].remainder(t[:b]).should == t[:c]
       end
     end
-
-    it "calculates remainder with Money (same currency)" do
-      ts = [
-          {:a => Money.new( 13, :USD), :b => Money.new( 4, :USD), :c => Money.new( 1, :USD)},
-          {:a => Money.new( 13, :USD), :b => Money.new(-4, :USD), :c => Money.new( 1, :USD)},
-          {:a => Money.new(-13, :USD), :b => Money.new( 4, :USD), :c => Money.new(-1, :USD)},
-          {:a => Money.new(-13, :USD), :b => Money.new(-4, :USD), :c => Money.new(-1, :USD)},
-      ]
-      ts.each do |t|
-        t[:a].remainder(t[:b]).should == t[:c]
-      end
-    end
-
-    it "calculates remainder with Money (different currency)" do
-      ts = [
-          {:a => Money.new( 13, :USD), :b => Money.new( 4, :EUR), :c => Money.new( 5, :USD)},
-          {:a => Money.new( 13, :USD), :b => Money.new(-4, :EUR), :c => Money.new( 5, :USD)},
-          {:a => Money.new(-13, :USD), :b => Money.new( 4, :EUR), :c => Money.new(-5, :USD)},
-          {:a => Money.new(-13, :USD), :b => Money.new(-4, :EUR), :c => Money.new(-5, :USD)},
-      ]
-      ts.each do |t|
-        t[:b].should_receive(:exchange_to).once.with(t[:a].currency).and_return(Money.new(t[:b].cents * 2, :USD))
-        t[:a].remainder(t[:b]).should == t[:c]
-      end
-    end
   end
 
   describe "#abs" do

data/spec/money/formatting_spec.rb

@@ -132,7 +132,7 @@ describe Money, "formatting" do
       one_thousand["LKR"].should == "1,000.00 ₨"
 
       # Brazilian Real
-      one_thousand["BRL"].should == "R$ 1.000,00"
+      one_thousand["BRL"].should == "R$1.000,00"
 
       # Other
       one_thousand["SEK"].should == "1 000,00 kr"
@@ -243,7 +243,7 @@ describe Money, "formatting" do
         one["LKR"].should == "1.00 ₨"
 
         # Brazilian Real
-        one["BRL"].should == "R$ 1,00"
+        one["BRL"].should == "R$1,00"
 
         # Other
         one["SEK"].should == "1,00 kr"
@@ -282,6 +282,15 @@ describe Money, "formatting" do
         money = Money.new(100, "EUR")
         money.format.should == "€1,00"
       end
+
+      specify "(:symbol => false) returns a signed amount without a symbol" do
+        money = Money.new(-100, "EUR")
+        money.format(:symbol => false).should == "-1,00"
+
+        money = Money.new(100, "EUR")
+        money.format(:symbol => false,
+                     :sign_positive => true).should == "+1,00"
+      end
     end
 
     describe ":decimal_mark option" do
@@ -361,7 +370,6 @@ describe Money, "formatting" do
       end
     end
 
-
     describe ":symbol_position option" do
       it "inserts currency symbol before the amount when set to :before" do
         Money.euro(1_234_567_12).format(:symbol_position => :before).should == "€1.234.567,12"
@@ -486,11 +494,6 @@ describe Money, "formatting" do
         money.format(:display_free => 'gratis').should == 'gratis'
       end
     end
-
-    it "maintains floating point precision" do
-      "0.01".to_money("USD").format(:symbol => false).should == "0.01"
-    end
-
   end
 
   context "custom currencies with 4 decimal places" do
@@ -535,4 +538,3 @@ describe Money, "formatting" do
 
   end
 end
-