thefox-wallet 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fffbb8179bacdf2090fea639b32169a971c74cc41a3aa9a6b4cd618232a42ea
-  data.tar.gz: e67c28cb3d33b3836fc0f1a3ff9340ef97203bb41c9fdd73dd81eb18f568b9fe
+  metadata.gz: dbdeab5e10aa901509aad542748c877b974843a7acab66c0666fffc831b9d40e
+  data.tar.gz: 05e48b852ff486781c50cc205b36a4ed4143d3c3f9f10f706168d999288e0d93
 SHA512:
-  metadata.gz: da2e9b2af441f797323b91d8904a31e357080a0b367e80479b94c3ce9680af9a999a00e4d77c04d9147e4f532ba14f9bd65e582942bf420c3b14cf075437e860
-  data.tar.gz: dd07b9c48990f1e207ee8225c86dad436e62467d109e507bf7de3fc741f0f510afad97ca4540d173a560921bedb27f322616c224d011e93dd8b5a9f6d3e40780
+  metadata.gz: 993f8b9b4404d12029eaa61917ab6de5a42996fc70d2c8a5a0545a557e5ce5a0e141f51a1741f49d556ffb676ea4159411bb4db57b36aae7e1418bea16a70a83
+  data.tar.gz: 8f27dc5b78ff979d69d1df2c4305d68b1628659fd93bf887c818180aa6ec4f9eb9eeb233ce4596841221c7116de3e2dc4f1f35044d4395fc7cab73af91490403

data/.editorconfig

@@ -10,6 +10,6 @@ charset = utf-8
 trim_trailing_whitespace = false
 insert_final_newline = true
 
-[*.{sh}]
+[*.{sh,css}]
 indent_style = tab
 indent_size = 4

data/.gitlab-ci.yml

@@ -9,15 +9,6 @@ stages:
   - test
   - release
 
-test_21:
-  image: ruby:2.1
-  stage: test
-  environment: test
-  only:
-    - tags
-  script:
-    - ./bin/test.sh
-
 test_22:
   image: ruby:2.2
   stage: test

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.1
   - 2.2
   - 2.3
   - 2.4.0

data/README.md

@@ -27,7 +27,7 @@ $ gem install thefox-wallet
 or via `Gemfile`:
 
 ```sh
-$ gem 'thefox-wallet', '~>0.18'
+$ gem 'thefox-wallet', '~>0.19'
 ```
 
 Use it in your sources:

data/Vagrantfile

@@ -1,28 +1,32 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant.configure("2") do |config|
-  config.vm.box = "generic/debian9"
+Vagrant.configure('2') do |config|
+  config.vm.box = 'generic/debian9'
   config.vm.box_check_update = false
 
-  # config.vm.network "forwarded_port", guest: 4000, host: 4001
+  config.vm.hostname = 'wallet'
+  # config.vm.network 'forwarded_port', guest: 4000, host: 4001
 
-  # config.vm.network "private_network", ip: "192.168.33.10"
-  config.vm.synced_folder ".", "/app"
+  # config.vm.network 'private_network', ip: '192.168.33.10'
+  config.vm.synced_folder '.', '/app'
 
-  config.vm.provider "virtualbox" do |vb|
+  config.vm.provider 'virtualbox' do |vb|
     vb.gui = false
     vb.memory = 1024
   end
 
-  config.vm.provision "shell" do |s|
+  config.vm.provision 'shell' do |s|
     s.env = {
       'DEBIAN_FRONTEND' => 'noninteractive',
+      'WORKING_DIR' => '/app',
     }
     s.inline = <<-SHELL
+      echo "cd ${WORKING_DIR}" >> /home/vagrant/.bashrc
+      
       apt-get update -yqq
       apt-get upgrade -y
-      apt-get install -y htop vim lsof net-tools rsync ruby ruby-dev
+      apt-get install -y htop vim lsof net-tools rsync ruby ruby-dev gnuplot
 
       gem update --system && \
       gem install bundler -v '1.15.4' && \

data/bin/.gitignore

@@ -0,0 +1 @@
+test.rb

data/bin/wallet

@@ -36,6 +36,10 @@ opts = OptionParser.new do |o|
     @options[:entry_title] = title
   end
   
+  o.on('-m', '--message <message>', 'Alias for --title.') do |message|
+    @options[:entry_title] = message
+  end
+  
   o.on('-d', '--date <YYYY-MM-DD>', 'Date used for a new entry.') do |date|
     @options[:entry_date] = date
   end

data/lib/wallet/entry.rb

@@ -62,8 +62,8 @@ module TheFox
         when String
           # String
           @date = Date.parse(date)
-        when Fixnum
-          # Fixnum
+        when Integer
+          # Integer
           @date = Time.at(date).to_date
         when Date
           # Date

data/lib/wallet/version.rb

@@ -2,11 +2,12 @@
 module TheFox
   module Wallet
     NAME = 'Wallet'
-    VERSION = '0.18.0'
-    DATE = '2018-08-13'
+    VERSION = '0.19.0'
+    DATE = '2018-09-01'
     HOMEPAGE = 'https://github.com/TheFox/wallet'
     
     NUMBER_FORMAT = '%.2f'
     NUMBER_ROUND = 5
+    DATETIME_FORMAT = '%F %T %Z'
   end
 end

data/lib/wallet/wallet.rb

@@ -7,6 +7,9 @@ require 'yaml/store'
 require 'csv'
 require 'pathname'
 require 'fileutils'
+require 'rubygems'
+require 'liquid'
+require 'pp'
 
 # OpenStruct use to generate HTML.
 require 'ostruct'
@@ -39,6 +42,10 @@ module TheFox
         @entries_index = Array.new
         @entries_index_is_loaded = false
         
+        spec = Gem::Specification.find_by_name('thefox-wallet')
+        @gem_root = Pathname.new(spec.gem_dir)
+        @resources_root = Pathname.new('resources').expand_path(@gem_root)
+        
         Signal.trap('SIGINT') do
           #@logger.warn('received SIGINT. break ...')
           @exit = true
@@ -340,7 +347,7 @@ module TheFox
         
         create_dirs
         
-        unless html_path.exist?
+        if not html_path.exist?
           html_path.mkpath
         end
         
@@ -376,36 +383,29 @@ module TheFox
         gitignore_file = File.open(gitignore_file_path, 'w')
         gitignore_file.write('*')
         gitignore_file.close
-        
+                
         # Write CSS file.
-        css_file_path = Pathname.new('style.css').expand_path(html_path)
-        css_file = File.open(css_file_path, 'w')
-        css_file.write('
-          html {
-            -webkit-text-size-adjust: none;
-          }
-          table.list, table.list th, table.list td {
-            border: 1px solid black;
-          }
-          th.left, td.left {
-            text-align: left;
-          }
-          th.right, td.right {
-            text-align: right;
-          }
-          th.first_column {
-            min-width: 180px;
-            width: 180px;
-          }
-          th.red, td.red {
-            color: #ff0000;
-          }
-        ')
-        css_file.close
+        src_css_file_path = Pathname.new('css/style.css').expand_path(@resources_root).to_s
+        dst_css_file_path = Pathname.new('style.css').expand_path(html_path).to_s
+        
+        # FileUtils.cp_r(src_css_file_path, dst_css_file_path, {:verbose => true})
+        %x[cp #{src_css_file_path} #{dst_css_file_path}];
         
         # Use this for index.html.
         years_total = Hash.new
         
+        # Year HTML Template
+        year_liquid_tpl_src = Pathname.new('views/year.liquid').expand_path(@resources_root).to_s
+        year_liquid_tpl = Liquid::Template.parse(File.read(year_liquid_tpl_src))
+        
+        # Month HTML Template
+        month_liquid_tpl_src = Pathname.new('views/month.liquid').expand_path(@resources_root).to_s
+        month_liquid_tpl = Liquid::Template.parse(File.read(month_liquid_tpl_src))
+        
+        # Gnuplot Template
+        gnuplot_year_liquid_tpl_src = Pathname.new('gnuplot/year_config.liquid').expand_path(@resources_root).to_s
+        gnuplot_year_liquid_tpl = Liquid::Template.parse(File.read(gnuplot_year_liquid_tpl_src))
+        
         # Iterate over all years.
         years(date_start, date_end).each do |year|
           year_s = year.to_s
@@ -413,35 +413,6 @@ module TheFox
           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_basename_s << '</title>
-                <link rel="stylesheet" href="style.css" type="text/css" />
-              </head>
-              <body>
-                <h1><a href=".">' << @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">
-                  <tr>
-                    <th class="left">Month</th>
-                    <th class="right">Revenue</th>
-                    <th class="right">Expense</th>
-                    <th class="right">Balance</th>
-                    <th colspan="' << categories_available.count.to_s << '">' << categories_available.count.to_s << ' Categories</th>
-                  </tr>
-                  <tr>
-                    <th colspan="4">&nbsp;</th>
-          ')
-          categories_available.each do |category|
-            year_file.write(%(<th class="right">#{category}</th>))
-          end
-          year_file.write('</tr>')
-          
           revenue_year = 0.0
           expense_year = 0.0
           balance_year = 0.0
@@ -451,6 +422,8 @@ module TheFox
           
           @logger.info("generate year #{year}")
           
+          tpl_months = Array.new()
+          
           month_files = @data_path
             .children
             .sort
@@ -472,11 +445,6 @@ module TheFox
             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
@@ -501,39 +469,11 @@ module TheFox
               }
               write_html = true
             end
-            unless month_file_path.exist?
+            if not month_file_path.exist?
               write_html = true
             end
             
-            if write_html
-              @logger.debug("file: #{month_file_name_s} (from #{file_name_s})")
-              
-              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_basename_s << '</title>
-                    <link rel="stylesheet" href="style.css" type="text/css" />
-                  </head>
-                  <body>
-                    <h1><a href=".">' << @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_s << '">' << year_s << '</a></h2>
-                    <table class="list">
-                      <tr>
-                        <th class="left">#</th>
-                        <th class="left">Date</th>
-                        <th class="left first_column">Title</th>
-                        <th class="right">Revenue</th>
-                        <th class="right">Expense</th>
-                        <th class="right">Balance</th>
-                        <th class="right">Category</th>
-                        <th class="left">Comment</th>
-                      </tr>
-              ')
-            end
+            tpl_days = Array.new()
             
             data['days'].sort.each do |day_name, day_items|
               day_items.each do |entry|
@@ -557,20 +497,19 @@ module TheFox
                 category_out = entry['category'] == 'default' ? '&nbsp;' : entry['category']
                 comment_out = entry['comment'] == '' ? '&nbsp;' : entry['comment']
                 
-                if write_html
-                  month_file.write('
-                    <tr>
-                      <td valign="top" class="left">' << entry_n.to_s << '</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' : '') << '">' << NUMBER_FORMAT % entry['balance'] << '</td>
-                      <td valign="top" class="right">' << category_out << '</td>
-                      <td valign="top" class="left">' << comment_out << '</td>
-                    </tr>
-                  ')
-                end
+                tpl_days << {
+                  'entry_n' => entry_n.to_s,
+                  'entry_date_s' => entry_date_s,
+                  'title' => entry['title'][0, 50],
+                  'revenue_out' => revenue_out,
+                  'expense_out' => expense_out,
+                  
+                  'balance_class' => entry['balance'] < 0 ? 'red' : '',
+                  'balance' => NUMBER_FORMAT % entry['balance'],
+                  
+                  'category_out' => category_out,
+                  'comment_out' => comment_out,
+                }
               end
             end
             
@@ -595,34 +534,51 @@ module TheFox
               balance_class = 'red'
             end
             if write_html
-              month_file.write('
-                  <tr>
-                    <th>&nbsp;</th>
-                    <th>&nbsp;</th>
-                    <th class="left"><b>TOTAL</b></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>
-                </table>')
-              month_file.write('</body></html>')
+              @logger.debug("file: #{month_file_name_s} (from #{file_name_s})")
+              
+              month_file = File.open(month_file_path, 'w')
+              month_file.write(month_liquid_tpl.render({
+                'month_s' => month_s,
+                'year_s' => year_s,
+                'year_file_name_s' => year_file_name_s,
+                'dir_path' => @dir_path_basename_s,
+                'file_name_s' => file_name_s,
+                
+                'now' => DateTime.now.strftime(DATETIME_FORMAT),
+                
+                'app_homepage' => HOMEPAGE,
+                'app_name' => NAME,
+                'app_version' => VERSION,
+                
+                'revenue_month' => NUMBER_FORMAT % revenue_month,
+                'expense_month' => NUMBER_FORMAT % expense_month,
+                'balance_class' => balance_class,
+                'balance_month' => NUMBER_FORMAT % balance_month,
+                
+                'days' => tpl_days,
+              }))
               month_file.close
             end
             
-            year_file.write('
-              <tr>
-                <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|
+            tpl_months_categories = categories_available.map{ |category|
               category_balance = categories_month_balance[category]
-              year_file.write('<td class="right ' << (category_balance < 0 ? 'red' : '') << '">' << NUMBER_FORMAT % category_balance << '</td>')
-            end
-            year_file.write('</tr>')
-          end
+              
+              {
+                'class' => category_balance < 0 ? 'red' : '',
+                'balance' => category_balance > 0.0 ? NUMBER_FORMAT % category_balance : '&nbsp;',
+              }
+            }
+            
+            tpl_months << {
+              'month_file_name_s' => month_file_name_s,
+              'month_s' => month_s,
+              'revenue_month' => NUMBER_FORMAT % revenue_month,
+              'expense_month' => NUMBER_FORMAT % expense_month,
+              'balance_class' => balance_class,
+              'balance_month' => NUMBER_FORMAT % balance_month,
+              'categories' => tpl_months_categories,
+            }
+          end # month_files.each
           
           year_total
             .sort
@@ -630,27 +586,33 @@ module TheFox
               item[1].balance_total = (sum + item[1].balance).round(NUMBER_ROUND)
             }
           
-          year_file.write('
-              <tr>
-                <th class="left"><b>TOTAL</b></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' : '') << '">' << NUMBER_FORMAT % category_balance << '</td>')
-          end
-          
-          year_file.write('
-              </tr>
-            </table>
-          ')
+          categories_year_balance_formatted = categories_available.map{ |category|
+            [category, {
+              'balance' => NUMBER_FORMAT % categories_year_balance[category],
+              'class' => categories_year_balance[category] < 0 ? 'red' : '',
+            }]
+          }.to_h
           
-          year_file.write(%{<p><img src="year_#{year_s}.png"></p>})
-          year_file.write('</body></html>')
+          year_file = File.open(year_file_path, 'w')
+          year_file.write(year_liquid_tpl.render({
+            'year_s' => year_s,
+            'dir_path' => @dir_path_basename_s,
+            'now' => DateTime.now.strftime(DATETIME_FORMAT),
+            'app_homepage' => HOMEPAGE,
+            'app_name' => NAME,
+            'app_version' => VERSION,
+            'categories_available_count' => categories_available.count.to_s,
+            'categories_available' => categories_available,
+            'revenue_year' => NUMBER_FORMAT % revenue_year,
+            'expense_year' => NUMBER_FORMAT % expense_year,
+            'balance_year_class' => balance_year < 0 ? 'red' : '',
+            'balance_year' => NUMBER_FORMAT % balance_year,
+            'categories_year_balance_formatted' => categories_year_balance_formatted,
+            'months' => tpl_months,
+          }))
           year_file.close
           
-          yeardat_file_path = Pathname.new("year_#{year_s}.dat").expand_path(@tmp_path)
+          yeardat_file_path = Pathname.new("year_#{year_s}.dat").expand_path(@tmp_path).to_s
           yeardat_file = File.new(yeardat_file_path, 'w')
           yeardat_file.write(year_total
             .sort{ |a, b| a[0] <=> b[0] }
@@ -661,35 +623,13 @@ module TheFox
           
           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'")
-          gnuplot_file.puts("set grid")
-          gnuplot_file.puts("set key below center horizontal noreverse enhanced autotitle box dashtype solid")
-          gnuplot_file.puts("set tics out nomirror")
-          gnuplot_file.puts("set border 3 front linetype black linewidth 1.0 dashtype solid")
-          
-          gnuplot_file.puts("set timefmt '%Y-%m'")
-          gnuplot_file.puts("set xdata time")
-          gnuplot_file.puts("set format x '%b'")
-          gnuplot_file.puts("set xrange ['#{year_s}-01-01':'#{year_s}-12-31']")
-          gnuplot_file.puts("set xtics '#{year_s}-01-01', 2592000, '#{year_s}-12-31'")
-          # gnuplot_file.puts("set yrange [-#{year_min_r}:#{year_max_r}]")
-          gnuplot_file.puts("set autoscale y")
-          
-          gnuplot_file.puts("set style line 1 linecolor rgb '#00ff00' linewidth 2 linetype 1 pointtype 2")
-          gnuplot_file.puts("set style line 2 linecolor rgb '#ff0000' linewidth 2 linetype 1 pointtype 2")
-          gnuplot_file.puts("set style line 3 linecolor rgb '#000000' linewidth 2 linetype 1 pointtype 2")
-          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("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.write(gnuplot_year_liquid_tpl.render({
+            'year_s' => year_s,
+            'yeardat_file_path' => yeardat_file_path,
+            'output_path' => File.expand_path('year_%s.png' % year_s, html_path),
+          }))
           gnuplot_file.close
+          
           system("gnuplot #{gnuplot_file_path} &> /dev/null")
           
           years_total[year_s] = ::OpenStruct.new({
@@ -701,60 +641,41 @@ module TheFox
         end
         
         years_total.sort.inject(0.0){ |sum, item| item[1].balance_total = (sum + item[1].balance).round(NUMBER_ROUND) }
+        balance_total = years_total.inject(0.0){ |sum, item| sum + item[1].balance }
         
-        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_basename_s << '</title>
-              <link rel="stylesheet" href="style.css" type="text/css" />
-            </head>
-            <body>
-              <h1>' << @dir_path_basename_s << '</h1>
-              <p>Generated @ ' << DateTime.now.strftime('%F %T') << ' by <a href="' << HOMEPAGE << '">' << NAME << '</a> v' << VERSION << '</p>
-        ')
-        
-        # Write total to index.html file.
-        index_file.write('
-            <table class="list">
-              <tr>
-                <th class="left">Year</th>
-                <th class="right">Revenue</th>
-                <th class="right">Expense</th>
-                <th class="right">Balance</th>
-                <th class="right">Balance &#8721;</th>
-              </tr>')
-        
-        # Write years total to index.html file.
-        years_total.each do |year_name, year_data|
-          index_file.write('
-            <tr>
-              <td class="left"><a href="year_' << year_name << '.html">' << year_name << '</a></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
+        index_liquid_tpl_src = Pathname.new('views/index.liquid').expand_path(@resources_root).to_s
+        index_liquid_tpl = Liquid::Template.parse(File.read(index_liquid_tpl_src))
         
-        balance_total = years_total.inject(0.0){ |sum, item| sum + item[1].balance }
+        years_total_formatted = years_total.map{ |year_name, year_data|
+          {
+            'name' => year_name,
+            'revenue' => NUMBER_FORMAT % year_data.revenue,
+            'expense' => NUMBER_FORMAT % year_data.expense,
+            
+            'balance' => NUMBER_FORMAT % year_data.balance,
+            'balance_class' => year_data.balance < 0 ? 'red' : '',
+            
+            'balance_total' => NUMBER_FORMAT % year_data.balance_total,
+            'balance_total_class' => year_data.balance_total < 0 ? 'red' : '',
+          }
+        }
         
-        index_file.write('
-                <tr>
-                  <th class="left"><b>TOTAL</b></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>
-          
-              <p><img src="total.png"></p>
-            </body>
-          </html>
-        ')
+        index_file_path = Pathname.new('index.html').expand_path(html_path)
+        index_file = File.open(index_file_path, 'w')
+        index_file.write(index_liquid_tpl.render({
+          'dir_path' => @dir_path_basename_s,
+          'now' => DateTime.now.strftime(DATETIME_FORMAT),
+          'app_homepage' => HOMEPAGE,
+          'app_name' => NAME,
+          'app_version' => VERSION,
+          
+          'years_total_formatted' => years_total_formatted,
+          
+          'revenue_total' => NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].revenue },
+          'expense_total' => NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].expense },
+          'balance_total' => NUMBER_FORMAT % balance_total,
+          'balance_total_class' => balance_total < 0 ? 'red' : '',
+        }))
         index_file.close
         
         store = YAML::Store.new(html_options_path)
@@ -775,36 +696,23 @@ module TheFox
         totaldat_file_c = totaldat_file_c.join("\n")
         
         # DAT file for GNUPlot.
-        totaldat_file_path = Pathname.new('total.dat').expand_path(@tmp_path)
+        totaldat_file_path = Pathname.new('total.dat').expand_path(@tmp_path).to_s
         totaldat_file = File.new(totaldat_file_path, 'w')
         totaldat_file.write(totaldat_file_c)
         totaldat_file.close
         
         # Generate image with GNUPlot.
-        png_file_path = Pathname.new('total.png').expand_path(html_path)
+        png_file_path = Pathname.new('total.png').expand_path(html_path).to_s
+        
+        gnuplot_total_liquid_tpl_src = Pathname.new('gnuplot/total_config.liquid').expand_path(@resources_root).to_s
+        gnuplot_total_liquid_tpl = Liquid::Template.parse(File.read(gnuplot_total_liquid_tpl_src))
         
         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'")
-        gnuplot_file.puts("set grid")
-        gnuplot_file.puts("set key below center horizontal noreverse enhanced autotitle box dashtype solid")
-        gnuplot_file.puts("set tics out nomirror")
-        gnuplot_file.puts("set border 3 front linetype black linewidth 1.0 dashtype solid")
-        gnuplot_file.puts("set xtics 1")
-        gnuplot_file.puts("set style line 1 linecolor rgb '#00ff00' linewidth 2 linetype 1 pointtype 2")
-        gnuplot_file.puts("set style line 2 linecolor rgb '#ff0000' linewidth 2 linetype 1 pointtype 2")
-        gnuplot_file.puts("set style line 3 linecolor rgb '#000000' linewidth 2 linetype 1 pointtype 2")
-        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 '#{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', \\")
-        gnuplot_file.puts("\t'' using 1:4 linestyle 3 title 'Balance', \\")
-        gnuplot_file.puts("\t'' using 1:5 linestyle 4 title '∑ Balance'")
+        gnuplot_file.write(gnuplot_total_liquid_tpl.render({
+          'png_file_path' => png_file_path,
+          'totaldat_file_path' => totaldat_file_path,
+        }))
         gnuplot_file.close
         
         system("gnuplot #{gnuplot_file_path} &> /dev/null")
@@ -956,21 +864,21 @@ module TheFox
       
       # Create all needed subdirectories for this wallet.
       def create_dirs
-        unless @dir_path.exist?
+        if not @dir_path.exist?
           @dir_path.mkpath
         end
         
-        unless @data_path.exist?
+        if not @data_path.exist?
           @data_path.mkpath
         end
         
-        unless @tmp_path.exist?
+        if not @tmp_path.exist?
           @tmp_path.mkpath
         end
         
         # Ignore all files in wallet/tmp.
         tmp_gitignore_path = Pathname.new('.gitignore').expand_path(@tmp_path)
-        unless tmp_gitignore_path.exist?
+        if not tmp_gitignore_path.exist?
           gitignore_file = File.open(tmp_gitignore_path, 'w')
           gitignore_file.write('*')
           gitignore_file.close

data/resources/css/style.css

@@ -0,0 +1,22 @@
+
+/* Style */
+
+html {
+  -webkit-text-size-adjust: none;
+}
+table.list, table.list th, table.list td {
+  border: 1px solid black;
+}
+th.left, td.left {
+  text-align: left;
+}
+th.right, td.right {
+  text-align: right;
+}
+th.first_column {
+  min-width: 180px;
+  width: 180px;
+}
+th.red, td.red {
+  color: #ff0000;
+}

data/resources/gnuplot/total_config.liquid

@@ -0,0 +1,25 @@
+set title 'Total'
+
+set xlabel 'Years'
+set ylabel 'Euro'
+
+set grid
+set key below center horizontal noreverse enhanced autotitle box dashtype solid
+set tics out nomirror
+set border 3 front linetype black linewidth 1.0 dashtype solid
+set xtics 1
+
+set style line 1 linecolor rgb '#00ff00' linewidth 2 linetype 1 pointtype 2
+set style line 2 linecolor rgb '#ff0000' linewidth 2 linetype 1 pointtype 2
+set style line 3 linecolor rgb '#000000' linewidth 2 linetype 1 pointtype 2
+set style line 4 linecolor rgb '#0000ff' linewidth 2 linetype 1 pointtype 2
+set style data linespoints
+
+set terminal png enhanced
+set output '{{ png_file_path }}'
+
+plot sum = 0, \
+  '{{ totaldat_file_path }}' using 1:2 linestyle 1 title 'Revenue', \
+  '' using 1:3 linestyle 2 title 'Expense', \
+  '' using 1:4 linestyle 3 title 'Balance', \
+  '' using 1:5 linestyle 4 title '∑ Balance'

data/resources/gnuplot/year_config.liquid

@@ -0,0 +1,30 @@
+set title 'Year {{ year_s }}'
+set xlabel 'Months'
+set ylabel 'Euro'
+set grid
+set key below center horizontal noreverse enhanced autotitle box dashtype solid
+set tics out nomirror
+set border 3 front linetype black linewidth 1.0 dashtype solid
+
+set timefmt '%Y-%m'
+set xdata time
+set format x '%b'
+set xrange ['{{ year_s }}-01-01':'{{ year_s }}-12-31']
+set xtics '{{ year_s }}-01-01', 2592000, '{{ year_s }}-12-31'
+set autoscale y
+
+set style line 1 linecolor rgb '#00ff00' linewidth 2 linetype 1 pointtype 2
+set style line 2 linecolor rgb '#ff0000' linewidth 2 linetype 1 pointtype 2
+set style line 3 linecolor rgb '#000000' linewidth 2 linetype 1 pointtype 2
+set style line 4 linecolor rgb '#0000ff' linewidth 2 linetype 1 pointtype 2
+set style data linespoints
+
+set terminal png enhanced
+
+set output '{{ output_path }}'
+
+plot sum = 0, \
+    '{{ yeardat_file_path }}' using 1:2 linestyle 1 title 'Revenue', \
+    '' using 1:3 linestyle 2 title 'Expense', \
+    '' using 1:4 linestyle 3 title 'Balance', \
+    '' using 1:5 linestyle 4 title '∑ Balance'

data/resources/views/index.liquid

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+    <title>{{ dir_path }}</title>
+    <link rel="stylesheet" href="style.css" type="text/css" />
+  </head>
+  
+  <body>
+    <h1><a href="./index.html">{{ dir_path }}</a></h1>
+    
+    <p>Generated @ {{ now }} by <a href="{{ app_homepage }}">{{ app_name }}</a> v{{ app_version }}</p>
+    
+    <table class="list">
+      <tr>
+        <th class="left">Year</th>
+        <th class="right">Revenue</th>
+        <th class="right">Expense</th>
+        <th class="right">Balance</th>
+        <th class="right">Balance &#8721;</th>
+      </tr>
+      
+      {% for year in years_total_formatted %}
+        <tr>
+          <td class="left"><a href="year_{{ year['name'] }}.html">{{ year['name'] }}</a></td>
+          <td class="right">{{ year['revenue'] }}</td>
+          <td class="right red">{{ year['expense'] }}</td>
+          <td class="right {{ year['balance_class'] }}">{{ year['balance'] }}</td>
+          <td class="right {{ year['balance_total_class'] }}">{{ year['balance_total'] }}</td>
+        </tr>
+      {% endfor %}
+      
+      <tr>
+        <th class="left"><b>TOTAL</b></th>
+        <th class="right">{{ revenue_total }}</th>
+        <th class="right red">{{ expense_total }}</th>
+        <th class="right {{ balance_total_class }}">{{ balance_total }}</th>
+        <th>&nbsp;</th>
+      </tr>
+    </table>
+    
+    <p><img src="total.png"></p>
+  </body>
+</html>

data/resources/views/month.liquid

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+    <title>{{ month_s }} {{ year_s }} - {{ dir_path }}</title>
+    <link rel="stylesheet" href="style.css" type="text/css" />
+  </head>
+  
+  <body>
+    <h1><a href="./index.html">{{ dir_path }}</a></h1>
+    
+    <p>Generated @ {{ now }} by <a href="{{ app_homepage }}">{{ app_name }}</a> v{{ app_version }} from <code>{{ file_name_s }}</code></p>
+    
+    <h2>Month: {{ month_s }} <a href="{{ year_file_name_s }}">{{ year_s }}</a></h2>
+    
+    <table class="list">
+      <tr>
+        <th class="left">#</th>
+        <th class="left">Date</th>
+        <th class="left first_column">Title</th>
+        <th class="right">Revenue</th>
+        <th class="right">Expense</th>
+        <th class="right">Balance</th>
+        <th class="right">Category</th>
+        <th class="left">Comment</th>
+      </tr>
+      
+      {% for day in days %}
+        <tr>
+          <td valign="top" class="left">{{ day['entry_n'] }}</td>
+          <td valign="top" class="left">{{ day['entry_date_s'] }}</td>
+          <td valign="top" class="left">{{ day['title'] }}</td>
+          <td valign="top" class="right">{{ day['revenue_out'] }}</td>
+          <td valign="top" class="right red">{{ day['expense_out'] }}</td>
+          <td valign="top" class="right {{ day['balance_class'] }}">{{ day['balance'] }}</td>
+          <td valign="top" class="right">{{ day['category_out'] }}</td>
+          <td valign="top" class="left">{{ day['comment_out'] }}</td>
+        </tr>
+      {% endfor %}
+      
+      <tr>
+        <th>&nbsp;</th>
+        <th>&nbsp;</th>
+        <th class="left"><b>TOTAL</b></th>
+        <th class="right">{{ revenue_month }}</th>
+        <th class="right red">{{ expense_month }}</th>
+        <th class="right {{ balance_class }}">{{ balance_month }}</th>
+        <th>&nbsp;</th>
+        <th>&nbsp;</th>
+      </tr>
+    </table>
+    
+  </body>
+</html>

data/resources/views/year.liquid

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+    <title>{{ year_s }} - {{ dir_path }}</title>
+    <link rel="stylesheet" href="style.css" type="text/css" />
+  </head>
+  
+  <body>
+    <h1><a href="./index.html">{{ dir_path }}</a></h1>
+    
+    <p>Generated @ {{ now }} by <a href="{{ app_homepage }}">{{ app_name }}</a> v{{ app_version }}</p>
+    
+    <h2>Year: {{ year_s }}</h2>
+    <table class="list">
+      <tr>
+        <th class="left">Month</th>
+        <th class="right">Revenue</th>
+        <th class="right">Expense</th>
+        <th class="right">Balance</th>
+        <th colspan="{{ categories_available_count }}">{{ categories_available_count }} Categories</th>
+      </tr>
+      <tr>
+        <th colspan="4">&nbsp;</th>
+        
+        {% for category in categories_available %}
+          <th class="right">{{ category }}</th>
+        {% endfor %}
+      </tr>
+      
+      {% for month in months %}
+        <tr>
+          <td class="left"><a href="{{ month['month_file_name_s'] }}">{{ month['month_s'] }}</a></td>
+          <td class="right">{{ month['revenue_month'] }}</td>
+          <td class="right red">{{ month['expense_month'] }}</td>
+          <td class="right {{ month['balance_class'] }}">{{ month['balance_month'] }}</td>
+          
+          {% for category in month['categories'] %}
+            <td class="right {{ category['class'] }}">{{ category['balance'] }}</td>
+          {% endfor %}
+        </tr>
+      {% endfor %}
+      
+      <tr>
+        <th class="left"><b>TOTAL</b></th>
+        <th class="right">{{ revenue_year }}</th>
+        <th class="right red">{{ expense_year }}</th>
+        <th class="right {{ balance_year_class }}">{{ balance_year }}</th>
+        
+        {% for category in categories_available %}
+          <th class="right {{ categories_year_balance_formatted[category]['class'] }}">{{ categories_year_balance_formatted[category]['balance'] }}</th>
+        {% endfor %}
+      </tr>
+    </table>
+    
+    <p><img src="year_{{ year_s }}.png"></p>
+  </body>
+</html>

data/thefox-wallet.gemspec

@@ -21,12 +21,13 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'bin'
   spec.executables   = ['wallet']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>=2.1.0'
+  spec.required_ruby_version = '>=2.2.0'
 
   spec.add_development_dependency 'pry', '~>0.10'
   spec.add_development_dependency 'minitest', '~>5.7'
   spec.add_development_dependency 'simplecov', '~>0.12'
   spec.add_development_dependency 'simplecov-phpunit', '~>1.0'
+  spec.add_development_dependency 'liquid', '~>4.0'
 
   spec.add_runtime_dependency 'uuid', '~>2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-wallet
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,8 @@ files:
 - Gemfile
 - README.md
 - Vagrantfile
-- bin/build_coverage.sh
+- bin/.gitignore
+- bin/coverage.sh
 - bin/dev
 - bin/dev_data.sh
 - bin/dev_setup.sh
@@ -115,6 +130,12 @@ files:
 - lib/wallet/entry.rb
 - lib/wallet/version.rb
 - lib/wallet/wallet.rb
+- resources/css/style.css
+- resources/gnuplot/total_config.liquid
+- resources/gnuplot/year_config.liquid
+- resources/views/index.liquid
+- resources/views/month.liquid
+- resources/views/year.liquid
 - thefox-wallet.gemspec
 - wallet.sublime-project
 homepage: https://github.com/TheFox/wallet
@@ -129,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="