db/migrate/20090611075753_add_slug_to_users.rb @@ -13,6 +13,8 @@ class User < ActiveRecord::Base validates_uniqueness_of :email, :allow_blank => true validates_uniqueness_of :blog_url, :twitter_user, :github_user, :allow_blank => true + sluggable_finder :name + # Returns the full github URL for this user if has a github user, or nil if not def github_url github_user.blank? ? nil : "#{GITHUB_URL}#{github_user}" @@ -22,4 +24,5 @@ class User < ActiveRecord::Base def twitter_url twitter_user.blank? ? nil : "#{TWITTER_URL}#{twitter_user}" end + end app/models/user.rb @@ -1,6 +1,6 @@ <p> - <strong><%= link_to h(entry.title), entry.url %></strong> published<%= " #{time_ago_in_words entry.published} ago" if entry.published %> by <%= link_to h(entry.feed.user.name), entry.feed.user %> - <%= link_to image_tag(url_for_gravatar(entry.feed.user.email), :alt => h(entry.feed.user.name), :title => h(entry.feed.user.name), :align => 'absmiddle', :hspace => 10), entry.feed.user if PLANETOID_CONF[:layout][:entries][:show_avatar] %> + <strong><%= link_to h(entry.title), entry.url %></strong> published<%= " #{time_ago_in_words entry.published} ago" if entry.published %> by <%= link_to h(entry.feed.user.name), member_path(entry.feed.user) %> + <%= link_to image_tag(url_for_gravatar(entry.feed.user.email), :alt => h(entry.feed.user.name), :title => h(entry.feed.user.name), :align => 'absmiddle', :hspace => 10), member_path(entry.feed.user) if PLANETOID_CONF[:layout][:entries][:show_avatar] %> </p> <% if PLANETOID_CONF[:layout][:entries][:show_summary] && entry.summary %> app/views/entries/_entry.html.erb @@ -20,8 +20,4 @@ <%= f.submit 'Update' %> </p> <% end %> - - <%= link_to 'Show', @feed %> | - <%= link_to 'Back', feeds_path %> - </div> \ No newline at end of file app/views/feeds/edit.html.erb @@ -14,7 +14,7 @@ <% @feeds.each do |feed| %> <tr> - <td><%=link_to h(feed.user.name), feed.user %></td> + <td><%=link_to h(feed.user.name), member_path(feed.user) %></td> <td><%= auto_link feed.feed_url %></td> <% if admin? %> <td><%= link_to 'Edit', edit_feed_path(feed) %></td> app/views/feeds/index.html.erb @@ -21,5 +21,4 @@ </p> <% end %> - <%= link_to 'Back', feeds_path %> </div> \ No newline at end of file app/views/feeds/new.html.erb @@ -1,5 +1,5 @@ <div class="span-12 last"> - <h3><strong><%= h project.name %></strong> <small>by <%= project.users.map {|u| "#{link_to(h(u.name), u)}"}.join(", ") %></small></h3> + <h3><strong><%= h project.name %></strong> <small>by <%= project.users.map {|u| "#{link_to(h(u.name), member_path(u))}"}.join(", ") %></small></h3> <p><%= link_to h(project.url.gsub("http://", "")), h(project.url) %></p> <blockquote><%= simple_format(project.description) %></blockquote> app/views/projects/_project.html.erb @@ -1,5 +1,5 @@ <div class="span-3"> - <%= link_to image_tag(url_for_gravatar(user.email), :alt => h(user.name), :title => h(user.name)), user if PLANETOID_CONF[:layout][:users][:show_avatar] %> + <%= link_to image_tag(url_for_gravatar(user.email), :alt => h(user.name), :title => h(user.name)), member_path(user) if PLANETOID_CONF[:layout][:users][:show_avatar] %> </div> <div class="span-12 last"> <h3><strong><%= h user.name %></strong></h3> app/views/users/_user.html.erb @@ -20,6 +20,7 @@ Rails::Initializer.run do |config| # config.gem "sqlite3-ruby", :lib => "sqlite3" # config.gem "aws-s3", :lib => "aws/s3" config.gem 'pauldix-feedzirra', :version => '~> 0.0.12', :lib => 'feedzirra', :source => 'http://gems.github.com' + config.gem "ismasan-sluggable_finder", :source => "http://gems.github.com", :lib => 'sluggable_finder' # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named config/environment.rb @@ -8,6 +8,9 @@ ActionController::Routing::Routes.draw do |map| map.resources :entries map.resources :feeds map.resources :users + + map.members '/members', :controller => 'users', :action => 'index' + map.member '/members/:id', :controller => 'users', :action => 'show' # The priority is based upon order of creation: first created -> highest priority. config/routes.rb @@ -1,14 +1,75 @@ -CREATE TABLE "entries" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "feed_id" integer, "title" varchar(255), "url" varchar(255), "author" varchar(255), "summary" text, "content" text, "published" datetime, "categories" varchar(255), "created_at" datetime, "updated_at" datetime); -CREATE TABLE "feeds" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer, "title" varchar(255), "url" varchar(255), "feed_url" varchar(255), "etag" varchar(255), "last_modified" datetime, "created_at" datetime, "updated_at" datetime); -CREATE TABLE "projects" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "description" text, "url" varchar(255), "created_at" datetime, "updated_at" datetime); -CREATE TABLE "projects_users" ("project_id" integer, "user_id" integer); -CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL); -CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "email" varchar(255), "blog_url" varchar(255), "twitter_url" varchar(255), "github_url" varchar(255), "created_at" datetime, "updated_at" datetime); -CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version"); +CREATE TABLE `entries` ( + `id` int(11) NOT NULL auto_increment, + `feed_id` int(11) default NULL, + `title` varchar(255) default NULL, + `url` varchar(255) default NULL, + `author` varchar(255) default NULL, + `summary` text, + `content` text, + `published` datetime default NULL, + `categories` varchar(255) default NULL, + `created_at` datetime default NULL, + `updated_at` datetime default NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; + +CREATE TABLE `feeds` ( + `id` int(11) NOT NULL auto_increment, + `user_id` int(11) default NULL, + `title` varchar(255) default NULL, + `url` varchar(255) default NULL, + `feed_url` varchar(255) default NULL, + `etag` varchar(255) default NULL, + `last_modified` datetime default NULL, + `created_at` datetime default NULL, + `updated_at` datetime default NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; + +CREATE TABLE `projects` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(255) default NULL, + `description` text, + `url` varchar(255) default NULL, + `created_at` datetime default NULL, + `updated_at` datetime default NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; + +CREATE TABLE `projects_users` ( + `project_id` int(11) default NULL, + `user_id` int(11) default NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `schema_migrations` ( + `version` varchar(255) NOT NULL, + UNIQUE KEY `unique_schema_migrations` (`version`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `users` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(255) default NULL, + `email` varchar(255) default NULL, + `blog_url` varchar(255) default NULL, + `twitter_user` varchar(255) default NULL, + `github_user` varchar(255) default NULL, + `created_at` datetime default NULL, + `updated_at` datetime default NULL, + `slug` varchar(255) default NULL, + PRIMARY KEY (`id`), + KEY `index_users_on_slug` (`slug`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; + INSERT INTO schema_migrations (version) VALUES ('20090520134455'); INSERT INTO schema_migrations (version) VALUES ('20090520145728'); INSERT INTO schema_migrations (version) VALUES ('20090520155946'); -INSERT INTO schema_migrations (version) VALUES ('20090528214708'); \ No newline at end of file +INSERT INTO schema_migrations (version) VALUES ('20090528214049'); + +INSERT INTO schema_migrations (version) VALUES ('20090528214708'); + +INSERT INTO schema_migrations (version) VALUES ('20090609085237'); + +INSERT INTO schema_migrations (version) VALUES ('20090611075753'); \ No newline at end of file db/development_structure.sql @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090528214708) do +ActiveRecord::Schema.define(:version => 20090611075753) do create_table "entries", :force => true do |t| t.integer "feed_id" @@ -56,6 +56,9 @@ ActiveRecord::Schema.define(:version => 20090528214708) do t.string "github_user" t.datetime "created_at" t.datetime "updated_at" + t.string "slug" end + add_index "users", ["slug"], :name => "index_users_on_slug" + end db/schema.rb @@ -1,6 +1,7 @@ jaime: id: 1 name: Jaime Iniesta + slug: jaime-iniesta email: jaimeiniesta@example.com blog_url: http://jaimeiniesta.com twitter_user: jaimeiniesta @@ -9,6 +10,7 @@ jaime: rai: id: 2 name: Raimond Garcia + slug: raimond-garcia email: raimondgarcia@example.com blog_url: http://raimondgarcia.com twitter_user: voodoorai2000 @@ -17,6 +19,7 @@ rai: raul: id: 3 name: Raul Murciano + slug: raul-murciano email: raulmurciano@example.com blog_url: http://raul.murciano.net twitter_user: happywebcoder @@ -25,6 +28,7 @@ raul: javier: id: 4 name: Javier Ramirez + slug: javier-ramirez email: javierramirez@example.com blog_url: http://formatinternet.com twitter_user: supercoco9 @@ -33,6 +37,7 @@ javier: emili: id: 5 name: Emili Parreno + slug: emili-parreno email: emiliparreno@example.com blog_url: http://eparreno.com twitter_user: eparreno @@ -41,6 +46,7 @@ emili: felipe: id: 6 name: Felipe Talavera + slug: felipe-talavera email: felipetalavera@example.com blog_url: http://iamfelipe.com twitter_user: flype @@ -49,6 +55,7 @@ felipe: juan: id: 7 name: Juan Gallego + slug: juan-gallego email: juangallego@example.com blog_url: http://juan.gg twitter_user: nickel83 @@ -57,5 +64,6 @@ juan: notdeveloper: id: 8 name: Not Developer + slug: not-developer email: notdeveloper@example.com blog_url: http://notdeveloper.example.com \ No newline at end of file test/fixtures/users.yml @@ -135,6 +135,16 @@ class UserTest < ActiveSupport::TestCase assert_nil users(:notdeveloper).github_url end + def test_should_create_slug + user = create_user + assert_equal user.slug, 'pepe-planeta' + end + + def test_should_not_repeat_slug + user = create_user(:name => 'Jaime Iniesta') + assert_equal user.slug, 'jaime-iniesta-2' + end + private def create_user(options = {}) test/unit/user_test.rb 51df0b7ebdf644be5f7cb7f2e279a3dec7c042e2 Jaime Iniesta jaimeiniesta@gmail.com http://github.com/jaimeiniesta/planetoid/commit/62e3f77379f3da165632fde75486e46989ee6129 62e3f77379f3da165632fde75486e46989ee6129 2009-06-11T01:45:01-07:00 2009-06-11T01:45:01-07:00 Added sluggable_finder gem for user permalinks; Members paths c1e14112e778c11e50dbf7c2be8f729e6b4c83fc Jaime Iniesta jaimeiniesta@gmail.com