mortgage_calculations 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/mortgage_calc/mortgage_util.rb

@@ -1,12 +1,13 @@
 module MortgageCalc
   class MortgageUtil
-    attr_accessor :loan_amount, :interest_rate, :period, :fee
+    attr_accessor :loan_amount, :borrowed_fees, :interest_rate, :period, :fee
 
-    def initialize(loan_amount, interest_rate, fee, period=360)
+    def initialize(loan_amount, interest_rate, fee, period=360, borrowed_fees=0)
       self.loan_amount = Float(loan_amount.to_s)
       self.interest_rate = Float(interest_rate.to_s)
       self.period = Integer(period.to_s)
       self.fee = Float(fee.to_s)
+      self.borrowed_fees = Float(borrowed_fees.to_s)
     end
 
     def apr
@@ -14,14 +15,11 @@ module MortgageCalc
     end
 
     def monthly_payment
-      @monthly_payment ||= calculate_monthly_payment(self.loan_amount, monthly_interest_rate, self.period)
+      @monthly_payment ||= calculate_monthly_payment(self.loan_amount + self.borrowed_fees, monthly_interest_rate, self.period)
     end
 
-    def monthly_payment_with_fees
-      @monthly_payment_with_fees ||= calculate_monthly_payment(self.loan_amount + fee, monthly_interest_rate, self.period)
-    end
-
-    private
+  private
+    
     def monthly_interest_rate
       self.interest_rate / 100 / 12
     end
@@ -29,7 +27,11 @@ module MortgageCalc
     def calculate_monthly_payment(amount, monthly_rate, period)
       amount * (monthly_rate/(1 - (1 + monthly_rate)**(-period)))
     end
-
+    
+    def monthly_payment_with_fees
+      @monthly_payment_with_fees ||= calculate_monthly_payment(self.loan_amount + fee, monthly_interest_rate, self.period)
+    end
+    
     # solves APR
     # [a (1 + a)^N] / [(1 + a)^N - 1] - P/C = 0
     # where a = APR/1200, N = period, P = monthly payment, C = loan_amount

data/mortgage_calculations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mortgage_calculations}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Perry Hertler"]
-  s.date = %q{2011-02-14}
+  s.date = %q{2011-03-17}
   s.description = %q{Utilities for Mortgage related calculations (APR and Monthly Payments)}
   s.email = %q{perry@hertler.org}
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://www.pathf.com/blogs/2010/02/mortcalc-gem/}
   s.licenses = ["MORExchange"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Utilities for Mortgage related calculations (APR and Monthly Payments)}
   s.test_files = [
     "spec/mortgage_calc/mortgage_util_spec.rb",
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/mortgage_calc/mortgage_util_spec.rb

@@ -69,6 +69,18 @@ module MortgageCalc
         @mortgage_util.period.class.should == Fixnum
       end
     end
+    
+    context "when borrowed_fees is specified" do
+      before(:all) do
+        @mortgage_util = MortgageUtil.new(100_000, 6.0, 2_000, 360, 2_000)
+      end
+      it "should not use the borrowed_fees in APR calculation" do
+        @mortgage_util.apr.should be_within(0.00001).of(6.1857)
+      end
+      it "should use the borrowed_fees in monthly payment calculation" do
+        @mortgage_util.monthly_payment.should be_within(0.002).of(611.54)
+      end
+    end
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortgage_calculations
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Perry Hertler
@@ -15,14 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -06:00
+date: 2011-03-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +31,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id001
+  name: rspec
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: cucumber
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id002
+  name: cucumber
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +61,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id003
+  name: bundler
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +77,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id004
+  name: jeweler
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rcov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,7 +91,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  version_requirements: *id005
+  name: rcov
+  prerelease: false
 description: Utilities for Mortgage related calculations (APR and Monthly Payments)
 email: perry@hertler.org
 executables: []
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Utilities for Mortgage related calculations (APR and Monthly Payments)