money 6.1.0.beta1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11002632b6f2ab53b4691fbcf1824b65ee95f7da
-  data.tar.gz: 9d93fd3a69e74b5c4285f365c7587dc7b6072281
+  metadata.gz: 5160af002d878da8e074fe1408852b40dcede5a5
+  data.tar.gz: 1a991c73c08d6667d8225e0fda638d651e1de914
 SHA512:
-  metadata.gz: f4cb9248d5cb8bdb5342b76f1e49766ee614e74ef432023567ae1839b7aa587a9194520938c4b7d1ed091262da8a11d038b47a673c62649cde63097633c2a00d
-  data.tar.gz: 2640b8e18f2ce3ac3a6eee8923c5b57b083609345dfa10bf2ae76ce4124348109c077f1c2284385c37d57f13b9408735a6c4e789ad4ccc01a090c4003ac5ffe4
+  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

@@ -2,6 +2,7 @@
 
 ## 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.

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.rb

@@ -97,6 +97,22 @@ 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)
@@ -147,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
@@ -389,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/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/version.rb

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

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/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

data/spec/money_spec.rb

@@ -235,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
 
@@ -444,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.1.0.beta1
+  version: 6.1.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -158,12 +158,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      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.