i18n_link 0.1.0 → 0.1.5

data/README.textile

@@ -2,7 +2,7 @@ h1. A helper for links in your translations
 
 h2. Why?
 
-I18n is backed right into Rails, and it's great. But if you want to place links inside your translated copies, things get a little messy.
+I18n is baked right into Rails, and it's great. But if you want to place links inside your translated copies, things get a little messy.
 You need to specify the label of your links separately from the rest of the copy. Writing HTML in your translations is even worse.
 
 <pre><code>en:
@@ -23,7 +23,7 @@ gets properly escaped, so you don't have to worry about XSS.
 
 h2. Installation
 
-Just add the following line to your Gemfile:
+Just add the following line to your Gemfile & run @bundle install@:
 
 <pre><code>gem 'i18n_link'</code></pre>
 
@@ -36,17 +36,31 @@ You may have as many links inside your translations as you like, and normal inte
 
 <pre><code><%=t_link "copy", guide: "http://guides.rubyonrails.org/i18n.html", advices: 100, repo: "https://github.com/lifo/docrails/tree/master/railties/guides" %></code></pre>
 
-You may also specify options for link_to. Just give a second option named like the link + @_options@
+You may also specify options for @link_to@. Just give a second option named like the link + @_options@
 
 <pre><code><%=t_link "copy", guide_link: "http://guides.rubyonrails.org/i18n.html", guide_link_options: {target: '_blank', class: "important"} %></code></pre>
 
+You may pass any kind of object accepted by @link_to@ as the link target, so your loved named routes like
+@article_path(:id => article.id)@ or hashes like @{controller: "articles", action: "index"}@ will all work fine, too.
+
+Even nested interpolations are possible:
+
+<pre><code>en:
+  copy: "Did you read this %{link:nice %{guide}}?"</code></pre>
+
+<pre><code><%=t_link "copy", link: "http://guides.rubyonrails.org/i18n.html", guide: 'article' %></code></pre>
+
 h2. isit18.com?
 
-Sorry, I'm using Ruby 1.9.2 and didn't took the time to port i18n_link back to Ruby 1.8. You either might update to Ruby 1.9 as well
+Sorry, I'm using Ruby 1.9.2 at the time of writing and didn't took the time to port i18n_link back to Ruby 1.8. You either might update to Ruby 1.9 as well
 or make the port yourself. It's probably a mater of minutes to do so, since the lib is small. Send me a pull request, if you have a port!
 
 h2. Abandoned & outdated?
 
-Everybody hates old and outdated gems, which don't work on with the latest Rails or Ruby version or haven't been updated for ages. 
+Everybody hates old and outdated gems, which don't work on with the latest Rails or Ruby version or haven't been updated for ages.
 Sadly, rubygems is full of such gems. If you improved i18n_link, send me a pull request. If I have not time to support the lib
-anymore, I will happily hand the project over to a new maintainer.
+anymore, I will happily hand the project over to a new maintainer.
+
+h2. Broken English?
+
+I'm not a native speaker, so you'll probably find some spelling errors or clumsy sentences above. If you do, please send me a message.

data/lib/i18n_link/helper.rb

@@ -7,7 +7,20 @@ module I18nLink
     
     def t_link(translation, options = {})
       options.symbolize_keys!
-      string = h(t(translation)).gsub(/%\{[^}]+\}/) do |tl|
+      string = String.new(h(t(translation))) # We want an escaped String, not an ActiveSupport::SafeBuffer
+
+      # Resolve the inner interpolations of nested interpolations
+      string.gsub!(/(%\{[^}]+:[^}]*)(%\{[^}]+\})([^}]*\})/) do |tl|
+        token = $2[2..-2].to_sym
+        if options.has_key?(token)
+          "#{$1}#{options[token]}#{$3}"
+        else
+          tl
+        end
+      end
+      
+      # Parse links
+      string.gsub!(/%\{[^}]+\}/) do |tl|
         if tl.include?(":")
           token, label = tl[2..-2].split(":", 2)
           addr = options.delete(token.to_sym)
@@ -15,13 +28,16 @@ module I18nLink
             tl
           else
             link_options = options.delete("#{token}_options".to_sym)
-            link_to(label, addr, link_options)
+            link_to(raw(label), addr, link_options)
           end
         else
           tl
         end
       end
+      
+      # Escape HTML of the replacements and interpolate
+      options.each { |key, value| options[key] = (value.is_a?(String) && !value.html_safe?) ? h(value) : value }
       raw(string % options)
     end
   end
-end
+end

data/spec/i18n_link_helper_spec.rb

@@ -48,8 +48,23 @@ describe I18nLink::Helper, "#t_link" do
     @view.t_link("test3", :link1 => "http://www.rubyonrails.org", :link2 => "http://www.github.com").should == 'I like <a href="http://www.rubyonrails.org">rails</a> and <a href="http://www.github.com">github</a>.'
   end
   
-  it "should allow normal I18n replacements" do
+  it "should allow normal I18n interpolations" do
     I18n.backend.store_translations(:en, :test4 => "I'm containing a %{link:link to Rails} in the %{position}.")
     @view.t_link("test4", :link => "http://www.rubyonrails.org", :position => "middle").should == 'I\'m containing a <a href="http://www.rubyonrails.org">link to Rails</a> in the middle.'
   end
-end
+  
+  it "should escape the HTML in normal interpolations" do
+    I18n.backend.store_translations(:en, :test5 => "Hello %{name}.")
+    @view.t_link("test5", :name => '<a href="http://evil.haxor.com">victim</a>').should == 'Hello &lt;a href=&quot;http://evil.haxor.com&quot;&gt;victim&lt;/a&gt;.'
+  end
+  
+  it "should not escape html_safe interpolations" do
+    I18n.backend.store_translations(:en, :test5 => "Hello %{name}.")
+    @view.t_link("test5", :name => '<a href="http://www.rubyonrails.org">Rails</a>'.html_safe).should == 'Hello <a href="http://www.rubyonrails.org">Rails</a>.'
+  end
+  
+  it "should allow interpolations inside of links" do
+    I18n.backend.store_translations(:en, :test6 => "Did you read our %{link:nice %{article}}?")
+    @view.t_link("test6", :link => "/article/2", :article => "article").should == 'Did you read our <a href="/article/2">nice article</a>?'
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: i18n_link
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors: 
 - Johannes Barre