money 6.0.1 → 6.1.0

data/spec/money_spec.rb

@@ -71,59 +71,6 @@ describe Money do
     end
   end
 
-  describe ".new_with_dollars" do
-    it "is synonym of #new_with_amount" do
-      MoneyExpectation = Class.new(Money)
-      def MoneyExpectation.new_with_amount *args
-        args
-      end
-      MoneyExpectation.new_with_dollars("expectation").should == ["expectation"]
-    end
-  end
-
-  describe ".new_with_amount" do
-    it "converts given amount to cents" do
-      Money.new_with_amount(1).should == Money.new(100)
-      Money.new_with_amount(1, "USD").should == Money.new(100, "USD")
-      Money.new_with_amount(1, "EUR").should == Money.new(100, "EUR")
-    end
-
-    it "respects :subunit_to_unit currency property" do
-      Money.new_with_amount(1, "USD").should == Money.new(1_00,  "USD")
-      Money.new_with_amount(1, "TND").should == Money.new(1_000, "TND")
-      Money.new_with_amount(1, "CLP").should == Money.new(1,     "CLP")
-    end
-
-    it "does not loose precision" do
-      Money.new_with_amount(1234).cents.should == 1234_00
-      Money.new_with_amount(100.37).cents.should == 100_37
-      Money.new_with_amount(BigDecimal.new('1234')).cents.should == 1234_00
-    end
-
-    it "accepts optional currency" do
-      m = Money.new_with_amount(1)
-      m.currency.should == Money.default_currency
-
-      m = Money.new_with_amount(1, Money::Currency.wrap("EUR"))
-      m.currency.should == Money::Currency.wrap("EUR")
-
-      m = Money.new_with_amount(1, "EUR")
-      m.currency.should == Money::Currency.wrap("EUR")
-    end
-
-    it "accepts optional bank" do
-      m = Money.new_with_amount(1)
-      m.bank.should == Money.default_bank
-
-      m = Money.new_with_amount(1, "EUR", bank = Object.new)
-      m.bank.should == bank
-    end
-
-    it "is associated to the singleton instance of Bank::VariableExchange by default" do
-      Money.new_with_amount(0).bank.should be(Money::Bank::VariableExchange.instance)
-    end
-  end
-
   describe ".empty" do
     it "creates a new Money object of 0 cents" do
       Money.empty.should == Money.new(0)
@@ -205,14 +152,12 @@ describe Money do
   describe "#fractional" do
     it "returns the amount in fractional unit" do
       Money.new(1_00).fractional.should == 1_00
-      Money.new_with_amount(1).fractional.should == 1_00
     end
 
     it "stores fractional as an integer regardless of what is passed into the constructor" do
-      [ Money.new(100), 1.to_money, 1.00.to_money, BigDecimal('1.00').to_money ].each do |m|
-        m.fractional.should == 100
-        m.fractional.should be_a(Fixnum)
-      end
+      m = Money.new(100)
+      m.fractional.should == 100
+      m.fractional.should be_a(Fixnum)
     end
 
     context "loading a serialized Money via YAML" do
@@ -290,6 +235,18 @@ YAML
 
           Money.rounding_mode.should == BigDecimal::ROUND_HALF_EVEN
         end
+
+        it "works for multiplication within a block" do
+          Money.rounding_mode(BigDecimal::ROUND_DOWN) do
+            (Money.new(1_00) * "0.019".to_d).fractional.should == 1
+          end
+
+          Money.rounding_mode(BigDecimal::ROUND_UP) do
+            (Money.new(1_00) * "0.011".to_d).fractional.should == 2
+          end
+
+          Money.rounding_mode.should == BigDecimal::ROUND_HALF_EVEN
+        end
       end
     end
 
@@ -304,14 +261,12 @@ YAML
 
       it "returns the amount in fractional unit" do
         Money.new(1_00).fractional.should == BigDecimal("100")
-        Money.new_with_amount(1).fractional.should == BigDecimal("100")
       end
 
       it "stores in fractional unit as an integer regardless of what is passed into the constructor" do
-        [ Money.new(100), 1.to_money, 1.00.to_money, BigDecimal('1.00').to_money ].each do |m|
-          m.fractional.should == BigDecimal("100")
-          m.fractional.should be_a(BigDecimal)
-        end
+        m = Money.new(100)
+        m.fractional.should == BigDecimal("100")
+        m.fractional.should be_a(BigDecimal)
       end
     end
   end
@@ -319,7 +274,6 @@ YAML
   describe "#amount" do
     it "returns the amount of cents as dollars" do
       Money.new(1_00).amount.should == 1
-      Money.new_with_amount(1).amount.should == 1
     end
 
     it "respects :subunit_to_unit currency property" do
@@ -330,7 +284,6 @@ YAML
 
     it "does not loose precision" do
       Money.new(100_37).amount.should == 100.37
-      Money.new_with_amount(100.37).amount.should == 100.37
     end
 
     it 'produces a BigDecimal' do
@@ -503,6 +456,18 @@ YAML
       money.bank.should_receive(:exchange_with).with(Money.new(100_00, Money::Currency.new("USD")), Money::Currency.new("EUR")).and_return(Money.new(200_00, Money::Currency.new('EUR')))
       money.exchange_to("EUR").should == Money.new(200_00, "EUR")
     end
+
+    it 'uses the block given as rounding method' do
+      money = Money.new(100_00, 'USD')
+      money.bank.should_receive(:exchange_with).and_yield(300_00)
+      expect { |block| money.exchange_to(Money::Currency.new('EUR'), &block) }.to yield_successive_args(300_00)
+    end
+
+    it "does no exchange when the currencies are the same" do
+      money = Money.new(100_00, "USD")
+      money.bank.should_not_receive(:exchange_with)
+      money.exchange_to("USD").should == money
+    end
   end
 
   describe "#allocate" do
@@ -680,4 +645,24 @@ YAML
       obj.as_euro.should == Money.new(1, "EUR")
     end
   end
+
+  describe ".default_currency" do
+    before do
+      @default_currency = Money.default_currency
+    end
+
+    it "accepts a lambda" do
+      Money.default_currency = lambda { :eur }
+      Money.default_currency.should == Money::Currency.new(:eur)
+    end
+
+    it "accepts a symbol" do
+      Money.default_currency = :eur
+      Money.default_currency.should == Money::Currency.new(:eur)
+    end
+
+    after do
+      Money.default_currency = @default_currency
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,11 +4,11 @@ Coveralls.wear!
 $LOAD_PATH.unshift File.dirname(__FILE__)
 require "rspec"
 require "money"
-require "support/default_currency_helper"
+
+I18n.enforce_available_locales = false
 
 RSpec.configure do |c|
   c.order = :random
-  c.include DefaultCurrencyHelper
 end
 
 def silence_warnings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.4
-- !ruby/object:Gem::Dependency
-  name: monetize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,33 +118,23 @@ files:
 - lib/money/bank/base.rb
 - lib/money/bank/single_currency.rb
 - lib/money/bank/variable_exchange.rb
-- lib/money/core_extensions.rb
-- lib/money/core_extensions/numeric.rb
-- lib/money/core_extensions/string.rb
-- lib/money/core_extensions/symbol.rb
 - lib/money/currency.rb
 - lib/money/currency/heuristics.rb
 - lib/money/currency/loader.rb
-- lib/money/deprecations.rb
 - lib/money/money.rb
 - lib/money/money/arithmetic.rb
 - lib/money/money/formatting.rb
-- lib/money/money/parsing.rb
 - lib/money/version.rb
 - money.gemspec
 - spec/bank/base_spec.rb
 - spec/bank/single_currency_spec.rb
 - spec/bank/variable_exchange_spec.rb
-- spec/core_extensions_spec.rb
 - spec/currency/heuristics_spec.rb
 - spec/currency_spec.rb
 - spec/money/arithmetic_spec.rb
-- spec/money/deprecations_spec.rb
 - spec/money/formatting_spec.rb
-- spec/money/parsing_spec.rb
 - spec/money_spec.rb
 - spec/spec_helper.rb
-- spec/support/default_currency_helper.rb
 homepage: http://rubymoney.github.io/money
 licenses:
 - MIT
@@ -187,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby Library for dealing with money and currency conversion.
@@ -195,14 +171,10 @@ test_files:
 - spec/bank/base_spec.rb
 - spec/bank/single_currency_spec.rb
 - spec/bank/variable_exchange_spec.rb
-- spec/core_extensions_spec.rb
 - spec/currency/heuristics_spec.rb
 - spec/currency_spec.rb
 - spec/money/arithmetic_spec.rb
-- spec/money/deprecations_spec.rb
 - spec/money/formatting_spec.rb
-- spec/money/parsing_spec.rb
 - spec/money_spec.rb
 - spec/spec_helper.rb
-- spec/support/default_currency_helper.rb
 has_rdoc: 

data/lib/money/core_extensions/numeric.rb

@@ -1,7 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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,7 +0,0 @@
-require "money/core_extensions/numeric"
-require "money/core_extensions/string"
-require "money/core_extensions/symbol"
-
-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."
-
-Money.silence_core_extensions_deprecations = true

data/lib/money/deprecations.rb

@@ -1,15 +0,0 @@
-class Money
-  # Displays a deprecation warning message.
-  #
-  # @param [String] message The message to display.
-  #
-  # @return [nil]
-  def self.deprecate(message)
-    unless Money.silence_core_extensions_deprecations
-      file, line = caller(2).first.split(':', 2)
-      line = line.to_i
-
-      warn "DEPRECATION WARNING: #{message} (called from: #{file}:#{line})"
-    end
-  end
-end

data/lib/money/money/parsing.rb

@@ -1,46 +0,0 @@
-#encoding: utf-8
-
-class Money
-  module Parsing
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def parse(input, currency = nil)
-        Money.deprecate ".parse is deprecated and will be removed in 6.1.0. Please use the `monetize` gem."
-        Monetize.parse(input, currency)
-      end
-
-      def from_string(value, currency = Money.default_currency)
-        Money.deprecate ".from_string is deprecated and will be removed in 6.1.0. Please use the `monetize` gem."
-        Monetize.from_string(value, currency)
-      end
-
-      def from_fixnum(value, currency = Money.default_currency)
-        Money.deprecate ".from_fixnum is deprecated and will be removed in 6.1.0. Please use the `monetize` gem."
-        Monetize.from_fixnum(value, currency)
-      end
-
-      def from_float(value, currency = Money.default_currency)
-        Money.deprecate ".from_float is deprecated and will be removed in 6.1.0. Please use the `monetize` gem."
-        Monetize.from_float(value, currency)
-      end
-
-      def from_bigdecimal(value, currency = Money.default_currency)
-        Money.deprecate ".from_bigdecimal is deprecated and will be removed in 6.1.0. Please use the `monetize` gem."
-        Monetize.from_bigdecimal(value, currency)
-      end
-
-      def from_numeric(value, currency = Money.default_currency)
-        Money.deprecate ".from_numeric is deprecated and will be removed in 6.1.0. Please use the `monetize` gem."
-        Monetize.from_numeric(value, currency)
-      end
-
-      def extract_cents(input, currency = Money.default_currency)
-        Money.deprecate ".extract_cents is deprecated and will be removed in 6.1.0. Please use the `monetize` gem."
-        Monetize.extract_cents(input, currency)
-      end
-    end
-  end
-end

data/spec/core_extensions_spec.rb

@@ -1,160 +0,0 @@
-require "spec_helper"
-
-describe Money, "core extensions" do
-
-  describe Numeric do
-    describe "#to_money" do
-      it "work as documented" do
-        money = 1234.to_money
-        money.cents.should == 1234_00
-        money.currency.should == Money.default_currency
-
-        money = 100.37.to_money
-        money.cents.should == 100_37
-        money.currency.should == Money.default_currency
-
-        money = BigDecimal.new('1234').to_money
-        money.cents.should == 1234_00
-        money.currency.should == Money.default_currency
-      end
-
-      it "accepts optional currency" do
-        1234.to_money('USD').should == Money.new(123400, 'USD')
-        1234.to_money('EUR').should == Money.new(123400, 'EUR')
-      end
-
-      it "respects :subunit_to_unit currency property" do
-        10.to_money('USD').should == Money.new(10_00, 'USD')
-        10.to_money('TND').should == Money.new(10_000, 'TND')
-        10.to_money('CLP').should == Money.new(10, 'CLP')
-      end
-
-      specify "GH-15" do
-        amount = 555.55.to_money
-        amount.should == Money.new(55555)
-      end
-    end
-  end
-
-  describe String do
-    describe "#to_money" do
-
-      STRING_TO_MONEY = {
-        "20.15"           => Money.new(20_15)             ,
-        "100"             => Money.new(100_00)            ,
-        "100.37"          => Money.new(100_37)            ,
-        "100,37"          => Money.new(100_37)            ,
-        "100 000"         => Money.new(100_000_00)        ,
-        "100,000.00"      => Money.new(100_000_00)        ,
-        "1,000"           => Money.new(1_000_00)          ,
-        "-1,000"          => Money.new(-1_000_00)         ,
-        "1,000.5"         => Money.new(1_000_50)          ,
-        "1,000.51"        => Money.new(1_000_51)          ,
-        "1,000.505"       => Money.new(1_000_51)          ,
-        "1,000.504"       => Money.new(1_000_50)          ,
-        "1,000.0000"      => Money.new(1_000_00)          ,
-        "1,000.5000"      => Money.new(1_000_50)          ,
-        "1,000.5099"      => Money.new(1_000_51)          ,
-        "1.550"           => Money.new(1_55)              ,
-        "25."             => Money.new(25_00)             ,
-        ".75"             => Money.new(75)                ,
-
-        "100 USD"         => Money.new(100_00, "USD")     ,
-        "-100 USD"        => Money.new(-100_00, "USD")    ,
-        "100 EUR"         => Money.new(100_00, "EUR")     ,
-        "100.37 EUR"      => Money.new(100_37, "EUR")     ,
-        "100,37 EUR"      => Money.new(100_37, "EUR")     ,
-        "100,000.00 USD"  => Money.new(100_000_00, "USD") ,
-        "100.000,00 EUR"  => Money.new(100_000_00, "EUR") ,
-        "1,000 USD"       => Money.new(1_000_00, "USD")   ,
-        "-1,000 USD"      => Money.new(-1_000_00, "USD")  ,
-        "1,000.5500 USD"  => Money.new(1_000_55, "USD")   ,
-        "-1,000.6500 USD" => Money.new(-1_000_65, "USD")  ,
-        "1.550 USD"       => Money.new(1_55, "USD")       ,
-
-        "USD 100"         => Money.new(100_00, "USD")     ,
-        "EUR 100"         => Money.new(100_00, "EUR")     ,
-        "EUR 100.37"      => Money.new(100_37, "EUR")     ,
-        "CAD -100.37"     => Money.new(-100_37, "CAD")    ,
-        "EUR 100,37"      => Money.new(100_37, "EUR")     ,
-        "EUR -100,37"     => Money.new(-100_37, "EUR")    ,
-        "USD 100,000.00"  => Money.new(100_000_00, "USD") ,
-        "EUR 100.000,00"  => Money.new(100_000_00, "EUR") ,
-        "USD 1,000"       => Money.new(1_000_00, "USD")   ,
-        "USD -1,000"      => Money.new(-1_000_00, "USD")  ,
-        "USD 1,000.9000"  => Money.new(1_000_90, "USD")   ,
-        "USD -1,000.090"  => Money.new(-1_000_09, "USD")  ,
-        "USD 1.5500"      => Money.new(1_55, "USD")       ,
-
-        "$100 USD"        => Money.new(100_00, "USD")     ,
-        "$1,194.59 USD"   => Money.new(1_194_59, "USD")   ,
-        "$-1,955 USD"     => Money.new(-1_955_00, "USD")  ,
-        "$1,194.5900 USD" => Money.new(1_194_59, "USD")   ,
-        "$-1,955.000 USD" => Money.new(-1_955_00, "USD")  ,
-        "$1.99000 USD"    => Money.new(1_99, "USD")       ,
-      }
-
-      it "works as documented" do
-        STRING_TO_MONEY.each do |string, money|
-          string.to_money.should == money
-        end
-      end
-
-      it "coerces input to string" do
-        Money.parse(20, "USD").should == Money.new(20_00, "USD")
-      end
-
-      it "accepts optional currency" do
-        "10.10".to_money('USD').should == Money.new(1010, 'USD')
-        "10.10".to_money('EUR').should == Money.new(1010, 'EUR')
-        "10.10 USD".to_money('USD').should == Money.new(1010, 'USD')
-      end
-
-      it "uses the parsed currency even if a currency was specified by the method" do
-        expect("10.10 USD".to_money("EUR")).to eq Money.new(1010, "USD")
-      end
-
-      it "ignores unrecognized data" do
-        "hello 2000 world".to_money.should == Money.new(2000_00)
-      end
-
-      it "respects :subunit_to_unit currency property" do
-        "1".to_money("USD").should == Money.new(1_00,  "USD")
-        "1".to_money("TND").should == Money.new(1_000, "TND")
-        "1".to_money("CLP").should == Money.new(1,     "CLP")
-        "1.5".to_money("KWD").cents.should == 1500
-      end
-    end
-
-    describe "#to_currency" do
-      it "converts String to Currency" do
-        "USD".to_currency.should == Money::Currency.new("USD")
-        "EUR".to_currency.should == Money::Currency.new("EUR")
-      end
-
-      it "raises Money::Currency::UnknownCurrency with unknown Currency" do
-        expect { "XXX".to_currency }.to raise_error(Money::Currency::UnknownCurrency)
-        expect { " ".to_currency }.to raise_error(Money::Currency::UnknownCurrency)
-      end
-    end
-  end
-
-  describe Symbol do
-    describe "#to_currency" do
-      it "converts Symbol to Currency" do
-        :usd.to_currency.should == Money::Currency.new("USD")
-        :ars.to_currency.should == Money::Currency.new("ARS")
-      end
-
-      it "is case-insensitive" do
-        :EUR.to_currency.should == Money::Currency.new("EUR")
-      end
-
-      it "raises Money::Currency::UnknownCurrency with unknown Currency" do
-        expect { :XXX.to_currency }.to raise_error(Money::Currency::UnknownCurrency)
-        expect { :" ".to_currency }.to raise_error(Money::Currency::UnknownCurrency)
-      end
-    end
-  end
-
-end

data/spec/money/deprecations_spec.rb

@@ -1,51 +0,0 @@
-# encoding: utf-8
-
-require "spec_helper"
-
-describe Money do
-  describe "::deprecate" do
-    it "should send a deprecation message with caller" do
-      error_message = "Deprecated method triggered here"
-
-      Money.should_receive(:warn).with do |message|
-        message.should =~ /DEPRECATION WARNING: #{error_message} \(called from:.*:\d+\)/
-      end
-
-      Money.deprecate(error_message)
-    end
-
-    context "when silenced" do
-      it "should not warn" do
-        Money.should_not_receive(:warn)
-
-        while_silenced { Money.deprecate("anything") }
-      end
-    end
-  end
-
-  describe "core extensions" do
-    it "does not print deprecations when silenced" do
-      while_silenced do
-        expect_no_deprecation_for { "$1.00".to_money }
-        expect_no_deprecation_for { "USD".to_currency }
-        expect_no_deprecation_for { 1.to_money }
-        expect_no_deprecation_for { :USD.to_currency }
-      end
-    end
-
-    def expect_no_deprecation_for(&block)
-      Money.should_not_receive(:warn)
-      yield
-    end
-  end
-
-  def while_silenced(&block)
-    begin
-      old_setting = Money.silence_core_extensions_deprecations
-      Money.silence_core_extensions_deprecations = true
-      yield
-    ensure
-      Money.silence_core_extensions_deprecations = old_setting
-    end
-  end
-end