backlog 0.36.2 → 0.37.1

data/Gemfile

@@ -1,19 +1,31 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 2.3.8"
+gem "rails", "~> 3.0.0"
 gem 'slave'
 gem 'mechanize'
 gem 'hpricot'
 gem 'simple_workflow'
+gem 'redhillonrails_core'
+gem 'automatic_foreign_key'
 
-if RUBY_PLATFORM =~ /java/
+platforms :jruby do
   gem 'jruby-openssl'
   gem 'activerecord-jdbc-adapter'
   gem 'activerecord-jdbcpostgresql-adapter'
-else
-  gem 'pg'
+end
+
+platforms :ruby do
+  gem 'postgres-pr'
 end
 
 group :deployment do
   gem 'hoe'
 end
+
+group :development do
+  gem "wirble"
+  gem "hirb"
+  gem "awesome_print"
+  gem 'firewatir'
+  gem 'rcov'
+end

data/Gemfile.lock

@@ -0,0 +1,130 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activerecord-jdbc-adapter (1.0.3-java)
+    activerecord-jdbcpostgresql-adapter (1.0.3-java)
+      activerecord-jdbc-adapter (= 1.0.3)
+      jdbc-postgres (~> 8.4.0)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    automatic_foreign_key (1.1.6)
+      activerecord (>= 2.2)
+      redhillonrails_core (>= 1.0.4.1)
+    awesome_print (0.3.1)
+    bouncy-castle-java (1.5.0145.2)
+    builder (2.1.2)
+    commonwatir (1.6.5)
+      user-choices
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    firewatir (1.6.5)
+      activesupport
+      commonwatir (= 1.6.5)
+    hirb (0.3.5)
+    hoe (2.7.0)
+      rake (>= 0.8.7)
+      rubyforge (>= 2.0.4)
+    hpricot (0.8.3-java)
+    i18n (0.5.0)
+    jdbc-postgres (8.4.702-java)
+    jruby-openssl (0.7.2)
+      bouncy-castle-java
+    json_pure (1.4.6)
+    mail (2.2.12)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mechanize (1.0.0)
+      nokogiri (>= 1.2.1)
+    mime-types (1.16)
+    nokogiri (1.4.4.2-java)
+      weakling (>= 0.0.3)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rcov (0.9.9-java)
+    redhillonrails_core (1.0.8)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    s4t-utils (1.0.4)
+      hoe (>= 1.3.0)
+    simple_workflow (0.0.2)
+      rails (>= 2.3.2)
+    slave (1.2.1)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+    user-choices (1.1.6.1)
+      builder (>= 2.1.2)
+      s4t-utils (>= 1.0.3)
+      xml-simple (>= 1.0.11)
+    weakling (0.0.4-java)
+    wirble (0.1.3)
+    xml-simple (1.0.12)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcpostgresql-adapter
+  automatic_foreign_key
+  awesome_print
+  firewatir
+  hirb
+  hoe
+  hpricot
+  jruby-openssl
+  mechanize
+  postgres-pr
+  rails (~> 3.0.0)
+  rcov
+  redhillonrails_core
+  simple_workflow
+  slave
+  wirble

data/History.txt

@@ -1,3 +1,20 @@
+== 0.37.1 2010-10-05
+
+=== Fixes
+
+* Added Save button to the new work record row in the daily work sheet to enable creation if WebKit based browsers like Safari.
+
+== Internal
+
+* Updated gem dependecies to reflect the move to Rails 3.
+* Switched to the glassfish gem for runtime.
+
+== 0.37.0 2010-10-05
+
+== Internal
+
+* Ported to Rails 3
+
 == 0.36.2 2010-07-26
 
 === Fixes

data/README.txt

@@ -25,8 +25,6 @@ There are concrete plans to integrate Backlog to a few types of systems:
 
 * Issue tracking (Jira, RuyForge, SourceForge, Bugzilla, etc.)
 * Calendars (ICal, Outlook, http://icalendar.rubyforge.org/)
-* Timekeeping
-* Invoicing (Mamut)
 
 If you have concrete needs, and are willing to beta test the integration, please contact us.
 

data/Rakefile

@@ -3,13 +3,13 @@
 
 require 'erb'
 
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+require File.expand_path('../config/application', __FILE__)
 
 require 'rake'
-require 'rake/testtask'
+#require 'rake/testtask'
 require 'rake/rdoctask'
 
-require 'tasks/rails'
+Backlog::Application.load_tasks
 
 require 'hoe'
 require 'version_from_history'
@@ -27,15 +27,15 @@ Hoe.new("backlog", APP::VERSION) do |p|
   # p.extra_rdoc_files = [/^(app\/(controllers|helpers|models)|lib|bin)|txt$/]
   p.clean_globs = ['doc', 'log/*']
   p.spec_extras = {
-    :files => Dir['**/*'].reject{|file_name| file_name =~ /^(doc|log|pkg|tmp|WEB-INF)/},
+    :files => Dir['**/*'].reject{|file_name| file_name =~ /^(doc|log|pkg|profiling|tmp|WEB-INF)/},
     :rdoc_options => ['--inline-source'],
     :executables => ['backlog'],
-    :requirements => ['ImageMagick', 'PostgreSQL']
+    :requirements => ['ImageMagick', 'PostgreSQL'],
   }
   p.need_zip = true
   p.url = 'http://rubyforge.org/projects/backlog/'
-  p.extra_deps = [['rails', '= 2.3.8'], ['gruff', '~> 0.2.9'], ['postgres', '~> 0.7.9'],
-      ['slave', '~> 1.2.1'], ['mechanize', '~> 0.8.4'], ['bundler', '~> 0.9.26']]
+  p.extra_deps = [['daemons', '~> 1.1.0'], ['rails', '~> 3.0.0'], ['gruff', '~> 0.3.6'], ['postgres-pr', '~> 0.6.3'],
+      ['slave', '~> 1.2.1'], ['mechanize', '~> 1.0.0'], ['bundler', '~> 1.0.5']]
   # ['rmagick', '~> 1.15.12'],
   p.rsync_args = "-acv --delete --exclude=wiki*"
 end
@@ -60,3 +60,13 @@ task :release_war do
   rf.login
   rf.add_file 'backlog', 'backlog', APP::VERSION, war_pkg_file
 end
+
+task 'test:units' => [] do
+
+end
+task 'test:functionals' => [] do
+
+end
+task 'test:integration' => [] do
+  
+end

data/app/controllers/absences_controller.rb

@@ -5,8 +5,7 @@ class AbsencesController < ApplicationController
   end
   
   # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
-  verify :method => :post, :only => [ :destroy, :create, :update ],
-  :redirect_to => { :action => :list }
+  verify :method => :post, :only => [ :destroy, :create, :update ], :redirect_to => { :action => :list }
   
   def list
     @absences = Absence.paginate :per_page => 10, :page => params[:page]

data/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+require 'prototype_legacy_helper'
+
 class ApplicationController < ActionController::Base
   include UserSystem
   include ApplicationHelper
@@ -13,10 +15,11 @@ class ApplicationController < ActionController::Base
   before_filter :authenticate_user
   before_filter :store_cookies_from_params
   before_filter :populate_layout
-  
+
   def initialize
-    @application_title = l :backlog
-    @application_description = l :backlog_description
+    super
+    @application_title = t :project
+    @application_description = t :project_description
     @sidebar = Sidebar.new(self)
   end
   
@@ -28,10 +31,6 @@ class ApplicationController < ActionController::Base
     end
   end
   
-  def render_to_string(*args)
-    super
-  end
-  
   private
   
   def determine_layout
@@ -148,9 +147,9 @@ class ApplicationController < ActionController::Base
   
   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-N',          :function => :new_task,    :options => {:controller => 'tasks', :action => 'new', :period_id => (@period ? @period.id : (@project && @project.periods.first ? @project.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-N',     :function => :new_project, :options => {:controller => 'projects', :action => 'new'}},
     {:key => 'Alt-Ctrl-G',     :function => :new_group, :options => {:controller => 'groups', :action => :new}},
     {:key => 'Alt-Shift-D',    :function => :daily_work_sheet, :options => {:controller => 'works', :action => :daily_work_sheet}},
     {:key => 'Alt-Shift-W',    :function => :weekly_work_sheet, :options => {:controller => 'works', :action => :weekly_work_sheet}},
@@ -171,9 +170,9 @@ class ApplicationController < ActionController::Base
     User.find_by_id(user_id) if user_id
   end
     
-    def redirect_to_post(options)
-      url = url_for options
-      render :text => <<EOF, :layout => false
+  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">
@@ -181,6 +180,6 @@ class ApplicationController < ActionController::Base
   </body>
 </html>
 EOF
-    end
-    
   end
+    
+end

data/app/controllers/application_controller.rb.rails2

@@ -0,0 +1,186 @@
+class ApplicationController < ActionController::Base
+  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 :store_cookies_from_params
+  before_filter :populate_layout
+  
+  def initialize
+    @application_title = l :project
+    @application_description = l :project_description
+    @sidebar = Sidebar.new(self)
+  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
+  
+  def render_to_string(*args)
+    super
+  end
+  
+  private
+  
+  def determine_layout
+    if false && 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
+    return false if session[:detours].nil?
+    detour = pop_detour
+    post = detour.delete(:request_method) == :post
+    if post
+      redirect_to_post(detour)
+    else
+      redirect_to detour
+    end
+    return true
+  end
+  
+  def back_or_redirect_to(options)
+    back or redirect_to options
+  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
+
+  
+  
+  def store_cookies_from_params
+    if params[:cookies]
+      params[:cookies].each_pair do |key, value|
+        logger.info "Storing cookie #{key.inspect}=#{value.inspect}"
+        #cookies[key] = {:value => value, :expires => 1.year.from_now}
+        session[key] = value
+        logger.info "Stored cookie #{key.inspect}=#{session[key].inspect}"
+      end
+    end
+  end
+  
+  
+  def populate_shortcuts
+    @shortcuts = [
+    {:key => 'Alt-N',          :function => :new_task,    :options => {:controller => 'tasks', :action => 'new', :period_id => (@period ? @period.id : (@project && @project.periods.first ? @project.periods.first.id : nil))}},
+    {:key => 'Alt-Shift-N',    :function => :new_period, :options => {:controller => 'periods', :action => 'new'}},
+    {:key => 'Alt-Ctrl-N',     :function => :new_project, :options => {:controller => 'projects', :action => 'new'}},
+    {:key => 'Alt-Ctrl-G',     :function => :new_group, :options => {:controller => 'groups', :action => :new}},
+    {:key => 'Alt-Shift-D',    :function => :daily_work_sheet, :options => {:controller => 'works', :action => :daily_work_sheet}},
+    {:key => 'Alt-Shift-W',    :function => :weekly_work_sheet, :options => {:controller => 'works', :action => :weekly_work_sheet}},
+    ]
+  end
+  
+  def populate_layout
+    return true if request.path_parameters[:action] =~ /_no_layout$/
+    
+    populate_shortcuts
+  end
+  
+  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="document.getElementById('form').submit()">
+    <form id="form" action="#{url}" method="POST">
+    </form>
+  </body>
+</html>
+EOF
+    end
+    
+  end