moneyrail 0.1.4 → 0.1.5

data/Rakefile

@@ -26,7 +26,7 @@ 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.4')
+  gemspec.add_dependency('rails', '= 2.3.5')
   gemspec.add_dependency('ruby-station-runtime', '>= 0.0.4')
   gemspec.add_dependency('less')
   gemspec.add_dependency('sqlite3-ruby')

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/app/controllers/home_controller.rb

@@ -1,9 +1,11 @@
 class HomeController < ApplicationController
 
   def index
-    @months = []
-    collect_months(@months)
-    append_current_month(@months)
+    months = []
+    collect_months(months)
+    append_current_month(months)
+
+    @months = months.group_by(&:year)
   end
 
   private

data/app/controllers/stats_controller.rb

@@ -1,56 +1,104 @@
 class StatsController < ApplicationController
-  def show
+
+  def month
+    @mode = :month
+
     year = params[:year].to_i
     month = params[:month].to_i
-
     @month = Date.new(year, month)
-    @month_range = @month .. ((@month >> 1) - 1)
+    @stat = make_month_stats(@month)
 
-    @categories = Category.hashed.values_at(:expense, :income).flatten(1)
+    render :show
+  end
+
+  def year
+    @mode = :year
+
+    year = params[:year].to_i
+    @year = Date.new(year)
+    months = (0...12).map{|i| @year >> i}
+    @stat = make_year_stats(months)
 
-    @stat = make_stats
+    render :show
+  end
+
+  def recent
+    @mode = :recent
+
+    now = DateTime.now.beginning_of_month
+    months = (0...12).map{|i| now << i}.reverse
+    @stat = make_year_stats(months)
+
+    render :show
   end
 
   private
 
-  #           Expense            Income
-  #      cat1 cat2 cat3 cat4   cat5 cat6
-  # acc1   99   99   99   0      0    33
-  # acc2   12   34  567   8      9     0
+  def month_range(month)
+    month.beginning_of_month .. month.end_of_month
+  end
+
+  #  -        Expense                Income
+  #  -   cat1 cat2 cat3 cat4 sum  cat5 cat6 sum
+  # acc1   99   99   99   0   x     0    33   y
+  # acc2   12   34  567   8   x     9     0   y
   # ------------------------------------
   # sum    
-  def make_stats
-    items = Item.all(:conditions => {:date => @month_range, :type => ["Expense", "Income"]}).group_by(&:category)
+  def make_month_stats(month)
+    rows = Account.all(:order => "position").map{|account|
+      items = Item.all(:conditions => {
+        :account_id => account.id,
+        :date => month_range(month), 
+        :type => ["Expense", "Income"]
+      }).group_by(&:category)
 
-    accounts = Account.all(:order => "position")
+      make_row(account.name, items)
+    }
+
+    return rows.push make_sum_row(rows)
+  end
+
+  #   -       Expense            Income
+  # month    cat1 cat2 cat3 cat4   cat5 cat6
+  # 200901   99   99   99   0      0    33
+  # 200902   12   34  567   8      9     0
+  # ------------------------------------
+  # sum    
+  def make_year_stats(months)
+    rows = months.map{|month|
+      items = Item.all(:conditions => {
+        :date => month_range(month),
+        :type => ["Expense", "Income"]
+      }).group_by(&:category)
 
-    rows = accounts.map{|account|
-      make_stat_row(account, items)
+      make_row(month, 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
+  def make_row(header, items)
+    expenses = Category.expenses.map{|category|
+      (items[category] || []).map(&:amount).sum
+    }
+    incomes = Category.incomes.map{|category|
+      (items[category] || []).map(&:amount).sum
     }
-    row.unshift(account.name)
+
+    [header] + 
+    expenses +
+    [expenses.sum] +
+    incomes +
+    [incomes.sum] + 
+    [incomes.sum - expenses.sum]
   end
 
   def make_sum_row(rows)
     rows.transpose.map{|cells|
-      if cells.first.class == String
-        ""
-      else
+      if cells.first.is_a? Numeric
         cells.sum
+      else
+        "sum"
       end
     }
   end

data/app/helpers/application_helper.rb

@@ -8,6 +8,10 @@ module ApplicationHelper
     d.strftime("%Y-%m")
   end
 
+  def format_year(d)
+    d.strftime("%Y")
+  end
+
   # (str, date) or (date)
   def link_to_edit_logs(a, b=nil)
     str, date = str_and_date(a, b)
@@ -21,10 +25,16 @@ module ApplicationHelper
     link_to str, show_logs_path(:year => date.year, :month => date.month)
   end
 
-  def link_to_show_stats(a, b=nil)
+  def link_to_show_month_stats(a, b=nil)
     str, date = str_and_date(a, b)
 
-    link_to str, show_stats_path(:year => date.year, :month => date.month)
+    link_to str, show_month_stats_path(:year => date.year, :month => date.month)
+  end
+
+  def link_to_show_year_stats(a, b=nil)
+    str, date = b ? [a, b] : [format_year(a), a]
+
+    link_to str, show_year_stats_path(:year => date.year)
   end
 
   private

data/app/models/category.rb

@@ -21,4 +21,12 @@ class Category < ActiveRecord::Base
     }
   end
 
+  def self.incomes
+    self.all(:conditions => {:kind => "Income"})
+  end
+
+  def self.expenses
+    self.all(:conditions => {:kind => "Expense"})
+  end
+
 end

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

@@ -3,15 +3,22 @@
   <li><%= link_to 'Categories', categories_path %></li>
   <li><%= link_to 'Items', items_path %></li>
 </ul>
+
+<h2>Logs</h2>
+<%= link_to 'Recent stats', show_recent_stats_path %>
+
+<% @months.each do |year, months| %>
+<h3><%= link_to_show_year_stats(Date.new(year)) %></h3>
 <ul>
-  <% @months.each do |m| %>
+  <% months.each do |m| %>
     <li>
       <%= link_to "Logs: #{m.year}-#{m.month}",
         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) %>
+        show_month_stats_path(:year => m.year, :month => m.month) %>
     </li>
   <% end %>
 </ul>
+<% end %>

data/app/views/layouts/application.html.erb

@@ -7,7 +7,9 @@
 
   <%= stylesheet_link_tag 'scaffold' %>
 
-  <% if controller.controller_name == "logs" %>
+  <% case controller.controller_name
+     when "logs" %>
+
     <title>MoneyRail : Logs: <%=h @year %>/<%=h @month %></title>
     <%= stylesheet_link_tag 'editor' %>
 
@@ -17,6 +19,10 @@
       <%= javascript_include_tag 'jquery' %>
       <%= javascript_include_tag 'editor' %>
     <% end %>
+
+  <% when "stats" %>
+    <%= stylesheet_link_tag 'stats' %>
+
   <% else %>
     <title>MoneyRail :
       <%=h controller.controller_name.camelcase %>:

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

@@ -1,21 +1,48 @@
 <h2>Statictics
-  <small><%= link_to_show_stats("<<", @month << 1) %></small>
-  <%= format_month(@month) %>
-  <small><%= link_to_show_stats(">>", @month >> 1) %></small>
+  <% case @mode ; when :year %>
+    <small><%= link_to_show_year_stats("<<", @year-365) %></small>
+    <%= format_year(@year) %>
+    <small><%= link_to_show_year_stats(">>", @year+365) %></small>
+  <% when :month %>
+    <small><%= link_to_show_month_stats("<<", @month << 1) %></small>
+    <%= format_month(@month) %>
+    <small><%= link_to_show_month_stats(">>", @month >> 1) %></small>
+  <% when :recent %>
+    (recent 12 months)
+  <% end %>
 </h2>
 
-<table>
+<table class="stats">
+  <%# row 1: Expense and Income %>
+  <tr>
+    <th rowspan="2"></th>
+    <th colspan="<%= Category.expenses.size + 1 %>">Expense</th>
+    <th colspan="<%= Category.incomes.size  + 1 %>">Income</th>
+    <th rowspan="2">sum</th>
+  </tr>
+
+  <%# row 2: Categories %>
   <tr>
-    <th>account</th>
-    <% @categories.each do |category| %>
+    <% Category.expenses.each do |category| %>
+      <th><%=h category.name %></th>
+    <% end %>
+      <th>sum</th>
+    <% Category.incomes.each do |category| %>
       <th><%=h category.name %></th>
     <% end %>
+      <th>sum</th>
   </tr>
 
+  <%# row 3-: stat %>
   <% @stat.each do |row| %>
     <tr>
-    <% row.each do |cell| %>
-      <td><%=h cell%></td>
+    <% row.each do |item| %>
+      <% case item 
+         when Date %>
+        <td><%= link_to_show_month_stats(item) %></td>
+      <% else %>
+        <td><%=h item %></td>
+      <% end %>
     <% end %>
     </tr>
   <% end %>

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.4' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/config/routes.rb

@@ -35,8 +35,12 @@ ActionController::Routing::Routes.draw do |map|
     :controller => :logs, :action => 'view', :mode => :edit
 
   # -- statistics
-  map.show_stats 'stats/:year/:month',
-    :controller => :stats, :action => 'show'
+  map.show_recent_stats 'stats/recent',
+    :controller => :stats, :action => 'recent'
+  map.show_month_stats 'stats/:year/:month',
+    :controller => :stats, :action => 'month'
+  map.show_year_stats 'stats/:year',
+    :controller => :stats, :action => 'year'
 
   # The priority is based upon order of creation: first created -> highest priority.
 

data/moneyrail.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{moneyrail}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yutaka HARA"]
-  s.date = %q{2009-12-06}
+  s.date = %q{2010-02-09}
   s.description = %q{Household account book, written in Rails}
   s.email = %q{yutaka.hara/at/gmail.com}
   s.extra_rdoc_files = [
@@ -102,6 +102,7 @@ Gem::Specification.new do |s|
      "public/robots.txt",
      "public/stylesheets/editor.less",
      "public/stylesheets/scaffold.css",
+     "public/stylesheets/stats.less",
      "script/about",
      "script/autospec",
      "script/console",
@@ -156,7 +157,10 @@ Gem::Specification.new do |s|
      "spec/models/category_spec.rb",
      "spec/models/income_spec.rb",
      "spec/models/item_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "test/functional/notes_controller_test.rb",
+     "test/unit/helpers/notes_helper_test.rb",
+     "test/unit/note_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -164,18 +168,18 @@ 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.4"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.5"])
       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.4"])
+      s.add_dependency(%q<rails>, ["= 2.3.5"])
       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.4"])
+    s.add_dependency(%q<rails>, ["= 2.3.5"])
     s.add_dependency(%q<ruby-station-runtime>, [">= 0.0.4"])
     s.add_dependency(%q<less>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])

data/public/stylesheets/stats.less

@@ -0,0 +1,13 @@
+table.stats {
+  border-collapse: collapse;
+
+  td, th {
+    border: 1px solid black;
+    padding: 0.2em;
+  }
+
+  td {
+    text-align: right;
+  }
+
+}

data/test/functional/notes_controller_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class NotesControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:notes)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create note" do
+    assert_difference('Note.count') do
+      post :create, :note => { }
+    end
+
+    assert_redirected_to note_path(assigns(:note))
+  end
+
+  test "should show note" do
+    get :show, :id => notes(:one).to_param
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, :id => notes(:one).to_param
+    assert_response :success
+  end
+
+  test "should update note" do
+    put :update, :id => notes(:one).to_param, :note => { }
+    assert_redirected_to note_path(assigns(:note))
+  end
+
+  test "should destroy note" do
+    assert_difference('Note.count', -1) do
+      delete :destroy, :id => notes(:one).to_param
+    end
+
+    assert_redirected_to notes_path
+  end
+end

data/test/unit/helpers/notes_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class NotesHelperTest < ActionView::TestCase
+end

data/test/unit/note_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class NoteTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moneyrail
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Yutaka HARA
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-06 00:00:00 +09:00
+date: 2010-02-09 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.4
+        version: 2.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby-station-runtime
@@ -147,6 +147,7 @@ files:
 - public/robots.txt
 - public/stylesheets/editor.less
 - public/stylesheets/scaffold.css
+- public/stylesheets/stats.less
 - script/about
 - script/autospec
 - script/console
@@ -224,3 +225,6 @@ test_files:
 - spec/models/income_spec.rb
 - spec/models/item_spec.rb
 - spec/spec_helper.rb
+- test/functional/notes_controller_test.rb
+- test/unit/helpers/notes_helper_test.rb
+- test/unit/note_test.rb