backlog 0.17.1 → 0.17.2

data/History.txt

@@ -1,3 +1,17 @@
+== 0.17.2 2008-01-07
+
+=== Fixes
+
+* Made task listing a bit prettier.
+* Changed to redirect to start page after registering.
+* Made welcome view slightly more welcoming :)
+* Fixed workflow to return from detour after updating backlog properties.
+
+=== Internal
+
+* Updated gem dependencies.
+* Added test of WAR file by running it with Jetty.
+
 == 0.17.1 2008-01-04
 
 === Fixes

data/Rakefile

@@ -1,6 +1,8 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
+require 'erb'
+
 require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 
 require 'rake'
@@ -30,7 +32,7 @@ Hoe.new("backlog", APP::VERSION) do |p|
   }
   p.need_zip = true
   p.url = 'http://rubyforge.org/projects/backlog/'
-  p.extra_deps = [['rails', '>= 1.2.3'], ['gruff', '>= 0.2.8'], ['rmagick', '>= 1.15.10'], ['postgres', '>= 0.7.1']]
+  p.extra_deps = [['rails', '>= 1.2.4'], ['gruff', '>= 0.2.9'], ['rmagick', '>= 1.15.12'], ['postgres', '>= 0.7.9']]
   p.rsync_args = "-av --delete --exclude=wiki*"
 end
 
@@ -45,8 +47,13 @@ end
 
 desc 'Release the application as a Java EE WAR file to RubyForge'
 task :release_war do
+  FileUtils.rm_rf 'WEB-INF' if File.exists? 'WEB-INF'
   Dir.mkdir 'WEB-INF' unless File.exists? 'WEB-INF'
-  FileUtils.cp 'vendor/plugins/goldspike/generators/goldspike/templates/web.xml.erb', 'WEB-INF/web.xml.erb' unless File.exists? 'WEB-INF/web.xml.erb'
+  unless File.exists? 'WEB-INF/web.xml.erb'
+    File.open('WEB-INF/web.xml.erb', 'w') do |f|
+      f << ERB.new(File.read('vendor/plugins/goldspike/generators/goldspike/templates/web.xml.erb')).result
+    end
+  end
   Rake::Task['war:standalone:create'].invoke
   war_pkg_file = "pkg/backlog-#{APP::VERSION}.war"
   if File.exists? 'backlog.war'

data/app/controllers/backlogs_controller.rb

@@ -71,7 +71,7 @@ class BacklogsController < ApplicationController
     @backlog = Backlog.find(params[:id])
     if @backlog.update_attributes(params[:backlog])
       flash[:notice] = 'Backlog was successfully updated.'
-      redirect_to :action => 'show', :id => @backlog
+      back_or_redirect_to :action => :show, :id => @backlog
     else
       render :action => 'edit'
     end

data/app/controllers/user_controller.rb

@@ -134,12 +134,14 @@ class UserController < ApplicationController
       @user.update_attribute( :deleted, true )
       logout
       rescue Exception => ex
-      flash.now[:notice] = "Error: #{@ex}."
+      flash.now[:notice] = "Error: #{ex}."
       redirect_back_or_default :action => 'welcome'
     end
   end
   
   def welcome
+    flash.keep
+    back_or_redirect_to :controller => 'welcome'
   end
   
   def set_group

data/app/views/tasks/_fields_header.rhtml

@@ -1,12 +1,15 @@
   <li>
   	<div style="font-weight: bold">
-    <span style="float: left" />
-    <span style="float: left; width: 2em; text-align: center; padding-left: 2px"><%=active ? 'ID' : l(:resolution_abr)%></span>
-    <span style="float: left"><%=l :task %></span>
-    <span style="float: left"><%=l :start if active && backlog.track_times? %></span>
-    <span style="float: left"/>
-    <span style="float: left"><%=l :done if (active && backlog.track_done?) || work_done %></span>
-    <span style="float: left" width="*"><%=l :todo if active && backlog.track_todo? %></span>
+	    <div style="float: left" />
+    	<div class="task_id"><%=active ? 'ID' : l(:resolution_abr)%></div>
+    	<div class="task_description"><%=l :task %></div>
+		<div style="float: right">
+		   	<div class="task_start"><%=l :start if active && backlog.track_times? %></div>
+    		<div class="task_end_work">&nbsp;</div>
+    		<div class="task_done"><%=l :done if (active && backlog.track_done?) || work_done %></div>
+    		<div class="task_todo"><%=l :todo if active && backlog.track_todo? %></div>
+    		<div class="task_buttons"></div>
+		</div>
 	</div>
 	<br clear="all"/>
   </li>

data/app/views/tasks/_task.rhtml

@@ -7,22 +7,22 @@
       <% end %>
     <% end %>
     </div>
-    <div style="float: left" style="border: 0px">
+    <div style="float: left" style="border: 3px solid red">
       <%=("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
       <%=resolution_image(@task.resolution) if @task.finished_at %>
       <%="-" if @task.children.size > 0 %>
     </div>
-	<div id="task_<%=@task.id%>_id" style="float: left; padding-left: 2px; width: 2em; text-align: center">
+	<div id="task_<%=@task.id%>_id" class="task_id">
    		<%=detour_to "##{@task.id}", :controller => 'tasks', :action => :edit, :id => @task.id, :style => 'border: 0px; margin: 0px; padding: 0px' if @task.position || @task.depth == 0 %>
 	</div>
-	<div id="task_<%=@task.id%>_description" style="float: left; padding: 2px; ">
+	<div id="task_<%=@task.id%>_description" class="task_description">
    		<%=h(@task.description) %>
 	</div>
 
 
 
     <div style="float: right" style="border: 1px solid black">
-    <div style="float: left" style="border: 1px solid black">
+    <div class="task_start">
       <% if active && @task.loggable? -%>
           <% if @task.work_started? -%>
             <% remote_form_for(:work, :url => {:controller => 'works', :action => 'update_time', :id => @task.started_work}) do |f| %>
@@ -35,15 +35,18 @@
           <% end -%>
       <% end -%>
     </div>
-    <div style="float: left" style="border: 1px solid black">
+    <div class="task_end_work">
       <% if active && @task.loggable? && @task.work_started? -%>
         <% form_tag({:controller => 'works', :action => 'update', :id => @task.started_work}) do %>
           <%= image_detour_to('ernes_stop.png', l(:end_work), {:controller => 'tasks', :action => :end_work, :id => @task.id}, nil, true) %>
         <% end -%>
+	  <% else %>
+        &nbsp;
       <% end -%>
     </div>
-    <div style="float: left" style="border: 1px solid black" align="<%=active && @task.loggable? && @task.track_done? ? 'left' : 'right'%>">
-    <% if @task.track_done? || @task.total_done != 0 %>
+    <div class="task_done" align="<%=active && @task.loggable? && @task.track_done? ? 'left' : 'right'%>">
+    &nbsp;
+	<% if @task.track_done? || @task.total_done != 0 %>
       <% if @task.loggable? || @task.finished_at -%>
           <% unless !@task.track_done? || @task.track_times? || @task.work_started? || @task.finished_at -%>
             <% form_tag({:controller => 'works', :action => (@task.work_started? ? :edit : :create), :id => @task.started_work}) do %>
@@ -58,7 +61,7 @@
       <% end -%>
     <% end -%>
     </div>
-    <div style="float: left" style="border: 1px solid black">
+    <div class="task_todo">
       <% if active && @task.loggable? -%>
           <% if @task.track_todo? -%>
             <% if @task.period.nil? || @task.period.active_or_future? -%>
@@ -74,7 +77,7 @@
           <% end -%>
       <% end -%>
     </div>
-    <div style="float: left" align="right" style="border: 1px solid black">
+    <div class="task_buttons">
         <% if @task.active? -%>
           <% if @task.loggable? -%>
             <% unless @task.work_started? -%>

data/app/views/user/welcome.rhtml

@@ -2,9 +2,7 @@
   <%= head_helper 'Welcome', :notice => false, :message => false %>
   <p>You are now logged into the system...</p>
   <p>
-    Since you are here it's safe to assume the application never
-    called store_location, otherwise you would have been redirected
-    somewhere else after a successful login.
+    Welcome to Backlog!
   </p>
-  <%= link_to 'logout', :action => 'logout' %>
+  <%=link_to l(:welcome_link), :controller => 'welcome' %>
 </div>

data/lang/en.yaml

@@ -110,5 +110,6 @@ view_fullscreen: View fullscreen
 wednesday: Wednesday
 week: Week
 weekly_work_sheet: Weekly work sheet
+welcome_link: Start getting things done.
 work: Work
 work_account: Work Account

data/lang/no.yaml

@@ -109,5 +109,6 @@ view_fullscreen: Vis fullskjerm
 wednesday: Onsdag
 week: Uke
 weekly_work_sheet: Timeoversikt for uke
+welcome_link: Få ting gjort.
 work: Arbeid
 work_account: Timeføringskonto

data/lib/class_table_inheritance.rb

@@ -53,7 +53,7 @@ class ActiveRecord::Base
         proxy_class.class_eval(&block) if block_given?
       end
       
-      has_one_without_cti proxy_symbol, :class_name => proxy_class.name, :foreign_key => primary_key_name, :dependent => true
+      has_one_without_cti proxy_symbol, :class_name => proxy_class.name, :foreign_key => primary_key_name, :dependent => :destroy
       
       if options[:save_before_superclass_callbacks] || true
         # We need the after_save filter for this association to run /before/ any other after_save's already registered on a superclass,

data/public/stylesheets/backlog.css

@@ -13,8 +13,16 @@ table.input td {vertical-align: top; margin: 0; border: 0; padding: 0 1px;}
 #maincontent div.btitle img.image-submit {float: right;}
 #maincontent div.btitle h4 {margin-top: 6px;}
 .highlight {background: yellow;}
-.task_list {width: 95%; text-align: left; list-style-type: none}
-.tasks {cursor: move;}
+.task_list {width: 95%; text-align: left; list-style-type: none; padding-left: 0}
+.task_list li {margin-left: 0}
+.tasks {cursor: move}
+.task_id {float: left; padding-left: 2px; width: 3em; text-align: center}
+.task_description {float: left; padding: 1px; width: auto}
+.task_start {float: left; width: 4em; text-align: center}
+.task_end_work {float: left; width: 2em}
+.task_done {float: left; width: 3em}
+.task_todo {float: left; width: 3em; padding: 1px}
+.task_buttons {float: left; width: 5em}
 .dragable-hover {background: yellow; border: 1px solid black;}
 .dropzone-hover {background: yellow; border: 1px solid black;}
 th.hours {text-align: right;}

data/test/functional/user_controller_test.rb

@@ -231,7 +231,8 @@ class UserControllerTest < Test::Unit::TestCase
     @request.cookies['autologin'] = CGI::Cookie.new('autologin', {:value => ['no_password_user'], :expires =>30.days.from_now})
     get :welcome
     assert_logged_in users(:no_password_user)
-    assert_response :ok
+    assert_response :redirect
+    assert_redirected_to :controller => 'welcome'
   end
   
   def test_autologin_with_token
@@ -239,7 +240,8 @@ class UserControllerTest < Test::Unit::TestCase
     @request.cookies['token'] = CGI::Cookie.new('autologin', {:value => ['random_token_string'], :expires =>30.days.from_now})
     get :welcome
     assert_logged_in users(:no_password_user)
-    assert_response :ok
+    assert_response :redirect
+    assert_redirected_to :controller => 'welcome'
   end
   
   def test_autologin_unverified_user_with_token
@@ -248,7 +250,8 @@ class UserControllerTest < Test::Unit::TestCase
     get :welcome
     assert_logged_in users(:no_password_user)
     assert current_user.verified?
-    assert_response :ok
+    assert_response :redirect
+    assert_redirected_to :controller => 'welcome'
   end
   
   private

data/test/performance/common.rb

@@ -0,0 +1,91 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Backlog
+  module Performance
+    module Tests
+      def start_server
+        @port = 4000
+        @factor = 1.0
+        @server_thread = IO.popen("script/server -e test -p #{@port}")
+        Thread.start do
+          loop do
+            lines = @server_thread.readline
+            #puts lines
+          end
+        end
+        sleep 4
+      end
+      
+      def stop_server
+        if @server_thread
+          Process.kill("TERM", @server_thread.pid)
+        end
+      end
+      
+      def start_jetty
+        @port = 8080
+        @context = '/backlog'
+        @factor = 2.0
+        ENV['RAILS_ENV'] = 'test'
+        @jetty_thread = IO.popen("rake war:standalone:run")
+        Thread.start do
+          loop do
+            lines = @jetty_thread.readline
+            puts lines
+          end
+        end
+        sleep 20
+      end
+      
+      def stop_jetty
+        if @jetty_thread
+          Process.kill("TERM", @jetty_thread.pid)
+          Process.kill("KILL", @jetty_thread.pid)
+        end
+      end
+      
+      def test_lots_of_requests
+        runs = 3
+        no_of_threads = 2
+        hits_per_thread = 5
+        
+        duration = with_timing("First") {get_burn_down_chart}
+        first_hit_limit = 12 * @factor
+        assert duration <= first_hit_limit, "Request took #{duration} seconds.  Should be less than #{first_hit_limit} seconds."
+        
+        runs.times do |run_no|
+          duration = with_timing((run_no+1)*no_of_threads*hits_per_thread, no_of_threads*hits_per_thread) do
+            threads = (1..no_of_threads).map do |i| 
+              Thread.new do 
+                hits_per_thread.times {get_burn_down_chart}
+              end
+            end
+            threads.each {|thread| thread.join}
+          end
+          maximum_duration = 6.0 * no_of_threads * hits_per_thread * @factor
+          assert duration <= maximum_duration, "Performance to low.  Expected #{maximum_duration} or less, took #{duration}."
+        end
+      end
+      
+      private
+      
+      def with_timing title = "Time", count = 1
+        start = Time.now
+        yield
+        stop = Time.now
+        duration = stop-start
+        puts "#{title}: #{'%.1f' % duration}s, #{(count/duration).to_i if count}/s"
+        duration
+      end
+      
+      def get_burn_down_chart
+        path = "#{@context}/parties/burn_down_chart/1"
+        Net::HTTP::start('localhost', @port) do |http|
+          response = http.get path
+          assert response.body =~ /^.PNG/, response.body
+        end
+      end
+      
+    end
+  end
+end

data/test/performance/jetty_test.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/common'
+
+class JettyTest < Test::Unit::TestCase
+  include Backlog::Performance::Tests
+  
+  def setup
+    start_jetty
+  end
+  
+  def teardown
+    stop_jetty
+  end
+  
+end

data/test/performance/server_test.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/common'
+
+class ServerTest < Test::Unit::TestCase
+  include Backlog::Performance::Tests
+  
+  PORT = 4000
+  
+  def setup
+    start_server
+  end
+  
+  def teardown
+    stop_server
+  end
+  
+end

data/vendor/plugins/redhillonrails_core/lib/red_hill_consulting/core/active_record/base.rb

@@ -39,7 +39,7 @@ module RedHillConsulting::Core::ActiveRecord
       end
 
       def indexes
-        @indexes ||= connection.indexes(table_name, "#{name} Indexes")
+        @indexes ||= connection.indexes(table_name)
       end
 
       def foreign_keys

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-05 00:00:00 +01:00
+date: 2008-01-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.2.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: gruff
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.8
+        version: 0.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
@@ -37,7 +37,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.15.10
+        version: 1.15.12
     version: 
 - !ruby/object:Gem::Dependency 
   name: postgres
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: 0.7.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -283,8 +283,9 @@ files:
 - test/fixtures/customers.yml
 - test/fixtures/tasks.yml
 - test/performance
-- test/performance/test_threaded.rb
-- test/performance/test.rb
+- test/performance/server_test.rb
+- test/performance/common.rb
+- test/performance/jetty_test.rb
 - LICENSE_LOCALIZATION
 - README_LOCALIZATION
 - History.txt
@@ -627,4 +628,3 @@ specification_version: 2
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 test_files: 
 - test/test_helper.rb
-- test/performance/test_threaded.rb

data/test/performance/test.rb

@@ -1,6 +0,0 @@
-count = 100
-puts "Running #{count} times"
-count.times do 
-  `GET http://localhost:3000/parties/burn_down_chart/1 >/dev/null`
-end
-puts "Finished."

data/test/performance/test_threaded.rb

@@ -1,65 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class BacklogsControllerTest < Test::Unit::TestCase
-  PORT = 4000
-  
-  def setup
-    @server_thread = IO.popen("script/server -e test -p #{PORT}")
-    Thread.start do
-      loop do
-        lines = @server_thread.readline
-        #puts lines
-      end
-    end
-    sleep 4
-  end
-  
-  def teardown
-    if @server_thread
-      Process.kill("TERM", @server_thread.pid)
-    end
-  end
-  
-  def test_lots_of_requests
-    runs = 3
-    no_of_threads = 2
-    hits_per_thread = 5
-    
-    duration = with_timing("First") {get_burn_down_chart}
-    first_hit_limit = 12
-    assert duration <= first_hit_limit, "Request took #{duration} seconds.  Should be less than #{first_hit_limit} seconds."
-    
-    runs.times do |run_no|
-      duration = with_timing((run_no+1)*no_of_threads*hits_per_thread, no_of_threads*hits_per_thread) do
-        threads = (1..no_of_threads).map do |i| 
-          Thread.new do 
-            hits_per_thread.times {get_burn_down_chart}
-          end
-        end
-        threads.each {|thread| thread.join}
-      end
-      maximum_duration = 6.0 * no_of_threads * hits_per_thread
-      assert duration <= maximum_duration, "Performance to low.  Expected #{maximum_duration} or less, took #{duration}."
-    end
-  end
-  
-  private
-  
-  def with_timing title = "Time", count = 1
-    start = Time.now
-    yield
-    stop = Time.now
-    duration = stop-start
-    puts "#{title}: #{'%.1f' % duration}s, #{(count/duration).to_i if count}/s"
-    duration
-  end
-  
-  def get_burn_down_chart
-    path = '/parties/burn_down_chart/1'
-    Net::HTTP::start('localhost', port = PORT) do |http|
-      response = http.get path
-      assert response.body =~ /^.PNG/
-    end
-  end
-  
-end