thefox-wallet 0.14.0 → 0.15.0

data/lib/wallet/wallet.rb

@@ -5,40 +5,37 @@ require 'logger'
 require 'yaml'
 require 'yaml/store'
 require 'csv'
-
-# OpenStruct use to generate HTML.
-require 'ostruct'
-
+require 'pathname'
+require 'ostruct' # OpenStruct use to generate HTML.
 # require 'pp'
 
-
 module TheFox
 	module Wallet
 		
 		class Wallet
 			
 			attr_writer :logger
-			attr_reader :html_path
+			attr_reader :dir_path
 			
-			def initialize(dir_path = 'wallet')
+			def initialize(dir_path = nil)
 				@exit = false
 				@logger = nil
-				@dir_path = dir_path
-				@data_path = File.expand_path('data', @dir_path)
-				@html_path = File.expand_path('html', @dir_path)
-				@tmp_path = File.expand_path('tmp', @dir_path)
+				@dir_path = dir_path || Pathname.new('wallet').expand_path
+				@dir_path_basename = @dir_path.basename
+				@dir_path_basename_s = @dir_path_basename.to_s
+				@data_path = Pathname.new('data').expand_path(@dir_path)
+				@tmp_path = Pathname.new('tmp').expand_path(@dir_path)
 				
 				@has_transaction = false
 				@transaction_files = Hash.new
 				
 				@entries_by_ids = nil
-				@entries_index_file_path = File.expand_path('index.yml', @data_path)
+				@entries_index_file_path = Pathname.new('index.yml').expand_path(@data_path)
 				@entries_index = Array.new
 				@entries_index_is_loaded = false
 				
 				Signal.trap('SIGINT') do
-					puts
-					puts 'received SIGINT. break ...'
+					@logger.warning('received SIGINT. break ...') if @logger
 					@exit = true
 				end
 			end
@@ -48,20 +45,18 @@ module TheFox
 					raise ArgumentError, 'variable must be a Entry instance'
 				end
 				
-				# puts "add, id #{entry.id}"
-				# puts "add, is_unique    #{is_unique}"
-				# puts "add, entry_exist? #{entry_exist?(entry)}"
-				# puts
-				
 				if is_unique && entry_exist?(entry)
 					return false
 				end
 				
+				create_dirs
+				
 				date = entry.date
 				date_s = date.to_s
-				dbfile_basename = "month_#{date.strftime('%Y_%m')}.yml"
-				dbfile_path = File.expand_path(dbfile_basename, @data_path)
-				tmpfile_path = "#{dbfile_path}.tmp"
+				dbfile_basename_s = "month_#{date.strftime('%Y_%m')}.yml"
+				dbfile_basename_p = Pathname.new(dbfile_basename_s)
+				dbfile_path = dbfile_basename_p.expand_path(@data_path)
+				tmpfile_path = Pathname.new("#{dbfile_path}.tmp")
 				file = {
 					'meta' => {
 						'version' => 1,
@@ -73,24 +68,19 @@ module TheFox
 				
 				@entries_index << entry.id
 				
-				# puts 'dbfile_basename: ' + dbfile_basename
-				# puts 'dbfile_path:     ' + dbfile_path
-				# puts 'tmpfile_path:    ' + tmpfile_path
-				# puts
-				
 				if @has_transaction
-					if @transaction_files.has_key?(dbfile_basename)
-						file = @transaction_files[dbfile_basename]['file']
+					if @transaction_files[dbfile_basename_s]
+						file = @transaction_files[dbfile_basename_s]['file']
 					else
-						if File.exist?(dbfile_path)
+						if dbfile_path.exist?
 							file = YAML.load_file(dbfile_path)
 							file['meta']['updated_at'] = DateTime.now.to_s
 						end
 						
-						@transaction_files[dbfile_basename] = {
-							'basename' => dbfile_basename,
-							'path' => dbfile_path,
-							'tmp_path' => tmpfile_path,
+						@transaction_files[dbfile_basename_s] = {
+							'basename' => dbfile_basename_s,
+							'path' => dbfile_path.to_s,
+							'tmp_path' => tmpfile_path.to_s,
 							'file' => file,
 						}
 					end
@@ -104,11 +94,9 @@ module TheFox
 					
 					file['days'][date_s].push(entry.to_h)
 					
-					@transaction_files[dbfile_basename]['file'] = file
+					@transaction_files[dbfile_basename_s]['file'] = file
 				else
-					create_dirs
-					
-					if File.exist?(dbfile_path)
+					if dbfile_path.exist?
 						file = YAML.load_file(dbfile_path)
 						file['meta']['updated_at'] = DateTime.now.to_s
 					end
@@ -130,8 +118,8 @@ module TheFox
 					
 					save_entries_index_file
 					
-					if File.exist?(tmpfile_path)
-						File.rename(tmpfile_path, dbfile_path)
+					if tmpfile_path.exist?
+						tmpfile_path.rename(dbfile_path)
 					end
 				end
 				
@@ -157,12 +145,6 @@ module TheFox
 							throw :done
 						end
 						
-						# puts 'keys left: ' + @transaction_files.keys.count.to_s
-						# puts 'tr_file_key: ' + tr_file_key
-						# puts 'path:        ' + tr_file_data['path']
-						# puts 'tmp_path:    ' + tr_file_data['tmp_path']
-						# puts
-						
 						store = YAML::Store.new(tr_file_data['tmp_path'])
 						store.transaction do
 							store['meta'] = tr_file_data['file']['meta']
@@ -259,16 +241,8 @@ module TheFox
 				
 				category = category.to_s.downcase
 				
-				# puts 'glob:     ' + glob
-				# puts 'begin_year:     ' + '%-10s' % begin_year.class.to_s + '   = "' + begin_year.to_s + '"'
-				# puts 'begin_month:    ' + '%-10s' % begin_month.class.to_s + '   = "' + begin_month.to_s + '"'
-				# puts 'begin_day:      ' + '%-10s' % begin_day.class.to_s + '   = "' + begin_day.to_s + '"'
-				# puts 'category:       ' + '%-10s' % category.class.to_s + '   = "' + category.to_s + '"'
-				# puts
-				
 				entries_a = Hash.new
 				Dir[glob].each do |file_path|
-					#puts "path: #{file_path}"
 					
 					data = YAML.load_file(file_path)
 					if category.length == 0
@@ -306,7 +280,7 @@ module TheFox
 			
 			def categories
 				categories_h = Hash.new
-				Dir[File.expand_path('month_*.yml', @data_path)].each do |file_path|
+				Dir[Pathname.new('month_*.yml').expand_path(@data_path)].each do |file_path|
 					data = YAML.load_file(file_path)
 					
 					data['days'].each do |day_name, day_items|
@@ -328,10 +302,14 @@ module TheFox
 				categories_a
 			end
 			
-			def gen_html
+			def gen_html(html_path, date_start = nil, date_end = nil, category = nil)
 				create_dirs
 				
-				html_options_path = File.expand_path('options.yml', @html_path)
+				unless html_path.exist?
+					html_path.mkpath
+				end
+				
+				html_options_path = Pathname.new('options.yml').expand_path(html_path)
 				html_options = {
 					'meta' => {
 						'version' => 1,
@@ -340,25 +318,30 @@ module TheFox
 					},
 					'changes' => Hash.new,
 				}
-				if Dir.exist?(@html_path)
-					if File.exist?(html_options_path)
+				if html_path.exist?
+					if html_options_path.exist?
 						html_options = YAML.load_file(html_options_path)
 						html_options['meta']['updated_at'] = DateTime.now.to_s
 					end
 				else
-					Dir.mkdir(@html_path)
+					html_path.mkpath
 				end
 				
 				categories_available = categories
+				if category
+					filter_categories = category.split(',')
+					categories_available &= filter_categories
+				end
 				
 				categories_total_balance = Hash.new
 				categories_available.map{ |item| categories_total_balance[item] = 0.0 }
 				
-				gitignore_file = File.open(File.expand_path('.gitignore', @html_path), 'w')
+				gitignore_file_path = Pathname.new('.gitignore').expand_path(html_path)
+				gitignore_file = File.open(gitignore_file_path, 'w')
 				gitignore_file.write('*')
 				gitignore_file.close
 				
-				css_file_path = File.expand_path('style.css', @html_path)
+				css_file_path = Pathname.new('style.css').expand_path(html_path)
 				css_file = File.open(css_file_path, 'w')
 				css_file.write('
 					html {
@@ -383,37 +366,38 @@ module TheFox
 				')
 				css_file.close
 				
-				index_file_path = File.expand_path('index.html', @html_path)
+				index_file_path = Pathname.new('index.html').expand_path(html_path)
 				index_file = File.open(index_file_path, 'w')
 				index_file.write('
 					<html>
 						<head>
 							<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-							<title>' << @dir_path << '</title>
+							<title>' << @dir_path_basename_s << '</title>
 							<link rel="stylesheet" href="style.css" type="text/css" />
 						</head>
 						<body>
-							<h1>' << @dir_path << '</h1>
-							<p>Generated @ ' << DateTime.now.strftime('%Y-%m-%d %H:%M:%S') << ' by  <a href="' << ::TheFox::Wallet::HOMEPAGE << '">' << ::TheFox::Wallet::NAME << '</a> ' << ::TheFox::Wallet::VERSION << '</p>
+							<h1>' << @dir_path_basename_s << '</h1>
+							<p>Generated @ ' << DateTime.now.strftime('%F %T') << ' by <a href="' << HOMEPAGE << '">' << NAME << '</a> v' << VERSION << '</p>
 				')
 				
 				years_total = Hash.new
-				years.each do |year|
+				years(date_start, date_end).each do |year|
 					year_s = year.to_s
-					year_file_name = "year_#{year}.html"
-					year_file_path = File.expand_path(year_file_name, @html_path)
+					year_file_name_s = "year_#{year}.html"
+					year_file_name_p = Pathname.new(year_file_name_s)
+					year_file_path = year_file_name_p.expand_path(html_path)
 					
 					year_file = File.open(year_file_path, 'w')
 					year_file.write('
 						<html>
 							<head>
 								<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-								<title>' << year_s << ' - ' << @dir_path << '</title>
+								<title>' << year_s << ' - ' << @dir_path_basename_s << '</title>
 								<link rel="stylesheet" href="style.css" type="text/css" />
 							</head>
 							<body>
-								<h1><a href="index.html">' << @dir_path << '</a></h1>
-								<p>Generated @ ' << DateTime.now.strftime('%Y-%m-%d %H:%M:%S') << ' by  <a href="' << ::TheFox::Wallet::HOMEPAGE << '">' << ::TheFox::Wallet::NAME << '</a> ' << ::TheFox::Wallet::VERSION << '</p>
+								<h1><a href="index.html">' << @dir_path_basename_s << '</a></h1>
+								<p>Generated @ ' << DateTime.now.strftime('%Y-%m-%d %H:%M:%S') << ' by <a href="' << HOMEPAGE << '">' << NAME << '</a> v' << VERSION << '</p>
 								
 								<h2>Year: ' << year_s << '</h2>
 								<table class="list">
@@ -428,7 +412,7 @@ module TheFox
 										<th colspan="4">&nbsp;</th>
 					')
 					categories_available.each do |category|
-						year_file.write('<th class="right">' << category << '</th>')
+						year_file.write(%(<th class="right">#{category}</th>))
 					end
 					year_file.write('</tr>')
 					
@@ -439,15 +423,32 @@ module TheFox
 					categories_available.map{ |item| categories_year_balance[item] = 0.0 }
 					year_total = Hash.new
 					
-					puts "generate year #{year}"
-					Dir[File.expand_path("month_#{year}_*.yml", @data_path)].each do |file_path|
-						file_name = File.basename(file_path)
-						month_n = file_name[11, 2]
-						month_file_name = "month_#{year}_#{month_n}.html"
-						month_file_path = File.expand_path(month_file_name, @html_path)
+					@logger.info("generate year #{year}") if @logger
+					@data_path.each_child do |file_path|
+						file_name_p = file_path.basename
+						file_name_s = file_name_p.to_s
+						
+						if file_path.extname != '.yml' || Regexp.new("^month_#{year}_").match(file_name_s).nil?
+							next
+						end
+						
+						month_n = file_name_s[11, 2]
+						month_file_name_s = "month_#{year}_#{month_n}.html"
+						month_file_name_p = Pathname.new(month_file_name_s)
+						month_file_path = month_file_name_p.expand_path(html_path)
 						
 						month_s = Date.parse("2015-#{month_n}-15").strftime('%B')
 						
+						if date_start && date_end
+							file_date_start = Date.parse("#{year}-#{month_n}-01")
+							file_date_end = Date.parse("#{year}-#{month_n}-01").next_month.prev_day
+							
+							if date_end < file_date_start ||
+								date_start > file_date_end
+								next
+							end
+						end
+						
 						revenue_month = 0.0
 						expense_month = 0.0
 						balance_month = 0.0
@@ -458,37 +459,37 @@ module TheFox
 						data = YAML.load_file(file_path)
 						
 						generate_html = false
-						if html_options['changes'].has_key?(file_name)
-							if html_options['changes'][file_name]['updated_at'] != data['meta']['updated_at']
-								html_options['changes'][file_name]['updated_at'] = data['meta']['updated_at']
+						if html_options['changes'][file_name_s]
+							if html_options['changes'][file_name_s]['updated_at'] != data['meta']['updated_at']
+								html_options['changes'][file_name_s]['updated_at'] = data['meta']['updated_at']
 								generate_html = true
 							end
 						else
-							html_options['changes'][file_name] = {
+							html_options['changes'][file_name_s] = {
 								'updated_at' => data['meta']['updated_at'],
 							}
 							generate_html = true
 						end
-						if !File.exist?(month_file_path)
+						unless month_file_path.exist?
 							generate_html = true
 						end
 						
 						if generate_html
-							puts "\tfile: #{month_file_name} (from #{file_name})"
+							@logger.debug("file: #{month_file_name_s} (from #{file_name_s})") if @logger
 							
 							month_file = File.open(month_file_path, 'w')
 							month_file.write('
 								<html>
 									<head>
 										<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-										<title>' << month_s << ' ' << year_s << ' - ' << @dir_path << '</title>
+										<title>' << month_s << ' ' << year_s << ' - ' << @dir_path_basename_s << '</title>
 										<link rel="stylesheet" href="style.css" type="text/css" />
 									</head>
 									<body>
-										<h1><a href="index.html">' << @dir_path << '</a></h1>
-										<p>Generated @ ' << DateTime.now.strftime('%Y-%m-%d %H:%M:%S') << ' by  <a href="' << ::TheFox::Wallet::HOMEPAGE << '">' << ::TheFox::Wallet::NAME << '</a> ' << ::TheFox::Wallet::VERSION << ' from <code>' << file_name << '</code></p>
+										<h1><a href="index.html">' << @dir_path_basename_s << '</a></h1>
+										<p>Generated @ ' << DateTime.now.strftime('%Y-%m-%d %H:%M:%S') << ' by  <a href="' << HOMEPAGE << '">' << NAME << '</a> v' << VERSION << ' from <code>' << file_name_s << '</code></p>
 										
-										<h2>Month: ' << month_s << ' <a href="' << year_file_name << '">' << year_s << '</a></h2>
+										<h2>Month: ' << month_s << ' <a href="' << year_file_name_s << '">' << year_s << '</a></h2>
 										<table class="list">
 											<tr>
 												<th class="left">#</th>
@@ -505,6 +506,19 @@ module TheFox
 						
 						data['days'].sort.each do |day_name, day_items|
 							day_items.each do |entry|
+								entry_date = Date.parse(entry['date'])
+								entry_date_s = entry_date.strftime('%d.%m.%y')
+								
+								date_start_oor = date_start > entry_date
+								date_end_oor = date_end < entry_date
+								
+								if category && !categories_available.include?(entry['category']) ||
+									date_start > entry_date ||
+									date_end < entry_date
+									
+									next
+								end
+								
 								entry_n += 1
 								revenue_month += entry['revenue']
 								expense_month += entry['expense']
@@ -513,8 +527,8 @@ module TheFox
 								categories_year_balance[entry['category']] += entry['balance']
 								categories_month_balance[entry['category']] += entry['balance']
 								
-								revenue_out = entry['revenue'] > 0 ? ::TheFox::Wallet::NUMBER_FORMAT % entry['revenue'] : '&nbsp;'
-								expense_out = entry['expense'] < 0 ? ::TheFox::Wallet::NUMBER_FORMAT % entry['expense'] : '&nbsp;'
+								revenue_out = entry['revenue'] > 0 ? NUMBER_FORMAT % entry['revenue'] : '&nbsp;'
+								expense_out = entry['expense'] < 0 ? NUMBER_FORMAT % entry['expense'] : '&nbsp;'
 								category_out = entry['category'] == 'default' ? '&nbsp;' : entry['category']
 								comment_out = entry['comment'] == '' ? '&nbsp;' : entry['comment']
 								
@@ -522,11 +536,11 @@ module TheFox
 									month_file.write('
 										<tr>
 											<td valign="top" class="left">' << entry_n.to_s << '</td>
-											<td valign="top" class="left">' << Date.parse(entry['date']).strftime('%d.%m.%y') << '</td>
+											<td valign="top" class="left">' << entry_date_s << '</td>
 											<td valign="top" class="left">' << entry['title'][0, 50] << '</td>
 											<td valign="top" class="right">' << revenue_out << '</td>
 											<td valign="top" class="right red">' << expense_out << '</td>
-											<td valign="top" class="right ' << (entry['balance'] < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % entry['balance'] << '</td>
+											<td valign="top" class="right ' << (entry['balance'] < 0 ? 'red' : '') << '">' << NUMBER_FORMAT % entry['balance'] << '</td>
 											<td valign="top" class="right">' << category_out << '</td>
 											<td valign="top" class="left">' << comment_out << '</td>
 										</tr>
@@ -561,9 +575,9 @@ module TheFox
 										<th>&nbsp;</th>
 										<th>&nbsp;</th>
 										<th class="left"><b>TOTAL</b></th>
-										<th class="right">' << ::TheFox::Wallet::NUMBER_FORMAT % revenue_month << '</th>
-										<th class="right red">' << ::TheFox::Wallet::NUMBER_FORMAT % expense_month << '</th>
-										<th class="right ' << balance_class << '">' << ::TheFox::Wallet::NUMBER_FORMAT % balance_month << '</th>
+										<th class="right">' << NUMBER_FORMAT % revenue_month << '</th>
+										<th class="right red">' << NUMBER_FORMAT % expense_month << '</th>
+										<th class="right ' << balance_class << '">' << NUMBER_FORMAT % balance_month << '</th>
 										<th>&nbsp;</th>
 										<th>&nbsp;</th>
 									</tr>
@@ -574,13 +588,13 @@ module TheFox
 						
 						year_file.write('
 							<tr>
-								<td class="left"><a href="' << month_file_name << '">' << month_s << '</a></td>
-								<td class="right">' << ::TheFox::Wallet::NUMBER_FORMAT % revenue_month << '</td>
-								<td class="right red">' << ::TheFox::Wallet::NUMBER_FORMAT % expense_month << '</td>
-								<td class="right ' << balance_class << '">' << ::TheFox::Wallet::NUMBER_FORMAT % balance_month << '</td>')
+								<td class="left"><a href="' << month_file_name_s << '">' << month_s << '</a></td>
+								<td class="right">' << NUMBER_FORMAT % revenue_month << '</td>
+								<td class="right red">' << NUMBER_FORMAT % expense_month << '</td>
+								<td class="right ' << balance_class << '">' << NUMBER_FORMAT % balance_month << '</td>')
 						categories_available.each do |category|
 							category_balance = categories_month_balance[category]
-							year_file.write('<td class="right ' << (category_balance < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % category_balance << '</td>')
+							year_file.write('<td class="right ' << (category_balance < 0 ? 'red' : '') << '">' << NUMBER_FORMAT % category_balance << '</td>')
 						end
 						year_file.write('</tr>')
 					end
@@ -590,12 +604,12 @@ module TheFox
 					year_file.write('
 							<tr>
 								<th class="left"><b>TOTAL</b></th>
-								<th class="right">' << ::TheFox::Wallet::NUMBER_FORMAT % revenue_year << '</th>
-								<th class="right red">' << ::TheFox::Wallet::NUMBER_FORMAT % expense_year << '</th>
-								<th class="right ' << (balance_year < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % balance_year << '</th>')
+								<th class="right">' << NUMBER_FORMAT % revenue_year << '</th>
+								<th class="right red">' << NUMBER_FORMAT % expense_year << '</th>
+								<th class="right ' << (balance_year < 0 ? 'red' : '') << '">' << NUMBER_FORMAT % balance_year << '</th>')
 					categories_available.each do |category|
 						category_balance = categories_year_balance[category]
-						year_file.write('<td class="right ' << (category_balance < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % category_balance << '</td>')
+						year_file.write('<td class="right ' << (category_balance < 0 ? 'red' : '') << '">' << NUMBER_FORMAT % category_balance << '</td>')
 					end
 					
 					year_file.write('
@@ -607,42 +621,15 @@ module TheFox
 					year_file.write('</body></html>')
 					year_file.close
 					
-					yeardat_file_path = File.expand_path("year_#{year_s}.dat", @tmp_path)
+					yeardat_file_path = Pathname.new("year_#{year_s}.dat").expand_path(@tmp_path)
 					yeardat_file = File.new(yeardat_file_path, 'w')
 					yeardat_file.write(year_total
 						.map{ |k, m| "#{year_s}-#{m.month_s} #{m.revenue} #{m.expense} #{m.balance} #{m.balance_total} #{m.balance_total}" }
 						.join("\n"))
 					yeardat_file.close
 					
-					# year_max = year_total
-					# 	.map{ |k, m| [m.revenue, m.balance, m.balance_total] }
-					# 	.flatten
-					# 	.max
-					# 	.to_i
-					
-					# year_min = year_total
-					# 	.map{ |k, m| [m.expense, m.balance, m.balance_total] }
-					# 	.flatten
-					# 	.min
-					# 	.to_i
-					# 	.abs
-					
-					# year_max_rl = year_max.to_s.length - 2
-					# year_max_r = year_max.round(-year_max_rl)
-					# year_max_d = year_max_r - year_max
-					# year_max_r = year_max_r + 5 * 10 ** (year_max_rl - 1) if year_max_r < year_max
-					# year_max_r += 100
-					
-					# year_min_rl = year_min.to_s.length - 2
-					# year_min_r = year_min.round(-year_min_rl)
-					# year_min_d = year_min_r - year_min
-					# year_min_r = year_min_r + 5 * 10 ** (year_min_rl - 1) if year_min_r < year_min
-					# year_min_r += 100
-					
-					# puts "#{year_max} #{year_max.to_s.length} #{year_max_r} #{year_max_rl}"
-					# puts "#{year_min} #{year_min.to_s.length} #{year_min_r} #{year_min_rl}"
-					
-					gnuplot_file = File.new(File.expand_path("year_#{year_s}.gp", @tmp_path), 'w')
+					gnuplot_file_path = Pathname.new("year_#{year_s}.gp").expand_path(@tmp_path)
+					gnuplot_file = File.new(gnuplot_file_path, 'w')
 					gnuplot_file.puts("set title 'Year #{year_s}'")
 					gnuplot_file.puts("set xlabel 'Months'")
 					gnuplot_file.puts("set ylabel 'Euro'")
@@ -665,14 +652,14 @@ module TheFox
 					gnuplot_file.puts("set style line 4 linecolor rgb '#0000ff' linewidth 2 linetype 1 pointtype 2")
 					gnuplot_file.puts("set style data linespoints")
 					gnuplot_file.puts("set terminal png enhanced")
-					gnuplot_file.puts("set output '" << File.expand_path("year_#{year_s}.png", @html_path) << "'")
+					gnuplot_file.puts("set output '" << File.expand_path("year_#{year_s}.png", html_path) << "'")
 					gnuplot_file.puts("plot sum = 0, \\")
 					gnuplot_file.puts("\t'#{yeardat_file_path}' using 1:2 linestyle 1 title 'Revenue', \\")
 					gnuplot_file.puts("\t'' using 1:3 linestyle 2 title 'Expense', \\")
 					gnuplot_file.puts("\t'' using 1:4 linestyle 3 title 'Balance', \\")
 					gnuplot_file.puts("\t'' using 1:5 linestyle 4 title '∑ Balance'")
 					gnuplot_file.close
-					system("gnuplot " << File.expand_path("year_#{year_s}.gp", @tmp_path))
+					system("gnuplot #{gnuplot_file_path} &> /dev/null")
 					
 					years_total[year_s] = ::OpenStruct.new({
 						year: year_s,
@@ -697,10 +684,10 @@ module TheFox
 					index_file.write('
 						<tr>
 							<td class="left"><a href="year_' << year_name << '.html">' << year_name << '</a></td>
-							<td class="right">' << ::TheFox::Wallet::NUMBER_FORMAT % year_data.revenue << '</td>
-							<td class="right red">' << ::TheFox::Wallet::NUMBER_FORMAT % year_data.expense << '</td>
-							<td class="right ' << (year_data.balance < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % year_data.balance << '</td>
-							<td class="right ' << (year_data.balance_total < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % year_data.balance_total << '</td>
+							<td class="right">' << NUMBER_FORMAT % year_data.revenue << '</td>
+							<td class="right red">' << NUMBER_FORMAT % year_data.expense << '</td>
+							<td class="right ' << (year_data.balance < 0 ? 'red' : '') << '">' << NUMBER_FORMAT % year_data.balance << '</td>
+							<td class="right ' << (year_data.balance_total < 0 ? 'red' : '') << '">' << NUMBER_FORMAT % year_data.balance_total << '</td>
 						</tr>')
 				end
 				
@@ -709,9 +696,9 @@ module TheFox
 				index_file.write('
 						<tr>
 							<th class="left"><b>TOTAL</b></th>
-							<th class="right">' << ::TheFox::Wallet::NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].revenue } << '</th>
-							<th class="right red">' << ::TheFox::Wallet::NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].expense } << '</th>
-							<th class="right ' << (balance_total < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % balance_total << '</th>
+							<th class="right">' << NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].revenue } << '</th>
+							<th class="right red">' << NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].expense } << '</th>
+							<th class="right ' << (balance_total < 0 ? 'red' : '') << '">' << NUMBER_FORMAT % balance_total << '</th>
 							<th>&nbsp;</th>
 						</tr>
 					</table>
@@ -731,17 +718,20 @@ module TheFox
 				end
 				
 				totaldat_file_c = years_total.map{ |k, y| "#{y.year} #{y.revenue} #{y.expense} #{y.balance} #{y.balance_total}" }
-				if totaldat_file_c.count > 6
-					totaldat_file_c = totaldat_file_c.slice(-6, 6)
+				if totaldat_file_c.count > 10
+					totaldat_file_c = totaldat_file_c.slice(-10, 10)
 				end
 				totaldat_file_c = totaldat_file_c.join("\n")
 				
-				totaldat_file_path = File.expand_path('total.dat', @tmp_path)
+				totaldat_file_path = Pathname.new('total.dat').expand_path(@tmp_path)
 				totaldat_file = File.new(totaldat_file_path, 'w')
 				totaldat_file.write(totaldat_file_c)
 				totaldat_file.close
 				
-				gnuplot_file = File.new(File.expand_path('total.gp', @tmp_path), 'w')
+				png_file_path = Pathname.new('total.png').expand_path(html_path)
+				
+				gnuplot_file_path = Pathname.new('total.gp').expand_path(@tmp_path)
+				gnuplot_file = File.new(gnuplot_file_path, 'w')
 				gnuplot_file.puts("set title 'Total'")
 				gnuplot_file.puts("set xlabel 'Years'")
 				gnuplot_file.puts("set ylabel 'Euro'")
@@ -756,7 +746,7 @@ module TheFox
 				gnuplot_file.puts("set style line 4 linecolor rgb '#0000ff' linewidth 2 linetype 1 pointtype 2")
 				gnuplot_file.puts("set style data linespoints")
 				gnuplot_file.puts("set terminal png enhanced")
-				gnuplot_file.puts("set output '" << File.expand_path('total.png', @html_path) << "'")
+				gnuplot_file.puts("set output '#{png_file_path}'")
 				gnuplot_file.puts("plot sum = 0, \\")
 				gnuplot_file.puts("\t'#{totaldat_file_path}' using 1:2 linestyle 1 title 'Revenue', \\")
 				gnuplot_file.puts("\t'' using 1:3 linestyle 2 title 'Expense', \\")
@@ -764,7 +754,7 @@ module TheFox
 				gnuplot_file.puts("\t'' using 1:5 linestyle 4 title '∑ Balance'")
 				gnuplot_file.close
 				
-				system("gnuplot " << File.expand_path('total.gp', @tmp_path))
+				system("gnuplot #{gnuplot_file_path} &> /dev/null")
 			end
 			
 			def import_csv_file(file_path)
@@ -796,11 +786,10 @@ module TheFox
 					
 					added = add(Entry.new(id, title, date, revenue, expense, category, comment), true)
 					
-					puts "import row '#{id}' -- #{added ? 'YES' : 'NO'}"
+					@logger.debug("import row '#{id}' -- #{added ? 'YES' : 'NO'}") if @logger
 				end
 				
-				puts
-				puts 'save data ...'
+				@logger.info('save data ...') if @logger
 				
 				transaction_end
 			end
@@ -816,8 +805,8 @@ module TheFox
 					# :encoding => 'ISO-8859-1',
 				}
 				CSV.open(file_path, 'wb', csv_options) do |csv|
-					Dir[File.expand_path('month_*.yml', @data_path)].each do |yaml_file_path|
-						puts 'export ' + File.basename(yaml_file_path)
+					Dir[Pathname.new('month_*.yml').expand_path(@data_path)].each do |yaml_file_path|
+						@logger.info("export #{File.basename(yaml_file_path)}") if @logger
 						
 						data = YAML.load_file(yaml_file_path)
 						
@@ -827,9 +816,9 @@ module TheFox
 									entry['id'],
 									entry['date'],
 									entry['title'],
-									::TheFox::Wallet::NUMBER_FORMAT % entry['revenue'],
-									::TheFox::Wallet::NUMBER_FORMAT % entry['expense'],
-									::TheFox::Wallet::NUMBER_FORMAT % entry['balance'],
+									NUMBER_FORMAT % entry['revenue'],
+									NUMBER_FORMAT % entry['expense'],
+									NUMBER_FORMAT % entry['balance'],
 									entry['category'],
 									entry['comment'],
 								]
@@ -854,9 +843,9 @@ module TheFox
 				if @entries_by_ids.nil? || force
 					@logger.debug('build entry-by-id index') if @logger
 					
-					glob = File.expand_path('month_*.yml', @data_path)
+					glob = Pathname.new('month_*.yml').expand_path(@data_path)
 					
-					@entries_by_ids = Dir[glob].map { |file_path|
+					@entries_by_ids = Dir[glob.to_s].map { |file_path|
 						data = YAML.load_file(file_path)
 						data['days'].map{ |day_name, day_items|
 							day_items.map{ |entry|
@@ -866,8 +855,6 @@ module TheFox
 					}.flatten.map{ |entry|
 						[entry.id, entry]
 					}.to_h
-					
-					# pp @entries_by_ids
 				end
 			end
 			
@@ -880,26 +867,26 @@ module TheFox
 			private
 			
 			def create_dirs
-				if !Dir.exist?(@dir_path)
-					Dir.mkdir(@dir_path)
+				unless @dir_path.exist?
+					@dir_path.mkpath
 				end
 				
-				if !Dir.exist?(@data_path)
-					Dir.mkdir(@data_path)
+				unless @data_path.exist?
+					@data_path.mkpath
 				end
 				
-				if !Dir.exist?(@tmp_path)
-					Dir.mkdir(@tmp_path)
+				unless @tmp_path.exist?
+					@tmp_path.mkpath
 				end
 				
-				tmp_gitignore_path = File.expand_path('.gitignore', @tmp_path)
-				if !File.exist?(tmp_gitignore_path)
+				tmp_gitignore_path = Pathname.new('.gitignore').expand_path(@tmp_path)
+				unless tmp_gitignore_path.exist?
 					gitignore_file = File.open(tmp_gitignore_path, 'w')
 					gitignore_file.write('*')
 					gitignore_file.close
 				end
 				
-				if File.exist?(@entries_index_file_path)
+				if @entries_index_file_path.exist?
 					load_entries_index_file
 				else
 					build_entry_by_id_index(true)
@@ -937,22 +924,39 @@ module TheFox
 				}
 			end
 			
-			def years
-				Dir[File.expand_path('month_*.yml', @data_path)].map{ |file_path| File.basename(file_path)[6, 4].to_i }.uniq
+			def years(date_start = nil, date_end = nil)
+				
+				files = Array.new
+				@data_path.each_child(false) do |file|
+					if file.extname == '.yml' && /^month_/.match(file.to_s)
+						files << file
+					end
+				end
+				
+				date_start_year = 0
+				date_start_year = date_start.year if date_start
+				
+				date_end_year = 9999
+				date_end_year = date_end.year if date_end
+				
+				files
+					.map{ |file| file.to_s[6, 4].to_i }
+					.uniq
+					.keep_if{ |year| year >= date_start_year && year <= date_end_year }
 			end
 			
 			def load_entries_index_file
 				unless @entries_index_is_loaded
 					@entries_index_is_loaded = true
-					if File.exist?(@entries_index_file_path)
-						data = YAML.load_file(@entries_index_file_path)
+					if @entries_index_file_path.exist?
+						data = YAML.load_file(@entries_index_file_path.to_s)
 						@entries_index = data['index']
 					end
 				end
 			end
 			
 			def save_entries_index_file
-				store = YAML::Store.new(@entries_index_file_path)
+				store = YAML::Store.new(@entries_index_file_path.to_s)
 				store.transaction do
 					store['index'] = @entries_index
 				end