bd_money 0.0.8 → 0.0.9

data/README.rdoc

@@ -59,14 +59,24 @@ There is a rails extension that makes it easier to store money values in the dat
     validates_numericality_of :price, :greater_than => 0
   end
 
-This assumes that there is a price (decimal highly recommended) column in the database.  You can also specify the
-:precision and :round_mode option for more fine control of the results.
+This assumes that there is a price (decimal highly recommended) column in the database.
+
+You can also specify the :precision, :round_mode and :format options for more fine control of the results. If you don't
+specify the :precision option it will try to guess it out of the scale column definition (recommended). Precision is
+important since the values will get rounded on every change internally to stay consistent with the database.
 
   class Loan < ActiveRecord::Base
-    money :amount, :round_mode => :half_up
-    money :apr, :precision => 5, :round_mode => :floor
+    money :amount, :round_mode => :half_up, :format => :no_cents
+    money :apr, :precision => 5, :round_mode => :floor, :format => :no_commas
   end
 
+  loan = Loan.create! :amount => '325.75', :apr => '0.01234'
+  loan.amount                                                       #=> 325.75
+  loan.amount.formatted                                             #=> $ 325.75
+  loan.apr                                                          #=> 0.0123
+  loan.apr.formatted                                                #=> $ 0.01
+  loan.apr.formatted(:precision => 5, :unit => "", :spacer => "")   #=> 0.01234
+
 You can set the attribute to a String, Fixnum, or Float and it will call #to_money to
 convert it to a Money object.  This makes it convenient for using money fields in forms.
 

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/bd_money.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bd_money}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   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

@@ -14,17 +14,17 @@ class Money
   } 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 },
+    :default   => { :unit => "$", :spacer => " ", :delimiter => ",", :separator => ".", :precision => 2, :last => "" },
+    :no_cents  => { :unit => "$", :spacer => " ", :delimiter => ",", :separator => ".", :precision => 0, :last => "" },
+    :no_commas => { :unit => "$", :spacer => " ", :delimiter => "", :separator => ".", :precision => 2, :last => "" },
+    :general   => { :unit => "", :spacer => "", :delimiter => "", :separator => ".", :precision => 2, :last => "" },
   } unless const_defined?(:FORMATS)
 
   REMOVE_RE = %r{[$,_ ]} unless const_defined?(:REMOVE_RE)
   VALID_RE = %r{^(-)?(\d)+(\.\d{1,30}(e-\d{1,10})?)?$} unless const_defined?(:VALID_RE)
 
-  YAML_TYPE_CLASS = 'npadv.com,2012-03-12' unless const_defined?(:YAML_TYPE_CLASS)
-  YAML_TYPE_MODE = 'money' unless const_defined?(:YAML_TYPE_MODE)
-  YAML_TYPE_FULL = "#{YAML_TYPE_CLASS}/#{YAML_TYPE_MODE}" unless const_defined?(:YAML_TYPE_FULL)
+  YAML_TYPE_ROOT = 'npadv.com,2012-03-12' unless const_defined?(:YAML_TYPE_ROOT)
+  YAML_TYPE_NAME = 'money' unless const_defined?(:YAML_TYPE_NAME)
 
   include Comparable
 
@@ -79,8 +79,8 @@ class Money
     @format || self.class.format
   end
 
-  def convert(value)
-    self.class.convert value
+  def convert(value, this_precision = precision, this_round_mode = round_mode)
+    self.class.convert value, this_precision, this_round_mode
   end
 
   def eql?(other)
@@ -187,15 +187,16 @@ class Money
     spacer    = options[:spacer] || defaults[:spacer]
     delimiter = options[:delimiter] || defaults[:delimiter]
     separator = options[:separator] || defaults[:separator]
-    precision = options[:precision] || defaults[:precision]
     separator = '' if precision == 0
+    precision = options[:precision] || defaults[:precision]
+    last      = options[:last] || defaults[:last]
 
     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}"
+      "#{unit}#{spacer}#{number}#{last}"
     rescue
       number
     end
@@ -215,7 +216,7 @@ class Money
   end
 
   def to_yaml_type
-    "!#{YAML_TYPE_FULL}"
+    "!#{YAML_TYPE_ROOT}/#{YAML_TYPE_NAME}"
   end
 
   def to_yaml(options = { })
@@ -258,9 +259,8 @@ class Money
       @format || :default
     end
 
-    def convert(value)
-      return value if value.is_a?(Money)
-      new value
+    def convert(value, precision = nil, round_mode = nil)
+      new value, precision, round_mode
     end
 
     def clean(value)
@@ -275,6 +275,6 @@ class Money
 
 end
 
-YAML::add_domain_type(Money::YAML_TYPE_CLASS, Money::YAML_TYPE_MODE) do |_, map|
+YAML::add_domain_type(Money::YAML_TYPE_ROOT, Money::YAML_TYPE_NAME) do |_, map|
   Money.new map['amount'], map['precision'], map['round_mode'], map['format']
 end

data/lib/bd_money/rails.rb

@@ -27,16 +27,22 @@ module ActiveRecord #:nodoc:
         def money(*names)
           options = names.extract_options!
           names.each do |name|
+            if options[:precision]
+              this_precision = options[:precision]
+            else
+              db_column      = columns.select { |x| x.name == name.to_s }.first
+              this_precision = (db_column && db_column.respond_to?(:scale)) ? db_column.scale : nil
+            end
             define_method "#{name}=" do |value|
               if value.present?
-                self[name] = ::Money.new(value, options[:precision], options[:round_mode]).amount
+                self[name] = ::Money.new(value, this_precision, options[:round_mode], options[:format]).round.amount
               else
                 self[name] = nil
               end
             end
             define_method "#{name}" do
               return nil unless self[name].present?
-              ::Money.new self[name], options[:precision], options[:round_mode]
+              ::Money.new self[name], this_precision, options[:round_mode], options[:format]
             end
           end
         end

data/spec/rails_spec.rb

@@ -21,22 +21,25 @@ end
 class BetterLoanExample < ActiveRecord::Base
   set_table_name "money_examples"
 
-  money :amount, :precision => 2, :round_mode => :half_up
-  money :apr, :precision => 5, :round_mode => :floor
+  money :amount, :round_mode => :half_up, :format => :no_cents
+  money :apr, :precision => 4, :round_mode => :floor, :format => :no_commas
 end
 
 describe Money do
   describe "default settings" do
-    it "should allow dynamic finders to work with money objects" do
-      record = DefaultLoanExample.create! :amount => '325.75', :apr => '0.01234'
-      DefaultLoanExample.find_by_amount(0.to_money).should be_nil
-      found = DefaultLoanExample.find_by_amount('325.75'.to_money)
-      found.should == record
-      found.amount.should be_a(Money)
-      found.amount.to_s.should == '325.75'
-      found.apr.should be_a(Money)
-      found.apr.to_s.should == '0.01'
-    end
+    before(:all) { @record = BetterLoanExample.create! :amount => '325.75', :apr => '0.01234' }
+    subject { BetterLoanExample.find_by_amount('325.75'.to_money) }
+    it { BetterLoanExample.find_by_amount(0.to_money).should be_nil }
+    it { subject.id.should == @record.id }
+    it { subject.amount.should be_a(Money) }
+    it { subject.amount.to_s.should == '325.75' }
+    it { subject.amount.format.should == :no_cents }
+    it { subject.amount.formatted.should == '$ 325.75' }
+    it { subject.apr.should be_a(Money) }
+    it { subject.apr.to_s.should == '0.0123' }
+    it { subject.apr.format.should == :no_commas }
+    it { subject.apr.formatted.should == '$ 0.01' }
+    it { subject.apr.formatted(:precision => 3, :unit => "", :spacer => "").should == '0.012' }
   end
   describe "custom settings" do
     it "should allow dynamic finders to work with money objects" do
@@ -47,7 +50,7 @@ describe Money do
       found.amount.should be_a(Money)
       found.amount.to_s.should == '123.45'
       found.apr.should be_a(Money)
-      found.apr.to_s.should == '0.01234'
+      found.apr.to_s.should == '0.0123'
     end
   end
   describe "setter method" do
@@ -72,5 +75,11 @@ describe Money do
       me.update_attribute :amount, nil
       me.amount.should be_nil
     end
+
+    describe "should round numbers to the column's' precision" do
+      subject { BetterLoanExample.new :amount => 300, :apr => 0.123456789 }
+      it { subject.amount.amount.to_s('F').should == '300.0' }
+      it { subject.apr.amount.to_s('F').should == '0.1234' }
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bd_money
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Adrian Madrid