smart_titles 0.1.2 → 0.2.0

data/Gemfile.lock

@@ -1,52 +1,66 @@
 PATH
   remote: .
   specs:
-    smart_titles (0.1.2.pre)
+    smart_titles (0.2.0)
       actionpack
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.5)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    bcrypt-ruby (3.0.0)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    mocha (0.9.12)
+    multi_json (1.0.3)
+    rack (1.3.2)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
-    tzinfo (0.3.24)
+    rspec-mocks (2.6.0)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  mocha
+  rake
   rspec
   smart_titles!

data/README.md

@@ -26,12 +26,9 @@ Integration
 ---
 You have to insert the following code inside the `<title>` tag in your layout:
 
-    <title><%= page_title || "Default title" %></title>
+    <title><%= head_title "Default title" %></title>
 
-The default title is displayed only if you haven't specified the title in your view.
-You can also omit `||` operator like this:
-
-    <title><%= page_title "Default title" %></title>
+The default title is displayed only if you haven't specified title in your view.
 
 With Internationalization
 ---
@@ -45,9 +42,40 @@ If you are using I18n in your Rails application static titles are specified in t
         new:
           title: Create a page
 
+And then you should just call `title` without any arguments.
+
+    <%= title %>
+
+Note that you don't have to call it if you don't output it.
+
+    <% title %>
+
 Dynamic titles are set as usual:
 
-    <%= title @page.title %> 
+    <%= title @page.title %>
+
+"Default title" will be only used by `head_title` if you call it with no arguments and there will be no title set by the current page.
+
+    <title><%= head_title %></title>
+
+Title Template
+---
+If you want to add your website name to all of your titles just add :title_template translation
+
+    en:
+      title: The Coolest Store
+      title_template: %{title} from the Coolest Store
+      products:
+        index:
+          title: Products
+
+And now products#index page will have "Products from the Coolest Store" browser's title. However, `<%= title %>` will still output `<h1>Products</h1>`.
+
+Changelog
+---
+### 0.2.0
+* `page_title` renamed to `head_title`.
+* Added support for :title_template translation
 
 Contributing
 ---

data/TODO

@@ -1 +0,0 @@
-* Test all functionality (especially with i18n)

data/lib/smart_titles/helper.rb

@@ -1,20 +1,33 @@
 module SmartTitles
   module Helper
     MISSING_TRANSLATION = 0
-  
-    def page_title(default = nil)
-      title if @page_title.nil?
-      @page_title != MISSING_TRANSLATION ? @page_title : default
-    end
 
-    def title(str = nil)
-      if str.nil?
-        str = t('.title')
-        @page_title = t('.title', :default => [:title, MISSING_TRANSLATION])
+    def head_title(custom_default_title = nil)
+      if title = page_title
+        t(:title_template, title: title, default: title)
       else
-        @page_title = str
+        page_title || custom_default_title || default_title
       end
-      content_tag(:h1, str)
+    end
+
+    attr_writer :page_title
+
+    def page_title
+      @page_title || default_page_title
+    end
+
+    def title(new_title = nil)
+      self.page_title = new_title if new_title
+      content_tag(:h1, page_title) if page_title
+    end
+
+    def default_page_title
+      translation = t('.title', default: MISSING_TRANSLATION)
+      translation unless translation == MISSING_TRANSLATION
+    end
+
+    def default_title
+      t(:title)
     end
   end
 end

data/lib/smart_titles/version.rb

@@ -1,3 +1,3 @@
 module SmartTitles
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/smart_titles.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport'
   s.add_dependency 'actionpack'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'mocha'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/smart_titles_helper_spec.rb

@@ -4,19 +4,124 @@ describe SmartTitles::Helper do
   include ActionView::Helpers
 
   before do
-    @sample = 'Hello World!'
+    @virtual_path = 'posts/new'
+    I18n.backend.reload!
   end
 
-  describe '#page_title' do
-    it 'returns the title set by #title' do
-      title(@sample)
-      page_title.should == @sample
+  def store_translations(*args)
+    I18n.backend.store_translations(:en, *args)
+  end
+
+  describe 'no i18n' do
+    describe '#title' do
+      it "sets #page_title" do
+        title("Hi")
+        page_title.should == "Hi"
+      end
+
+      it "returns h1-wrapped title" do
+        title("Hi").should == "<h1>Hi</h1>"
+      end
+    end
+
+    describe '#page_title' do
+      it "returns nil if no title was set" do
+        page_title.should == nil
+      end
+    end
+
+    describe '#head_title' do
+      it 'returns #page_title if it was set' do
+        title("Hi")
+        head_title.should == "Hi"
+      end
+
+      it "returns missing translation if no title was set" do
+        head_title.should include("translation missing: en.title")
+      end
+
+      it "returns title passed if no title was set" do
+        head_title("Default").should == "Default"
+      end
+
+      describe 'with :title_template' do
+        it "used for page_title" do
+          store_translations title_template: "d %{title} b"
+          title("New post")
+          head_title.should == "d New post b"
+        end
+
+        it "is skipped for custom title" do
+          store_translations title_template: "d %{title} b"
+          head_title("Default").should == "Default"
+        end
+      end
     end
   end
 
-  describe '#title' do
-    it 'returns the title in h1 tag' do
-      title(@sample).should == "<h1>#{@sample}</h1>"
+  describe 'i18n' do
+    describe '#title' do
+      it "returns .title wrapped in h1 tag if there are :title and .title" do
+        store_translations title: "My Website", posts: { new: { title: "New post" } }
+        title.should == "<h1>New post</h1>"
+      end
+
+      it "returns .title wrapped in h1 tag if there is only .title" do
+        store_translations posts: { new: { title: "New post" } }
+        title.should == "<h1>New post</h1>"
+      end
+
+      it "returns nothing if there is no .title" do
+        store_translations title: "My Website"
+        title.should == nil
+      end
+
+      it "returns nothing if there are no translations" do
+        title.should == nil
+      end
+    end
+
+    describe '#head_title' do
+      it "returns .title if there are :title and .title" do
+        store_translations title: "My Website", posts: { new: { title: "New post" } }
+        head_title.should == "New post"
+      end
+
+      it "returns .title if there is only .title" do
+        store_translations posts: { new: { title: "New post" } }
+        head_title.should == "New post"
+      end
+
+      it "returns :title if there is no .title" do
+        store_translations title: "My Website"
+        head_title.should == "My Website"
+      end
+
+      it "returns missing translation if there are no tranlations" do
+        head_title.should include("translation missing: en.title")
+      end
+
+      it "returns custom title" do
+        store_translations title: "My Website"
+        head_title("Custom").should == "Custom"
+      end
+
+      it "returns .title even if custom default title is passed" do
+        store_translations posts: { new: { title: "New post" } }
+        head_title("Custom").should == "New post"
+      end
+
+      describe 'with :title_template' do
+        it "used for page_title" do
+          store_translations title_template: "d %{title} b", posts: { new: { title: "New post" } }
+          head_title.should == "d New post b"
+        end
+
+        it "is skipped for default title" do
+          store_translations title: "My Website", title_template: "d %{title} b"
+          head_title.should == "My Website"
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'rails/all'
+require 'active_support/all'
+require 'action_view'
 require 'smart_titles'
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -9,5 +9,5 @@ require 'smart_titles'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+  config.mock_with :mocha
 end

metadata

@@ -1,60 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: smart_titles
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-14 00:00:00 +07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70267713724040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70267713724040
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70267713723160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70267713723160
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &70267713722240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70267713722240
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70267713721580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70267713721580
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70267713720720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70267713720720
 description: 
 email: sema@sema.in
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .rspec
@@ -64,7 +81,6 @@ files:
 - README.md
 - Rakefile
 - TODO
-- VERSION
 - lib/smart_titles.rb
 - lib/smart_titles/helper.rb
 - lib/smart_titles/railtie.rb
@@ -72,34 +88,37 @@ files:
 - smart_titles.gemspec
 - spec/smart_titles_helper_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/semaperepelitsa/smart_titles
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2783804746369927006
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2783804746369927006
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Really convenient way to set up page titles in Rails application.
-test_files: 
+test_files:
 - spec/smart_titles_helper_spec.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.1