RubyGems - backlog - Versions diffs - 0.21.1 → 0.21.2 - Mend

backlog 0.21.1 → 0.21.2

Files changed (11) hide show

data/History.txt +19 -0
data/app/controllers/application.rb +23 -5
data/app/controllers/application.rb~ +207 -0
data/app/controllers/periods_controller.rb +7 -3
data/app/models/task.rb +4 -6
data/app/models/user.rb +1 -0
data/app/models/work_lock_nagger.rb +7 -5
data/bin/backlog +14 -6
data/etc/backlog.conf +9 -1
data/test/functional/periods_controller_test.rb +54 -23
metadata +4 -3

data/History.txt CHANGED Viewed

@@ -1,3 +1,22 @@
+== 0.21.2 2008-02-08
+=== Features
+* Added ability to override the public application URL in the backlog.conf config file.
+=== Fixes
+* Changed so that End Work -> Start Work operations don't generate overlapping work records by default.
+* Added checking of return code to the 'setup_unix' task so the script fails unless it can successfully
+  change to the postgresql administration user.
+* Added "debug" and "bsd" options to administration script.
+  The "debug" option turns on tracing in the rake scripts.
+  The "bsd" option changes the postgresql admin user from "postgres" to "pgsql".
+* Fixed bug 16427: http://rubyforge.org/tracker/index.php?func=detail&aid=16427&group_id=3829&atid=14750
+  When postponing the first task to a new sprint, the sprint is created and the task is postponed directly.
+  A white screen is displayed during the dialog, but it was the best solution I could find.
+* Fixed the default host/port for Work Lock Nag email from localhost:3000 to read from the local network settings and backlog.conf.
 == 0.21.1 2008-02-04
 === Features

data/app/controllers/application.rb CHANGED Viewed

@@ -71,7 +71,7 @@ class ApplicationController < ActionController::Base
   end
   def rjs_detour_to(options)
-    store_detour(params)
+    store_detour(params, request.post?)
     rjs_redirect_to(options)
   end
@@ -80,7 +80,8 @@ class ApplicationController < ActionController::Base
     render :template => 'redirect', :layout => false
   end
-  def store_detour(options)
+  def store_detour(options, post = false)
+    options[:request_method] = :post if post
     if session[:detours] && session[:detours].last == options
       logger.debug "duplicate detour: #{options}"
       return
@@ -102,7 +103,12 @@ class ApplicationController < ActionController::Base
   def back_or_redirect_to(options)
     if session[:detours]
       detour = pop_detour
-      redirect_to detour
+      post = detour.delete(:request_method) == :post
+      if post
+        redirect_to_post(detour)
+      else
+        redirect_to detour
+      end
     else
       redirect_to options
     end
@@ -143,7 +149,7 @@ class ApplicationController < ActionController::Base
     # TODO (uwe): This does not scale!
     #periods = Period.find(:all).select {|period| period.active_or_future?(true) && period.party.includes?(user)}
     periods = Period.find_active_or_future(true)
     @sidebars = periods.sort_by {|p| p.required_speed}.reverse.map do |period|
       content = '<ul>'
@@ -186,4 +192,16 @@ class ApplicationController < ActionController::Base
       User.find_by_id(user_id) if user_id
     end
-  end
+    def redirect_to_post(options)
+      url = url_for options
+      render :text => <<EOF, :layout => false
+<html>
+  <body onload="document.getElementById('form').submit()">
+    <form id="form" action="#{url}" method="POST">
+    </form>
+  </body>
+</html>
+EOF
+    end
+  end

data/app/controllers/application.rb~ ADDED Viewed

@@ -0,0 +1,207 @@
+class ApplicationController < ActionController::Base
+  include Localization
+  include UserSystem
+  include ApplicationHelper
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::JavaScriptHelper
+  include ActionView::Helpers::PrototypeHelper
+  include ActionView::Helpers::ScriptaculousHelper
+  include UrlForFix
+  layout :determine_layout
+  helper :user
+  before_filter :store_detour_from_params
+  before_filter :authenticate_user
+  before_filter :populate_layout
+  def initialize
+    @application_title = l :backlog
+    @application_description = l :backlog_description
+  end
+  def self.in_place_edit_for(object, attribute, options = {})
+    define_method("set_#{object}_#{attribute}") do
+      @item = object.to_s.camelize.constantize.find(params[:id])
+      @item.update_attribute(attribute, params[:value])
+      render :text => @item.send(attribute).to_s
+    end
+  end
+  private
+  def determine_layout
+    if request.accepts.find {|mt| mt == 'xml'}
+      'wap'
+    else
+      # Firefox
+      #<Mime::Type:0xb79cd374 @synonyms=["application/xhtml+xml"], @string="text/html", @symbol=:html>
+      #<Mime::Type:0xb79cd1e4 @synonyms=["text/xml", "application/x-xml"], @string="application/xml", @symbol=:xml>
+      #<Mime::Type:0xb746d16c @synonyms=[], @string="image/png", @symbol=nil>
+      #<Mime::Type:0xb79cd3ec @synonyms=[], @string="text/plain", @symbol=:text>
+      #<Mime::Type:0xb79cd43c @synonyms=[], @string="*/*", @symbol=:all>
+      # nokia N80
+      #<Mime::Type:0xb79ab374 @synonyms=["application/xhtml+xml"], @string="text/html", @symbol=:html>
+      #<Mime::Type:0xb7308408 @synonyms=[], @string="text/css", @symbol=nil>
+      #<Mime::Type:0xb73082f0 @synonyms=[], @string="text/x-vcard", @symbol=nil>
+      #<Mime::Type:0xb73081ec @synonyms=[], @string="text/x-vcalendar", @symbol=nil>
+      #<Mime::Type:0xb73080d4 @synonyms=[], @string="image/gif", @symbol=nil>
+      #<Mime::Type:0xb7307fd0 @synonyms=[], @string="image/vnd.wap.wbmp", @symbol=nil>
+      #<Mime::Type:0xb79ab43c @synonyms=[], @string="*/*", @symbol=:all>
+      # SonyEricson K810i
+      #<Mime::Type:0xb72509d4 @synonyms=[], @string="multipart/mixed", @symbol=nil>
+      #<Mime::Type:0xb7250934 @synonyms=[], @string="application/vnd.wap.multipart.mixed", @symbol=nil>
+      #<Mime::Type:0xb7250880 @synonyms=[], @string="application/vnd.wap.xhtml+xml", @symbol=nil>
+      #<Mime::Type:0xb79ab374 @synonyms=["application/xhtml+xml"], @string="text/html", @symbol=:html>
+      #<Mime::Type:0xb72507cc @synonyms=[], @string="text/vnd.wap.wml", @symbol=nil>
+      #<Mime::Type:0xb73082f0 @synonyms=[], @string="text/x-vcard", @symbol=nil>
+      #<Mime::Type:0xb73081ec @synonyms=[], @string="text/x-vcalendar", @symbol=nil>
+      #<Mime::Type:0xb73080d4 @synonyms=[], @string="image/gif", @symbol=nil>
+      #<Mime::Type:0xb7307fd0 @synonyms=[], @string="image/vnd.wap.wbmp", @symbol=nil>
+      #<Mime::Type:0xb79ab43c @synonyms=[], @string="*/*", @symbol=:all>
+      'mwrt002'
+    end
+  end
+  def detour_to(options)
+    store_detour(params)
+    redirect_to(options)
+  end
+  def rjs_detour_to(options)
+    store_detour(params, request.post?)
+    rjs_redirect_to(options)
+  end
+  def rjs_redirect_to(options)
+    @options = options
+    render :template => 'redirect', :layout => false
+  end
+  def store_detour(options, post = false)
+    options[:request_method] = :post if post
+    if session[:detours] && session[:detours].last == options
+      logger.debug "duplicate detour: #{options}"
+      return
+    end
+    logger.debug "adding detour: #{options}"
+    session[:detours] ||= []
+    session[:detours] << options
+  end
+  def store_detour_from_params
+    if params[:detour]
+      store_detour(params[:detour])
+    end
+    if params[:return_from_detour] && session[:detours]
+      pop_detour
+    end
+  end
+  def back_or_redirect_to(options)
+    if session[:detours]
+      detour = pop_detour
+      post = detour.delete(:request_method) == :post
+      if post
+        redirect_to_post(detour)
+      else
+        redirect_to detour
+      end
+    else
+      redirect_to options
+    end
+  end
+  def pop_detour
+    detours = session[:detours]
+    return nil unless detours
+    detour = detours.pop
+    logger.debug "popped detour: #{detour.inspect} #{session[:detours].size} more"
+    if detours.empty?
+      session[:detours] = nil
+    end
+    detour
+  end
+  private :pop_detour
+  def populate_shortcuts
+    @shortcuts = [
+    {:key => 'Alt-N',          :function => :new_task,    :options => {:controller => 'tasks', :action => 'new', :period_id => (@period ? @period.id : (@backlog && @backlog.periods.first ? @backlog.periods.first.id : nil))}},
+    {:key => 'Alt-Shift-N',    :function => :new_period, :options => {:controller => 'periods', :action => 'new'}},
+    {:key => 'Alt-Ctrl-N',     :function => :new_backlog, :options => {:controller => 'backlogs', :action => 'new'}},
+    {:key => 'Alt-Ctrl-G',     :function => :new_group, :options => {:controller => 'groups', :action => :new}},
+    {:key => "Alt-#{l :up}",   :function => :up},
+    {:key => "Alt-#{l :down}", :function => :down},
+    {:key => "Alt-Shift-#{l :left}", :function => :move_to_top},
+    {:key => "Alt-Shift-#{l :right}", :function => :move_to_bottom},
+    {:key => 'Alt-X',                 :function => :complete},
+    {:key => 'Alt-Q',                 :function => :reopen},
+    ]
+  end
+  def populate_layout
+    return true if request.path_parameters[:action] =~ /_no_layout$/
+    populate_shortcuts
+    # TODO (uwe): This does not scale!
+    #periods = Period.find(:all).select {|period| period.active_or_future?(true) && period.party.includes?(user)}
+    periods = Period.find_active_or_future(true)
+    @sidebars = periods.sort_by {|p| p.required_speed}.reverse.map do |period|
+      content = '<ul>'
+      period.tasks.select {|task| task.in_list? }[0...5].map do |task|
+        "<li>#{task.description}</li>"
+        end.each do |period_link|
+          content << "#{period_link}"
+        end
+        content << "</ul>\n"
+        content << drop_receiving_element("sidebar_#{period.id}",
+        :url => with_detour({:action => "move_task_to_period", :period_id => period.id, :layout => false}),
+        :accept => "tasks", :loading => "", :complete => "",
+        :hoverclass => 'highlight')
+        { :id => period.id,
+          :title => "#{period.party.name}##{period.position} (#{'%0.1f' % period.required_speed})",
+          :options => {:controller => 'periods', :action => :show, :id => period},
+          :content => content
+        }
+      end
+      started_tasks = Task.find_started
+      if not started_tasks.empty?
+        links = started_tasks.map do |task|
+        "<li><a href=\"#{url_for :controller => 'tasks', :action => :list_started, :id => task.id}\">#{task.description}</a></li>"
+        end
+        @sidebars.unshift({ :title   => l(:started_tasks),
+          :options => {:controller => 'tasks', :action => :list_started},
+          :content => "<ul>#{links}"
+        })
+      end
+    end
+    private
+    def user_id
+      session[:user_id]
+    end
+    def user
+      User.find_by_id(user_id) if user_id
+    end
+    def redirect_to_post(options)
+      url = url_for options
+      render :text => <<EOF, :layout => false
+<html>
+  <body onload="alert('submitting');document.getElementById('form').submit()">
+    <form id="form" action="#{url}" method="POST">
+    </form>
+  </body>
+</html>
+EOF
+    end
+  end

data/app/controllers/periods_controller.rb CHANGED Viewed

@@ -130,12 +130,16 @@ class PeriodsController < ApplicationController
         next_task = @task.higher_item ? @task.higher_item : @task.lower_item ? @task.lower_item : @task
         @task.move_to_period period
         load_tasks(@task.period)
-        render :action => :move_task_to_period, :layout => false
+        if request.xhr?
+          render :action => :move_task_to_period, :layout => false
+        else
+          redirect_to :action => :show, :id => @task.period, :task_id => @task.id, :layout => false
+        end
       else
-        rjs_detour_to :controller => 'periods', :action => :new, :period => {:party_id => @task.period.party_id}, :layout => false
+        rjs_detour_to :action => :new, :period => {:party_id => @task.period.party_id}, :layout => false
       end
     else
-      redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task_id => @task.id, :layout => false
+      redirect_to :action => :show, :id => @task.period, :task_id => @task.id, :layout => false
     end
   end

data/app/models/task.rb CHANGED Viewed

@@ -348,17 +348,15 @@ class Task < ActiveRecord::Base
     new_work.task = self
     new_work.started_at = Time.previous_quarter
-    if works.size > 0
       if current_user
-        last_work = works.select {|work| work.user == current_user}.last
-      end
-      unless last_work
-        last_work = works.select {|work| work.user.nil?}.last
+        last_work = current_user.works.last
+      else
+        last_work = Work.find(:first, :order => 'compeleted_at DESC')
       end
       if last_work && last_work.completed_at > new_work.started_at
         new_work.started_at = last_work.completed_at
       end
-    end
     new_work.user = current_user
     new_work.work_account_id = work_account.id
     new_work.save!

data/app/models/user.rb CHANGED Viewed

@@ -9,6 +9,7 @@ class User < Party
   # even if they follow the defaults since ClassTableInheritanceInRails breaks it.
   has_and_belongs_to_many :groups, :join_table => "groups_users", :foreign_key => "user_id", :association_foreign_key => 'group_id'
   has_and_belongs_to_many :work_lock_subscribers, :class_name => 'User', :join_table => "user_work_lock_subscriptions", :foreign_key => "user_id", :association_foreign_key => 'subscriber_user_id'
+  has_many :works, :foreign_key => :user_id, :order => :completed_at
   has_many :work_locks, :foreign_key => :user_id, :order => :end_on
   attr_accessor :password_needs_confirmation

data/app/models/work_lock_nagger.rb CHANGED Viewed

@@ -1,16 +1,18 @@
 class WorkLockNagger
   include ActionController::UrlWriter
-  puts "Loading class"
   def initialize
-    puts "Worker initialized"
   end
   def nag
-    puts "Nag called"
+    sleep 1.minute
+    puts "Work Lock Nagger started"
     begin
-      url = url_for(:host => 'localhost', :port => 3000, :controller => 'works', :action => :weekly_work_sheet_by_work_account)
+      host = Socket::gethostbyname('localhost')[1][1]
+      config = YAML::load(ERB.new(IO.read(APP_CONFIG_FILE)).result) || {}
+      port = config[:port] || 3000
+      url = url_for(:host => host, :port => port, :controller => 'works', :action => :weekly_work_sheet_by_work_account)
     rescue Exception => e
       puts e.message
       puts e.backtrace

data/bin/backlog CHANGED Viewed

@@ -114,23 +114,31 @@ when 'status'
     exit 3
   end
 when 'setup_unix'
+  puts "Starting setup on #{RUBY_PLATFORM}"
+  bsd = ARGV[1..-1].include? 'bsd'
+  debug = ARGV[1..-1].include? 'debug'
+  pg_admin_user = bsd ? 'pgsql' : 'postgres'
   current_user = `whoami`
-  users = `su - postgres -c "echo '\\du' | psql template1"`
+  users = `su - #{pg_admin_user} -c "echo '\\du' | psql template1"`
+  raise "Could not list users: #{$? >> 8}:#{$? & 0xff}" unless ($? >> 8) == 0
   unless users =~ /root/
     puts users
     createuser_command = `which createuser`.chomp
-    puts `su - postgres -c "#{createuser_command} -dAR #{current_user}"`
+    puts `su - #{pg_admin_user} -c "#{createuser_command} -dAR #{current_user}"`
   end
-  dbs = `su - postgres -c "echo '\\l' | psql template1"`
+  dbs = `su - #{pg_admin_user} -c "echo '\\l' | psql template1"`
   unless dbs =~ /#{APPLICATION}_production/
     puts dbs
     createdb_command = `which createdb`.chomp
-    puts `su - postgres -c "#{createdb_command} #{APPLICATION}_production"`
+    puts `su - #{pg_admin_user} -c "#{createdb_command} #{APPLICATION}_production"`
+    raise "Could not create database: #{$? >> 8}:#{$? & 0xff}" unless ($? >> 8) == 0
   end
+  FileUtils.mkdir_p INSTALL_DIR
   Dir.chdir INSTALL_DIR
   Dir.mkdir LOG_DIR unless File.exists? LOG_DIR
   ENV['RAILS_ENV'] = 'production'
-  puts `rake db:migrate`
+  puts `rake db:migrate #{'--trace' if debug}`
+  raise "Could not migrate database: #{$? >> 8}:#{$? & 0xff}" unless ($? >> 8) == 0
   # TODO:  provide startup information based on launchd in OS X versions >= 10.4
   if File.directory? '/etc/init.d'
@@ -144,7 +152,7 @@ when 'setup_unix'
   `su - -c "chkconfig #{APPLICATION} on"`
   puts
 else
-  puts "Usage: #$0 {start|stop|restart|status|setup_unix}"
+  puts "Usage: #$0 {start|stop|restart|status|setup_unix [bsd] [debug]}"
   exit 1
 end

data/etc/backlog.conf CHANGED Viewed

@@ -1,9 +1,17 @@
+# Uncomment the following line to set the public url for this server.
+# Default url is http://localhost:3000/
+# Examples:
+# app_url: http://localhost:3000/
+# app_url: http://myhost.mydomain/
+# app_url: http://myhost.mydomain/backlog
 # Uncomment the following line to override the network port to listen on.
 # Default port is 3000.
 # port: 3000
-# Uncomment one of the following sections to override the database connection settings.
+# Uncomment _one_ of the following sections to override the database connection settings.
 # database:
 #   adapter: postgresql

data/test/functional/periods_controller_test.rb CHANGED Viewed

@@ -126,15 +126,19 @@ class PeriodsControllerTest < Test::Unit::TestCase
     post :move_task_to_next_period, :id => tasks(:another).id
-    assert_response :success
+    assert_response :redirect
-    after = Task.find(tasks(:another).id)
-    assert_equal tasks(:another).period_id, after.period_id
+    check_move_effects(before, :future)
+  end
+  def test_move_task_to_next_period_xhr
+    before = Task.find(tasks(:another).id)
-    new_task = Task.find_by_period_id_and_previous_task_id(periods(:future).id, before.id)
-    assert_nil new_task.finished_at
-    assert_nil new_task.resolution
-    assert_equal 1, new_task.position
+    xhr :post, :move_task_to_next_period, :id => tasks(:another).id
+    assert_response :success
+    check_move_effects(before, :future)
   end
   def test_move_task_to_next_period_from_past
@@ -143,15 +147,20 @@ class PeriodsControllerTest < Test::Unit::TestCase
     post :move_task_to_next_period, :id => task.id
-    assert_response :success
+    assert_response :redirect
-    after = Task.find(task.id)
-    assert_equal task.period_id, after.period_id
+    check_move_effects(before, :active)
+  end
+  def test_move_task_to_next_period_from_past_xhr
+    task = tasks(:first)
+    before = Task.find(task.id)
-    new_task = Task.find_by_period_id_and_previous_task_id(periods(:active).id, task.id)
-    assert_nil new_task.finished_at
-    assert_nil new_task.resolution
-    assert_equal 1, new_task.position
+    xhr :post, :move_task_to_next_period, :id => task.id
+    assert_response :success
+    check_move_effects(before, :active)
   end
   def test_move_to_next_period_at_end
@@ -175,17 +184,20 @@ class PeriodsControllerTest < Test::Unit::TestCase
     post :move_task_to_next_period, :id => before.id
-    assert_response :success
+    assert_response :redirect
-    after = Task.find(before.id)
-    assert_equal before.period_id, after.period_id
-    assert_equal Task::POSTPONED, after.resolution
-    assert_not_nil after.finished_at
+    check_move_effects(before, :active)
+  end
+  def test_move_to_next_period_from_ancient_xhr
+    before = tasks(:in_ancient)
+    previous_last_id = Task.find(:first, :order => 'id DESC').id
+    xhr :post, :move_task_to_next_period, :id => before.id
+    assert_response :success
-    new = Task.find(:first, :order => 'id DESC', :conditions => "id > #{previous_last_id}")
-    assert_not_nil new
-    assert_equal before.id, new.previous_task_id
-    assert_equal 1, new.position
+    check_move_effects(before, :active)
   end
   def test_move_task_to_period_back_to_earlier_period
@@ -253,4 +265,23 @@ class PeriodsControllerTest < Test::Unit::TestCase
     assert_nil after.resolution
   end
+  private
+  def check_move_effects(before, period_sym)
+    after = Task.find(before.id)
+    assert_equal before.period_id, after.period_id
+    assert_equal Task::POSTPONED, after.resolution
+    assert_not_nil after.finished_at
+    newest_task = Task.find(:first, :order => 'id DESC')
+    new_task = Task.find_by_period_id_and_previous_task_id(periods(period_sym).id, before.id)
+    assert_not_nil newest_task
+    assert_not_nil new_task
+    assert_equal newest_task.id, new_task.id
+    assert_equal before.previous_task_id || before.id, new_task.previous_task_id
+    assert_nil new_task.finished_at
+    assert_nil new_task.resolution
+    assert_equal 1, new_task.position
+  end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backlog
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.2
 platform: ruby
 authors:
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2008-02-05 00:00:00 +01:00
+date: 2008-02-08 00:00:00 +01:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -64,7 +64,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
     version:
 description: Backlog is a tool to help you collect and organize all your tasks, whether you are a single person or a small or large group.  A time keeping module is also included to track time spent on the different tasks.
 email: uwe@kubosch.no
@@ -209,6 +209,7 @@ files:
 - app/controllers/welcome_controller.rb
 - app/controllers/backlogs_controller.rb
 - app/controllers/estimates_controller.rb
+- app/controllers/application.rb~
 - app/controllers/application.rb
 - app/controllers/parties_controller.rb
 - app/controllers/periods_controller.rb