<% if project.completed? -%>
diff --git a/tracks/app/views/sidebar/_context.rhtml b/tracks/app/views/sidebar/_context.rhtml
index 8295d64e..70f69ca6 100644
--- a/tracks/app/views/sidebar/_context.rhtml
+++ b/tracks/app/views/sidebar/_context.rhtml
@@ -1 +1 @@
-
diff --git a/tracks/app/views/sidebar/_project.rhtml b/tracks/app/views/sidebar/_project.rhtml
index 176f8a48..a4be5026 100644
--- a/tracks/app/views/sidebar/_project.rhtml
+++ b/tracks/app/views/sidebar/_project.rhtml
@@ -1 +1 @@
-
diff --git a/tracks/app/views/todo/_completed.rhtml b/tracks/app/views/todo/_completed.rhtml
index 9743962d..476b3e83 100644
--- a/tracks/app/views/todo/_completed.rhtml
+++ b/tracks/app/views/todo/_completed.rhtml
@@ -9,7 +9,7 @@
-
Currently there are no completed actions <%= append_descriptor %>
+
Currently there are no completed actions.
<%= render :partial => "todo/item", :collection => done, :locals => { :parent_container_type => "completed" } %>
diff --git a/tracks/config/environment.rb.tmpl b/tracks/config/environment.rb.tmpl
index d2d3a842..752f46b7 100644
--- a/tracks/config/environment.rb.tmpl
+++ b/tracks/config/environment.rb.tmpl
@@ -64,6 +64,7 @@ AUTHENTICATION_SCHEMES = ['database']
require 'name_part_finder'
require 'todo_list'
+require 'url_friendly_name'
require 'config'
if (AUTHENTICATION_SCHEMES.include? 'ldap')
diff --git a/tracks/config/routes.rb b/tracks/config/routes.rb
index d5b5011e..faa2c710 100644
--- a/tracks/config/routes.rb
+++ b/tracks/config/routes.rb
@@ -39,22 +39,22 @@ ActionController::Routing::Routes.draw do |map|
map.connect 'context/create', :controller => 'context', :action => 'create'
map.connect 'context/order', :controller => 'context', :action => 'order'
map.connect 'context/:id', :controller=> 'context', :action => 'show', :requirements => {:id => /\d+/}
- map.connect 'context/:context/feed/:action/:name/:token', :controller => 'feed'
- map.connect 'context/:name', :controller => 'context', :action => 'show'
+ map.connect 'context/:context/feed/:action/:url_friendly_name/:token', :controller => 'feed'
+ map.connect 'context/:url_friendly_name', :controller => 'context', :action => 'show'
map.connect 'contexts', :controller => 'context', :action => 'list'
- map.connect 'contexts/feed/:feedtype/:name/:token', :controller => 'feed', :action => 'list_contexts_only'
+ map.connect 'contexts/feed/:feedtype/:url_friendly_name/:token', :controller => 'feed', :action => 'list_contexts_only'
# Projects Routes
map.connect 'project/create', :controller => 'project', :action => 'create'
map.connect 'project/toggle_check/:id', :controller => 'project', :action => 'toggle_check'
map.connect 'project/order', :controller => 'project', :action => 'order'
- map.connect 'project/:project/feed/:action/:name/:token', :controller => 'feed'
+ map.connect 'project/:project/feed/:action/:url_friendly_name/:token', :controller => 'feed'
map.connect 'project/:id', :controller => 'project', :action => 'show', :requirements => {:id => /\d+/}
- map.connect 'project/:name', :controller => 'project', :action => 'show'
+ map.connect 'project/:url_friendly_name', :controller => 'project', :action => 'show'
map.connect 'projects', :controller => 'project', :action => 'list'
- map.connect 'projects/feed/:feedtype/:name/:token', :controller => 'feed', :action => 'list_projects_only'
+ map.connect 'projects/feed/:feedtype/:url_friendly_name/:token', :controller => 'feed', :action => 'list_projects_only'
# Notes Routes
map.connect 'note/add', :controller => 'note', :action => 'add'
@@ -64,7 +64,7 @@ ActionController::Routing::Routes.draw do |map|
# Feed Routes
map.connect 'feeds', :controller => 'feed', :action => 'index'
- map.connect 'feed/:action/:name/:token', :controller => 'feed'
+ map.connect 'feed/:action/:url_friendly_name/:token', :controller => 'feed'
# Install the default route as the lowest priority.
map.connect ':controller/:action/:id'
diff --git a/tracks/db/schema.rb b/tracks/db/schema.rb
index d2906f34..e16f95d1 100644
--- a/tracks/db/schema.rb
+++ b/tracks/db/schema.rb
@@ -5,10 +5,10 @@
ActiveRecord::Schema.define(:version => 20) do
create_table "contexts", :force => true do |t|
- t.column "name", :string, :default => "", :null => false
- t.column "position", :integer, :default => 0, :null => false
- t.column "hide", :boolean, :default => false
- t.column "user_id", :integer, :default => 1
+ t.column "name", :string, :default => "", :null => false
+ t.column "hide", :integer, :limit => 4, :default => 0, :null => false
+ t.column "position", :integer, :default => 0, :null => false
+ t.column "user_id", :integer, :default => 0, :null => false
end
create_table "notes", :force => true do |t|
@@ -56,7 +56,7 @@ ActiveRecord::Schema.define(:version => 20) do
create_table "projects", :force => true do |t|
t.column "name", :string, :default => "", :null => false
t.column "position", :integer, :default => 0, :null => false
- t.column "user_id", :integer, :default => 1
+ t.column "user_id", :integer, :default => 0, :null => false
t.column "description", :text
t.column "state", :string, :limit => 20, :default => "active", :null => false
end
@@ -70,23 +70,23 @@ ActiveRecord::Schema.define(:version => 20) do
add_index "sessions", ["session_id"], :name => "sessions_session_id_index"
create_table "todos", :force => true do |t|
- t.column "context_id", :integer, :default => 0, :null => false
- t.column "project_id", :integer
- t.column "description", :string, :default => "", :null => false
+ t.column "context_id", :integer, :default => 0, :null => false
+ t.column "description", :string, :limit => 100, :default => "", :null => false
t.column "notes", :text
t.column "created_at", :datetime
t.column "due", :date
t.column "completed_at", :datetime
- t.column "user_id", :integer, :default => 1
+ t.column "project_id", :integer
+ t.column "user_id", :integer, :default => 0, :null => false
t.column "show_from", :date
- t.column "state", :string, :limit => 20, :default => "immediate", :null => false
+ t.column "state", :string, :limit => 20, :default => "immediate", :null => false
end
create_table "users", :force => true do |t|
- t.column "login", :string, :limit => 80, :default => "", :null => false
- t.column "password", :string, :limit => 40, :default => "", :null => false
+ t.column "login", :string, :limit => 80
+ t.column "password", :string, :limit => 40
t.column "word", :string
- t.column "is_admin", :boolean, :default => false, :null => false
+ t.column "is_admin", :integer, :limit => 4, :default => 0, :null => false
t.column "first_name", :string
t.column "last_name", :string
t.column "auth_type", :string, :default => "database", :null => false
diff --git a/tracks/lib/url_friendly_name.rb b/tracks/lib/url_friendly_name.rb
new file mode 100644
index 00000000..e8a7431b
--- /dev/null
+++ b/tracks/lib/url_friendly_name.rb
@@ -0,0 +1,20 @@
+module UrlFriendlyName
+
+ def self.included(base)
+ base.extend ClassMethods
+ end
+
+ def url_friendly_name
+ name.gsub(/_/,'__').gsub(/ /,'_').gsub(/\./,'__dot__')
+ end
+
+ module ClassMethods
+
+ def find_by_url_friendly_name(url_friendly_name)
+ name = url_friendly_name.gsub(/__dot__/,'.').gsub(/([^_])_(?!_)/,'\1 ').gsub(/__/,'_') #second regex replaces all single underscores with spaces
+ self.find_by_name(name)
+ end
+
+ end
+
+end
\ No newline at end of file
diff --git a/tracks/test/unit/context_test.rb b/tracks/test/unit/context_test.rb
index 5e499739..2dc0a163 100644
--- a/tracks/test/unit/context_test.rb
+++ b/tracks/test/unit/context_test.rb
@@ -76,4 +76,25 @@ class ContextTest < Test::Unit::TestCase
assert_equal 2, Context.find(@agenda.id).done_todos.size
end
+ def test_url_friendly_name_for_name_with_spaces
+ assert_url_friendly_name_converts_properly 'any computer', 'any_computer'
+ end
+
+ def test_url_friendly_name_for_name_without_spaces
+ assert_url_friendly_name_converts_properly 'NoSpacesHere', 'NoSpacesHere'
+ end
+
+ def test_url_friendly_name_for_name_with_underscores
+ assert_url_friendly_name_converts_properly 'there is an_underscore', 'there_is_an__underscore'
+ end
+
+ def assert_url_friendly_name_converts_properly(name, url_friendly_name)
+ context = Context.create(:name => name)
+ assert_equal url_friendly_name, context.url_friendly_name
+ found_context = Context.find_by_url_friendly_name(url_friendly_name)
+ assert_not_nil context
+ assert_equal context.id, found_context.id
+ end
+
+
end
diff --git a/tracks/test/unit/project_test.rb b/tracks/test/unit/project_test.rb
index a7858781..a1118d6d 100644
--- a/tracks/test/unit/project_test.rb
+++ b/tracks/test/unit/project_test.rb
@@ -99,5 +99,28 @@ class ProjectTest < Test::Unit::TestCase
assert_equal 1, Project.find(@timemachine.id).done_todos.size
end
-
+ def test_url_friendly_name_for_name_with_spaces
+ assert_url_friendly_name_converts_properly 'Build a playhouse', 'Build_a_playhouse'
+ end
+
+ def test_url_friendly_name_for_name_without_spaces
+ assert_url_friendly_name_converts_properly 'NoSpacesHere', 'NoSpacesHere'
+ end
+
+ def test_url_friendly_name_for_name_with_an_underscore
+ assert_url_friendly_name_converts_properly 'there is an_underscore', 'there_is_an__underscore'
+ end
+
+ def test_url_friendly_name_for_name_with_a_dot
+ assert_url_friendly_name_converts_properly 'hello.com', 'hello__dot__com'
+ end
+
+ def assert_url_friendly_name_converts_properly(name, url_friendly_name)
+ project = Project.create(:name => name)
+ assert_equal url_friendly_name, project.url_friendly_name
+ found_project = Project.find_by_url_friendly_name(url_friendly_name)
+ assert_not_nil project
+ assert_equal project.id, found_project.id
+ end
+
end