backlog 0.10.2 → 0.10.3

data/History.txt

@@ -1,17 +1,25 @@
-== 0.10.2 2007-09-24
-
-=== Features
-
-=== Fixes
+== 0.10.3 2007-09-24
+
+* Removed "Active Sprint" from Group edit view, when there is no active sprint.
+* Made "Home" link correct when running in application server with JRuby.
+* Made notices and messages a bit prettier and easier to read.
+* Added link to create new group in the "New sprint" view.
+* Fixed link to party from task edit view.  Got broken when reverting from EdgeRails.
+* Changed default database.yml to work in Aptana RadRails.
+* Removed Datek specific info from environment files.
+* Changed to raise mail delivery failures to help user choose valid email address.
+* Changed expiry of login token from 1 day to 1 year to enable cookie login.
+* Fixed indentation for subtasks in task lists.
+* Changed to allow revising estimates for tasks in future sprints.
+* Fixed bug in ordering of subtasks.
+* Fixed bug in task ordering in backlog view.
+
+== 0.10.2 2007-09-23
 
 * Removed version from name of released WAR file to enable easier replacement in Tomcat.
 * Fixed bug when starting work on a task.
 
-== 0.10.1 2007-09-23
-
-=== Features
-
-=== Fixes
+== 0.10.1 2007-09-22
 
 * Fixed bug in "remember me" login when running with JRuby
 * Fixed bug when moving a task to next sprint on mysql
@@ -44,8 +52,6 @@
 
 == 0.9.1 2007-09-09
 
-=== Fixes
-
 * Fixed loading of database config in production environment.
 * Fixed misaligned columns in weekly work sheet when invoicing is disabled.
 * Added "Back" link from Show Backlog view.

data/app/controllers/backlogs_controller.rb

@@ -38,6 +38,11 @@ class BacklogsController < ApplicationController
     @completed_tasks = @backlog.tasks.select {|t| t.finished_at}.sort {|t1, t2| t2.finished_at <=> t1.finished_at}
   end
   
+  def show_no_layout
+    show
+    render :partial => 'tasks'
+  end
+  
   def new
     @backlog = Backlog.new
   end

data/app/controllers/tasks_controller.rb

@@ -78,7 +78,8 @@ class TasksController < ApplicationController
         if @task.period_id != nil
           @task.remove_from_list
           @task.period = nil
-          new_pos = @task.backlog.tasks.count(:conditions => 'period_id IS NULL') + 1
+          new_pos = @task.backlog.tasks.count(:conditions => 'period_id IS NULL AND parent_id IS NULL') + 1
+          params[:task].delete(:period_id)
           params[:task][:position] = new_pos
         end
       end
@@ -162,7 +163,6 @@ class TasksController < ApplicationController
       task.period_id = params[:period_id]
     end
     task.insert_at params[:position]
-    task.save!
     back_or_redirect_to :controller => 'periods', :action => :show_no_layout, :id => task.period, :task => task.id
   end
   

data/app/models/party.rb

@@ -17,7 +17,7 @@ class Party < ActiveRecord::Base
     completed_periods = periods.select {|p| p.end_on < Date.today}
     if last_completed = completed_periods.last
       last_completed.speed
-    elsif active_period = periods.find {|p| p.active?}
+    elsif active_period = periods.to_ary.find {|p| p.active?}
       active_period.speed
     else
       0

data/app/models/task.rb

@@ -15,7 +15,7 @@ class Task < ActiveRecord::Base
   has_many :works, :order => 'completed_at', :dependent => :destroy
   has_many :task_files, :dependent => :destroy
   
-  acts_as_list :scope => '#{period_id ? "period_id = #{period_id}" : parent_id.nil? ? "period_id IS NULL AND backlog_id = #{backlog_id}" : "parent_id = #{parent_id}"} AND finished_at IS NULL'
+  acts_as_list :scope => '#{parent_id ? "parent_id = #{parent_id}" : period_id ? "period_id = #{period_id}" : "period_id IS NULL AND parent_id IS NULL AND backlog_id = #{backlog_id}"} AND finished_at IS NULL'
   acts_as_tree :order => 'position'
   
   validates_presence_of :backlog_id, :if => Proc.new { |task| task.parent_id.nil? }
@@ -30,8 +30,9 @@ class Task < ActiveRecord::Base
   
   #validates_uniqueness_of :description, :scope => :backlog_id, :if => Proc.new {|task| task.backlog_id && task.previous_task_id.nil?}
   validates_uniqueness_of :description, :scope => :period_id, :if => :period_id
+  validates_uniqueness_of :position, :scope => :parent_id, :if => :parent_id, :allow_nil => true
   validates_uniqueness_of :position, :scope => :period_id, :if => :period_id, :allow_nil => true
-  validates_uniqueness_of :position, :scope => [:period_id, :backlog_id], :if => Proc.new {|task| task.period_id.nil?}, :allow_nil => true
+  validates_uniqueness_of :position, :scope => [:period_id, :parent_id, :backlog_id], :if => Proc.new {|task| task.period_id.nil? && task.parent_id.nil?}, :allow_nil => true
   
   def validate
     if self.parent_id && (self.period_id || self.backlog_id)

data/app/models/user.rb

@@ -68,11 +68,15 @@ class User < Party
   end
 
   def token_expired?
-    self.security_token and self.token_expiry and (Clock.now > self.token_expiry)
+    self.security_token.nil? or self.token_expiry.nil? or (Clock.now > self.token_expiry)
+  end
+
+  def token_stale?
+    token_expired? or Clock.now.to_i >= (self.token_expiry.to_i - self.class.token_lifetime / 2)
   end
 
   def generate_security_token
-    if self.security_token.nil? or self.token_expiry.nil? or (Clock.now.to_i + token_lifetime / 2) >= self.token_expiry.to_i
+    if token_stale?
       token = new_security_token
       return token
     else
@@ -86,7 +90,7 @@ class User < Party
     @password_needs_confirmation = true
   end
 
-  def token_lifetime
+  def self.token_lifetime
     UserSystem::CONFIG[:security_token_life_hours] * 60 * 60
   end
 
@@ -119,7 +123,7 @@ class User < Party
   end
 
   def new_security_token
-    expiry = Time.at(Clock.now.to_i + token_lifetime)
+    expiry = Time.at(Clock.now.to_i + self.class.token_lifetime)
     write_attribute('security_token', self.class.hashed(self.salted_password + Clock.now.to_i.to_s + rand.to_s))
     write_attribute('token_expiry', expiry)
 #    update_without_callbacks

data/app/views/groups/edit.rhtml

@@ -45,6 +45,7 @@
 
 </div>
 
+<% if @group.periods.last %>
 <div id="rfeature">
   <div class="btitle">
     <h4><%=l :active %> <%=l :period %></h4>
@@ -52,4 +53,4 @@
 
   <%=link_to image_tag(url_for(:controller => 'parties', :action => :burn_down_chart_thumbnail, :format => 'png', :id => @group.id)), :controller => 'parties', :action => :burn_down_chart, :format => :png, :id => @group%>
 </div>
-
+<% end %>

data/app/views/layouts/_left_top.rhtml

@@ -1,7 +1,7 @@
     <div id="navbar">
       <span style="float: left"><%=link_to "#{l :backlog} #{APP::VERSION}", 'http://rubyforge.org/projects/backlog'%></span>
       <span style="float: left"><form action="<%=url_for :controller => 'search', :action => :results%>"><%=text_field_tag :q, @search || l(:search), :onfocus => "if (value == '#{l(:search)}') value='' "%><%=submit_tag :search, :style => 'display: none'%></form></span>
-      <%= link_to l(:home), '/' %>
+      <%= link_to l(:home), url_for(:controller => 'backlogs') %>
       
       <% if user? %>
       | <%= link_to l(:backlogs), :controller => 'backlogs', :action => :list %>
@@ -13,23 +13,11 @@
       <% if user? %>| <%=link_to user.email, :controller => 'user', :action => :edit%><% end %>
     </div>
     <div id="header">
-      <% if flash[:notice] %>
+      <% if flash[:notice] || flash['notice'] || flash[:message] || flash['message'] %>
       <div id="notice">
         <%=flash[:notice]%>
-	  </div>
-	  <% end %>
-      <% if flash['notice'] %>
-      <div id="notice">
         <%=flash['notice']%>
-	  </div>
-	  <% end %>
-      <% if flash[:notice] %>
-      <div id="message">
         <%=flash[:message]%>
-	  </div>
-	  <% end %>
-      <% if flash['message'] %>
-      <div id="message">
         <%=flash['message']%>
 	  </div>
 	  <% end %>

data/app/views/periods/_form.rhtml

@@ -12,6 +12,7 @@
 <% if @period.party %>
   <%=image_detour_to(@period.party.icon, "#{l(@period.party.to_sym)} #{@period.party.name}", :controller => @period.party.controller, :action => :edit, :id => @period.party) %>
 <% end %>
+<%=detour_to l(:new_group), :controller => 'groups', :action => :new %>
 </p>
 
 <% if @period.party %>

data/app/views/tasks/_form.rhtml

@@ -17,7 +17,7 @@
 <p><label for="task_period_id"><%=l :period%></label><br/>
 <%= select 'task', 'period_id', [['', '']] + @periods.map{|p| [p.name, p.id]}, {},
 		:onchange => remote_function(:update => 'period_link', 
-									 :url => { :controller => 'periods', :action => 'make_link', :id => "'+value+'" }) %>
+									 :url => { :controller => 'periods', :action => 'make_link', :id => "'+value+'", :escape => false }) %>
 <span id="period_link">
 	<%=render :partial => '/periods/link', :locals => {:period => @task.period}%>
 </span>

data/app/views/tasks/_task.rhtml

@@ -8,8 +8,8 @@
     <% end %>
     </td>
     <td align="left" valign="top" width="1" nowrap="true">
-      <%=detour_to @task.position.to_s, :controller => 'tasks', :action => :edit, :id => @task.id if @task.position || @task.depth == 0 %>
       <%= ("&nbsp;" * @task.depth * 4) if @task.depth > 0 %>
+      <%=detour_to @task.position.to_s, :controller => 'tasks', :action => :edit, :id => @task.id if @task.position || @task.depth == 0 %>
       <%= resolution_image(@task.resolution) if @task.finished_at %>
       <%= "-" if @task.children.size > 0 %>
     </td>
@@ -63,7 +63,7 @@
         <% form_tag({:controller => 'estimates', :action => 'create', :id => @task}) do %>
           <%= submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
           <% if @task.track_todo? %>
-            <% if @task.period.nil? || @task.period.active? %>
+            <% if @task.period.nil? || @task.period.active_or_future? %>
               <%= text_field 'estimate', 'todo', :tabindex => i+2, :id => "#{@task.id}_todo", :value => @task.todo, :class => :task_hours, :maxlength => 4, :onkeypress => "handleEvent(this, event, #{@task.id})" %>
             <% else %>
               <%= @task.todo %>
@@ -92,8 +92,8 @@
   </tr>
 
 <% if active && (@task.period.nil? || @task.period.active_or_future?) %>
-<%= draggable_element "task_#{@task.id}", :revert => true %>
-<%= drop_receiving_element "task_#{@task.id}",
+<%=draggable_element "task_#{@task.id}" %>
+<%=drop_receiving_element "task_#{@task.id}",
       :update => update, :url => with_detour({:controller => 'tasks', :action => "move_to", :period_id => @task.period_id, :position => @task.position, :layout => false}),
       :accept => "tasks",
       :loading => "",
@@ -103,6 +103,6 @@
 <% end %>
 
   <% for subtask in task.children %>
-    <%=render :partial => '/tasks/task', :locals => { :task => subtask, :i => i, :active => active } if (active && subtask.active?) || (!active && subtask.completed?) %>
+    <%=render :partial => '/tasks/task', :locals => { :task => subtask, :i => i, :active => active, :highlight_task => subtask == @selected_task, :update => update } if (active && subtask.active?) || (!active && subtask.completed?) %>
     <% i += 1 %>
   <% end %>

data/config/database.yml

@@ -1,44 +1,44 @@
 development:
-<% if RUBY_PLATFORM =~ /java/ %>
+#<% if RUBY_PLATFORM =~ /java/ %>
   adapter: jdbc
   driver: org.postgresql.Driver
   url: jdbc:postgresql://localhost:5432/backlog_development
   database: backlog_development
   username: root
   host: localhost
-<% else %>
+#<% else %>
   adapter: postgresql
   database: backlog_development
   username: root
   host: localhost
-<% end %>
+#<% end %>
 
 # Warning: The database defined as 'test' will be erased and
 # re-generated from your development database when you run 'rake'.
 # Do not set this db to the same as development or production.
 test:
-<% if RUBY_PLATFORM =~ /java/ %>
+#<% if RUBY_PLATFORM =~ /java/ %>
   adapter: jdbc
   driver: org.postgresql.Driver
   url: jdbc:postgresql://localhost:5432/backlog_test
   database: backlog_test
   username: root
   host: localhost
-<% else %>
+#<% else %>
   adapter: postgresql
   database: backlog_test
-<% end %>
+#<% end %>
 
 production:
-<% if RUBY_PLATFORM =~ /java/ %>
+#<% if RUBY_PLATFORM =~ /java/ %>
   adapter: jdbc
   driver: org.postgresql.Driver
   url: jdbc:postgresql://localhost:5432/backlog_production
   username: root
   host: localhost
-<% else %>
+#<% else %>
   adapter: postgresql
   database: backlog_production
   username: root
   host: localhost
-<% end %>
+#<% end %>

data/config/environments/development.rb

@@ -18,9 +18,10 @@ config.action_view.debug_rjs                         = true
 config.action_mailer.raise_delivery_errors = true
 
 ActionMailer::Base.delivery_method = :sendmail
+
 #ActionMailer::Base.delivery_method = :smtp
-#
 #ActionMailer::Base.smtp_settings = {
-#  :address => "mail.datek.no",
-#  :port => 25
+#  :address => "localhost",
+#  :port => 25,
+#  :domain => 'localdomain'
 #}

data/config/environments/production.rb

@@ -15,6 +15,15 @@ config.action_controller.perform_caching             = true
 # config.action_controller.asset_host                  = "http://assets.example.com"
 
 # Disable delivery errors if you bad email addresses should just be ignored
-config.action_mailer.raise_delivery_errors = false
+config.action_mailer.raise_delivery_errors = true
 
+puts "Using sendmail to send mail"
 ActionMailer::Base.delivery_method = :sendmail
+
+#puts "Using sendmail to send mail"
+#ActionMailer::Base.delivery_method = :smtp
+#ActionMailer::Base.smtp_settings = {
+#  :address => "localhost",
+#  :port => 25,
+#  :domain => 'localdomain'
+#}

data/config/environments/user_environment.rb

@@ -1,13 +1,13 @@
 module UserSystem
   CONFIG = {
     # Source address for user emails
-    :email_from => 'backlog@datek.no',
+    :email_from => 'backlog@backlog.rubyforge.org',
 
     # Destination email for system errors
-    :admin_email => 'uwe@datek.no',
+    :admin_email => 'backlog@backlog.rubyforge.org',
 
     # Sent in emails to users
-    :app_url => 'http://sandra:3000/',
+    :app_url => 'http://backlog.rubyforge.org/',
 
     # Sent in emails to users
     :app_name => 'Backlog',
@@ -16,6 +16,6 @@ module UserSystem
     :mail_charset => 'utf-8',
 
     # Security token lifetime in hours
-    :security_token_life_hours => 24,
+    :security_token_life_hours => 24 * 365,
   }
 end

data/lib/url_for_fix.rb

@@ -1,14 +1,16 @@
 module UrlForFix
   # TODO (uwe): Can be removed when using EdgeRails of Rails >= 1.3
   def url_for(org_options = {}, *parameters_for_method_reference)
-    return super(org_options, *parameters_for_method_reference) if org_options.is_a? String
+    return super(org_options, *parameters_for_method_reference) if org_options.nil? || org_options.is_a?(String)
     new_options = {}
     org_options.each do |param, value|
       add_option(new_options, param, value)
     end
-    super new_options, *parameters_for_method_reference
+    url = super new_options, *parameters_for_method_reference
+    url = CGI::unescape(url) if url && org_options[:escape] == false
+    url
   end
-
+  
   # Used with AplicationHelper::url_for
   def add_option(options, param, value)
     case value

data/test/fixtures/tasks.yml

@@ -1,65 +1,71 @@
-first:
-  id: 1
-  created_at: 2007-06-11
-  backlog_id: 1
-  period_id: 2
-  description: first task
-  position: 1
-another:
-  id: 2
-  created_at: 2007-06-12
-  backlog_id: 1
-  period_id: 3
-  description: second task
-  position: 1
-postponed:
-  id: 3
-  created_at: 2007-06-12
-  backlog_id: 1
-  period_id: 3
-  description: postponed task
-  finished_at: 2007-08-02 14:15:42
-  resolution: POSTPONED
-started:
-  id: 4
-  created_at: 2007-08-02 14:15:42
-  backlog_id: 2
-  period_id: 3
-  description: third task
-  position: 2
-in_last_period:
-  id: 5
-  created_at: 2007-08-02 14:15:42
-  backlog_id: 1
-  period_id: 4
-  description: task in last period
-  initial_estimate: 1.0
-  position: 1
-  previous_task_id: 3
-not_planned:
-  id: 6
-  created_at: 2007-08-02 14:15:42
-  backlog_id: 1
-  description: unplanned task
-  position: 1
-supertask:
-  id: 7
-  created_at: 2007-06-12
-  backlog_id: 1
-  period_id: 3
-  description: super task
-  position: 3
-subtask:
-  id: 8
-  created_at: 2007-06-12
-  parent_id: 7
-  description: sub task
-  position: 1
-in_ancient:
-  id: 9
-  created_at: 2007-06-03
-  backlog_id: 1
-  period_id: 1
-  description: ancient task
-  position: 1
-  
+--- !omap
+- first:
+    id: 1
+    created_at: 2007-06-11
+    backlog_id: 1
+    period_id: 2
+    description: first task
+    position: 1
+- another:
+    id: 2
+    created_at: 2007-06-12
+    backlog_id: 1
+    period_id: 3
+    description: second task
+    position: 1
+- postponed:
+    id: 3
+    created_at: 2007-06-12
+    backlog_id: 1
+    period_id: 3
+    description: postponed task
+    finished_at: 2007-08-02 14:15:42
+    resolution: POSTPONED
+- started:
+    id: 4
+    created_at: 2007-08-02 14:15:42
+    backlog_id: 2
+    period_id: 3
+    description: third task
+    position: 2
+- in_last_period:
+    id: 5
+    created_at: 2007-08-02 14:15:42
+    backlog_id: 1
+    period_id: 4
+    description: task in last period
+    initial_estimate: 1.0
+    position: 1
+    previous_task_id: 3
+- not_planned:
+    id: 6
+    created_at: 2007-08-02 14:15:42
+    backlog_id: 1
+    description: unplanned task
+    position: 1
+- supertask:
+    id: 7
+    created_at: 2007-06-12
+    backlog_id: 1
+    period_id: 3
+    description: super task
+    position: 3
+- subtask:
+    id: 8
+    created_at: 2007-06-12
+    parent_id: 7
+    description: sub task
+    position: 1
+- in_ancient:
+    id: 9
+    created_at: 2007-06-03
+    backlog_id: 1
+    period_id: 1
+    description: ancient task
+    position: 1
+- subsubtask_2:
+    id: 10
+    created_at: 2007-06-12
+    parent_id: 8
+    description: sub sub task
+    position: 1

data/test/fixtures/users.yml

@@ -46,7 +46,7 @@ unverified_user:
   email: unverified_user@example.com
   verified: false
   security_token: random_token_string
-  token_expiry: <%= (Clock.now + 1.day) %> # for mysql, add .strftime("%y-%m-%d %H:%M:%S")
+  token_expiry: <%= (Clock.now + User.token_lifetime) %> # for mysql, add .strftime("%y-%m-%d %H:%M:%S")
   deleted: false
 
 no_password_user:

data/test/functional/tasks_controller_test.rb

@@ -12,6 +12,7 @@ class TasksControllerTest < Test::Unit::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     @request.session[:user_id] = 1000001
+    assert_sequences
   end
   
   def teardown

data/test/functional/user_controller_test.rb

@@ -109,7 +109,7 @@ class UserControllerTest < Test::Unit::TestCase
   
   def test_welcome__fails_if_expired_token
     user = users(:unverified_user)
-    Clock.advance_by_days 2 # now past verification deadline
+    Clock.time = Clock.now + User.token_lifetime + 1 # now past verification deadline
     get :welcome, :user=> { :id => user.id }, :key => user.security_token
     user.reload
     assert !user.verified

data/test/test_helper.rb

@@ -46,7 +46,7 @@ class Test::Unit::TestCase
     
     Period.find(:all).each do |p|
       p.open_tasks.each_with_index do |t, i|
-        assert_equal i+1, t.position
+        assert_equal i+1, t.position, "Open tasks for period #{p.id} are not in sequence:\n#{p.open_tasks.map{|t|[t.id, t.position]}.inspect}\nTask #{t.id} position does not match."
       end
     end
   end

data/test/unit/user_test.rb

@@ -17,7 +17,7 @@ class UserTest < Test::Unit::TestCase
   
   def test_authenticate_by_token__fails_if_expired
     user = users(:unverified_user)
-    Clock.time = Clock.now + 2.days
+    Clock.time = Clock.now + User.token_lifetime + 1.days
     assert_nil User.authenticate_by_token(user.id, user.security_token)
   end
   
@@ -46,18 +46,18 @@ class UserTest < Test::Unit::TestCase
     assert_not_nil token
     user.reload
     assert_equal token, user.security_token
-    assert_equal((Clock.now + user.token_lifetime).to_i, user.token_expiry.to_i)
+    assert_equal((Clock.now + User.token_lifetime).to_i, user.token_expiry.to_i)
   end
   
   def test_generate_security_token__reuses_token_when_not_stale
     user = users(:unverified_user)
-    Clock.time = Clock.now + user.token_lifetime/2 - 1
+    Clock.time = Clock.now + User.token_lifetime/2 - 1
     assert_equal user.security_token, user.generate_security_token 
   end
   
   def test_generate_security_token__generates_new_token_when_getting_stale
     user = users(:unverified_user)
-    Clock.time = Clock.now + user.token_lifetime/2
+    Clock.time = Clock.now + User.token_lifetime/2
     assert_not_equal user.security_token, user.generate_security_token 
   end
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
-date: 2007-09-23 00:00:00 +02:00
+  version: 0.10.3
+date: 2007-09-24 00:00:00 +02:00
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.
 require_paths: 
 - lib