cashrb 1.1.1 → 1.2.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+cashrb v1.2.0
+=============
+ - allow creation using decimal values instead of cents if you'd rather
+
 cashrb v1.1.1
 =============
  - fix bug in #to_s/#to_f regarding negative amounts

data/README.md

@@ -14,6 +14,17 @@ Usage
     n.to_s  #=> "1.00"
     n.to_f  #=> 1.0
 
+    # Don't like passing cents, set :from => :decimal and use a decimal value
+    n = Cash.new(1.11, from: :decimal)
+    n.cents #=> 111
+    n.to_s  #=> "1.11"
+    n.to_f  #=> 1.11
+
+    # Hate cents and always want to pass a decimal, just set the default
+    Cash.default_from = :decimal
+    n = Cash.new(1.11)
+    n.cents #=> 111
+
     # Define currency as you see fit.
     a = Cash.new(100, currency: :usd)
     b = Cash.new(100, currency: :eur)

data/cashrb.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = "cashrb"
-  s.version     = "1.1.1"
+  s.version     = "1.2.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Shane Emmons"]
   s.email       = ["semmons99@gmail.com"]
-  s.homepage    = "http://github.com/semmons99/cashrb"
+  s.homepage    = "http://semmons99.github.com/cashrb/"
   s.summary     = "Dead simple gem to work with Money/Currency without the hassle of Floats"
   s.description = "Dead simple gem to work with Money/Currency without the hassle of Floats"
 

data/lib/cashrb/cash.rb

@@ -10,28 +10,60 @@ class Cash
   DEFAULT_CENTS_IN_WHOLE  = 100
   DEFAULT_ROUNDING_METHOD = BigDecimal::ROUND_HALF_UP
   DEFAULT_CURRENCY        = nil
+  DEFAULT_FROM            = :cents
+
+  VALID_FROMS             = [:cents, :decimal]
 
   CURRENCY_AWARE_METHODS  = [:+, :-, :/, :%, :divmod, :<=>]
 
   class << self
-    attr_accessor :default_cents_in_whole
-    attr_accessor :default_rounding_method
-    attr_accessor :default_currency
-
     def reset_defaults
       @default_cents_in_whole  = DEFAULT_CENTS_IN_WHOLE
       @default_rounding_method = DEFAULT_ROUNDING_METHOD
       @default_currency        = DEFAULT_CURRENCY
+      @default_from            = DEFAULT_FROM
+    end
+
+    def valid_from?(from)
+      VALID_FROMS.include? from
+    end
+
+    def bd(val)
+      BigDecimal(val.to_s)
+    end
+
+    attr_accessor :default_cents_in_whole
+    attr_accessor :default_rounding_method
+    attr_accessor :default_currency
+    attr_reader   :default_from
+
+    def default_from=(from)
+      unless valid_from? from
+        raise ArgumentError, 
+          "invalid ':from'. valid values are #{VALID_FROMS.join(",")}"
+      end
+      @default_from = from
     end
   end
 
   reset_defaults
 
+  BD_ONE = bd(1)
+  BD_TEN = bd(10)
+
   attr_reader :currency
 
-  def initialize(cents = 0, options = {})
-    parse_initialize_options(options)
-    @cents = bd(cents).round(0, @rounding_method)
+  def initialize(amt = 0, options = {})
+    opts = parse_initialize_options(options)
+    @cents = bd(amt)
+
+    if opts[:from] == :decimal
+      dollars, cents = @cents.divmod(BD_ONE)
+      @cents = (dollars * @cents_in_whole)
+      @cents += (cents * (BD_TEN ** @decimal_places))
+    end
+
+    @cents = @cents.round(0, @rounding_method)
   end
 
   def cents
@@ -99,7 +131,7 @@ class Cash
   private
 
   def bd(val)
-    BigDecimal(val.to_s)
+    self.class.bd(val)
   end
 
   def dollars_and_cents
@@ -116,17 +148,24 @@ class Cash
       :cents_in_whole  => self.class.default_cents_in_whole,
       :rounding_method => self.class.default_rounding_method,
       :currency        => self.class.default_currency,
+      :from            => self.class.default_from
     }.merge(options)
 
     @currency        = opts[:currency]
     @cents_in_whole  = if @currency.respond_to? :cents_in_whole
-                         @currency.cents_in_whole 
+                         bd(@currency.cents_in_whole)
                        else
-                         opts[:cents_in_whole]
+                         bd(opts[:cents_in_whole])
                        end
     @decimal_places  = decimal_places(@cents_in_whole)
     @rounding_method = opts[:rounding_method]
-    nil
+
+    unless self.class.valid_from? opts[:from]
+      raise ArgumentError,
+        "invalid ':from'. valid values are #{VALID_FROMS.join(",")}"
+    end
+
+    opts
   end
 
   def decimal_places(cents_in_whole)

data/test/test_cash.rb

@@ -29,6 +29,19 @@ class TestCash < MiniTest::Unit::TestCase
     assert_equal :usd, rs.currency
   end
 
+  def test_default_from
+    Cash.default_from = :decimal
+
+    rs = Cash.new(1.11)
+    assert_equal 111, rs.cents
+  end
+
+  def test_invalid_default_from
+    assert_raises ArgumentError do
+      Cash.default_from = :foo
+    end
+  end
+
   def test_new
     rs = Cash.new(100)
     assert_equal 100, rs.cents
@@ -58,6 +71,67 @@ class TestCash < MiniTest::Unit::TestCase
     assert_equal 0.9, rs.to_f
   end
 
+  def test_new_with_from
+    rs = Cash.new(111, :from => :cents)
+    assert_equal 111, rs.cents
+
+    rs = Cash.new(1.11, :from => :decimal)
+    assert_equal 111, rs.cents
+  end
+
+  def test_new_with_from_and_cents_in_whole
+    rs = Cash.new(111, :from => :cents, :cents_in_whole => 1)
+    assert_equal 111, rs.cents
+
+    rs = Cash.new(111, :from => :cents, :cents_in_whole => 5)
+    assert_equal 111, rs.cents
+
+    rs = Cash.new(111, :from => :cents, :cents_in_whole => 10)
+    assert_equal 111, rs.cents
+
+    rs = Cash.new(111, :from => :cents, :cents_in_whole => 100)
+    assert_equal 111, rs.cents
+
+    rs = Cash.new(111, :from => :cents, :cents_in_whole => 1000)
+    assert_equal 111, rs.cents
+
+    rs = Cash.new(1.0, :from => :decimal, :cents_in_whole => 1)
+    assert_equal 1, rs.cents
+
+    rs = Cash.new(1.1, :from => :decimal, :cents_in_whole => 5)
+    assert_equal 6, rs.cents
+
+    rs = Cash.new(1.1, :from => :decimal, :cents_in_whole => 10)
+    assert_equal 11, rs.cents
+
+    rs = Cash.new(1.11, :from => :decimal, :cents_in_whole => 100)
+    assert_equal 111, rs.cents
+
+    rs = Cash.new(1.01, :from => :decimal, :cents_in_whole => 100)
+    assert_equal 101, rs.cents
+
+    rs = Cash.new(1.00, :from => :decimal, :cents_in_whole => 100)
+    assert_equal 100, rs.cents
+
+    rs = Cash.new(1.111, :from => :decimal, :cents_in_whole => 1000)
+    assert_equal 1111, rs.cents
+
+    rs = Cash.new(1.011, :from => :decimal, :cents_in_whole => 1000)
+    assert_equal 1011, rs.cents
+
+    rs = Cash.new(1.001, :from => :decimal, :cents_in_whole => 1000)
+    assert_equal 1001, rs.cents
+
+    rs = Cash.new(1.000, :from => :decimal, :cents_in_whole => 1000)
+    assert_equal 1000, rs.cents
+  end
+
+  def test_new_with_invalid_from
+    assert_raises ArgumentError do
+      Cash.new(1, :from => :foo)
+    end
+  end
+
   def test_plus_with_Cash_Cash
     rs = Cash.new(6) + Cash.new(4)
     assert_equal Cash.new(10), rs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cashrb
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-08 00:00:00.000000000Z
+date: 2011-04-12 00:00:00.000000000Z
 dependencies: []
 description: Dead simple gem to work with Money/Currency without the hassle of Floats
 email:
@@ -27,7 +27,7 @@ files:
 - Rakefile
 - .gemtest
 - cashrb.gemspec
-homepage: http://github.com/semmons99/cashrb
+homepage: http://semmons99.github.com/cashrb/
 licenses: []
 post_install_message: 
 rdoc_options: []