bd_money 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/bd_money.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bd_money}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Madrid"]
-  s.date = %q{2012-03-12}
+  s.date = %q{2012-03-22}
   s.description = %q{This library makes it easier to deal with Money values, storing them as BigDecimal to avoid floating-point math errors.}
   s.email = %q{aemadrid@gmail.com}
   s.extra_rdoc_files = [

data/lib/bd_money/bd_money.rb

@@ -39,7 +39,9 @@ class Money
   end
 
   def amount=(value)
-    if value.is_a?(BigDecimal)
+    if value.respond_to?(:to_big_decimal)
+      @amount = value.to_big_decimal
+    elsif value.is_a?(BigDecimal)
       @amount = value
     else
       str = self.class.clean value
@@ -149,6 +151,14 @@ class Money
     amount == 0
   end
 
+  def to_money
+    self
+  end
+
+  def to_big_decimal
+    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
@@ -183,8 +193,9 @@ class Money
     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]
+    unit   = options[:unit] || defaults[:unit]
+    spacer = options[:spacer] || defaults[:spacer]
+    spacer = '' if unit.to_s.empty?
     delimiter = options[:delimiter] || defaults[:delimiter]
     separator = options[:separator] || defaults[:separator]
     separator = '' if precision == 0

data/spec/bd_money_spec.rb

@@ -297,6 +297,15 @@ describe Money do
     end
   end
 
+  describe "to_big_decimal" do
+    let(:bd_amt) { BigDecimal.new(amt) }
+    it { bd_amt.should == subject.to_big_decimal }
+  end
+
+  describe "to_money" do
+    it { should == subject.to_money }
+  end
+
   describe "format" do
     let(:amt) { '1234567.12' }
     let(:neg_amt) { '-1234567.12' }
@@ -305,11 +314,15 @@ describe Money do
     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 { subject.formatted(:general, :last => '%').should == '1234567.12%' }
+    it { subject.formatted(:general, :spacer => " ", :last => '%').should == '1234567.12%' }
     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' }
+    it { neg_subject.formatted(:general, :last => '%').should == '-1234567.12%' }
+    it { neg_subject.formatted(:general, :spacer => " ", :last => '%').should == '-1234567.12%' }
   end
 
   describe "forwarded" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bd_money
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Adrian Madrid
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 -06:00
+date: 2012-03-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency