treasurer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa2a2dc0c5bcd8c4cc5bc4bc905e4c99e317497
-  data.tar.gz: 0208ef5153cfb46947fce5ca8079ead628180fb2
+  metadata.gz: 65f2e9677098bdac4956e3562dd33f66317c52df
+  data.tar.gz: 34118648a3281e1274a00f953887283937af5d76
 SHA512:
-  metadata.gz: 891b64d30e9cc11a6fe2793b88751e20bfb84630a14c39370f35bea6d485b47621be03ee06ee9db3d5ab77f159c7bf5458e9dd6af76396e06b4b63d9192cd6cb
-  data.tar.gz: 3694e108f72e3f72b90f2e21660f5939a52b4c931e5b0f4d196f3a2e358ad58e5e5d3b297a4e17dbf1f485e20d211ac66320e5748946f7c0ba63266536b0438f
+  metadata.gz: 728db7d25466eb3f09bb2e47f0336dee0ea762624b899f7cc521584c17629de66818f584afbbefbdbeb4d351110381984b8075581c4df2da725a903bae864287
+  data.tar.gz: c1837491048206c26c5dc37104201ce2b5d232bbdb85135b0e2e3e482495d1ad52dcfbe17d2662fe860c4c0b06ac32be32c08fe9f3d8e16c90289339ff614f54

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
     gem "coderunner", ">= 0.14.16"
-    gem "budgetcrmod", ">= 0.0.0"
+    gem "budgetcrmod", ">= 0.2.0"
     gem "command-line-flunky", ">= 1.0.0"
 
 # Add dependencies to develop your gem here.
@@ -12,6 +12,7 @@ group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
+  gem "jeweler", "~> 2.3.1"
   gem "simplecov", ">= 0"
+	gem "ruby-prof", ">= 0.15"
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/treasurer/analysis.rb

@@ -2,39 +2,39 @@
 class Treasurer::Reporter
 module Analysis
 	# Within the range of the report, return a list
-	# of the dates of the beginning of each budget
+	# of the dates of the beginning of each account
 	# period, along with a list of the expenditures
 	# for each period and a list of the items within
 	# each period
-	def budget_expenditure(budget, budget_info, options={})
+	def account_expenditure(account, account_info, options={})
 		dates = []
 		expenditures = []
-		budget_items = []
-		date = budget_info[:end]||@today
-		start_date = [(budget_info[:start]||@start_date), @start_date].max
+		account_items = []
+		date = account_info[:end]||@today
+		start_date = [(account_info[:start]||@start_date), @start_date].max
 		expenditure = 0
 		items_temp = []
-		items = @runner.component_run_list.values.find_all{|r| r.budget == budget and r.in_date(budget_info)}
+		items = @runner.component_run_list.values.find_all{|r| r.external_account == account and r.in_date(account_info)}
 		#ep ['items', items]
-		#ep ['budget', budget]
+		#ep ['account', account]
 		counter = 0
-		if not budget_info[:period]
+		if not account_info[:period]
 			dates.push date
-			budget_items.push items
-			expenditures.push (items.map{|r| r.debit - r.credit}+[0]).sum
+			account_items.push items
+			expenditures.push (items.map{|r| (r.deposit - r.withdrawal) * (account_info[:external] ? -1 : 1)}+[0]).sum
 		else
 
-			case budget_info[:period][1]
+			case account_info[:period][1]
 			when :month
 				while date > @start_date
 					items_temp += items.find_all{|r| r.date == date}
-					if date.mday == (budget_info[:monthday] or 1)
+					if date.mday == (account_info[:monthday] or 1)
 						counter +=1
-						if counter % budget_info[:period][0] == 0
-							expenditure = (items_temp.map{|r| r.debit - r.credit}+[0]).sum
+						if counter % account_info[:period][0] == 0
+							expenditure = (items_temp.map{|r| (r.deposit - r.withdrawal) * (account_info[:external] ? -1 : 1)}+[0]).sum
 							dates.push date
 							expenditures.push expenditure
-							budget_items.push items_temp
+							account_items.push items_temp
 							items_temp = []
 							expenditure = 0
 						end
@@ -44,13 +44,13 @@ module Analysis
 			when :day
 				while date > @start_date
 					items_temp += items.find_all{|r| r.date == date}
-					#expenditure += (budget_items[-1].map{|r| r.debit}+[0]).sum
+					#expenditure += (account_items[-1].map{|r| r.debit}+[0]).sum
 					counter +=1
-					if counter % budget_info[:period][0] == 0
-						expenditure = (items_temp.map{|r| r.debit - r.credit}+[0]).sum
+					if counter % account_info[:period][0] == 0
+						expenditure = (items_temp.map{|r| (r.deposit - r.withdrawal) * (account_info[:external] ? -1 : 1)}+[0]).sum
 						dates.push date
 						expenditures.push expenditure
-						budget_items.push items_temp
+						account_items.push items_temp
 						items_temp = []
 						expenditure = 0
 					end
@@ -59,45 +59,46 @@ module Analysis
 			end
 		end
 
-		[dates, expenditures, budget_items]
+		[dates, expenditures, account_items]
 
 	end
-	# Work out the average spend from the budget and include it in the budget info
-	def budgets_with_averages(budgets, options={})
-	 projected_budgets = budgets.dup
-	 projected_budgets.each{|key,v| projected_budgets[key]=projected_budgets[key].dup}
-	 projected_budgets.each do |budget, budget_info|
-		 #budget_info = budgets[budget]
-		 dates, expenditures, items = budget_expenditure(budget, budget_info)
-		 budget_info[:average] = expenditures.mean rescue 0.0
+	# Work out the average spend from the account and include it in the account info
+	def accounts_with_averages(accounts, options={})
+	 projected_accounts_info = accounts.dup
+	 projected_accounts_info.each{|key,v| projected_accounts_info[key]=projected_accounts_info[key].dup}
+	 projected_accounts_info.each do |account, account_info|
+		 #account_info = accounts[account]
+		 dates, expenditures, items = account_expenditure(account, account_info)
+		 account_info[:average] = expenditures.mean rescue 0.0
 	 end
-	 projected_budgets
+	 projected_accounts_info
 	end
-	# Work out the projected spend from the budget and include it in the budget info
-	def budgets_with_projections(budgets, options={})
-	 projected_budgets = budgets.dup
-	 projected_budgets.each{|key,v| projected_budgets[key]=projected_budgets[key].dup}
-	 projected_budgets.each do |budget, budget_info|
-		 #budget_info = budgets[budget]
-		 dates, expenditures, items = budget_expenditure(budget, budget_info)
-		 budget_info[:projection] = expenditures.mean rescue 0.0
+	# Work out the projected spend from the account and include it in the account info
+	def accounts_with_projections(accounts, options={})
+	 projected_accounts_info = accounts.dup
+	 projected_accounts_info.each{|key,v| projected_accounts_info[key]=projected_accounts_info[key].dup}
+	 projected_accounts_info.each do |account, account_info|
+		 #account_info = accounts[account]
+		 dates, expenditures, items = account_expenditure(account, account_info)
+		 account_info[:projection] = expenditures.mean rescue 0.0
 	 end
-	 projected_budgets
+	 projected_accounts_info
 	end
-	# Get a list of budgets to be included in the report
-	# i.e. budgets with non-empty expenditure
-	def get_actual_budgets
-		@actual_budgets = BUDGETS.dup
-		BUDGETS.keys.each do |budget|
-			@actual_budgets.delete(budget) if budget_expenditure(budget, BUDGETS[budget])[0].size == 0
-		end
-	end
-	# Find all discretionary budgets and estimate the future
-	# expenditure from that budget based on past
+	## Get a list of accounts to be included in the report
+	## i.e. accounts with non-empty expenditure
+	#def get_actual_accounts
+		#@actual_accounts = ACCOUNT_INFO.dup
+		#ACCOUNT_INFO.keys.each do |account|
+			#@actual_accounts.delete(account) if account_expenditure(account, ACCOUNT_INFO[account])[0].size == 0
+		#end
+	#end
+	# Find all discretionary accounts and estimate the future
+	# expenditure from that account based on past
 	# expenditure (currently only a simple average)
-	def get_projected_budgets
-		 @projected_budgets = Hash[@actual_budgets.dup.find_all{|k,v| v[:discretionary]}]
-		 @projected_budgets = budgets_with_projections(@projected_budgets)
+	def get_projected_accounts
+		 @projected_accounts_info = Hash[ACCOUNT_INFO.dup.find_all{|k,v| v[:discretionary]}]
+		 @projected_accounts_info = accounts_with_projections(@projected_accounts_info)
+		 #@projected_accounts_info = @accounts.find_all{|acc| info = ACCOUNT_INFO[acc.name] and info[:discretionary]} 
 	end
 	# Calculate the sum of all items within future
 	# items that fall before end_date
@@ -117,7 +118,7 @@ module Analysis
 		sum
 	end
 	# Sum every future occurence of the given 
-	# regular items that falls within the budget period
+	# regular items that falls within the account period
 	def sum_regular(regular_items, end_date, options={})
 	  #end_date = @today + @days_ahead
 		sum = regular_items.inject(0) do |sum, (name, item)|	
@@ -179,9 +180,9 @@ module Analysis
 
 
 
-        #ep ['name2234', name, info, @projected_budget_factor] if info[:discretionary]
+        #ep ['name2234', name, info, @projected_account_factor] if info[:discretionary]
 
-				value + nunits * (info[:size]||info[:projection]*(@projected_budget_factor||1.0))
+				value + nunits * (info[:size]||info[:projection]*(@projected_account_factor||1.0))
 
 			end
 			sum + value

data/lib/treasurer/commands.rb

@@ -19,9 +19,12 @@ class << self
 		raise "This folder has not been set up to use with Treasurer; please initialise a folder with treasurer init" unless FileTest.exist? '.code_runner_script_defaults.rb' and eval(File.read('.code_runner_script_defaults.rb'))[:code] == 'budget'
 	end
 	def create_report(copts = {})
+		reporter = fetch_reporter(copts)
+		reporter.report()
+	end
+	def fetch_reporter(copts = {})
 		load_treasurer_folder
 		reporter = Reporter.new(CodeRunner.fetch_runner(h: :component), days_before: copts[:b]||360, days_ahead: copts[:a]||180, today: copts[:t])
-		reporter.report()
 	end
 	def init_root_folder(folder, copts={})
 		raise "Folder already exists" if FileTest.exist? folder

data/lib/treasurer/local_customisations.rb

@@ -10,7 +10,7 @@ REGULAR_TRANSFERS = {
 		house: {size: 600, period: [1, :month], monthday: 20, end: Date.parse("01/07/2013")},
   },
   [:Income, :FirstBank] =>{
-		pay: {size: 1000, period: [1, :month], monthday: 1, end: Date.parse("01/07/2014")},
+		pay: {size: 1200, period: [1, :month], monthday: 1, end: Date.parse("01/07/2014")},
   },
  
 }
@@ -19,7 +19,7 @@ REGULAR_TRANSFERS.default = {}
 
 FUTURE_TRANSFERS = {
 	[:Income, :SecondBank] =>{
-		topup: {size: 100, date: Date.parse("26/09/2010")},
+		bonus: {size: 100, date: Date.parse("26/09/2010")},
   },
   [:FirstBank, :PersonalLoans] =>{
 		payfriend: {size: 640, date: Date.parse("25/09/2010")},
@@ -32,12 +32,16 @@ FUTURE_TRANSFERS.default = {}
 
 
 
-BUDGETS = {
-	Monthly: {account: :FirstBank, period: [1, :month], monthday: 1, start: nil, end: nil, discretionary: false},
-	MonthlySecondBank: {account: :SecondBank, period: [1, :month], monthday: 1, start: nil, end: nil, discretionary: false},
-	Weekly: {account: :FirstBank, period: [7, :day], monthday: nil, start: nil, end: nil, discretionary: true},
-	WeeklySecondBank: {account: :SecondBank, period: [7, :day], monthday: nil, start: nil, end: nil, discretionary: true},
-	MyHoliday: {account: :SecondBank, period: [1, :day], monthday: nil, start: Date.parse("02/12/2013"), end: Date.parse("2/01/2014"), discretionary: false},
+ACCOUNT_INFO = {
+	Monthly: {linked_account: :FirstBank, period: [1, :month], monthday: 1, start: nil, end: nil, discretionary: false},
+	MonthlySecondBank: {linked_account: :SecondBank, period: [1, :month], monthday: 1, start: nil, end: nil, discretionary: false},
+	Weekly: {linked_account: :FirstBank, period: [7, :day], monthday: nil, start: nil, end: nil, discretionary: true},
+	WeeklySecondBank: {linked_account: :SecondBank, period: [7, :day], monthday: nil, start: nil, end: nil, discretionary: true},
+	MyHoliday: {linked_account: :SecondBank, period: [1, :day], monthday: nil, start: Date.parse("02/12/2013"), end: Date.parse("2/01/2014"), discretionary: false},
+	PersonalLoans: {type: :Liability},
+	FirstBank: {type: :Asset},
+	SecondBank: {type: :Asset},
+	Pay: {linked_account: :FirstBank, type: :Income},
 }
 
 def in_date(item)
@@ -60,16 +64,16 @@ end
 def red_line(account, date)
 	case account
 	when :FirstBank
-		300
+		-350
 	when :SecondBank
-		500
+		0
 	else
 		0
 	end
 end
 
 
-def external_account
+def sub_account
 	case description
 	when /co-op|sainsbury/i 
 		:Food
@@ -85,19 +89,21 @@ def external_account
 		:Entertainment
 	when /blackwell/i
 		:Books
-	when /norries/i
-		:PersonalLoans
 	else
 		:Unknown
 	end
 end
 
-def budget
+def external_account
 	case description
 	when /Vodafone/i
 		:Monthly
+	when /norries/i
+		:PersonalLoans
+	when /my employer/i
+		:Pay
 	else
-		case external_account
+		case sub_account
 		when :Food, :Entertainment
 			:Weekly
 		when :Insurance, :Phone, :Rent

data/lib/treasurer/report.rb

@@ -1,3 +1,13 @@
+class Float
+	def to_s
+		sprintf("%.2f", self)
+	end
+end
+class Date
+	def inspect
+		"Date.parse('#{to_s}')"
+	end
+end
 # Some thoughts on double entry accounting: 
 #
 # assets - liabilities = equity
@@ -48,10 +58,13 @@ class Treasurer
 class Reporter
 	#include LocalCustomisations
 	attr_reader :today
-	attr_reader :in_limit_discretionary_budget_factor
-	attr_reader :stable_discretionary_budget_factor
-	attr_accessor :projected_budget_factor
-	attr_accessor :equity
+	attr_reader :in_limit_discretionary_account_factor
+	attr_reader :stable_discretionary_account_factor
+	attr_accessor :projected_account_factor
+	attr_reader :accounts
+	attr_reader :equity
+	attr_reader :projected_accounts_info
+	attr_reader :days_before 
 	def initialize(runner, options)
 		@runner = runner
 		@days_ahead = options[:days_ahead]||180
@@ -59,48 +72,83 @@ class Reporter
 		@today = options[:today]||Date.today
 		@start_date = @today - @days_before
 		@runs = runner.component_run_list.values
+
+		if run = @runs.find{|r| not r.external_account}
+			raise "External_account not specified for #{run.data_line}" 
+		end
 		@indateruns = @runs.find_all{|r| r.days_ago(@today) < @days_before}
-		p 'accounts256',@runs.size, @runs.map{|r| r.account}.uniq 
+		#p 'accounts256',@runs.size, @runs.map{|r| r.account}.uniq 
 	
 	end
-	def report
-		get_actual_budgets
-		get_projected_budgets
-	  accounts = @runs.map{|r| r.account}.uniq.map{|acc| Account.new(acc, self, @runner, @runs, @projected_budgets, false)} 
-	  external_accounts = (@runs.map{|r| r.external_account}.uniq - accounts.map{|acc| acc.name}).map{|acc| Account.new(acc, self, @runner, @runs, @projected_budgets, true)} 
+	def generate_accounts
+	  accounts = @runs.map{|r| r.account}.uniq.map{|acc| Account.new(acc, self, @runner, @runs, false)} 
+	  external_accounts = (@runs.map{|r| r.external_account}.uniq - accounts.map{|acc| acc.name}).map{|acc| Account.new(acc, self, @runner, @runs, true)} 
 		@accounts = accounts + external_accounts
+		@expense_accounts = @accounts.find_all{|acc| acc.type == :Expense}
+		get_projected_accounts
+		#p ['projected_accounts_info', @projected_accounts_info]
+		#exit
 		@accounts.unshift (@equity = Equity.new(self, @runner, @accounts))
-		get_in_limit_discretionary_budget_factor
-		get_stable_discretionary_budget_factor
+	end
+	def report
+		generate_accounts
+		#get_actual_accounts
+		get_in_limit_discretionary_account_factor
+		get_stable_discretionary_account_factor
 		report = ""
 		report << header
-		report << '\begin{multicols}{2}'
+		#report << '\begin{multicols}{2}'
 		report << account_summaries
-		report << discretionary_budget_table
+		report << discretionary_account_table
 		report << account_balance_graphs
 		report << expense_account_summary
-		report << budget_expenditure_graphs
-		report << '\end{multicols}'
-		#report << budget_resolutions
-		report << budget_breakdown
+		report << account_expenditure_graphs
+		#report << '\end{multicols}'
+		##report << account_resolutions
+		#report << account_breakdown
+		
+		report << assumptions
 		report << transactions_by_account
 		report << footer
 
 		File.open('report.tex', 'w'){|f| f.puts report}
-		system "latex report.tex && latex report.tex"
+		system "pdflatex report.tex && pdflatex report.tex"
+	end
+	class Account
+	end
+	class SubAccount < Account
+		def initialize(name, reporter, runner, runs, external)
+			@name = name
+			@reporter = reporter
+			@runner = runner
+			#@projected_accounts_info =Hash[projected_accounts_info.find_all{|k,v| v[:account] == name}]
+			@external = external
+			@runs = runs.find_all{|r| r.sub_account  == name}
+			info[:external] = external if info
+			#ep ['sub_accounts333', name, @runs.size, runs.size]
+		end
 	end
 	class Account
 		attr_reader :name, :external, :runs
-		def initialize(name, reporter, runner, runs, projected_budgets, external)
+		def initialize(name, reporter, runner, runs, external)
 			@name = name
 			@reporter = reporter
 			@runner = runner
-			@projected_budgets =Hash[projected_budgets.find_all{|k,v| v[:account] == name}]
+			#@projected_accounts_info =Hash[projected_accounts_info.find_all{|k,v| v[:account] == name}]
 			@external = external
 			@runs = runs.find_all{|r| (@external ? r.external_account : r.account) == name}
+			info[:external] = external if info
+		end
+		def sub_accounts
+			@sub_accounts ||= @runs.map{|r| r.sub_account}.uniq.compact.map{|acc| SubAccount.new(acc, @reporter, @runner, @runs, @external)}
 		end
 		def type
-			account_type(name)
+			#account_type(name)
+			if ACCOUNT_INFO[name] and type = ACCOUNT_INFO[name][:type]
+				type
+			else
+				:Expense
+			end
 		end
 		def red_line(date)
 			if Treasurer::LocalCustomisations.instance_methods.include? :red_line
@@ -109,35 +157,58 @@ class Reporter
 				0.0
 			end
 		end
+		def report_start
+			@reporter.today - @reporter.days_before
+	  end
+		def opening_date
+			(info && info[:start]) || @runs.map{|r| r.date}.min
+		end
+		def opening_balance
+			(info && info[:opening_balance]) || 0.0
+		end
+		def has_balance?
+			not @runs.find{|r| not r.has_balance?} 
+		end
 		def balance(date = @reporter.today) 
+			date_i = date.to_datetime.to_time.to_i
 			#if !date
 				#@runs.sort_by{|r| r.date}[-1].balance
-			if @external
+			if @external or not has_balance?
 				#p ['name is ', name, type]
 				#
-				#@runs.find_all{|r| r.date < date}.map{|r| (r.deposit - r.withdrawal) * (@external ? -1 : 1)}.sum || 0.0
-				# Temporary....
-				0.0
+				opening_balance + (@runs.find_all{|r| r.date <= date and r.date >= opening_date }.map{|r| money_in_sign * (r.deposit - r.withdrawal) * (@external ? -1 : 1)}.sum || 0.0)
+				 #Temporary....
+				#0.0
 			else
-				@runs.sort_by{|r| (r.date.to_datetime.to_time.to_i - date.to_datetime.to_time.to_i).to_f.abs}[0].balance
+				nearest_time = @runs.map{|r| (r.date_i - date_i).to_f.abs}.sort[0]
+				@runs.find_all{|r| (r.date_i - date_i).to_f.abs == nearest_time}.sort_by{|r| r.id}[-1].balance
 			end
 		end
-		def expenditure(today, days_before, &block)
-				p ['name22 is ', name, type]
-			@runs.find_all{|r| r.days_ago(today) < days_before and (!block or yield(r)) }.map{|r| @external ? r.withdrawal : r.deposit }.sum || 0
+		def deposited(today, days_before, &block)
+				p ['name22 is ', name, type, @runs.size]
+			#@runs.find_all{|r| r.days_ago(today) < days_before and (!block or yield(r)) }.map{|r| (@external and not ([:Liability, :Income].include?(type))) ? r.withdrawal : r.deposit }.sum || 0
+			@runs.find_all{|r| r.days_ago(today) < days_before and (!block or yield(r)) }.map{|r| (@external) ? r.withdrawal : r.deposit }.sum || 0
 		end
-		def income(today, days_before)
-			@runs.find_all{|r| r.days_ago(today) < days_before }.map{|r| @external ? r.deposit : r.withdrawal }.sum || 0
+		def withdrawn(today, days_before)
+			#@runs.find_all{|r| r.days_ago(today) < days_before }.map{|r| (@external and not ([:Liability, :Income].include?(type))) ? r.deposit : r.withdrawal }.sum || 0
+			@runs.find_all{|r| r.days_ago(today) < days_before }.map{|r| (@external) ? r.deposit : r.withdrawal }.sum || 0
 		end
+		
 		def summary_table(today, days_before)
 
 			<<EOF
 \\subsubsection{#{name}}
 \\begin{tabulary}{0.8\\textwidth}{ r | l}
 Balance & #{balance} \\\\
-Deposited & #{expenditure(today, days_before)} \\\\
-Withdrawn & #{income(today, days_before)} \\\\
+Deposited & #{deposited(today, days_before)} \\\\
+Withdrawn & #{withdrawn(today, days_before)} \\\\
 \\end{tabulary}
+EOF
+		end
+		def summary_line(today, days_before)
+
+			<<EOF
+#{name} & #{balance} & #{deposited(today, days_before)} & #{withdrawn(today, days_before)} 
 EOF
 		end
 		def money_in_sign
@@ -148,10 +219,23 @@ EOF
 				1.0
 			end
 		end
+		def discretionary
+			info and info[:discretionary]
+		end
+		def info
+			ACCOUNT_INFO[name] ||= {}
+		end
 		def projected_balance(date)
-			 return 0.0 if @external # Temporary Hack
+			 #return 0.0 if @external # Temporary Hack
+			 #ep ['projected', @reporter.projected_accounts_info]
+			 raise "Only should be called for Asset and Liability accounts" unless [:Asset, :Liability].include? type
 			 non_discretionary_projected_balance(date)  -
-			 @reporter.sum_regular(@projected_budgets, date) 
+			 @reporter.sum_regular(linked_projected_account_info, date)
+			 
+			 #(discretionary ? @reporter.sum_regular({name => info}, date) : 0.0)
+		end
+		def linked_projected_account_info
+			Hash[@reporter.projected_accounts_info.find_all{|ac,inf| inf[:linked_account] == name}]
 		end
 		def cache
 			@cache ||={}
@@ -181,7 +265,7 @@ EOF
 		# balance of the account
 		def write_balance_graph(today, days_before, days_ahead)
 			 #accshort = name.gsub(/\s/, '')
-			 if not (@external or type == :Equity)
+			 if not (@external or type == :Equity or not has_balance?)
 				 kit = @runner.graphkit(['date.to_time.to_i', 'balance'], {conditions: "account == #{name.inspect} and days_ago(Date.parse(#{today.to_s.inspect})) < #{days_before} and days_ago(Date.parse(#{today.to_s.inspect})) > -1", sort: '[date, id]'})
 			 else
 				 pastdates = (today-days_before..today).to_a
@@ -193,23 +277,25 @@ EOF
 			 kit2 = GraphKit.quick_create([futuredates.map{|d| d.to_time.to_i}, projection])
 			 red = futuredates.map{|date| red_line(date)}
 			 kit3 = GraphKit.quick_create([futuredates.map{|d| d.to_time.to_i}, red])
-			 @reporter.projected_budget_factor = @reporter.in_limit_discretionary_budget_factor
+			 @reporter.projected_account_factor = @reporter.in_limit_discretionary_account_factor
 			 limit = futuredates.map{|date| projected_balance(date)}
 			 kit4 = GraphKit.quick_create([futuredates.map{|d| d.to_time.to_i}, limit])
-			 @reporter.projected_budget_factor = @reporter.stable_discretionary_budget_factor
-			 #ep ['projected_budget_factor!!!!', @reporter.projected_budget_factor]
+			 @reporter.projected_account_factor = @reporter.stable_discretionary_account_factor
+			 #ep ['projected_account_factor!!!!', @reporter.projected_account_factor]
 			 stable = futuredates.map{|date| projected_balance(date)}
 			 kit5 = GraphKit.quick_create([futuredates.map{|d| d.to_time.to_i}, stable])
 			 #exit
-			 @reporter.projected_budget_factor = nil
+			 @reporter.projected_account_factor = nil
 			 kit += (kit2 + kit4 + kit5)
+			 #kit += (kit2)
 			 kit = kit3 + kit
 			 kit.title = "Balance for #{name}"
 			 kit.xlabel = %['Date' offset 0,-2]
 			 kit.xlabel = nil
 			 kit.ylabel = "Balance"
+			 
 
-			 kit.data[0].gp.title = 'Limit'
+			 #kit.data[0].gp.title = 'Limit'
 			 kit.data[1].gp.title = 'Previous'
 			 kit.data[2].gp.title = '0 GBP Discretionary'
 			 kit.data[2].gp.title = 'Projection'
@@ -218,14 +304,18 @@ EOF
 			 kit.data.each{|dk| dk.gp.with = "lp"}
 			 kit.gp.key = ' bottom left '
 
+			 #(p kit; STDIN.gets) if name == :LloydsCreditCard
 			 CodeRunner::Budget.kit_time_format_x(kit)
 
-			 (kit).gnuplot_write("#{name}_balance.eps", size: "4.0in,3.0in")
+			 (kit).gnuplot_write("#{name}_balance.eps", size: "4.0in,2.0in") #, latex: true)
+  #%x[epspdf #{name}_balance.eps]
 		end
 		# A string to include the balance graph in the document
 		def balance_graph_string
 			 #accshort = name.gsub(/\s/, '')
-       "\\begin{center}\\includegraphics[width=3.0in]{#{name}_balance.eps}\\end{center}"
+       #"\\begin{center}\\includegraphics[width=3.0in]{#{name}_balance.eps}\\end{center}"
+      #"\\begin{center}\\includegraphics[width=0.9\\textwidth]{#{name}_balance.eps}\\end{center}"
+      "\\myfigure{#{name}_balance.eps}"
 		end
 	end
 	class Equity < Account
@@ -285,30 +375,35 @@ Balance & #{balance} \\\\
 \\end{tabulary}
 EOF
 		end
+		def summary_line(today, days_before)
+			"Equity & #{balance(today)} &  & "
+		end
 	end
 	def account_summaries
 		#ep 'accounts', @accounts.map{|a| a.name}
 		
 		<<EOF
 \\section{Summary of Accounts}
-\\subsection{Equity}
-#{@accounts.find{|acc| acc.type == :Equity }.summary_table(@today, @days_before)}
-\\subsection{Assets}
-#{@accounts.find_all{|acc| acc.type == :Asset }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
-\\subsection{Liabilities}
-#{@accounts.find_all{|acc| acc.type == :Liability }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
-\\subsection{Income}
-#{@accounts.find_all{|acc| acc.type == :Income }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
-\\subsection{Expenses}
-#{@accounts.find_all{|acc| acc.type == :Expense }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
+#{[:Equity, :Asset, :Liability, :Income, :Expense].map{|type|
+		"\\subsection{#{type}}
+    \\begin{tabulary}{0.9\\textwidth}{ R | c | c | c}
+		Account & Balance & Deposited & Withdrawn \\\\
+		\\hline
+		\\Tstrut
+    #{@accounts.find_all{|acc| acc.type == type }.map{|acc| acc.summary_line(@today, @days_before)}.join("\\\\\n")}
+		\\end{tabulary}"
+}.join("\n\n")}
 EOF
 	end
 	def account_balance_graphs
 		<<EOF
 \\section{Graphs of Recent Balances}
-#{@accounts.find_all{|acc| acc.type != :Expense}.map{|acc|
- acc.write_balance_graph(@today, @days_before, @days_ahead)
- acc.balance_graph_string
+#{[:Equity, :Asset, :Liability].map{|typ|
+ "\\subsection{#{typ}}\\vspace{3em}" + 
+ @accounts.find_all{|acc| acc.type == typ}.map{|acc|
+	 acc.write_balance_graph(@today, @days_before, @days_ahead)
+	 acc.balance_graph_string
+	}.join("\n\n")
 }.join("\n\n")
 }
 EOF
@@ -317,58 +412,66 @@ EOF
 		<<EOF
 \\section{Expense Account Summary}
 \\subsection{Budget Period}
-#{expense_pie_chart('budgetperiod'){|r| r.days_ago(@today) < @days_before}}
+#{expense_pie_chart('accountperiod', @expense_accounts){|r| r.days_ago(@today) < @days_before}}
 \\subsection{Last Week}
-#{expense_pie_chart('lastweekexpenses'){|r| p ['r.daysago', r.days_ago(@today)]; r.days_ago(@today) < 7}}
+#{expense_pie_chart('lastweekexpenses', @expense_accounts){|r| 
+   #p ['r.daysago', r.days_ago(@today)]; 
+   r.days_ago(@today) < 7}}
 \\subsection{Last Month}
-#{expense_pie_chart('lastmonthexpenses'){|r| r.days_ago(@today) < 30}}
+#{expense_pie_chart('lastmonthexpenses', @expense_accounts){|r| r.days_ago(@today) < 30}}
 \\subsection{Last Year}
-#{expense_pie_chart('lastyearexpenses'){|r| r.days_ago(@today) < 365}}
-\\section{Expense Accounts by Budget}
-#{@actual_budgets.map{|budget, budget_info|
-	  "\\subsection{#{budget}}
-		#{expense_pie_chart(budget + 'expenses'){|r|r.days_ago(@today) < @days_before and r.budget == budget}}"
+#{expense_pie_chart('lastyearexpenses', @expense_accounts){|r| r.days_ago(@today) < 365}}
+\\section{Expense Account Breakdown}
+#{@expense_accounts.map{|account|
+		#ep ['sub_accounts2124', account.sub_accounts.map{|sa| sa.name}]
+	  "\\subsection{#{account.name}} + 
+		#{expense_pie_chart(account.name + 'breakdown', account.sub_accounts){|r|r.days_ago(@today) < @days_before }}"
 }.join("\n\n")}
-
 EOF
+
+#EOF
 	end
-	def expense_pie_chart(name, &block)
-		expaccs = @accounts.find_all{|acc| acc.type == :Expense}
-		labels = expaccs.map{|acc| acc.name}
-		exps = expaccs.map{|acc| acc.expenditure(@today, 50000, &block)}
+	def expense_pie_chart(name, accounts, &block)
+		#expaccs = accounts.find_all{|acc| acc.type == :Expense}
+		labels = accounts.map{|acc| acc.name}
+		exps = accounts.map{|acc| acc.deposited(@today, 50000, &block)}
 		labels, exps = [labels, exps].transpose.find_all{|l, e| e != 0.0}.transpose
-		return "No expenditure in budget period." if labels == nil
-		ep ['labels22539', labels, exps]
+		#ep ['labels22539', name, labels, exps]
+		return "No expenditure in account period." if labels == nil
 		kit = GraphKit.quick_create([exps])
 		kit.data[0].gp.with = 'boxes'
 		kit.gp.style = "fill solid"
 		#pp ['kit222', kit, labels]
 		i = -1
 		kit.gp.xtics = "(#{labels.map{|l| %["#{l}" #{i+=1}]}.join(', ')}) rotate by 315"
-		kit.gnuplot_write("#{name}.eps")
+    kit.gnuplot_write("#{name}.eps", size: "4.0in,2.0in")
+  #%x[ps2eps #{name}.ps]
 
-    "\\begin{center}\\includegraphics[width=3.0in]{#{name}.eps}\\vspace{1em}\\end{center}"
+    #"\\begin{center}\\includegraphics[width=3.0in]{#{name}.eps}\\vspace{1em}\\end{center}"
+    #"\\begin{center}\\includegraphics[width=0.9\\textwidth]{#{name}.eps}\\vspace{1em}\\end{center}"
+    "\\myfigure{#{name}.eps}"
 	end
-	def get_in_limit_discretionary_budget_factor
-		@projected_budget_factor = 1.0
+	def get_in_limit_discretionary_account_factor
+		@projected_account_factor = 1.0
 		loop do
 			ok = true
 			date = @today
 			while date < @today + @days_ahead
 				ok = false if @equity.projected_balance(date) < @equity.red_line(date)
 				date += 1
-				#ep ['projected_budget_factor', date, @equity.projected_balance(date),  @equity.red_line(date), ok]
+				#ep ['projected_account_factor', date, @equity.projected_balance(date),  @equity.red_line(date), ok]
 			end
-			@in_limit_discretionary_budget_factor = @projected_budget_factor
-			break if (@projected_budget_factor == 0.0 or ok == true)
-			@projected_budget_factor -= 0.01
-			@projected_budget_factor -= 0.1
+			@in_limit_discretionary_account_factor = @projected_account_factor
+			break if (@projected_account_factor == 0.0 or ok == true)
+			@projected_account_factor -= 0.01
+			@projected_account_factor -= 0.04
+			ep ['projected_account_factor', @projected_account_factor]
 		end
-		@projected_budget_factor = nil
+		@projected_account_factor = nil
 		#exit
 	end
-	def get_stable_discretionary_budget_factor
-		@projected_budget_factor = 1.0
+	def get_stable_discretionary_account_factor
+		@projected_account_factor = 1.0
 		loop do
 			ok = true
 			date = @today
@@ -377,94 +480,102 @@ EOF
 				#ok = false if @equity.projected_balance(date) < @equity.red_line(date)
 				date += 1
 				balances.push @equity.projected_balance(date)
-				#ep ['projected_budget_factor', date, @equity.projected_balance(date),  @equity.red_line(date), ok]
+				#ep ['projected_account_factor', date, @equity.projected_balance(date),  @equity.red_line(date), ok]
 			end
 			ok = false if balances.mean < @equity.balance(@today)
-			@stable_discretionary_budget_factor = @projected_budget_factor
-			break if (@projected_budget_factor == 0.0 or ok == true)
-			@projected_budget_factor -= 0.01
-			@projected_budget_factor -= 0.1
+			@stable_discretionary_account_factor = @projected_account_factor
+			break if (@projected_account_factor == 0.0 or ok == true)
+			@projected_account_factor -= 0.01
+			@projected_account_factor -= 0.1
 		end
-		@projected_budget_factor = nil
+		@projected_account_factor = nil
 		#exit
 	end
-	def discretionary_budget_table
-		discretionary_budgets = budgets_with_averages(@projected_budgets)
+	def discretionary_account_table
+		discretionary_accounts = accounts_with_averages(@projected_accounts_info)
 
 		<<EOF
 \\section{Discretionary Budget Summary}
-\\begin{tabulary}{0.5\\textwidth}{ R | c  c  c c  }
+\\begin{tabulary}{0.9\\textwidth}{ R | c  c  c c  }
 Budget & Average & Projection & Limit & Stable \\\\
-#{discretionary_budgets.map{|budget, info|
+#{discretionary_accounts.map{|account, info|
 		#ep info
-		"#{budget} & #{info[:average]} & #{info[:projection]} & #{
-        (info[:projection] * @in_limit_discretionary_budget_factor).round(2)} & 
-        #{(info[:projection] * @stable_discretionary_budget_factor).round(2)}  \\\\"
+		"#{account} & #{info[:average]} & #{info[:projection]} & #{
+        (info[:projection] * @in_limit_discretionary_account_factor).round(2)} & 
+        #{(info[:projection] * @stable_discretionary_account_factor).round(2)}  \\\\"
   }.join("\n\n")
 }
 \\end{tabulary}
 EOF
 	end
-	def budget_expenditure_graphs
+	def account_expenditure_graphs
 		<<EOF
-\\section{Budget Expenditure}
-#{budget_and_transfer_graphs(@actual_budgets, {})}
+\\section{Expenditure by Account Period}
+#{account_and_transfer_graphs(Hash[@expense_accounts.find_all{|acc| acc.info and acc.info[:period]}.map{|acc| [acc.name, acc.info]}], {})}
 EOF
 	end
-	def budget_and_transfer_graphs(budgets, options)
-"#{budgets.map{|budget, budget_info| 
-dates, expenditures, items = budget_expenditure(budget, budget_info)
-#ep ['budget', budget, dates, expenditures]
-kit = GraphKit.quick_create([dates.map{|d| d.to_time.to_i}, expenditures])
-kit.data.each{|dk| dk.gp.with="boxes"}
-kit.gp.style = "fill solid"
-kit.xlabel = nil
-kit.ylabel = "Expenditure"
-unless options[:transfers]
- kits = budgets_with_averages({budget => budget_info}).map{|budget, budget_info| 
-	 #ep 'Budget is ', budget
-	 kit2 = GraphKit.quick_create([
-			[dates[0], dates[-1]].map{|d| d.to_time.to_i}, 
-			[budget_info[:average], budget_info[:average]]
-	 ])
-	 kit2.data[0].gp.with = 'lp lw 4'
-	 kit2
-	}
-	#$debug_gnuplot = true
-	#kits.sum.gnuplot
-	kit += kits.sum
-
+	def account_and_transfer_graphs(accounts, options)
+"#{accounts.map{|account, account_info| 
+#ep ['accountbadf', account, account_info]
+	dates, expenditures, items = account_expenditure(account, account_info)
+if dates.size == 0
+	""
 else
-	kit.data[0].y.data.map!{|expen| expen*-1.0}
+	#ep ['account', account, dates, expenditures]
+	kit = GraphKit.quick_create([dates.map{|d| d.to_time.to_i}, expenditures])
+	kit.data.each{|dk| dk.gp.with="boxes"}
+	kit.gp.style = "fill solid"
+	kit.xlabel = nil
+	kit.ylabel = "Expenditure"
+	unless options[:transfers]
+	 kits = accounts_with_averages({account => account_info}).map{|account, account_info| 
+		 #ep 'Budget is ', account
+		 kit2 = GraphKit.quick_create([
+				[dates[0], dates[-1]].map{|d| d.to_time.to_i}, 
+				[account_info[:average], account_info[:average]]
+		 ])
+		 kit2.data[0].gp.with = 'lp lw 4'
+		 kit2
+		}
+		#$debug_gnuplot = true
+		#kits.sum.gnuplot
+		kit += kits.sum
+
+	else
+		kit.data[0].y.data.map!{|expen| expen*-1.0}
+	end
+	kit.title = "#{account} Expenditure with average (Total = #{kit.data[0].y.data.sum})"
+	CodeRunner::Budget.kit_time_format_x(kit)
+	#kit.gnuplot
+	#ep ['kit1122', account, kit]
+  kit.gnuplot_write("#{account}.eps", size: "4.0in,2.0in")
+  #%x[ps2eps #{account}.ps]
+	#"\\begin{center}\\includegraphics[width=3.0in]{#{account}.eps}\\vspace{1em}\\end{center}"
+  #"\\begin{center}\\includegraphics[width=0.9\\textwidth]{#{account}.eps}\\vspace{1em}\\end{center}"
+  "\\myfigure{#{account}.eps}"
 end
-kit.title = "#{budget} Expenditure with average (Total = #{kit.data[0].y.data.sum})"
-CodeRunner::Budget.kit_time_format_x(kit)
-#kit.gnuplot
-#ep ['kit1122', budget, kit]
-kit.gnuplot_write("#{budget}.eps")
-"\\begin{center}\\includegraphics[width=3.0in]{#{budget}.eps}\\vspace{1em}\\end{center}"
 }.join("\n\n")
 }"
 	end
 
-	def budget_resolutions
+	def account_resolutions
 	  <<EOF
 \\section{Budget Resolutions}
 
-This section sums items from budgets drawn from an alternate account, i.e. it determines how much should be transferred from one account to another as a result of expenditure from a given budget.
+This section sums items from accounts drawn from an alternate account, i.e. it determines how much should be transferred from one account to another as a result of expenditure from a given account.
 
-#{@actual_budgets.map{|budget, budget_info|
+#{@actual_accounts.map{|account, account_info|
 
-"\\subsection{#{budget} }
+"\\subsection{#{account} }
 		\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{r l}
 			%\\hline
 			Account Owed & Amount  \\\\
 			\\hline
 			\\Tstrut
-  #{budget_items = @indateruns.find_all{|r| r.budget == budget}
-    alternate_accounts = budget_items.map{|r| r.account}.uniq - [budget_info[:account]]
+  #{account_items = @indateruns.find_all{|r| r.account == account}
+    alternate_accounts = account_items.map{|r| r.account}.uniq - [account_info[:account]]
 		alternate_accounts.map{|acc|
-			alternate_items = budget_items.find_all{|r| r.account == acc}
+			alternate_items = account_items.find_all{|r| r.account == acc}
 			total = alternate_items.map{|r| r.withdrawal - r.deposit}.sum
 			"#{acc} & #{total} \\\\"
 		}.join("\n\n")
@@ -477,10 +588,10 @@ This section sums items from budgets drawn from an alternate account, i.e. it de
 			\\vspace{1em}\n\n
 
 #{	alternate_accounts.map{|acc|
-			alternate_items = budget_items.find_all{|r| r.account == acc}
+			alternate_items = account_items.find_all{|r| r.account == acc}
 			alternate_items.pieces((alternate_items.size.to_f/50.to_f).ceil).map{|piece|
 			"\\footnotesize\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 4 + " L " + " r " * 3 }}
-			    #{budget}: & #{budget_info[:account]} & owes & #{acc} &&&&\\\\
+			    #{account}: & #{account_info[:account]} & owes & #{acc} &&&&\\\\
 					\\hline
 
 					\\Tstrut
@@ -499,17 +610,30 @@ This section sums items from budgets drawn from an alternate account, i.e. it de
 }
 EOF
 	end
-	def budget_breakdown
+	def assumptions
+	  <<EOF
+		\\section{Assumptions for Projection}
+		\\subsection{Regular Transfers}
+		\\begin{lstlisting}[language=ruby]
+#{REGULAR_TRANSFERS.pretty_inspect.latex_escape}
+		\\end{lstlisting}
+		\\subsection{One-off Transfers}
+		\\begin{lstlisting}[language=ruby]
+#{FUTURE_TRANSFERS.pretty_inspect.latex_escape}
+		\\end{lstlisting}
+EOF
+	end
+	def account_breakdown
 		<<EOF
-\\section{Budget and Transfer Breakdown}
-#{(@actual_budgets).map{|budget, budget_info| 
-	dates, expenditures, budget_items = budget_expenditure(budget, budget_info)
-	#pp budget, budget_items.map{|items| items.map{|i| i.date.to_s}}
-	"\\subsection{#{budget}}" + 
-		budget_items.zip(dates, expenditures).map{|items, date, expenditure|
+\\section{SubAccount Breakdown}
+#{(@actual_accounts).map{|account, account_info| 
+	dates, expenditures, account_items = account_expenditure(account, account_info)
+	#pp account, account_items.map{|items| items.map{|i| i.date.to_s}}
+	"\\subsection{#{account}}" + 
+		account_items.zip(dates, expenditures).map{|items, date, expenditure|
 		if items.size > 0
 			"
-			\\footnotesize
+			\\tiny
 			\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 3 + " L " + " r " * 2 + " c " }}
 			%\\hline
 			#{date.to_s.latex_escape} & & & Total & #{expenditure} &  \\\\
@@ -540,13 +664,13 @@ EOF
 \\section{Recent Transactions}
 #{@accounts.find_all{|acc| not acc.type == :Equity}.sort_by{|acc| acc.external ? 0 : 1}.map{|acc| 
 	"\\subsection{#{acc.name}}
-\\footnotesize
-#{all = acc.runs.find_all{|r|  r.days_ago(@today) < @days_before}.sort_by{|r| [r.date, r.id]}.reverse
+\\tiny
+  #{all = acc.runs.find_all{|r|  r.days_ago(@today) < @days_before}.sort_by{|r| [r.sub_account, r.date, r.id]}.reverse
 #ep ['acc', acc, 'ids', all.map{|r| r.id}, 'size', all.size]
 all.pieces((all.size.to_f/50.to_f).ceil).map{|piece|
-"\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 3 + " L " + " r " * 3 + "l"}}
+"\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 3 + " l " + " r " * 3 + "l"}}
 		#{piece.map{|r| 
-	  (CodeRunner::Budget.rcp.component_results - [:sc] + [:budget]).map{|res| r.send(res).to_s.latex_escape
+	  (CodeRunner::Budget.rcp.component_results - [:sc] + [:sub_account]).map{|res| r.send(res).to_s.latex_escape
 	  #rcp.component_results.map{|res| r.send(res).to_s.gsub(/(.{20})/, '\1\\\\\\\\').latex_escape
   }.join(" & ")
 }.join("\\\\\n")}
@@ -557,13 +681,27 @@ EOF
 
 	def header
 		<<EOF
-\\documentclass{article}
-\\usepackage[cm]{fullpage}
+\\documentclass[a5paper]{article}
+\\usepackage[scale=0.9]{geometry}
+%\\usepackage[cm]{fullpage}
 \\usepackage{tabulary}
 \\usepackage{graphicx}
 \\usepackage{multicol}
-%\\usepackage{hyperlink}
+\\usepackage{hyperref}
+\\usepackage{xcolor,listings}
 \\newcommand\\Tstrut{\\rule{0pt}{2.8ex}}
+\\newcommand\\myfigure[1]{\\vspace*{0em}\\begin{center}
+
+\\includegraphics[width=0.9\\textwidth]{#1}
+
+\\end{center}\\vspace*{0em}
+
+}
+\\lstset{%
+basicstyle=\\ttfamily\\color{black},
+identifierstyle = \\ttfamily\\color{purple},
+keywordstyle=\\ttfamily\\color{blue},
+stringstyle=\\color{orange}}
 \\begin{document}
 \\title{#{@days_before}-day Budget Report}
 \\maketitle

data/test/otheraccountstatement.csv

@@ -7,3 +7,4 @@ Date,Type,Sort Code,Account Number,Description,In,Out,Balance,
 01/09/2010,DEB,222222,88888888,THE MAGGIE ARMS,,48.00,1518.30
 01/09/2010,DEB,222222,88888888,BARLEY MOW,,6.60,1566.30
 30/08/2010,DD,222222,88888888,PAYPAL PAYMENT,,11.91,1572.90
+30/08/2010,FPO,222222,88888888,MY EMPLOYER,1000.0,,1560.99

data/test/test_treasurer.rb

@@ -1,6 +1,10 @@
 require 'helper'
+require 'ruby-prof'
+#require 'ruby-prof/test'
 
-class TestTreasurer < Test::Unit::TestCase
+class TestTreaurer < Test::Unit::TestCase
+	#include RubyProf::Test
+	#PROFILE_OPTIONS[:
 	def testfolder
 		'test/myaccount'
 	end
@@ -13,7 +17,16 @@ class TestTreasurer < Test::Unit::TestCase
 			Treasurer.add_file('../otheraccountstatement.csv', 'SecondBank', {})
 			Treasurer.add_folder_of_files('../multiple')
 			Treasurer.status h: :component
+			RubyProf.start
 			Treasurer.create_report t: Date.parse('2010-09-07'), b: 40, a: 35
+			result = RubyProf.stop
+			result.eliminate_methods!([/Array#map/, /Array#each/])
+			printer = RubyProf::GraphHtmlPrinter.new(result)
+			File.open('timing.html', 'w'){|f| printer.print(f, {})}
+			reporter = Treasurer.fetch_reporter(t: Date.parse('2010-09-07'), b: 40, a: 35)
+			reporter.generate_accounts
+			assert_equal(382.08, reporter.equity.balance.round(2))
+			assert_equal(724.33, reporter.equity.projected_balance(Date.parse('2010-10-09')).round(2))
 		end
 		#FileUtils.rm_r(testfolder) if FileTest.exist? testfolder
 	end

data/treasurer.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: treasurer 0.2.0 ruby lib
+# stub: treasurer 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "treasurer"
-  s.version = "0.2.0"
+  s.name = "treasurer".freeze
+  s.version = "0.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Edmund Highcock"]
-  s.date = "2014-06-02"
-  s.description = "A simple command line tool for managing accounts and finances. Easily import internet banking spreadsheets and generate sophisticated reports and projections."
-  s.email = "edmundhighcock@users.sourceforge.net"
-  s.executables = ["treasurer"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Edmund Highcock".freeze]
+  s.date = "2018-02-27"
+  s.description = "A simple command line tool for managing accounts and finances. Easily import internet banking spreadsheets and generate sophisticated reports and projections.".freeze
+  s.email = "edmundhighcock@users.sourceforge.net".freeze
+  s.executables = ["treasurer".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -40,42 +40,45 @@ Gem::Specification.new do |s|
     "test/test_treasurer.rb",
     "treasurer.gemspec"
   ]
-  s.homepage = "http://github.com/edmundhighcock/treasurer"
-  s.licenses = ["GPLv3"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "A simple command line tool for managing accounts and finances."
+  s.homepage = "http://github.com/edmundhighcock/treasurer".freeze
+  s.licenses = ["GPLv3".freeze]
+  s.rubygems_version = "2.6.8".freeze
+  s.summary = "A simple command line tool for managing accounts and finances.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<coderunner>, [">= 0.14.16"])
-      s.add_runtime_dependency(%q<budgetcrmod>, [">= 0.0.0"])
-      s.add_runtime_dependency(%q<command-line-flunky>, [">= 1.0.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_runtime_dependency(%q<coderunner>.freeze, [">= 0.14.16"])
+      s.add_runtime_dependency(%q<budgetcrmod>.freeze, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.1"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_development_dependency(%q<ruby-prof>.freeze, [">= 0.15"])
     else
-      s.add_dependency(%q<coderunner>, [">= 0.14.16"])
-      s.add_dependency(%q<budgetcrmod>, [">= 0.0.0"])
-      s.add_dependency(%q<command-line-flunky>, [">= 1.0.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<coderunner>.freeze, [">= 0.14.16"])
+      s.add_dependency(%q<budgetcrmod>.freeze, [">= 0.2.0"])
+      s.add_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.1"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_dependency(%q<ruby-prof>.freeze, [">= 0.15"])
     end
   else
-    s.add_dependency(%q<coderunner>, [">= 0.14.16"])
-    s.add_dependency(%q<budgetcrmod>, [">= 0.0.0"])
-    s.add_dependency(%q<command-line-flunky>, [">= 1.0.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<coderunner>.freeze, [">= 0.14.16"])
+    s.add_dependency(%q<budgetcrmod>.freeze, [">= 0.2.0"])
+    s.add_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.1"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<ruby-prof>.freeze, [">= 0.15"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: treasurer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: command-line-flunky
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.15'
 description: A simple command line tool for managing accounts and finances. Easily
   import internet banking spreadsheets and generate sophisticated reports and projections.
 email: edmundhighcock@users.sourceforge.net
@@ -171,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A simple command line tool for managing accounts and finances.