happy-titles 1.0.0 → 1.1.0

data/Rakefile

@@ -1,10 +1,11 @@
+require 'rubygems'
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 desc 'Test the happy-titles plugin.'
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["-c"]
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.pattern = FileList['spec/*_spec.rb']
+  t.rspec_opts = ['-c']
 end
 
 begin

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/happy-titles.gemspec

@@ -1,49 +1,47 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{happy-titles}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Pearson"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2011-05-07}
   s.email = %q{andy@andy-pearson.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
     ".git_ignore",
-     ".gitignore",
-     "MIT-LICENCE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "happy-titles.gemspec",
-     "init.rb",
-     "lib/happy-titles.rb",
-     "lib/happy-titles/railtie.rb",
-     "rails/init.rb",
-     "spec/happy_titles_spec.rb",
-     "spec/spec_helper.rb"
+    "MIT-LICENCE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "happy-titles.gemspec",
+    "init.rb",
+    "lib/happy-titles.rb",
+    "lib/happy-titles/railtie.rb",
+    "rails/init.rb",
+    "spec/happy_titles_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/andypearson/happy-titles}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A simple way to handle page titles in your layouts.}
   s.test_files = [
     "spec/happy_titles_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/happy-titles.rb

@@ -16,12 +16,20 @@ module HappyTitles
     content_tag(:title, render_title_template(template_key))
   end
   
-  def title(page_title = nil)
+  def title(page_title = nil, settings = {})
+
+    if page_title && page_title.is_a?(Hash)
+      settings = page_title
+      page_title = settings[:title] ? settings[:title] : nil
+    end
+    
+    @happy_title_settings = settings
     if page_title
       @page_title = h(page_title.gsub(/<\/?[^>]*>/, '')) if page_title
     else
       @page_title || ''
     end
+    
   end
   
   def self.included(base)
@@ -46,18 +54,26 @@ module HappyTitles
     
     def render_title_template(template_key)
       key = (@page_title && @@happy_title_settings[:templates][template_key][1]) ? 1 : 0
-      substitute_placeholders(@@happy_title_settings[:templates][template_key][key])
+      template = read_happy_title_setting(:template) ? read_happy_title_setting(:template) : @@happy_title_settings[:templates][template_key][key]
+      substitute_placeholders(template)
     end
     
     def substitute_placeholders(template)
       title = template
       title = title.gsub(':title', title_text)
-      title = title.gsub(':site', @@happy_title_settings[:site])
-      title = title.gsub(':tagline', @@happy_title_settings[:tagline])
+      title = title.gsub(':site', read_happy_title_setting(:site))
+      title = title.gsub(':tagline', read_happy_title_setting(:tagline))
+    end
+    
+    def read_happy_title_setting(key)
+      setting = @@happy_title_settings[key]
+      setting = @happy_title_settings[key] if @happy_title_settings && !@happy_title_settings[key].blank?
+      setting = setting.call if setting.is_a?(Proc)
+      setting
     end
     
     def title_text
-      (@page_title) ? @page_title : @@happy_title_settings[:tagline]
+      (@page_title) ? @page_title : read_happy_title_setting(:tagline)
     end
     
 end

data/spec/happy_titles_spec.rb

@@ -4,6 +4,13 @@ describe 'Happy Titles!' do
   
   before do
     @view = ActionView::Base.new
+    @default_site = ActionView::Base.happy_title_settings[:site].dup
+    @default_tagline = ActionView::Base.happy_title_settings[:tagline].dup
+  end
+  
+  after do
+    ActionView::Base.happy_title_setting(:site, @default_site)
+    ActionView::Base.happy_title_setting(:tagline, @default_tagline)
   end
   
   describe 'after loading the plugin' do
@@ -67,16 +74,6 @@ describe 'Happy Titles!' do
   
   describe 'custom settings' do
     
-    before do
-      @default_site = ActionView::Base.happy_title_settings[:site].dup
-      @default_tagline = ActionView::Base.happy_title_settings[:tagline].dup
-    end
-    
-    after do
-      ActionView::Base.happy_title_setting(:site, @default_site)
-      ActionView::Base.happy_title_setting(:tagline, @default_tagline)
-    end
-    
     it 'should be able to change the default site' do
       ActionView::Base.happy_title_setting(:site, 'My Custom Site')
       ActionView::Base.happy_title_settings[:site].should == 'My Custom Site'
@@ -120,7 +117,7 @@ describe 'Happy Titles!' do
     
     it 'should set the title' do
       @view.title("Happy Title!")
-      @view.send(:page_title).should == "Happy Title!"
+      @view.page_title.should == "Happy Title!"
     end
     
     it 'should overwrite a privously set title' do
@@ -146,6 +143,65 @@ describe 'Happy Titles!' do
     
   end
   
+  describe 'setting the title with a hash' do
+    
+    it 'should overwite the title' do
+      @view.title(:title => 'My page title')
+      @view.happy_title.should have_tag('title', 'My page title | My Site')
+    end
+    
+    it 'should overwrite the site' do
+      @view.title(:site => 'Overridden Site')
+      @view.happy_title.should have_tag('title', 'Overridden Site | My short, descriptive and witty tagline')
+    end
+    
+    it 'should not overwrite the site if the provided value is blank' do
+      @view.title(:site => '')
+      @view.happy_title.should have_tag('title', 'My Site | My short, descriptive and witty tagline')
+    end
+    
+    it 'should overwrite the tagline' do
+      @view.title(:tagline => 'Overridden Tagline')
+      @view.happy_title.should have_tag('title', 'My Site | Overridden Tagline')
+    end
+      
+    it 'should not overwrite the tagline if the provided value is blank' do
+      @view.title(:tagline => '')
+      @view.happy_title.should have_tag('title', 'My Site | My short, descriptive and witty tagline')
+    end
+    
+    it 'should overwrite the template' do
+      @view.title(:template => '[[:site]] -- :title')
+      @view.happy_title.should have_tag('title', '[[My Site]] -- My short, descriptive and witty tagline')
+    end
+    
+    it 'should not overwrite the template if the provided value is blank' do
+      @view.title(:template => '')
+      @view.happy_title.should have_tag('title', 'My Site | My short, descriptive and witty tagline')
+    end
+    
+    it 'should allow you to set the title seperatly' do
+      @view.title('Custom page title', :site => 'Overridden Tagline')
+      @view.happy_title.should have_tag('title', 'Custom page title | Overridden Tagline')
+    end
+    
+  end
+  
+  describe 'procs as settings' do
+    
+    it 'should allow a proc for the site name and tagline' do
+      @view.title(:site => Proc.new { "Site Number #{2 + 2}" }, :tagline => Proc.new { "Tagline Number #{12 - 8}" })
+      @view.happy_title.should have_tag('title', 'Site Number 4 | Tagline Number 4')
+    end
+    
+    it 'should allow a proc for the site name and tagline from settings' do
+      ActionView::Base.happy_title_setting(:site, Proc.new { "Site Number #{3 + 3}" })
+      ActionView::Base.happy_title_setting(:tagline, Proc.new { "Tagline Number #{10 - 4}" })
+      @view.happy_title.should have_tag('title', 'Site Number 6 | Tagline Number 6')
+    end
+    
+  end
+  
   describe 'reading the title method' do
     
     it 'should return an empty string when called with no args' do

data/spec/spec_helper.rb

@@ -1,22 +1,22 @@
 # coding: utf-8
 require 'rubygems'
 
-gem 'activesupport', '2.3.8'
-gem 'actionpack', '2.3.8'
+gem 'activesupport', '~> 3.0'
+gem 'actionpack', '~> 3.0'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
 
-gem 'rspec', '>= 1.2.6'
-gem 'rspec-rails', '>= 1.2.6'
+gem 'rspec', '~> 2.5'
+gem 'rspec-rails', '~> 2.5'
 gem 'hpricot', '>= 0.6.1'
 gem 'rspec_tag_matchers', '>= 1.0.0'
 require 'rspec_tag_matchers'
 
 require File.join(File.dirname(__FILE__), "../lib/happy-titles")
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(RspecTagMatchers)
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: happy-titles
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Andy Pearson
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +01:00
+date: 2011-05-07 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +29,6 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .git_ignore
-- .gitignore
 - MIT-LICENCE
 - README.markdown
 - Rakefile
@@ -45,28 +45,32 @@ homepage: http://github.com/andypearson/happy-titles
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple way to handle page titles in your layouts.

data/.gitignore

@@ -1,2 +0,0 @@
-.DS_Store
-pkg