money 6.0.1.beta3 → 6.0.1.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2817efb2d831c4dc20a21ad35e2668ef18f877
-  data.tar.gz: ab6fb4c372bae304d46f672517844816e2d9788e
+  metadata.gz: 9f4c3a30959c99ab2533096b20f089c4d0700c90
+  data.tar.gz: 698dd9f7be9922faf38f75644aa18f380fabd546
 SHA512:
-  metadata.gz: f6a4ce82b5f4d9624d9b1568a39357b0d35d190f2c6b94f30bce534f2b2daffa103e40c9da450788c36c2d994e33eeb1554eb1931655c29fa0cd474ceb971402
-  data.tar.gz: f08fda3dc489e7031a6937c28a32678bdef279b8e0e8725c832019576f380da9ee4b217aa6a5d7055985dcdff49cec1d6e48117a0e49843ad5792683290356aa
+  metadata.gz: a18278df5e345754a702754fdf42b3d22645c7fb84af4ef45a996d58d18815322b96eefea624d2e36baae9f07502f3a63c907ead755984428cf14197cd26bdbe
+  data.tar.gz: 791835e4c32da05b0ffb916378da511f6d6b7ad51867b82c8b54102873f27512fea91c853a6ba565bf8dcdfbe97c632a76c66061da6c0dd30a202f29a210cbdb

data/lib/money.rb

@@ -1,17 +1,9 @@
 require "bigdecimal"
 require "bigdecimal/util"
-require "i18n" rescue LoadError
+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"
-
-class Money
-  class << self
-    attr_accessor :silence_core_extensions_deprecations
-  end
-
-  self.silence_core_extensions_deprecations = false
-end

data/lib/money/core_extensions.rb

@@ -2,6 +2,6 @@ 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."
+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/core_extensions/numeric.rb

@@ -1,9 +1,7 @@
 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
+    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,15 +1,13 @@
 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."
+    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)
-    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
+    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,9 +1,7 @@
 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
+    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/deprecations.rb

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

data/lib/money/money.rb

@@ -18,10 +18,7 @@ require "money/money/formatting"
 #
 # @see http://en.wikipedia.org/wiki/Money
 class Money
-  include Comparable
-  include Arithmetic
-  include Formatting
-  include Parsing
+  include Comparable, Money::Arithmetic, Money::Formatting, Money::Parsing
 
   # Convenience method for fractional part of the amount. Synonym of #fractional
   #
@@ -67,17 +64,6 @@ class Money
     end
   end
 
-  def as_d(num)
-    if num.is_a?(Rational)
-      num.to_d(self.class.conversion_precision)
-    elsif num.respond_to?(:to_d)
-      num.to_d
-    else
-      BigDecimal.new(num.to_s)
-    end
-  end
-  private :as_d
-
   # @attr_reader [Currency] currency The currency the money is in.
   # @attr_reader [Money::Bank::*] bank The +Money::Bank+ based object used to
   # perform currency exchanges with.
@@ -103,7 +89,8 @@ class Money
     # @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
+      :assume_from_symbol, :infinite_precision, :conversion_precision,
+      :silence_core_extensions_deprecations
 
     # @attr_writer rounding_mode Use this to specify the rounding mode
     attr_writer :rounding_mode
@@ -144,6 +131,9 @@ 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)
@@ -393,41 +383,19 @@ class Money
   # @example
   #   Money.ca_dollar(100).to_s #=> "1.00"
   def to_s
-    unit, subunit = fractional().abs.divmod(currency.subunit_to_unit)
-
-    unit_str       = ""
-    subunit_str    = ""
-    fraction_str   = ""
-
-    if self.class.infinite_precision
-      subunit, fraction = subunit.divmod(BigDecimal("1"))
-
-      unit_str       = unit.to_i.to_s
-      subunit_str    = subunit.to_i.to_s
-      fraction_str   = fraction.to_s("F")[2..-1] # want fractional part "0.xxx"
-
-      fraction_str = "" if fraction_str =~ /^0+$/
-    else
-      unit_str, subunit_str = unit.to_s, subunit.to_s
-    end
-
-    absolute_str = if currency.decimal_places == 0
-      if fraction_str == ""
-        unit_str
-      else
-        "#{unit_str}#{decimal_mark}#{fraction_str}"
-      end
-    else
-      # need to pad subunit to right position,
-      # for example 1 usd 3 cents should be 1.03 not 1.3
-      subunit_str.insert(0, '0') while subunit_str.length < currency.decimal_places
+    unit, subunit, fraction = strings_from_fractional
 
-      "#{unit_str}#{decimal_mark}#{subunit_str}#{fraction_str}"
-    end
+    str = if currency.decimal_places == 0
+            if fraction == ""
+              unit
+            else
+              "#{unit}#{decimal_mark}#{fraction}"
+            end
+          else
+            "#{unit}#{decimal_mark}#{pad_subunit(subunit)}#{fraction}"
+          end
 
-    absolute_str.tap do |str|
-      str.insert(0, "-") if fractional() < 0
-    end
+    fractional < 0 ? "-#{str}" : str
   end
 
   # Return the amount of money as a BigDecimal.
@@ -544,28 +512,6 @@ class Money
     amounts.collect { |fractional| Money.new(fractional, currency) }
   end
 
-  def allocations_from_splits(splits)
-    splits.inject(0) { |sum, n| sum + as_d(n) }
-  end
-  private :allocations_from_splits
-
-  def amounts_from_splits(allocations, splits)
-    left_over = fractional
-
-    amounts = splits.map do |ratio|
-      if self.class.infinite_precision
-        fractional * ratio
-      else
-        (fractional * ratio / allocations).floor.tap do |frac|
-          left_over -= frac
-        end
-      end
-    end
-
-    [amounts, left_over]
-  end
-  private :amounts_from_splits
-
   # Split money amongst parties evenly without loosing pennies.
   #
   # @param [Numeric] num number of parties.
@@ -584,24 +530,6 @@ class Money
     end
   end
 
-  def split_infinite(num)
-    amt = div(as_d(num))
-    1.upto(num).map{amt}
-  end
-  private :split_infinite
-
-  def split_flat(num)
-    low = Money.new(fractional / num, currency)
-    high = Money.new(low.fractional + 1, currency)
-
-    remainder = fractional % num
-
-    Array.new(num).each_with_index.map do |_, index|
-      index < remainder ? high : low
-    end
-  end
-  private :split_flat
-
   # Round the monetary amount to smallest unit of coinage.
   #
   # @note
@@ -624,4 +552,80 @@ class Money
       self
     end
   end
+
+  private
+
+  def as_d(num)
+    if num.is_a?(Rational)
+      num.to_d(self.class.conversion_precision)
+    else
+      num.to_d
+    end
+  rescue NoMethodError
+    BigDecimal.new(num.to_s)
+  end
+
+  def strings_from_fractional
+    unit, subunit = fractional().abs.divmod(currency.subunit_to_unit)
+
+    if self.class.infinite_precision
+      strings_for_infinite_precision(unit, subunit)
+    else
+      strings_for_base_precision(unit, subunit)
+    end
+  end
+
+  def strings_for_infinite_precision(unit, subunit)
+    subunit, fraction = subunit.divmod(BigDecimal("1"))
+    fraction = fraction.to_s("F")[2..-1] # want fractional part "0.xxx"
+    fraction = "" if fraction =~ /^0+$/
+
+    [unit.to_i.to_s, subunit.to_i.to_s, fraction]
+  end
+
+  def strings_for_base_precision(unit, subunit)
+    [unit.to_s, subunit.to_s, ""]
+  end
+
+  def pad_subunit(subunit)
+    cnt = currency.decimal_places
+    padding = "0" * cnt
+    "#{padding}#{subunit}"[-1 * cnt, cnt]
+  end
+
+  def allocations_from_splits(splits)
+    splits.inject(0) { |sum, n| sum + as_d(n) }
+  end
+
+  def amounts_from_splits(allocations, splits)
+    left_over = fractional
+
+    amounts = splits.map do |ratio|
+      if self.class.infinite_precision
+        fractional * ratio
+      else
+        (fractional * ratio / allocations).floor.tap do |frac|
+          left_over -= frac
+        end
+      end
+    end
+
+    [amounts, left_over]
+  end
+
+  def split_infinite(num)
+    amt = div(as_d(num))
+    1.upto(num).map{amt}
+  end
+
+  def split_flat(num)
+    low = Money.new(fractional / num, currency)
+    high = Money.new(low.fractional + 1, currency)
+
+    remainder = fractional % num
+
+    Array.new(num).each_with_index.map do |_, index|
+      index < remainder ? high : low
+    end
+  end
 end

data/lib/money/money/arithmetic.rb

@@ -25,7 +25,7 @@ class Money
     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." unless Money.silence_core_extensions_deprecations
+          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
@@ -58,8 +58,8 @@ class Money
     end
 
     def check_compare_deprecate(val)
-      unless val.is_a?(Money) || Money.silence_core_extensions_deprecations
-        Money.deprecate "as of Money 6.1.0 you must `require 'monetize/core_extensions'` to compare Money to core classes."
+      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
 

data/lib/money/money/formatting.rb

@@ -1,37 +1,30 @@
 # encoding: UTF-8
 class Money
   module Formatting
-
-    if Object.const_defined?("I18n")
+    def self.included(base)
       [
         [:thousands_separator, :delimiter, "."],
         [:decimal_mark, :separator, ","]
       ].each do |method, name, character|
-        define_method(method) do
-          if self.class.use_i18n
-            I18n.t(
-              :"number.currency.format.#{name}",
-              :default => I18n.t(
-                :"number.format.#{name}",
-                :default => (currency.send(method) || character)
-              )
-            )
-          else
-            currency.send(method) || character
-          end
-        end
-      end
-    else
-      def thousands_separator
-        currency.thousands_separator || ","
+        define_i18n_method(method, name, character)
       end
+    end
 
-      def decimal_mark
-        currency.decimal_mark || "."
+    def self.define_i18n_method(method, name, character)
+      define_method(method) do
+        if self.class.use_i18n
+          I18n.t(
+            :"number.currency.format.#{name}", :default => I18n.t(
+              :"number.format.#{name}",
+              :default => (currency.send(method) || character)
+            )
+          )
+        else
+          currency.send(method) || character
+        end
       end
+      alias_method name, method
     end
-    alias_method :delimiter, :thousands_separator
-    alias_method :separator, :decimal_mark
 
     # Creates a formatted price string according to several rules.
     #

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "6.0.1.beta3"
+  VERSION = "6.0.1.beta4"
 end

data/spec/money/deprecations_spec.rb

@@ -3,15 +3,49 @@
 require "spec_helper"
 
 describe Money do
-  describe "#deprecate" do
-    let(:error_message) { "Deprecated method triggered here" }
-
+  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

data/spec/money_spec.rb

@@ -43,6 +43,11 @@ describe Money do
       it { should eq initializing_value }
     end
 
+    context "given the initializing value doesn't respond to .to_d" do
+      let(:initializing_value) { :"1" }
+      it { should eq Money.new(1) }
+    end
+
     context 'given a currency is not provided' do
       subject(:money) { Money.new(initializing_value) }
       its(:currency) { should eq Money.default_currency }
@@ -209,7 +214,7 @@ describe Money do
         m.fractional.should be_a(Fixnum)
       end
     end
-    
+
     context "loading a serialized Money via YAML" do
 
       let(:serialized) { <<YAML
@@ -341,7 +346,7 @@ YAML
       def m.amount
         5
       end
-      
+
       m.dollars.should == 5
     end
   end
@@ -436,6 +441,10 @@ YAML
       it "suppresses fractional cents when there is none" do
         Money.new(1.0, "USD").to_s.should == "0.01"
       end
+
+      it "shows fractional if needed when :subunut_to_unit == 1" do
+        Money.new(10_00.1, "CLP").to_s.should == "1000,1"
+      end
     end
   end
 
@@ -643,4 +652,32 @@ YAML
       (MoneyChild.new(1000) - Money.new(500)).should eq Money.new(500)
     end
   end
+
+  describe "#as_*" do
+    before do
+      Money.default_bank = Money::Bank::VariableExchange.new
+      Money.add_rate("EUR", "USD", 1)
+      Money.add_rate("EUR", "CAD", 1)
+      Money.add_rate("USD", "EUR", 1)
+    end
+
+    after do
+      Money.default_bank = Money::Bank::VariableExchange.instance
+    end
+
+    specify "as_us_dollar converts Money object to USD" do
+      obj = Money.new(1, "EUR")
+      obj.as_us_dollar.should == Money.new(1, "USD")
+    end
+
+    specify "as_ca_dollar converts Money object to CAD" do
+      obj = Money.new(1, "EUR")
+      obj.as_ca_dollar.should == Money.new(1, "CAD")
+    end
+
+    specify "as_euro converts Money object to EUR" do
+      obj = Money.new(1, "USD")
+      obj.as_euro.should == Money.new(1, "EUR")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.0.1.beta3
+  version: 6.0.1.beta4
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n