@@ -1,7 +1,7 @@ module Permalinker def self.included(base) - base.send(:extend,ClassMethods) + base.send(:extend, ClassMethods) end module ClassMethods @@ -18,15 +18,7 @@ module Permalinker end # Adds class methods. - module SingletonMethods - def find(*args) - if args.first.is_a? String - super(:first, :conditions => ["slug = ?", args.first]) - else - super - end - end - + module SingletonMethods def format_identifier(s) s.gsub!(/'/,'') # remove characters that occur mid-word s.gsub!(/[\W]/,' ') # translate non-words into spaces lib/permalinker.rb @@ -5,7 +5,7 @@ describe Articles do include DefaultControllerHelper include ArticleSpecHelper - #it_should_behave_like "default controller behavior" + it_should_behave_like "default controller behavior" describe "#index" do it "should return a list of all articles in reverse order of creation" do spec/controllers/articles_spec.rb @@ -4,15 +4,13 @@ describe Article do include DefaultSpecHelper include DefaultModelHelper include ArticleSpecHelper - - it_should_behave_like "timestamps work correctly" + it_should_behave_like "validates required fields" it "should build a slug" do article = Article.new(:title => "Page One") - article.save - article.should_not be_nil - article.slug.should == "Page_One" + article.should be_valid + article.slug.should == "page-one" end end \ No newline at end of file spec/models/article_spec.rb @@ -9,7 +9,7 @@ module ArticleSpecHelper end def valid_attributes - {:title => 'My Bestest Blog Post'} + {:title => "Blog Post #{rand(50)} on #{Time.now.to_i}"} end def updated_attributes spec/spec_helpers/app_specific/article_spec_helper.rb spec/spec_helpers/shared_behaviors/timestamps.rb 1d1b1311fa0af7ede7cc7ab15d250dff924f4833 Jeff Whitmire jeff@jwhitmire.com http://github.com/hornbeck/blerb/commit/1f7054ff1c22c20c480b40ed88c97912f04ec851 1f7054ff1c22c20c480b40ed88c97912f04ec851 2008-02-04T22:56:37-08:00 2008-02-04T22:56:37-08:00 fixed article specs; removed class find method from permalinker; removed useless timestamp shared behavior 7a71ba9d1e19872e40c86755d10eb8b6498fe892 Jeff Whitmire jeff@jwhitmire.com