sevenwire-money 2.3.3 → 2.3.4

data/lib/money/micro_money.rb

@@ -1,15 +1,12 @@
 class MicroMoney < Money
 
   # Forces the :units => :millicents option.
-  def initialize_with_millicents(money, *args)
+  def initialize(money, *args)
     options = args.last.is_a?(Hash) ? args.pop : {}
     options.merge!(:units => :millicents)
-    initialize_without_millicents(money, *(args << options))
+    super(money, *(args << options))
   end
 
-  alias :initialize_without_millicents :initialize
-  alias :initialize :initialize_with_millicents
-
 
   ### OUTPUT/CONVERSIONS
 

data/lib/money/money.rb

@@ -150,7 +150,7 @@ class Money
   #
   # with_currency:
   #
-  #  Money.ca_dollar(0).format => "free"
+  #  Money.ca_dollar(0).format => "$0.00"
   #  Money.ca_dollar(100).format => "$1.00"
   #  Money.ca_dollar(100).format(:with_currency) => "$1.00 CAD"
   #  Money.us_dollar(85).format(:with_currency) => "$0.85 USD"
@@ -166,10 +166,20 @@ class Money
   # html:
   #
   #  Money.ca_dollar(570).format(:html, :with_currency) =>  "$5.70 <span class=\"currency\">CAD</span>"
+  #
+  # fractional:
+  #
+  #  MicroMoney.new(500).format(:tenths) => "$0.005"
   def format(*rules)
     rules = rules.flatten
 
-    if rules.include?(:no_cents)
+    if rules.include?(:tenths)
+      formatted = sprintf("$%.3f", millicents.to_f / 100000)
+    elsif rules.include?(:hundredths)
+      formatted = sprintf("$%.4f", millicents.to_f / 100000)
+    elsif rules.include?(:thousandths)
+      formatted = sprintf("$%.5f", millicents.to_f / 100000)
+    elsif rules.include?(:no_cents)
       formatted = sprintf("$%d", cents.to_f / 100)
     else
       formatted = sprintf("$%.2f", cents.to_f / 100)
@@ -187,8 +197,19 @@ class Money
   # Output a money object as a string.
   # Example:
   #   Money.new(100).to_s => "1.00"
-  def to_s
-    sprintf("%.2f", cents.to_f / 100)
+  def to_s(precision)
+    case precision
+    when :tenths
+      sprintf("%.3f", millicents.to_f / 100000)
+    when :hundredths
+      sprintf("%.4f", millicents.to_f / 100000)
+    when :thousandths
+      sprintf("%.5f", millicents.to_f / 100000)
+    when :no_cents
+      sprintf("%d", cents.to_f / 100)
+    else
+      sprintf("%.2f", cents.to_f / 100)
+    end
   end
 
   # Converts to a float value.

data/money.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "money"
-  s.version = "2.3.3"
+  s.version = "2.3.4"
   s.summary = "Money and MicroMoney with currency exchange support library"
   s.email = "brandon@sevenwire.com"
   s.homepage = "http://github.com/sevenwire/money"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sevenwire-money
 version: !ruby/object:Gem::Version 
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors: 
 - Tobias Luetke