finance 1.1.1 → 1.1.2

data/HISTORY

@@ -1,3 +1,9 @@
+= Version 1.1.2
+16 Jun 2012
+
+* Bugfix: Array#irr and Array#xirr check for a valid sequence of cash flows.
+* Bugfix: Integer#months and Integer#years no longer collide with Rails methods.
+
 = Version 1.1.0
 11 Sep 2011
 

data/lib/finance/cashflows.rb

@@ -44,6 +44,12 @@ module Finance
     # @see http://en.wikipedia.org/wiki/Internal_rate_of_return
     # @api public
     def irr
+      # Make sure we have a valid sequence of cash flows.
+      positives, negatives = self.partition{ |i| i >= 0 }
+      if positives.empty? || negatives.empty?
+        raise ArgumentError, "Calculation does not converge."
+      end
+
       func = Function.new(self, :npv)
       rate = [ func.one ]
       n = nlsolve( func, rate )
@@ -83,6 +89,12 @@ module Finance
     #   @transactions.xirr(0.6) #=> Rate("0.024851", :apr, :compounds => :annually)
     # @api public
     def xirr(iterations=100)
+      # Make sure we have a valid sequence of cash flows.
+      positives, negatives = self.partition{ |t| t.amount >= 0 }
+      if positives.empty? || negatives.empty?
+        raise ArgumentError, "Calculation does not converge."
+      end
+
       func = Function.new(self, :xnpv)
       rate = [ func.one ]
       n = nlsolve( func, rate )

data/lib/finance/interval.rb

@@ -1,19 +1,13 @@
 class Integer
-  # convert an integer value representing months into months
+  # convert an integer value representing months (or years) into months
   # @return [Integer] the number of months
   # @example
   #   360.months #=> 360
-  # @api public
-  def months
-    self
-  end
-
-  # convert an integer value representing years into months
-  # @return [Integer] the number of months
-  # @example
   #   30.years #=> 360
   # @api public
-  def years
-    self * 12
+  def method_missing(name, *args, &block)
+    return self      if name.to_s == "months"
+    return self * 12 if name.to_s == "years"
+    super
   end
 end

data/test/test_cashflows.rb

@@ -11,7 +11,9 @@ class TestCashflows < Test::Unit::TestCase
   context "an array of numeric cashflows" do
     should "have an Internal Rate of Return" do
       assert_equal D("0.143"), [-4000,1200,1410,1875,1050].irr.round(3)
+      assert_raises(ArgumentError) { [10,20,30].irr }
     end
+
     should "have a Net Present Value" do
       assert_equal D("49.211"), [-100.0, 60, 60, 60].npv(0.1).round(3)
     end
@@ -26,6 +28,7 @@ class TestCashflows < Test::Unit::TestCase
 
     should "have an Internal Rate of Return" do
       assert_equal D("0.024851"), @xactions.xirr.effective.round(6)
+      assert_raises(ArgumentError) { @xactions[1,2].xirr }
     end
 
     should "have a Net Present Value" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finance
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flt
-  requirement: &2151813040 !ruby/object:Gem::Requirement
+  requirement: &2152191000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151813040
+  version_requirements: *2152191000
 description: The finance library provides a Ruby interface for working with interest
   rates, mortgage amortization, and cashflows (NPV, IRR, etc.).
 email: wkranec@gmail.com
@@ -40,7 +40,6 @@ files:
 - lib/finance/amortization.rb
 - lib/finance/cashflows.rb
 - lib/finance/decimal.rb
-- lib/finance/gistfile1.rb
 - lib/finance/interval.rb
 - lib/finance/rates.rb
 - lib/finance/transaction.rb

data/lib/finance/gistfile1.rb

@@ -1,25 +0,0 @@
-require_relative 'cashflows'
-require_relative 'transaction'
-
-require 'time'
-include Finance
-
-trans = [
-  Transaction.new(-1000, :date => Time.parse("2011-01-01")),
-  Transaction.new(100, :date => Time.parse("2011-02-11")),
-  Transaction.new(100, :date => Time.parse("2011-03-11")),
-  Transaction.new(100, :date => Time.parse("2011-04-11")),
-  Transaction.new(100, :date => Time.parse("2011-05-11")),
-  Transaction.new(100, :date => Time.parse("2011-06-11")),
-  Transaction.new(100, :date => Time.parse("2011-07-11")),
-  Transaction.new(100, :date => Time.parse("2011-08-11")),
-  Transaction.new(100, :date => Time.parse("2011-09-11")),
-  Transaction.new(100, :date => Time.parse("2011-10-11")),
-  Transaction.new(100, :date => Time.parse("2011-11-11")),
-  Transaction.new(100, :date => Time.parse("2011-12-11")),
-  Transaction.new(100, :date => Time.parse("2012-01-11"))
-#  Transaction.new(-100, :date => Time.parse("2011-01-11")),
-#  Transaction.new(150, :date => Time.parse("2012-01-11"))
-]
-
-puts trans.xirr.effective.round(9)