@@ -10,7 +10,7 @@ module Admin end def show(id) - @article = Article.find_by_slug(id) + @article = Article.with_slug(id) raise NotFound unless @article display @article end @@ -32,13 +32,13 @@ module Admin def edit(id) only_provides :html - @article = Article.find_by_slug(id) + @article = Article.with_slug(id) raise NotFound unless @article render end def update(id, article) - @article = Article.find_by_slug(id) + @article = Article.with_slug(id) raise NotFound unless @article if @article.update_attributes(article) redirect url(:admin_article, @article) @@ -48,7 +48,7 @@ module Admin end def destroy(id) - @article = Article.find_by_slug(id) + @article = Article.with_slug(id) raise NotFound unless @article if @article.destroy! redirect url(:admin_articles) app/controllers/admin/articles.rb @@ -2,12 +2,12 @@ class Articles < Application provides :html, :atom def index - @articles = Article.find(:all, :order => 'created_at desc') + @articles = Article.all(:order => 'created_at desc') display @articles end def show(id) - @article = Article.find_by_slug(id) + @article = Article.with_slug(id) raise NotFound unless @article display @article end app/controllers/articles.rb @@ -27,7 +27,7 @@ module Permalinker s.downcase # lowercase what's left end - def find_by_slug(slug) + def with_slug(slug) first :slug => slug end end lib/permalinker.rb d010765d10cbdfc3cfff9f39fdf194e38b886c85 Josh Nichols josh@technicalpickles.com http://github.com/hornbeck/blerb-core/commit/fbc7482b96bbbef9cf8537f7342df9834b321740 fbc7482b96bbbef9cf8537f7342df9834b321740 2008-02-13T22:44:39-08:00 2008-02-13T22:44:39-08:00 Changed Permalinker's find_by_slug to with_slug. Seems to fit better with DM's .first, .all, etc 710a5e11d28249fd4cf6cca453d5ed89f68a5e63 Josh Nichols josh@technicalpickles.com