ShadowBelmolve-money 2.3.3 → 2.3.4

data/README.rdoc

@@ -12,9 +12,10 @@ This library aids one in handling money and different currencies. Features:
 
 Resources:
 
-- This fork: http://github.com/ShadowBelmolve/money
 - Website: http://money.rubyforge.org
 - RDoc API: http://money.rubyforge.org
+- This fork: http://github.com/ShadowBelmolve/money
+- Forked from: http://github.com/nofxx/money
 - Git repository: http://github.com/FooBarWidget/money/tree/master
 
 

data/lib/money/money.rb

@@ -84,7 +84,8 @@ class Money
 
   # Do two money objects equal? Only works if both objects are of the same currency
   def ==(other_money)
-    cents == other_money.cents && bank.same_currency?(currency, other_money.currency)
+    other_money.respond_to?(:cents) && cents == other_money.cents &&
+      other_money.respond_to?(:currency) && bank.same_currency?(currency, other_money.currency)
   end
 
   def <=>(other_money)
@@ -149,6 +150,40 @@ class Money
     Money.new(rate / 100 / period * cents * count)
   end
 
+  #Round to nearest coin value
+  #  basically, we don't have coins for cents in CZK, 
+  #  our smallest fraction is 0.50CZK
+  #
+  #Money.new(14_58).round_to_coin(50) => 14.50
+  def round_to_coin(coin)
+    coef = 1.0/coin
+    val = (cents * coef).round / coef
+    Money.new(val, currency)
+  end
+
+  #Returns array a where
+  # a[0] is price _after_ applying tax (tax base)
+  # a[1] is tax
+  def tax_brakedown(tax)
+    _tax = (cents * (tax / 100.0)).round
+    [Money.new(cents + _tax, currency), Money.new(_tax, currency)]
+  end
+
+  #Returns array a where
+  # a[0] is price _before_ applying tax (tax base)
+  # a[1] is tax
+  def tax_reverse_brakedown(tax)
+    coef = tax/100.0
+    [Money.new((cents / (1+coef)).round, currency), 
+     Money.new((cents*coef/(1+coef)).round, currency) ]
+  end
+  
+  # Just a helper if you got tax inputs in percentage.
+  # Ie. add_tax(20) =>  cents * 1.20
+  def add_tax(tax)
+    tax_brakedown(tax)[0]
+  end
+
   # Split money in number of installments
   #
   # Money.new(10_00).split_in_installments(3)
@@ -171,12 +206,6 @@ class Money
     split_in_installments(cents/other_money.cents, order)
   end
 
-  # Just a helper if you got tax inputs in percentage.
-  # Ie. add_tax(20) =>  cents * 1.20
-  def add_tax(tax)
-    Money.new(cents + cents / 100 * tax)
-  end
-
   # Format the price according to several rules
   # Currently supported are :with_currency, :no_cents, :symbol and :html
   #

data/lib/money/variable_exchange_bank.rb

@@ -31,15 +31,20 @@ class Money
     def initialize
       @rates = {}
       @rates["USD"] = 1.0
+      @mutex = Mutex.new
     end
 
     def add_rate(currency, rate)
-      @rates[currency.upcase] = (currency.upcase != Money.default_currency) ? (rate * @rates[Money.default_currency]) : rate
+      @mutex.synchronize do
+        @rates[currency.upcase] = (currency.upcase != Money.default_currency) ? (rate * @rates[Money.default_currency]) : rate
+      end
     end
 
     def get_rate(currency = nil)
-      return nil unless @rates[currency]
-      (currency != Money.default_currency) ? @rates[currency.upcase] / @rates[Money.default_currency] : @rates[currency.upcase]
+      @mutex.synchronize do
+        return nil unless @rates[currency]
+        (currency != Money.default_currency) ? @rates[currency.upcase] / @rates[Money.default_currency] : @rates[currency.upcase]
+      end
     end
     
     # Given two currency names, checks whether they're both the same currency.

data/money.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{money}
-  s.version = "2.3.3"
+  s.version = "2.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Money Team"]

data/spec/money/money_spec.rb

@@ -114,8 +114,16 @@ describe Money do
     end
 
     it "should calculate tax" do
-      Money.new(100).add_tax(20).cents.should eql(120)
-      Money.new(100).add_tax(-20).cents.should eql(80)
+      Money.new(1218).add_tax(19).cents.should eql(1449)
+      Money.new(1218).add_tax(-19).cents.should eql(987)
+    end
+
+    it "should provide tax brakedown" do
+      Money.new(1225).tax_brakedown(19).map{|c| c.to_s}.should eql(['14.58','2.33'])
+    end
+
+    it "should provide reverse tax brakedown" do
+      Money.new(-8).tax_reverse_brakedown(19).map{|c| c.to_s}.should eql(['-0.07','-0.01'])
     end
 
     it "shuld to_s wallet" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ShadowBelmolve-money
 version: !ruby/object:Gem::Version 
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors: 
 - Money Team