moneyrail 0.0.2 → 0.1.0

data/HISTORY

@@ -0,0 +1,38 @@
+2009-09-30  Yutaka HARA  <yhara(at)kmc.gr.jp>
+
+  * Released 0.0.3
+
+  * new: show statistics
+
+  * new: showing/hiding tables
+
+  * new: show links to neighbor months
+
+  * new: show day of week
+
+2009-08-20  Yutaka HARA  <yhara(at)kmc.gr.jp>
+
+	* Released 0.0.2
+
+  * fix: item deletion raises an error other than firefox
+
+2009-08-19  Yutaka HARA  <yhara(at)kmc.gr.jp>
+
+	* Released 0.0.1
+
+  * new: delete an item when title and amount are both empty
+
+  * fix: item deletion raises an error
+
+	* fix: fails to update cells whose position > 0
+
+	* new: show logs
+
+2009-08-16  Yutaka HARA  <yhara(at)kmc.gr.jp>
+
+	* Released 0.0.0
+
+
+
+
+

data/Rakefile

@@ -26,7 +26,9 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.homepage = "http://github.com/yhara/#{PROJECT_NAME}"
   gemspec.description = gemspec.summary
   gemspec.authors = ["Yutaka HARA"]
-  gemspec.add_dependency('rails', '= 2.3.3')
-  gemspec.add_dependency('ruby-station-runtime', '>= 0.0.2')
+  gemspec.add_dependency('rails', '= 2.3.4')
+  gemspec.add_dependency('ruby-station-runtime', '>= 0.0.4')
+  gemspec.add_dependency('less')
+  gemspec.add_dependency('sqlite3-ruby')
   gemspec.files.concat Dir["vendor/plugins/**/*"]
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/app/controllers/home_controller.rb

@@ -24,7 +24,7 @@ class HomeController < ApplicationController
   def append_current_month(months)
     current = Time.now.to_date.beginning_of_month
     unless months.include?(current)
-      months.push current
+      months.unshift current
     end
   end
 

data/app/controllers/logs_controller.rb

@@ -1,12 +1,15 @@
 class LogsController < ApplicationController
 
   def view
+    # param
     @mode = params[:mode]
     @year, @month = params[:year].to_i, params[:month].to_i
 
-    first_day = Date.new(@year, @month)
-    @month_range = first_day .. ((first_day >> 1) - 1)
+    # date
+    @current_month = Date.new(@year, @month)
+    @month_range = @current_month .. ((@current_month >> 1) - 1)
 
+    # items
     @accounts = Account.all(:order => "position")
     @categories = Category.hashed
     @cat_all = [

data/app/controllers/stats_controller.rb

@@ -0,0 +1,57 @@
+class StatsController < ApplicationController
+  def show
+    year = params[:year].to_i
+    month = params[:month].to_i
+
+    @month = Date.new(year, month)
+    @month_range = @month .. ((@month >> 1) - 1)
+
+    @categories = Category.hashed.values_at(:expense, :income).flatten(1)
+
+    @stat = make_stats
+  end
+
+  private
+
+  #           Expense            Income
+  #      cat1 cat2 cat3 cat4   cat5 cat6
+  # acc1   99   99   99   0      0    33
+  # acc2   12   34  567   8      9     0
+  # ------------------------------------
+  # sum    
+  def make_stats
+    items = Item.all(:conditions => {:date => @month_range, :type => ["Expense", "Income"]}).group_by(&:category)
+
+    accounts = Account.all(:order => "position")
+
+    rows = accounts.map{|account|
+      make_stat_row(account, items)
+    }
+
+    return rows.push make_sum_row(rows)
+  end
+
+  def make_stat_row(account, items)
+    row = @categories.map{|category|
+      if items[category]
+        items[category].
+          find_all{|item| item.account == account}.
+          map{|item| item.amount}.
+          sum
+      else
+        0
+      end
+    }
+    row.unshift(account.name)
+  end
+
+  def make_sum_row(rows)
+    rows.transpose.map{|cells|
+      if cells.first.class == String
+        ""
+      else
+        cells.sum
+      end
+    }
+  end
+end

data/app/helpers/application_helper.rb

@@ -1,3 +1,41 @@
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
+  def format_date(d)
+    d.strftime("%Y-%m-%d (%a)")
+  end
+
+  def format_month(d)
+    d.strftime("%Y-%m")
+  end
+
+  # (str, date) or (date)
+  def link_to_edit_logs(a, b=nil)
+    str, date = str_and_date(a, b)
+
+    link_to str, edit_logs_path(:year => date.year, :month => date.month)
+  end
+
+  def link_to_show_logs(a, b=nil)
+    str, date = str_and_date(a, b)
+
+    link_to str, show_logs_path(:year => date.year, :month => date.month)
+  end
+
+  def link_to_show_stats(a, b=nil)
+    str, date = str_and_date(a, b)
+
+    link_to str, show_stats_path(:year => date.year, :month => date.month)
+  end
+
+  private
+
+  def str_and_date(a, b)
+    if b 
+      [a, b]
+    else
+      [format_month(a), a]
+    end
+  end
+
+
 end

data/app/helpers/logs_helper.rb

@@ -1,5 +1,13 @@
 module LogsHelper
 
+  def link_to_edit_or_show(str, month)
+    if @mode == :edit
+      link_to_edit_logs str, month
+    else
+      link_to_show_logs str, month
+    end
+  end
+
   def cell(value)
     if @mode == :edit
       "<input type='text' value='#{h value}' />"

data/app/views/home/index.html.erb

@@ -10,6 +10,8 @@
         show_logs_path(:year => m.year, :month => m.month) %>
       <%= link_to "(edit)",
         edit_logs_path(:year => m.year, :month => m.month) %>
+      <%= link_to "stats",
+        show_stats_path(:year => m.year, :month => m.month) %>
     </li>
   <% end %>
 </ul>

data/app/views/logs/view.html.erb

@@ -1,17 +1,27 @@
-<h2><%=h @year %>/<%=h @month %></h2>
-<% unless @mode == :edit %>
-  <%= link_to "(edit)", edit_logs_path(:year => @year, :month => @month) %>
+<h2>
+  <small><%= link_to_edit_or_show("<<", @current_month << 1) %></small>
+  <%= h format_month(@current_month) %>
+  <small><%= link_to_edit_or_show(">>", @current_month >> 1) %></small>
+</h2>
+<% if @mode != :edit %>
+  <%= link_to_edit_logs "(edit)", @current_month %>
 <% end %>
 
-<ul>
+<ul id="account_links">
+  <li>
+    <%= link_to_function "all",
+      "MoneyRail.show_all_accounts();" %>
+  </li>
   <% @accounts.each_with_index do |account, i| %>
-    <li><%= link_to account.name, "#account_#{i}" %></li>
+    <li><%= link_to_function account.name, 
+      "MoneyRail.show_only_account(#{i});" %></li>
   <% end %>
 </ul>
+<br class="clear">
 
 <% @accounts.each_with_index do |account, i| %>
   <%# for each account %>
-  <a name="account_<%=h i%>" />
+  <div id="account_<%=h i%>">
   <h3>
     <%=h account.name %>
     <%= link_to '△', move_up_account_path(account) %>
@@ -64,7 +74,7 @@
           <% case item
              when Date %>
             <td>
-              <%=h item.to_s %>
+              <%=h format_date(item) %>
             </td>
 
           <% when :no_date %>
@@ -86,6 +96,7 @@
       </tr>
     <% end %>
   </table>
+  </div>
 <% end %>
 
 <% javascript_tag do %>
@@ -105,6 +116,8 @@
     <%=h @cat_all.map{|c| c.id.to_s}.join(", ") %>
   ];
 
+  MoneyRail.n_accounts = <%=h @accounts.size %>;
+
   MoneyRail.item_update_path = function(item_id){
     var str = "<%=h update_item_path(9999) %>.json";
     return str.replace(/9999/, item_id);

data/app/views/stats/show.html.erb

@@ -0,0 +1,22 @@
+<h2>Statictics
+  <small><%= link_to_show_stats("<<", @month << 1) %></small>
+  <%= format_month(@month) %>
+  <small><%= link_to_show_stats(">>", @month >> 1) %></small>
+</h2>
+
+<table>
+  <tr>
+    <th>account</th>
+    <% @categories.each do |category| %>
+      <th><%=h category.name %></th>
+    <% end %>
+  </tr>
+
+  <% @stat.each do |row| %>
+    <tr>
+    <% row.each do |cell| %>
+      <td><%=h cell%></td>
+    <% end %>
+    </tr>
+  <% end %>
+</table>

data/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.3' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -38,4 +38,5 @@ Rails::Initializer.run do |config|
   # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
   # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
   # config.i18n.default_locale = :de
-end
+
+end

data/config/routes.rb

@@ -34,6 +34,10 @@ ActionController::Routing::Routes.draw do |map|
   map.edit_logs 'logs/:year/:month/edit',
     :controller => :logs, :action => 'view', :mode => :edit
 
+  # -- statistics
+  map.show_stats 'stats/:year/:month',
+    :controller => :stats, :action => 'show'
+
   # The priority is based upon order of creation: first created -> highest priority.
 
   # Sample of regular route:

data/db/seeds.rb

@@ -0,0 +1,10 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#   
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Major.create(:name => 'Daley', :city => cities.first)
+Account.create(:name => "wallet")
+Category.create(:name => "Sarary", :kind => "Income")
+Category.create(:name => "Foods", :kind => "Expense")

data/main.rb

@@ -2,4 +2,16 @@
 require 'optparse'
 require 'ruby-station'; RubyStation.parse_argv
 
-RubyStation::Helper::Rails.run
+# setup database
+unless File.exist?(RubyStation.data_path("production.sqlite3"))
+  yml_path = File.join(File.dirname(__FILE__), "config/database.yml")
+  conf = YAML.load_file(yml_path)
+  conf["production"]["database"] = RubyStation.data_path("production.sqlite3")
+  File.open(yml_path, "w"){|f| YAML.dump(conf, f) }
+
+  system "rake db:migrate db:seed RAILS_ENV=production"
+end
+
+ARGV.push "--port=#{RubyStation.port}"
+ARGV.push "--environment=production"
+load File.join(File.dirname(__FILE__), 'script/server')

data/moneyrail.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{moneyrail}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yutaka HARA"]
-  s.date = %q{2009-08-20}
+  s.date = %q{2009-11-03}
   s.description = %q{Household account book, written in Rails}
   s.email = %q{yutaka.hara/at/gmail.com}
   s.extra_rdoc_files = [
@@ -15,7 +18,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      ".gitmodules",
-     "Changelog",
+     "HISTORY",
      "README",
      "Rakefile",
      "VERSION",
@@ -25,6 +28,7 @@ Gem::Specification.new do |s|
      "app/controllers/home_controller.rb",
      "app/controllers/items_controller.rb",
      "app/controllers/logs_controller.rb",
+     "app/controllers/stats_controller.rb",
      "app/helpers/accounts_helper.rb",
      "app/helpers/application_helper.rb",
      "app/helpers/categories_helper.rb",
@@ -53,6 +57,7 @@ Gem::Specification.new do |s|
      "app/views/items/show.html.erb",
      "app/views/layouts/application.html.erb",
      "app/views/logs/view.html.erb",
+     "app/views/stats/show.html.erb",
      "config/boot.rb",
      "config/database.yml",
      "config/environment.rb",
@@ -71,6 +76,7 @@ Gem::Specification.new do |s|
      "db/migrate/20090802073601_create_categories.rb",
      "db/migrate/20090804065900_create_items.rb",
      "db/production.sqlite3",
+     "db/seeds.rb",
      "doc/README_FOR_APP",
      "features/step_definitions/webrat_steps.rb",
      "features/support/env.rb",
@@ -157,14 +163,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["= 2.3.3"])
-      s.add_runtime_dependency(%q<ruby-station-runtime>, [">= 0.0.2"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.4"])
+      s.add_runtime_dependency(%q<ruby-station-runtime>, [">= 0.0.4"])
+      s.add_runtime_dependency(%q<less>, [">= 0"])
+      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["= 2.3.3"])
-      s.add_dependency(%q<ruby-station-runtime>, [">= 0.0.2"])
+      s.add_dependency(%q<rails>, ["= 2.3.4"])
+      s.add_dependency(%q<ruby-station-runtime>, [">= 0.0.4"])
+      s.add_dependency(%q<less>, [">= 0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["= 2.3.3"])
-    s.add_dependency(%q<ruby-station-runtime>, [">= 0.0.2"])
+    s.add_dependency(%q<rails>, ["= 2.3.4"])
+    s.add_dependency(%q<ruby-station-runtime>, [">= 0.0.4"])
+    s.add_dependency(%q<less>, [">= 0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end
 end

data/public/javascripts/editor.js

@@ -172,6 +172,20 @@ MoneyRail.on_row_button_clicked = function(e){
   MoneyRail.insert_row(e.target);
 };
 
+MoneyRail.show_all_accounts = function(){
+  MoneyRail.n_accounts.times(function(i){
+    $j("#account_"+i).show();
+  });
+};
+
+MoneyRail.show_only_account = function(k){
+  MoneyRail.n_accounts.times(function(i){
+    $j("#account_"+i)[i==k ? 'show' : 'hide']();
+  });
+};
+
+// main
+
 MoneyRail.register_events = function(){
   // register input updated
   $j.each($j("input"), function(input){

data/public/stylesheets/editor.less

@@ -1,5 +1,18 @@
 @cell_width: 70px;
 
+br.clear{
+  clear: both;
+}
+
+ul#account_links{
+  list-style: none;
+
+  li{
+    float: left;
+    margin-right: 1em;
+  }
+}
+
 table.editor {
   border-collapse: collapse;
 
@@ -19,8 +32,7 @@ table.editor {
   }
 
   th.date {
-    min-width: @cell_width;
-    width: @cell_width;
+    min-width: @cell_width * 2;
   }
 
   th.category {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moneyrail
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Yutaka HARA
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-20 00:00:00 +09:00
+date: 2009-11-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby-station-runtime
@@ -30,7 +30,27 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.2
+        version: 0.0.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: less
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
     version: 
 description: Household account book, written in Rails
 email: yutaka.hara/at/gmail.com
@@ -43,7 +63,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .gitmodules
-- Changelog
+- HISTORY
 - README
 - Rakefile
 - VERSION
@@ -53,6 +73,7 @@ files:
 - app/controllers/home_controller.rb
 - app/controllers/items_controller.rb
 - app/controllers/logs_controller.rb
+- app/controllers/stats_controller.rb
 - app/helpers/accounts_helper.rb
 - app/helpers/application_helper.rb
 - app/helpers/categories_helper.rb
@@ -81,6 +102,7 @@ files:
 - app/views/items/show.html.erb
 - app/views/layouts/application.html.erb
 - app/views/logs/view.html.erb
+- app/views/stats/show.html.erb
 - config/boot.rb
 - config/database.yml
 - config/environment.rb
@@ -99,6 +121,7 @@ files:
 - db/migrate/20090802073601_create_categories.rb
 - db/migrate/20090804065900_create_items.rb
 - db/production.sqlite3
+- db/seeds.rb
 - doc/README_FOR_APP
 - features/step_definitions/webrat_steps.rb
 - features/support/env.rb

data/Changelog

@@ -1,21 +0,0 @@
-2009-08-19  Yutaka HARA  <yhara(at)kmc.gr.jp>
-
-	* Released 0.0.1
-
-  * new: delete an item when title and amount are both empty
-
-  * fix: item deletion raises an error
-
-	* fix: fails to update cells whose position > 0
-
-2009-08-17  Yutaka HARA  <yhara(at)kmc.gr.jp>
-
-	* new: show logs
-
-2009-08-16  Yutaka HARA  <yhara(at)kmc.gr.jp>
-
-	* Released 0.0.0
-
-
-
-