--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,6 +1,4 @@
 class Project < ActiveRecord::Base
-  acts_as_taggable
-
   belongs_to  :user
   has_many    :comments, :dependent => :destroy
   has_many    :repositories, :order => "repositories.mainline desc, repositories.created_at asc",
@@ -15,21 +13,6 @@ class Project < ActiveRecord::Base
   has_many :users, :through => :members
   has_many :articles
     
-  is_indexed :fields => ["title", "description", "slug"],
-    :concatenate => [
-      { :class_name => 'Tag',
-        :field => 'name',
-        :as => 'category',
-        :association_sql => "LEFT OUTER JOIN taggings ON taggings.taggable_id = projects.id " +
-                            "AND taggings.taggable_type = 'Project' LEFT OUTER JOIN tags ON taggings.tag_id = tags.id"
-      }],
-    :include => [{
-      :association_name => "user",
-      :field => "login",
-      :as => "user"
-    }]
-
-
   URL_FORMAT_RE = /^(http|https|nntp):\/\//.freeze
   validates_presence_of :title, :user_id, :slug
   validates_uniqueness_of :slug, :case_sensitive => false

--- a/config/initializers/class_settings.rb
+++ /dev/null
@@ -1 +0,0 @@
-TagList.delimiter = " "
\ No newline at end of file

--- a/db/migrate/001_create_users.rb
+++ b/db/migrate/001_create_users.rb
@@ -9,13 +9,20 @@ class CreateUsers < ActiveRecord::Migration
       t.column :updated_at,                :datetime
       t.column :remember_token,            :string
       t.column :remember_token_expires_at, :datetime
-      
+      t.integer :ssh_key_id, :references => nil
+      t.text :ssh_key
+      t.string :fullname
+      t.string :slug
+      t.string :url
       t.column :activation_code, :string, :limit => 40
       t.column :activated_at, :datetime
+      t.timestamps
     end
     
+    add_index :users, :id
     add_index :users, :login
     add_index :users, :email
+    add_index :users, :slug
   end
 
   def self.down

--- a/db/migrate/002_create_projects.rb
+++ b/db/migrate/002_create_projects.rb
@@ -1,18 +1,44 @@
 class CreateProjects < ActiveRecord::Migration
+  
   def self.up
     create_table :projects do |t|
-      t.column :name, :string
+      t.column :title, :string
       t.column :description, :text
-      t.column :user_id, :integer, :references => nil
-      t.column :created_at, :datetime
-      t.column :updated_at, :datetime
+      t.column :user_id, :integer
+      t.string :slug, :unique => true
+      t.string :license
+      t.string :home_url
+      t.string :mailinglist_url
+      t.string :bugtracker_url
+      t.column :audience, :enum, :limit => [:public, :members_only], :default => :public
+      t.column :status, :enum, :limit => [:active, :inactive], :default => :active
+      t.column :life_cycle, :enum, :limit => [:planning, :pre_alpha, :alpha, :beta, :stable, :mature_frozen, :other], :default => :pre_alpha 
+      t.column :os, :enum, :limit => [:mac_os, :win32, :linux, :independent, :other, :notapplicable], :default => :independent
+      t.column :platform, :enum, :limit => [:ruby, :rails, :dotnet, :python, :php, :other, :notapplicable], :default => :rails
+      t.integer :views, :default => 0
+      t.integer :wiki_id, :references => nil
+      t.timestamps
     end
-    
-    add_index :projects, :name
+    add_index :projects, :id
+    add_index :projects, :title
     add_index :projects, :user_id
+    add_index :projects, :slug
+    add_index :projects, [:audience, :status]
+    
+    #    
+    create_table :members do |t|
+      t.column :accesslevel, :enum, :limit => [:readonly, :modify, :admin], :default => :modify
+      t.integer :project_id, :null => false
+      t.integer :user_id, :null => false
+      t.timestamps
+    end
+    add_index :members, [:id]
+    add_index :members, [:project_id]
+    add_index :members, [:user_id]
   end
 
   def self.down
+    drop_table :members 
     drop_table :projects
   end
 end

--- /dev/null
+++ b/db/migrate/003_create_repositories.rb
@@ -0,0 +1,23 @@
+class CreateRepositories < ActiveRecord::Migration
+  def self.up
+    create_table :repositories do |t|
+      t.string  :name
+      t.string :description
+      t.integer :project_id, :references => nil
+      t.integer :user_id, :references => nil
+      t.boolean :mainline, :default => false
+      t.integer :parent_id, :references => nil
+      t.boolean :ready, :default => false
+      t.timestamps
+    end
+    add_index :repositories, :id
+    add_index :repositories, :name
+    add_index :repositories, :project_id
+    add_index :repositories, :user_id
+    add_index :repositories, :parent_id
+  end
+
+  def self.down
+    drop_table :repositories
+  end
+end

--- a/db/migrate/003_rename_project_name_to_title.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class RenameProjectNameToTitle < ActiveRecord::Migration
-  def self.up
-    rename_column :projects, :name, :title
-  end
-
-  def self.down
-    rename_column :projects, :title, :name
-  end
-end

--- /dev/null
+++ b/db/migrate/004_create_committerships.rb
@@ -0,0 +1,16 @@
+class CreateCommitterships < ActiveRecord::Migration
+  def self.up
+    create_table :committerships do |t|
+      t.integer :user_id
+      t.integer :repository_id
+      t.integer :kind, :default => 2
+      t.timestamps
+    end
+    add_index :committerships, :user_id
+    add_index :committerships, :repository_id
+  end
+
+  def self.down
+    drop_table :committerships
+  end
+end

--- a/db/migrate/004_create_repositories.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class CreateRepositories < ActiveRecord::Migration
-  def self.up
-    create_table :repositories do |t|
-      t.string  :name
-      t.integer :project_id, :references => nil
-      t.integer :user_id, :references => nil
-
-      t.timestamps
-    end
-    add_index :repositories, :name
-    add_index :repositories, :project_id
-    add_index :repositories, :user_id
-  end
-
-  def self.down
-    drop_table :repositories
-  end
-end

--- a/db/migrate/005_add_ssh_key_to_users.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddSshKeyToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :ssh_key, :text
-  end
-
-  def self.down
-    remove_column :users, :ssh_key
-  end
-end

--- /dev/null
+++ b/db/migrate/005_create_ssh_keys.rb
@@ -0,0 +1,16 @@
+class CreateSshKeys < ActiveRecord::Migration
+  def self.up
+    create_table :ssh_keys do |t|
+      t.integer :user_id
+      t.boolean :ready, :default => false
+      t.text  :key
+      t.timestamps
+    end
+    add_index :ssh_keys, :user_id
+    add_index :users, :ssh_key_id
+  end
+
+  def self.down
+    drop_table :ssh_keys
+  end
+end

--- a/db/migrate/006_add_slug_to_projects.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class AddSlugToProjects < ActiveRecord::Migration
-  def self.up
-    add_column :projects, :slug, :string
-    add_index  :projects, :slug, :unique => true
-  end
-
-  def self.down
-    remove_column :projects, :slug
-  end
-end

--- /dev/null
+++ b/db/migrate/006_create_tasks.rb
@@ -0,0 +1,18 @@
+class CreateTasks < ActiveRecord::Migration
+  def self.up
+    create_table :tasks do |t|
+      t.string :target_class
+      t.string :command
+      t.text :arguments
+      t.boolean :performed, :default => false
+      t.datetime :performed_at
+      t.integer :target_id, :references => nil
+      t.timestamps
+    end
+    add_index :tasks, :performed
+  end
+
+  def self.down
+    drop_table :tasks
+  end
+end

--- a/db/migrate/007_add_mainline_to_projects.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class AddMainlineToProjects < ActiveRecord::Migration
-  def self.up
-    add_column  :repositories, :mainline, :boolean, :default => false
-    add_column  :repositories, :parent_id, :integer, :references => nil
-    add_index   :repositories, :parent_id
-  end
-
-  def self.down
-    remove_column :repositories, :mainline
-    remove_column :repositories, :parent_id
-  end
-end

--- /dev/null
+++ b/db/migrate/007_create_comments.rb
@@ -0,0 +1,21 @@
+class CreateComments < ActiveRecord::Migration
+  def self.up
+    create_table :comments do |t|
+      t.integer :user_id, :null => false
+      t.integer :repository_id, :null => false
+      t.string :sha1, :null => true
+      t.text :body
+      t.integer :project_id
+      t.timestamps
+    end
+    add_index :comments, :id
+    add_index :comments, :user_id
+    add_index :comments, :repository_id
+    add_index :comments, :sha1
+    add_index :comments, :project_id
+  end
+
+  def self.down
+    drop_table :comments
+  end
+end

--- /dev/null
+++ b/db/migrate/008_create_merge_requests.rb
@@ -0,0 +1,23 @@
+class CreateMergeRequests < ActiveRecord::Migration
+  def self.up
+    create_table :merge_requests do |t|
+      t.integer :user_id, :references => nil
+      t.integer :source_repository_id, :references => nil
+      t.integer :target_repository_id, :references => nil
+      t.text :proposal
+      t.string :sha_snapshot
+      t.integer :status, :default => 0
+      t.string :source_branch
+      t.string :target_branch
+      t.timestamps
+    end
+    add_index :merge_requests, :user_id
+    add_index :merge_requests, :source_repository_id
+    add_index :merge_requests, :target_repository_id
+    add_index :merge_requests, :status
+  end
+
+  def self.down
+    drop_table :merge_requests
+  end
+end

--- a/db/migrate/008_create_permissions.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class CreatePermissions < ActiveRecord::Migration
-  def self.up
-    create_table :permissions do |t|
-      t.integer :user_id, :references => nil
-      t.integer :repository_id, :references => nil
-      t.integer :kind, :default => 2
-
-      t.timestamps
-    end
-    add_index :permissions, :user_id
-    add_index :permissions, :repository_id
-  end
-
-  def self.down
-    drop_table :permissions
-  end
-end

--- a/db/migrate/009_add_more_info_to_projects.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class AddMoreInfoToProjects < ActiveRecord::Migration
-  def self.up
-    add_column :projects, :license, :string
-    add_column :projects, :home_url, :string
-    add_column :projects, :mailinglist_url, :string
-    add_column :projects, :bugtracker_url, :string
-  end
-
-  def self.down
-    remove_column :projects, :license
-    remove_column :projects, :home_url
-    remove_column :projects, :mailinglist_url
-    remove_column :projects, :bugtracker_url
-  end
-end

--- /dev/null
+++ b/db/migrate/009_create_wikis.rb
@@ -0,0 +1,26 @@
+class CreateWikis < ActiveRecord::Migration
+
+  def self.up
+
+    create_table :wikis do |t|
+      t.string :title, :default => "", :null => false
+      t.string :slug, :unique => true
+      t.text :page
+      t.column :status, :enum, :limit => [:draft, :published, :test, :deleted], :default => :draft
+      t.column :format, :enum, :limit => [:markdown, :monospace, :image], :default => :markdown
+      t.integer :project_id, :null => true
+      # only allow project members to see it 
+      #FIXME possibly redundant - would you ever want to hide a page (outside of the normal project audience setting?)
+      t.column :audience, :enum, :limit => [:public, :members], :default => :public
+      t.integer :views, :default => 0
+      t.timestamps
+    end
+    
+  end
+
+  def self.down
+    drop_table :wikis
+  end
+
+end
+

--- /dev/null
+++ b/db/migrate/010_create_events.rb
@@ -0,0 +1,50 @@
+
+# Journal - changes to models like Wiki, Article, Ticket
+# Repository - change or repository event (commit, clone etc.)
+# Message - messages posted by developers (different to a commit message, and different to an article)
+# Error - error log messages
+# Debug - debug log messages
+# System - system log messages
+# 
+# Note: Journal events table in CreateJournal
+
+
+class CreateEvents < ActiveRecord::Migration
+
+  def self.up
+    create_table :events do |t|
+      t.column :entry_type, :enum, :limit => [:journal, :repository, :message, :error, :system, :debug]
+      t.integer :project_id
+      t.integer :user_id
+      t.integer :entry_id, :references => nil
+      t.timestamps
+    end
+    add_index :events, [:id]
+    add_index :events, [:project_id]
+    add_index :events, [:user_id]
+    add_index :events, [:entry_type]
+
+    create_table :debug_events do |t|
+      t.string :summary
+    end
+    add_index :debug_events, [:id]
+
+    create_table :system_events do |t|
+      t.string :summary
+    end
+    add_index :system_events, [:id]
+
+    create_table :error_events do |t|
+      t.string :summary
+    end
+    add_index :error_events, [:id]
+  end
+
+  
+  def self.down
+    drop_table :error_events
+    drop_table :system_events
+    drop_table :debug_events
+    drop_table :events
+  end
+end
\ No newline at end of file

--- a/db/migrate/010_create_ssh_keys.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class CreateSshKeys < ActiveRecord::Migration
-  def self.up
-    create_table :ssh_keys do |t|
-      t.integer :user_id, :references => nil
-      t.text  :key
-      t.timestamps
-    end
-    remove_column :users, :ssh_key
-    add_column :users, :ssh_key_id, :integer, :references => nil
-    add_index :ssh_keys, :user_id
-    add_index :users, :ssh_key_id
-  end
-
-  def self.down
-    drop_table :ssh_keys
-    add_column :users, :ssh_key, :text
-    remove_column :users, :ssh_key_id
-  end
-end

--- a/db/migrate/011_add_ready_status_to_repositories.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class AddReadyStatusToRepositories < ActiveRecord::Migration
-  def self.up
-    add_column :repositories, :ready, :boolean, :default => false
-    add_index :repositories, :ready
-  end
-
-  def self.down
-    remove_column :repositories, :ready
-  end
-end

--- /dev/null
+++ b/db/migrate/011_create_journals.rb
@@ -0,0 +1,93 @@
+#
+# The journal keeps a log of changed fields (that need journalling)
+# 
+# history queries needed:
+#   history of a row - select from journal where model_type = :article and row_id = 1
+#   history of a specific column in a row - select from journal where model_type = :article and row_id = 1 and changes.model_column = :price
+#   history of all changes by user or ip
+#   history last 100 changes
+#   
+#   Issues:
+#   How do we handle new columns created on existing rows
+#
+class CreateJournals < ActiveRecord::Migration
+
+  def self.up
+
+    # one journal entry for every create or update action
+    create_table :journals do |t|
+      t.column :model_type, :enum, :limit => [:article, :ticket, :wiki, :comment]
+      t.string :summary
+      t.integer :row_id, :references => nil # key back to the owner (e.g. article_id)
+      t.column :action, :enum, :limit => [:create, :update]
+      t.integer :user_id
+      t.string :ip
+      t.timestamps
+    end
+    add_index :journals, [:id, :model_type, :row_id]
+    add_index :journals, [:user_id]
+    add_index :journals, [:ip]
+
+    # one change entry for every field changed
+    create_table :changes do |t|
+      t.integer :journal_id
+      t.string :model_column # the name of the column that changed
+      t.column :datatype, :enum, :limit => [:string, :text, :integer, :enum, :datetime, :boolean]
+      t.integer :data_id, :references => nil
+    end
+    add_index :changes, [:id]
+    add_index :changes, [:journal_id, :model_column]
+    
+    create_table :changed_strings do |t|
+      t.string :data
+    end
+    add_index :changed_strings, [:id]
+
+    create_table :changed_texts do |t|
+      t.text :data
+    end
+    add_index :changed_texts, [:id]
+
+    create_table :changed_integers do |t|
+      t.integer :data
+    end
+    add_index :changed_integers, [:id]
+
+    create_table :changed_floats do |t|
+      t.float :data
+    end
+    add_index :changed_floats, [:id]
+
+    create_table :changed_datetimes do |t|
+      t.integer :data
+    end
+    add_index :changed_datetimes, [:id]
+
+    create_table :changed_booleans do |t|
+      t.boolean :data
+    end
+    add_index :changed_booleans, [:id]
+
+    create_table :changed_enums do |t|
+      t.string :data
+    end
+    add_index :changed_enums, [:id]
+
+  end
+
+  def self.down
+    drop_table :changed_enums
+    drop_table :changed_booleans
+    drop_table :changed_datetimes
+    drop_table :changed_floats
+    drop_table :changed_integers
+    drop_table :changed_texts
+    drop_table :changed_strings
+    drop_table :changes
+    drop_table :journals
+  end
+
+end
+
+
+    
\ No newline at end of file