money 6.0.0.pre5 → 6.0.0

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## master
+## 6.0.0
 - Fix BTC subunit
 - New option :sign_positive to add a + sign to positive numbers
 - Only allow to multiply a money by a number (int, float)
@@ -25,6 +25,8 @@
 - Changed the New Taiwan Dollar symbol position from after the amount to before the amount.
 - Passing a Money instance to the Money constructor will obtain a new Money object with the same property values as the original
 - Add deprecation warning to comparators
+- Add Money.disallow_currency_conversion! option
+- Allow to inherits from `Money`
 
 ## 5.1.1
 

data/README.md

@@ -240,6 +240,13 @@ There is nothing stopping you from creating bank objects which scrapes
 Money.default_bank = ExchangeBankWhichScrapesXeDotCom.new
 ```
 
+If you wish to disable automatic currency conversion to prevent arithmetic when
+currencies don't match:
+
+``` ruby
+Money.disallow_currency_conversion!
+```
+
 ### Implementations
 
 The following is a list of Money.gem compatible currency exchange rate
@@ -261,7 +268,7 @@ For deprecated methods of integrating with Rails, check [the wiki](https://githu
 
 ## Migration Notes
 
-#### Version 6.0.0.pre3
+#### Version 6.0.0
 
 - The `Money#dollars` and `Money#amount` methods now return instances of
   `BigDecimal` rather than `Float`. We should avoid representing monetary

data/lib/money/bank/single_currency.rb

@@ -0,0 +1,24 @@
+require 'money/bank/base'
+
+class Money
+  module Bank
+    # Raised when trying to exchange currencies
+    class DifferentCurrencyError < Error; end
+
+    # Class to ensure client code is operating in a single currency
+    # by raising if an exchange attempts to happen.
+    #
+    # This is useful when an application uses multiple currencies but
+    # it usually deals with only one currency at a time so any arithmetic
+    # where exchanges happen are erroneous. Using this as the default bank
+    # means that that these mistakes don't silently do the wrong thing.
+    class SingleCurrency < Base
+
+      # 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}"
+      end
+    end
+  end
+end

data/lib/money/money.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "money/bank/variable_exchange"
+require "money/bank/single_currency"
 require "money/money/arithmetic"
 require "money/money/parsing"
 require "money/money/formatting"
@@ -127,26 +128,34 @@ class Money
     attr_accessor :conversion_precision
   end
 
-  # Set the default bank for creating new +Money+ objects.
-  self.default_bank = Bank::VariableExchange.instance
+  def self.setup_defaults
+    # Set the default bank for creating new +Money+ objects.
+    self.default_bank = Bank::VariableExchange.instance
 
-  # Set the default currency for creating new +Money+ object.
-  self.default_currency = Currency.new("USD")
+    # Set the default currency for creating new +Money+ object.
+    self.default_currency = Currency.new("USD")
 
-  # Default to using i18n
-  self.use_i18n = true
+    # 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 currency symbol assumptions when parsing
+    self.assume_from_symbol = false
 
-  # Default to not using infinite precision cents
-  self.infinite_precision = false
+    # Default to not using infinite precision cents
+    self.infinite_precision = false
 
-  # Default to bankers rounding
-  self.rounding_mode = BigDecimal::ROUND_HALF_EVEN
+    # Default to bankers rounding
+    self.rounding_mode = BigDecimal::ROUND_HALF_EVEN
 
-  # Default the conversion of Rationals precision to 16
-  self.conversion_precision = 16
+    # Default the conversion of Rationals precision to 16
+    self.conversion_precision = 16
+  end
+
+  def self.inherited(base)
+    base.setup_defaults
+  end
+
+  setup_defaults
 
   # Create a new money object with value 0.
   #
@@ -252,6 +261,12 @@ class Money
     Money.default_bank.add_rate(from_currency, to_currency, rate)
   end
 
+  # Sets the default bank to be a SingleCurrency bank that raises on
+  # currency exchange. Useful when apps operate in a single currency at a time.
+  def self.disallow_currency_conversion!
+    self.default_bank = Bank::SingleCurrency.instance
+  end
+
   # Creates a new Money object of value given in the
   # +fractional unit+ of the given +currency+.
   #

data/money.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "money"
-  s.version     = "6.0.0.pre5"
+  s.version     = "6.0.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tobias Luetke", "Hongli Lai", "Jeremy McNevin",
                    "Shane Emmons", "Simone Carletti"]

data/spec/bank/single_currency_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Money::Bank::SingleCurrency do
+  describe "#exchange_with" 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")
+    end
+  end
+end

data/spec/money_spec.rb

@@ -159,6 +159,21 @@ describe Money do
     end
   end
 
+  describe ".disallow_currency_conversions!" do
+    before do
+      @default_bank = Money.default_bank
+    end
+
+    after do
+      Money.default_bank = @default_bank
+    end
+
+    it "disallows conversions when doing money arithmetic" do
+      Money.disallow_currency_conversion!
+      expect { Money.new(100, "USD") + Money.new(100, "EUR") }.to raise_exception(Money::Bank::DifferentCurrencyError)
+    end
+  end
+
   describe "#cents" do
     it "is a synonym of #fractional" do
       expectation = Money.new(0)
@@ -587,4 +602,16 @@ YAML
       end
     end
   end
+
+  describe "inheritance" do
+    it "allows inheritance" do
+      # TypeError:
+      #   wrong argument type nil (expected Fixnum)
+      # ./lib/money/money.rb:63:in `round'
+      # ./lib/money/money.rb:63:in `fractional'
+      # ./lib/money/money/arithmetic.rb:115:in `-'
+      MoneyChild = Class.new(Money)
+      (MoneyChild.new(1000) - Money.new(500)).should eq Money.new(500)
+    end
+  end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre5
-  prerelease: 6
+  version: 6.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Tobias Luetke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -99,6 +99,7 @@ files:
 - lib/money/currency/heuristics.rb
 - lib/money/bank/variable_exchange.rb
 - lib/money/bank/base.rb
+- lib/money/bank/single_currency.rb
 - lib/money/money.rb
 - lib/money.rb
 - spec/support/default_currency_helper.rb
@@ -110,6 +111,7 @@ files:
 - spec/money_spec.rb
 - spec/currency/heuristics_spec.rb
 - spec/spec_helper.rb
+- spec/bank/single_currency_spec.rb
 - spec/bank/variable_exchange_spec.rb
 - spec/bank/base_spec.rb
 - CHANGELOG.md
@@ -136,9 +138,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 2830931323134829129
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23