smart_titles 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,49 +1,48 @@
 PATH
   remote: .
   specs:
-    smart_titles (0.3.0)
+    smart_titles (0.3.2)
       actionpack
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
+    activesupport (3.2.9)
       i18n (~> 0.6)
-    activesupport (3.1.3)
       multi_json (~> 1.0)
-    builder (3.0.0)
+    builder (3.0.4)
     erubis (2.7.0)
     guard (0.8.8)
       thor (~> 0.14.6)
     guard-minitest (0.4.0)
       guard (~> 0.4)
     hike (1.2.1)
-    i18n (0.6.0)
-    multi_json (1.0.4)
-    rack (1.3.5)
-    rack-cache (1.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    multi_json (1.3.7)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rake (0.9.2.2)
-    sprockets (2.0.3)
+    sprockets (2.2.1)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)

data/Readme.md

@@ -76,6 +76,9 @@ And now products#index page will have "Products from the Coolest Store" browser'
 
 Changelog
 ---
+### 0.3.2
+Page title is no longer double-escaped.
+
 ### 0.3.0
 * Important change in the documentation: you have to call `title` with no arguments when you want to use translated title.
 * Fixed bug when `head_title` returned default title even if there was a custom title in locale.

data/lib/smart_titles/helper.rb

@@ -29,7 +29,9 @@ module SmartTitles
     # * Set custom title for the current page if it is passed. Otherwise the title will be automatically set 
     # * Return the title passed or looked up from locale wrapped into h1 tag
     def title(custom_title = nil)
-      provide(:page_title, custom_title || page_title)
+      title = custom_title || page_title
+      title &&= title.html_safe
+      provide(:page_title, title)
       content_tag(:h1, page_title) if page_title
     end
 

data/lib/smart_titles/version.rb

@@ -1,3 +1,3 @@
 module SmartTitles
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/smart_titles/helper_test.rb

@@ -94,6 +94,19 @@ class SmartTitlesHelperTest < ActionView::TestCase
     assert_equal "My Website", head_title
   end
 
+
+  def test_head_title_template_is_escaped
+    store_translations title_template: '"%{title}"'
+    title 'New post'
+    assert_equal '&quot;New post&quot;', h(head_title)
+  end
+
+  def test_head_title_is_not_double_escaped
+    title 'New "post"'
+    assert_equal 'New &quot;post&quot;', h(head_title)
+  end
+
+
 private
 
   # Virtual path is used by Rails-patched version of I18n.translate
@@ -140,4 +153,8 @@ private
     store_translations title_template: "d %{title} b"
   end
 
+  def h(s)
+    ERB::Util.html_escape(s)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_titles
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,10 +100,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Really convenient way to set up page titles in a Rails application.
 test_files:
 - test/smart_titles/helper_test.rb
 - test/test_helper.rb
+has_rdoc: