@@ -14,8 +14,12 @@ module HappyTitles content_tag(:title, render_title_template(template_key)) end - def title(page_title) - @page_title = h(page_title.gsub(/<\/?[^>]*>/, '')) if page_title + def title(page_title = nil) + if page_title + @page_title = h(page_title.gsub(/<\/?[^>]*>/, '')) if page_title + else + @page_title || '' + end end def self.included(base) lib/happy_titles.rb @@ -120,7 +120,7 @@ describe 'Happy Titles!' do it 'should set the title' do @view.title("Happy Title!") - @view.send(:page_title).should eql("Happy Title!") + @view.send(:page_title).should == "Happy Title!" end it 'should overwrite a privously set title' do @@ -146,6 +146,24 @@ describe 'Happy Titles!' do end + describe 'reading the title method' do + + it 'should return an empty string when called with no args' do + @view.title.should == '' + end + + it 'should return @page_title when @page_title is set and is called with no args' do + @view.title('Happy Title!') + @view.title.should == 'Happy Title!' + end + + it 'should not set the title when called with no args' do + @view.title + @view.happy_title.should have_tag('title', 'My Site | My short, descriptive and witty tagline') + end + + end + describe 'showing the title' do it 'should output a valid title element' do spec/happy_titles_spec.rb bf73b48c8f11e56067f679df96a475aaabf7281c Andy Pearson andy@andy-pearson.com http://github.com/andypearson/happy-titles/commit/49c3accb89a14f5faa00314a099150a0f6409024 49c3accb89a14f5faa00314a099150a0f6409024 2009-03-19T11:33:38-07:00 2009-03-19T11:33:38-07:00 Updating the title method so it returns the current page_title or an empty string when called with no arguments 2406c1103cba767e41d79ea15e60603a3018c4cc Andy Pearson andy@andy-pearson.com