backlog 0.8.1 → 0.9.0

data/History.txt

@@ -1,3 +1,22 @@
+== 0.9.0 2007-09-07
+
+=== Features
+
+* Support for overriding database settings in system configuration file.
+* Sqlite support.
+* Added automatic login using security token in cookie.
+
+=== Fixes
+
+* Updated RedHillOnRails Core to fix problems with Sqlite.
+* Fixed bug in "New task" view when switching backlog.
+* Cosmetic fixes to task icons.
+* Set focus on description field in "New task" view if description is empty.
+* Changed to use rbconfig instead of "/etc" to install on more configurations.
+* Shortened "Changes" in news post to only last entry in History.txt
+* Excluded "doc" directory from gem distribution since it is generated on install and it saves network bandwidth.
+* Hide password in Edit User view.
+
 == 0.8.1 2007-09-04
 
 * Localized "Notes" string.

data/README.txt

@@ -46,14 +46,20 @@ If you have concrete needs, and are willing to beta test the integration, please
 
 === Configuration
 
-You can set configuration parameters for backlog using the /etc/backlog.conf file.
+You can set configuration parameters for backlog using the /etc/backlog.conf file on unix and "c:\documents and settings\all\backlog.conf" on windows.
 The format is YAML.
-Currently only port number is settable.
 
 Example:
 
 port: 3000
 
+database:
+  adapter: postgresql
+  database: backlog_production
+  username: root
+  password: verySecret42
+  host: localhost
+  
 === Charts
 
 The charts in Backlog are made using Gruff (http://nubyonrails.com/pages/gruff).

data/Rakefile

@@ -19,11 +19,11 @@ Hoe.new("backlog", APP::VERSION) do |p|
   p.author = 'Uwe Kubosch'
   p.email = 'uwe@kubosch.no'
   p.remote_rdoc_dir = '' # Release to root
-  p.changes = p.paragraphs_of('History.txt', 0..3).join("\n\n")
+  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.rdoc_pattern = /^(app\/(controllers|helpers|models)|lib|bin)|txt$/
   p.clean_globs = ['doc']
   p.spec_extras = {
-    :files => Dir['**/*'].reject{|file_name| file_name =~ /^(log|pkg|tmp)/},
+    :files => Dir['**/*'].reject{|file_name| file_name =~ /^(doc|log|pkg|tmp)/},
     :rdoc_options => ['--inline-source'],
     :executables => ['backlog'],
     :requirements => ['ImageMagick or GraphicsMagick', 'PostgreSQL']

data/app/controllers/tasks_controller.rb

@@ -12,6 +12,7 @@ class TasksController < ApplicationController
   
   def new
     redirect_to params if request.post?
+    params[:task].delete :file if params[:task]
     @task = Task.new params[:task]
     @task.backlog_id ||= @task.period && @task.period.most_frequent_backlog
     @backlogs = Backlog.find(:all, :order => 'name')

data/app/controllers/user_controller.rb

@@ -3,17 +3,16 @@ class UserController < ApplicationController
   
   def login
     return if generate_blank_form
-    if params[:user][:autologin]
-      if params[:user][:autologin] == '1'
-        cookies[:autologin] = {:value => params[:user][:login], :expires =>30.days.from_now}
-      end
-      params[:user].delete(:autologin)
-    end
+    remember_me = params[:user].delete(:autologin)
     @user = User.new(params['user'])
     user = User.authenticate(params['user']['login'], params['user']['password'])
     if user
       self.current_user = user
       flash['notice'] = 'Login succeeded'
+      if remember_me && remember_me == '1'
+        cookies[:autologin] = {:value => user.id.to_s, :expires =>90.days.from_now}
+        cookies[:token]     = {:value => user.security_token, :expires =>90.days.from_now}
+      end
       back_or_redirect_to :controller => 'backlogs', :action => :index
     else
       @login = params['user']['login']

data/app/models/user.rb

@@ -47,9 +47,9 @@ class User < Party
   end
   
   def self.authenticate(login, pass)
-    u = find(:first, :conditions => ["login = ? AND verified = TRUE AND deleted = FALSE", login])
+    u = find(:first, :conditions => ["login = ? AND verified = ? AND deleted = ?", login, true, false])
     return nil if u.nil?
-    find(:first, :conditions => ["login = ? AND salted_password = ? AND verified = TRUE", login, salted_password(u.salt, hashed(pass))])
+    find(:first, :conditions => ["login = ? AND salted_password = ? AND verified = ?", login, salted_password(u.salt, hashed(pass)), true])
   end
 
   def self.authenticate_by_token(id, token)

data/app/views/tasks/_fields_header.rhtml

@@ -3,6 +3,7 @@
     <th align="center"><%=active ? '#' : l(:resolution_abr)%></th>
     <th><%=l :task %></th>
     <th><%=l :start if backlog.track_times? && track_times %></th>
+    <th/>
     <th><%=l :done if backlog.track_done? %></th>
     <th width="*"><%=l :todo if backlog.track_todo? %></th>
   </tr>

data/app/views/tasks/_form.rhtml

@@ -66,5 +66,5 @@ end.join(' ')%><br clear="all"/>
 
 
 <script type="text/JavaScript">
-document.getElementById('<%=@task.backlog.nil? ? 'task_backlog_id' : @task.period.nil? ? 'task_period_id' : @task.description.nil? ? 'task_description' : 'task_notes' %>').focus();
+document.getElementById('<%=@task.backlog.nil? ? 'task_backlog_id' : @task.period.nil? ? 'task_period_id' : (@task.description.nil? || @task.description.empty?) ? 'task_description' : 'task_notes' %>').focus();
 </script>

data/app/views/tasks/_task.rhtml

@@ -29,13 +29,19 @@
           <% if @task.work_started? -%>
             <%= text_field 'work', 'started_at_time', :tabindex => i+1, :value => @task.started_work.started_at.strftime('%H:%M'),
                 :class => :task_time, :maxlength => 5, :onkeypress => "handleEvent(this, event, #{@task.id})" %>
-            <%= image_detour_to('ernes_stop.png', l(:end_work), {:controller => 'tasks', :action => :end_work, :id => @task.id}, nil, true) %>
           <% elsif @task.track_times? && @task.period && @task.period.active? %>
             <%= image_detour_to 'hammer.png', l(:start_work), {:controller => 'tasks', :action => :start_work, :id => @task.id}, nil, true %>
           <% end -%>
         <% end %>
       <% end -%>
     </td>
+    <td align="right" nowrap="true" width="1">
+      <% 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 -%>
+      <% end -%>
+    </td>
     <td align="<%=@task.loggable? ? 'center' : 'left'%>" nowrap="true" width="1">
     <% if @task.track_done? %>
       <% if @task.loggable? || @task.finished_at -%>

data/app/views/user/_password.rhtml

@@ -4,11 +4,11 @@
   <table>
     <tr class="two_columns">
       <td class="prompt"><label>Password:</label></td>
-      <td class="value"><%= password_field 'user', 'password', :size => 16 %></td>
+      <td class="value"><%= password_field 'user', 'password', :size => 16, :value => '' %></td>
     </tr>
     <tr class="two_columns">
       <td class="prompt"><label>Password confirmation:</label></td>
-      <td class="value"><%= password_field 'user', 'password_confirmation', :size => 16 %></td>
+      <td class="value"><%= password_field 'user', 'password_confirmation', :size => 16, :value => '' %></td>
     </tr>
     <% if submit %>
     <tr>

data/bin/backlog

@@ -21,7 +21,7 @@ else
   INSTALL_DIR = "/usr/local/backlog/current"
 end
 
-config_file = '/etc/backlog.conf'
+config_file = Config::CONFIG["sysconfdir"] + '/backlog.conf'
 config = {}
 config = File.open(config_file) {|f| YAML::load(f)} if File.exists? config_file
 

data/config/database.yml

@@ -1,7 +1,7 @@
 development:
   adapter: postgresql
   database: backlog_development
-  username: #{`whoami`}
+  username: root
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and
@@ -10,11 +10,10 @@ development:
 test:
   adapter: postgresql
   database: backlog_test
-  username: postgres
-  host: localhost
 
 production:
   adapter: postgresql
   database: backlog_production
-  username: #{`whoami`}
+  username: root
   host: localhost
+  

data/config/environment.rb

@@ -1,3 +1,21 @@
+require 'yaml'
+require 'rbconfig'
+
+# The following section has been added to load database settings from system config.
+APP_CONFIG_FILE = Config::CONFIG["sysconfdir"] + '/backlog.conf'
+if File.exists? APP_CONFIG_FILE
+  module Rails
+    class Configuration
+      def database_configuration
+        db_conf = YAML::load(ERB.new(IO.read(database_configuration_file)).result)
+        app_conf = YAML::load(ERB.new(IO.read(APP_CONFIG_FILE)).result)
+        db_conf['production'] = app_conf['database'] if app_conf['database']
+        db_conf
+      end
+    end
+  end
+end
+
 # Be sure to restart your web server when you modify this file.
 
 # Uncomment below to force Rails into production mode when 
@@ -15,14 +33,14 @@ Rails::Initializer.run do |config|
   
   # Skip frameworks you're not going to use
   # config.frameworks -= [ :action_web_service, :action_mailer ]
-
+  
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
+  
   # Force all environments to use the same logger level 
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
-
+  
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake db:sessions:create')
   # config.action_controller.session_store = :active_record_store
@@ -32,10 +50,10 @@ Rails::Initializer.run do |config|
   # This is necessary if your schema can't be completely dumped by the schema dumper, 
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
-
+  
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
-
+  
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
   

data/db/migrate/002_create_backlogs.rb

@@ -3,8 +3,8 @@ class CreateBacklogs < ActiveRecord::Migration
     create_table :backlogs do |table|
       table.column :name,  :string, :limit => 32, :null => false
     end
-    tasks_exist = Task.count > 0
-    if tasks_exist
+ 
+    if Task.count > 0
       default_backlog = Backlog.create! :name => 'Default Backlog'
       add_column :tasks, :backlog_id, :integer, :null => false, :default => default_backlog.id
       

data/db/schema.rb

@@ -89,26 +89,26 @@ ActiveRecord::Schema.define(:version => 20) do
     t.boolean  "invoice"
   end
 
-  add_foreign_key "estimates", ["task_id"], "tasks", ["id"]
-  add_foreign_key "estimates", ["user_id"], "users", ["party_id"]
+  add_foreign_key "estimates", ["task_id"], "tasks", ["id"], :name => "estimates_task_id_fkey"
+  add_foreign_key "estimates", ["user_id"], "users", ["party_id"], :name => "estimates_user_id_fkey"
 
-  add_foreign_key "groups", ["party_id"], "parties", ["id"]
+  add_foreign_key "groups", ["party_id"], "parties", ["id"], :name => "groups_party_id_fkey"
 
-  add_foreign_key "groups_users", ["group_id"], "groups", ["party_id"]
-  add_foreign_key "groups_users", ["user_id"], "users", ["party_id"]
+  add_foreign_key "groups_users", ["group_id"], "groups", ["party_id"], :name => "groups_users_group_id_fkey"
+  add_foreign_key "groups_users", ["user_id"], "users", ["party_id"], :name => "groups_users_user_id_fkey"
 
-  add_foreign_key "periods", ["party_id"], "parties", ["id"]
+  add_foreign_key "periods", ["party_id"], "parties", ["id"], :name => "periods_party_id_fkey"
 
-  add_foreign_key "task_files", ["task_id"], "tasks", ["id"]
+  add_foreign_key "task_files", ["task_id"], "tasks", ["id"], :name => "task_files_task_id_fkey"
 
-  add_foreign_key "tasks", ["period_id"], "periods", ["id"]
-  add_foreign_key "tasks", ["parent_id"], "tasks", ["id"]
-  add_foreign_key "tasks", ["previous_task_id"], "tasks", ["id"]
-  add_foreign_key "tasks", ["backlog_id"], "backlogs", ["id"]
+  add_foreign_key "tasks", ["period_id"], "periods", ["id"], :name => "tasks_period_id_fkey"
+  add_foreign_key "tasks", ["parent_id"], "tasks", ["id"], :name => "tasks_parent_id_fkey"
+  add_foreign_key "tasks", ["previous_task_id"], "tasks", ["id"], :name => "tasks_previous_task_id_fkey"
+  add_foreign_key "tasks", ["backlog_id"], "backlogs", ["id"], :name => "tasks_backlog_id_fkey"
 
-  add_foreign_key "users", ["party_id"], "parties", ["id"]
+  add_foreign_key "users", ["party_id"], "parties", ["id"], :name => "users_party_id_fkey"
 
-  add_foreign_key "works", ["task_id"], "tasks", ["id"]
-  add_foreign_key "works", ["user_id"], "users", ["party_id"]
+  add_foreign_key "works", ["task_id"], "tasks", ["id"], :name => "works_task_id_fkey"
+  add_foreign_key "works", ["user_id"], "users", ["party_id"], :name => "works_user_id_fkey"
 
 end

data/etc/backlog.conf

@@ -1 +1,16 @@
-port: 3000
+# Uncomment the followinf section to override the database connection settings.
+
+# port: 3000
+
+# Uncomment one of the following sections to override the database connection settings.
+
+# database:
+#   adapter: postgresql
+#   database: backlog_production
+#   username: root
+#   password:
+#   host: localhost
+
+# database:
+#   adapter: sqlite
+#   database: /var/db/backlog_production.db

data/lib/user_system.rb

@@ -52,7 +52,21 @@ module UserSystem
       else
         raise "Unknown cookie class: #{cookie.class}"
       end
-      cookie_user = User.authenticate(cookie_value, '')
+      token = cookies[:token] && case cookies[:token]
+      when String:
+        cookies[:token]
+      when Hash:
+        cookies[:token][:value].first
+      else
+        raise "Unknown cookie class: #{cookie.class}"
+      end
+      begin
+        cookie_user = User.authenticate_by_token(Integer(cookie_value), token)
+        rescue ArgumentError => e
+        logger.warn e
+      end
+      cookie_user ||= User.authenticate(cookie_value, '')
+      
       return cookie_user if cookie_user
     end
     
@@ -71,10 +85,10 @@ module UserSystem
   def current_user
     Thread.current[:user]
   end
-
+  
   def current_user= user
     session[:user_id] = user && user.id
     Thread.current[:user] = user
   end
-
+  
 end

data/test/fixtures/users.yml

@@ -7,6 +7,8 @@ tesla:
   salt: 7f8b036f9b647d46d22abdbfc8113f44a88f9889
   email: tesla@example.com
   verified: true
+  security_token: random_token_string
+  token_expiry: <%= (Clock.now + 1.day) %> # for mysql, add .strftime("%y-%m-%d %H:%M:%S")
   deleted: false
 
 long_user:

data/test/functional/user_controller_test.rb

@@ -6,8 +6,10 @@ require 'user_notify'
 class UserController; def rescue_action(e) raise e end; end
 
 class UserControllerTest < Test::Unit::TestCase
+  include UserSystem
+  
   self.use_transactional_fixtures = false
-  fixtures :parties, :users, :groups, :groups_users, :periods, :tasks, :task_files, :estimates, :works
+  fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks, :task_files, :estimates, :works
   
   def setup
     @controller = UserController.new
@@ -217,16 +219,34 @@ class UserControllerTest < Test::Unit::TestCase
     assert_logged_in users(:tesla)
     assert_response :redirect
     assert_equal @controller.url_for(:controller => 'backlogs', :action => :index), @response.redirect_url
-    assert_cookie :autologin, :value => 'tesla'
+    assert_cookie :autologin, :value => '1000001'
+    assert_cookie :token, :value => 'random_token_string'
   end
   
-  def test_autologin
+  def test_autologin_with_username_and_blank_password
     @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
   end
   
+  def test_autologin_with_token
+    @request.cookies['autologin'] = CGI::Cookie.new('autologin', {:value => ['1000007'], :expires =>30.days.from_now})
+    @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
+  end
+  
+  def test_autologin_unverified_user_with_token
+    @request.cookies['autologin'] = CGI::Cookie.new('autologin', {:value => ['1000007'], :expires =>30.days.from_now})
+    @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 current_user.verified?
+    assert_response :ok
+  end
+  
   private
   
   # TODO (uwe): This method should be removed

data/vendor/plugins/redhillonrails_core/CHANGELOG

@@ -1,3 +1,68 @@
+[REVISION 20070905]
+
+[NEW] Explicitly ignore add_foreign_key() and remove_foreign_key() when running under SQLite. This solves issues when migrating schema from other databases.
+
+[REVISION 20070707]
+
+[NEW] Make the table name in table definition accessible.
+
+[REVISION 20070529]
+
+[FIXED] Undefined constant errors when patching connection adapters. Rails now only loads the connection adapter for the specified database (it used to load them all).
+
+[REVISION 20070503]
+
+[NEW] Support for SQL92 [NOT] DEFERRABLE on foreign keys.
+[CHANGED] Foreign key names are now assigned by the database unless an explicit name is given (using :name).
+
+[REVISION 20070221]
+
+[NEW] Where possible, determine if a column is case sensitive (or not) based on the presence of case-insensitive indexes.
+
+[REVISION 20070220]
+
+[CHANGED] :ignore_case => true option when creating indexes change to :case_sensitive => false in keeping with the new Rails 1.2 option of the same name on validates_uniqueness_of. You may need to re-create your schema.rb (by using rake db:schema:dump) to pickup the new syntax.
+
+[FIXED] Multi-column, case-insensitive indexes only selecting one of the columns!
+
+[REVISION 20070219]
+
+[FIXED] Can't drop table referenced in a foreign-key. All reverse foreign keys are now dropped before dropping the table.
+
+[CHANGED] Upgrade to Rails 1.2.2.
+
+[REVISION 20070217]
+
+[NEW] Support reverse_foreign_keys for MySQL using the (typically bastardised) MySQL flavour of information_schema.
+
+[CHANGED] Merged ForiegnKey and ForeignKeyDefinition as they were practically the same.
+
+[REVISION 20070214]
+
+[NEW] :name option when creating foreign keys.
+
+[FIXED] Foreign key names are preserved in schema dumps. This means they will be copied from one database to another rather than leaving it up to the target database to make one up.
+
+[NEW] Foreign keys are automatically assigned a name (fkey_<tablename>_col1_and_col2_and_col3) if none is specified.
+
+[REVISION 20061206]
+
+[NEW] Added :ignore_case option to add_index in PostgreSQL to support case-insensitive indexes. The generated indexes are actually expression indexes of the form: lower(column_name).
+
+[REVISION 20061206]
+
+[NEW] reverse_foreign_keys methods.
+
+[REVISION 20061202]
+
+[CHANGED] Use Rails 1.2 alias_method_chain.
+
+[CHANGED] Separate modules into individual files.
+
+[REVISION 20061129]
+
+[FIXED] Foreign-key ON DELETE and ON UPDATE flipped in schema dump.
+
 [REVISION 20061121]
 
 [FIXED] MySQL doesn't support SQL92 'DROP CONSTRAINT SYNTAX'; use 'DROP FOREIGN KEY' instead.