bd_money 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bd_money.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bd_money}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Madrid"]

data/lib/bd_money/bd_money.rb

@@ -12,6 +12,12 @@ class Money
     :up        => BigDecimal::ROUND_UP,
   } unless const_defined?(:ROUND_MODES)
 
+  FORMATS = {
+    :default   => { :unit => "$", :spacer => " ", :delimiter => ",", :separator => ".", :precision => 2 },
+    :no_cents  => { :unit => "$", :spacer => " ", :delimiter => ",", :separator => ".", :precision => 0 },
+    :no_commas => { :unit => "$", :spacer => " ", :delimiter => "", :separator => ".", :precision => 2 },
+  } unless const_defined?(:FORMATS)
+
   REMOVE_RE = %r{[$,_ ]} unless const_defined?(:REMOVE_RE)
   VALID_RE = %r{^(-)?(\d)+(\.\d{1,12})?$} unless const_defined?(:VALID_RE)
 
@@ -20,10 +26,11 @@ class Money
   class MoneyError < StandardError # :nodoc:
   end
 
-  def initialize(value, precision = nil, round_mode = nil)
+  def initialize(value, precision = nil, round_mode = nil, format = nil)
     self.amount = value
     self.precision = precision if precision
     self.round_mode = round_mode if round_mode
+    self.format = format if format
   end
 
   def amount=(value)
@@ -58,6 +65,15 @@ class Money
     @round_mode || self.class.round_mode
   end
 
+  def format=(value)
+    raise "Unknown format options [#{value}]" unless FORMATS.key?(value)
+    @format = value
+  end
+
+  def format
+    @format || self.class.format
+  end
+
   def convert(value)
     self.class.convert value
   end
@@ -98,23 +114,6 @@ class Money
     convert amount ^ convert(other).amount
   end
 
-  def round_amount(this_precision = precision, this_round_mode = round_mode)
-    this_round_mode = BigDecimal.const_get("ROUND_#{this_round_mode.to_s.upcase}") if this_round_mode.is_a?(Symbol)
-    amount.round this_precision, this_round_mode
-  end
-
-  def round(this_precision = precision, this_round_mode = round_mode)
-    convert round_amount(this_precision, this_round_mode)
-  end
-
-  def to_i(this_round_mode = round_mode)
-    round_amount(0, this_round_mode).to_i
-  end
-
-  def to_f(this_precision = precision, this_round_mode = round_mode)
-    round_amount(this_precision, this_round_mode).to_i
-  end
-
   def to_credit
     convert amount.abs
   end
@@ -145,9 +144,25 @@ class Money
     amount == 0
   end
 
-  def to_s(this_precision = precision, this_round_mode = round_mode)
+  def round_amount(this_precision = precision, this_round_mode = round_mode)
     this_round_mode = BigDecimal.const_get("ROUND_#{this_round_mode.to_s.upcase}") if this_round_mode.is_a?(Symbol)
-    amount_str     = amount.round(this_precision, this_round_mode).to_s('F')
+    amount.round this_precision, this_round_mode
+  end
+
+  def round(this_precision = precision, this_round_mode = round_mode)
+    convert round_amount(this_precision, this_round_mode)
+  end
+
+  def to_i(this_round_mode = round_mode)
+    round_amount(0, this_round_mode).to_i
+  end
+
+  def to_f(this_precision = precision, this_round_mode = round_mode)
+    round_amount(this_precision, this_round_mode).to_i
+  end
+
+  def to_s(this_precision = precision, this_round_mode = round_mode)
+    amount_str     = round_amount(this_precision, this_round_mode).to_s('F')
     dollars, cents = amount_str.split('.')
     return dollars if this_precision == 0
     if cents.size >= this_precision
@@ -159,6 +174,28 @@ class Money
 
   alias :inspect :to_s
 
+  def formatted(*args)
+    defaults = args.first.is_a?(::Symbol) ? FORMATS[args.shift] : FORMATS[:default]
+    options = args.last.is_a?(::Hash) ? args.pop : { }
+
+    unit      = options[:unit] || defaults[:unit]
+    spacer    = options[:spacer] || defaults[:spacer]
+    delimiter = options[:delimiter] || defaults[:delimiter]
+    separator = options[:separator] || defaults[:separator]
+    precision = options[:precision] || defaults[:precision]
+    separator = '' if precision == 0
+
+    number = to_s precision
+    begin
+      parts = number.to_s.split('.')
+      parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
+      number = parts.join(separator)
+      "#{unit}#{spacer}#{number}"
+    rescue
+      number
+    end
+  end
+
   def respond_to?(meth)
     amount.respond_to?(meth) || super
   end
@@ -192,6 +229,15 @@ class Money
       @round_mode || :half_up
     end
 
+    def format=(value)
+      raise "Unknown format options [#{value}]" unless FORMATS.key?(value)
+      @format = value
+    end
+
+    def format
+      @format || :default
+    end
+
     def convert(value)
       return value if value.is_a?(Money)
       new value

data/spec/bd_money_spec.rb

@@ -190,6 +190,7 @@ describe Money do
       it { Money.new('0.0').should be_zero }
     end
   end
+
   describe "to_s" do
     describe "no decimals" do
       let(:amt) { '3' }
@@ -269,6 +270,22 @@ describe Money do
       it { subject.to_s(6).should == amt }
     end
   end
+
+  describe "format" do
+    let(:amt){ '1234567.12'}
+    let(:neg_amt){ '-1234567.12'}
+    it {subject.formatted().should == '$ 1,234,567.12'}
+    it {subject.formatted(:no_cents).should == '$ 1,234,567'}
+    it {subject.formatted(:no_commas).should == '$ 1234567.12'}
+    it {subject.formatted(:precision => 1).should == '$ 1,234,567.1'}
+    it {subject.formatted(:no_commas, :precision => 1).should == '$ 1234567.1'}
+    it {neg_subject.formatted().should == '$ -1,234,567.12'}
+    it {neg_subject.formatted(:no_cents).should == '$ -1,234,567'}
+    it {neg_subject.formatted(:no_commas).should == '$ -1234567.12'}
+    it {neg_subject.formatted(:precision => 1).should == '$ -1,234,567.1'}
+    it {neg_subject.formatted(:no_commas, :precision => 1).should == '$ -1234567.1'}
+  end
+
   describe "forwarded" do
     describe "power" do
       subject { Money.new(amt).power 2 }
@@ -276,6 +293,7 @@ describe Money do
       it { subject.to_s.should == '12.46' }
     end
   end
+
   describe "Rounding" do
     let(:pos_amt1) { Money.new '1.4' }
     let(:pos_amt2) { Money.new '1.5' }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bd_money
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Adrian Madrid