it 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 540cf86712cced87828cbb22246c440c4fff172b
+  data.tar.gz: 58c4b692810db1b1732ad21d31394c5cec10b2a1
+SHA512:
+  metadata.gz: f16fe37fd4a51ee176710ed9efec3e6874a3c1d86daefc128d48c718b81766701977aa1a5e180447a70ec344d4463b6f4fbf7081c0bc271973733d60ff07ce15
+  data.tar.gz: 9a98bc3f607fb8d6903c2ed5fae6b0aec9e416f36fa1897f75474176a2c3819326ed81a7d933c7a47abc7820edd18333ec803145ccdc18c97971f06dc844924d

data/Gemfile

@@ -1,6 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-group :development, :test do
-  gem 'actionpack'
-  gem 'rspec-rails'
-end
+gemspec

data/README.textile

@@ -1,3 +1,5 @@
+"!https://codeclimate.com/github/iGEL/it.png!":https://codeclimate.com/github/iGEL/it "!https://travis-ci.org/iGEL/it.png!":https://travis-ci.org/iGEL/it (Specs pass on Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, Rubinius and Jruby)
+
 h1. What is *it*?
 
 I18n is baked right into Rails, and it's great. But if you want to place markup or 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.
@@ -65,10 +67,6 @@ Plain mail:
 
 The @%s@ will be replaced with the label, in the example with Rails. You could provide any other string containing @%s@. The default is just @%s@, so it will return only the label itself.
 
-h2. isit18.com?
-
-Well, the specs pass on 1.8.7, but I never tried it in a real app. Report any issues on "github":https://github.com/iGEL/it/issues
-
 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. Sadly, rubygems is full of such gems. If you improved *it* 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.
@@ -76,7 +74,3 @@ Everybody hates old and outdated gems, which don't work on with the latest Rails
 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.
-
-h2. Like it?
-
-Like it? Flattr it! !http://api.flattr.com/button/flattr-badge-large.png!:http://flattr.com/thing/351483/it-HTML-tags-for-your-translations

data/lib/it.rb

@@ -1,3 +1,5 @@
+require 'it/parser'
+require 'it/interpolation'
 require 'it/tag'
 require 'it/link'
 require 'it/plain'
@@ -12,7 +14,7 @@ module It
   # It outside of your views. See documentation at Helper#it
   def self.it(identifier, options = {})
     options.stringify_keys!
-    process(I18n.t(identifier, :locale => options["locale"]), options)
+    Parser.new(I18n.t(identifier, :locale => options["locale"]), options).process
   end
 
   # Creates a new link to be used in +it+.
@@ -40,39 +42,4 @@ module It
   def self.tag(tag_name, options = {})
     It::Tag.new(tag_name, options)
   end
-
-  private
-  def self.process(string, options)
-    # Handle pluralization
-    string = I18n.backend.send(:pluralize, options["locale"] || I18n.locale, string, options["count"]) if string.is_a?(Hash) && options["count"]
-
-    # We want the escaped String, not an ActiveSupport::SafeBuffer
-    translation = String.new(ERB::Util.h(string))
-
-    # For deep nesting, we repeat the process until we have no interpolations anymore
-    while translation =~ /%\{[^{}}]+\}/
-      translation.gsub!(/%\{[^{}}]+\}/) do |interpolation|
-        token, label = interpolation[2..-2].split(":", 2)
-
-        # Convert tokens with String arguments into It::Links, if they are named link, link_* or *_link
-        if (token == "link" || token.ends_with?("_link") || token.starts_with?("link_")) && (options[token].is_a?(String) || options[token].is_a?(Hash))
-          options[token] = It::Link.new(options[token])
-        end
-
-        if !options.has_key?(token)
-          raise KeyError, "key{#{token}} not found"
-        elsif label && !options[token].is_a?(It::Tag)
-          raise ArgumentError, "key{#{token}} has an argument, so it cannot resolved with a #{options[token].class}"
-        elsif label # Normal tags
-          options[token].process(label.html_safe)
-        elsif options[token].is_a?(It::Tag) # Empty tag
-          options[token].process
-        else # Normal interpolations, as I18n.t would do it.
-          ERB::Util.h(options[token])
-        end
-      end
-    end
-
-    translation.html_safe
-  end
 end

data/lib/it/helper.rb

@@ -40,7 +40,7 @@ module It
     #
     def it(identifier, options = {})
       options.stringify_keys!
-      It.process(t(identifier, :locale => options["locale"]), options)
+      It::Parser.new(t(identifier, :locale => options["locale"]), options).process
     end
   end
 end

data/lib/it/interpolation.rb

@@ -0,0 +1,40 @@
+module It
+  class Interpolation
+    attr_accessor :key, :label, :values
+    
+    def initialize(string, values)
+      self.key, self.label = string[2..-2].split(':', 2)
+      self.values = values
+
+      convert_links
+    end
+    
+    def process
+      check_input_values
+
+      if label # Normal tags
+        values[key].process(label.html_safe)
+      elsif values[key].is_a?(It::Tag) # Empty tag
+        values[key].process
+      else # Normal interpolations, as I18n.t would do it.
+        ERB::Util.h(values[key])
+      end
+    end
+
+    private
+    # Convert keys with String arguments into It::Links, if they are named link, link_* or *_link
+    def convert_links
+      if key =~ /(\Alink\Z|_link\Z|\Alink_)/ && values[key].is_a?(String)
+        self.values[key] = It::Link.new(values[key])
+      end
+    end
+
+    def check_input_values
+      if !values.has_key?(key)
+        raise KeyError, "key{#{key}} not found"
+      elsif label && !values[key].is_a?(It::Tag)
+        raise ArgumentError, "key{#{key}} has an argument, so it cannot resolved with a #{values[key].class}"
+      end
+    end
+  end
+end

data/lib/it/parser.rb

@@ -0,0 +1,38 @@
+module It
+  class Parser
+    attr_accessor :string, :options
+
+    INTERPOLATION_REGEXP = /%\{[^{}}]+\}/
+
+    def initialize(string, options)
+      self.string = string
+      self.options = options
+    end
+
+    def process
+      handle_pluralization
+      escape_string
+
+      # For deep nesting, we repeat the process until we have no interpolations anymore
+      while has_interpolation?
+        self.string.gsub!(INTERPOLATION_REGEXP) do |interpolation|
+          Interpolation.new(interpolation, options).process
+        end
+      end
+      string.html_safe
+    end
+
+    private
+    def has_interpolation?
+      string =~ INTERPOLATION_REGEXP
+    end
+
+    def handle_pluralization
+      self.string = I18n.backend.send(:pluralize, (options['locale'] || I18n.locale), string, options['count']) if string.is_a?(Hash) && options['count']
+    end
+
+    def escape_string
+      self.string = String.new(ERB::Util.h(string))
+    end
+  end
+end

data/spec/it/helper_spec.rb

@@ -5,8 +5,8 @@ require 'it'
 
 describe It::Helper, "#it" do
   before do
-    I18n.backend.store_translations(:en, :test1 => "I'm containing a %{link:link to Rails} in the middle.")
-    I18n.backend.store_translations(:de, :test1 => "Ich enthalte einen %{link:Link zu Rails} in der Mitte.")
+    I18n.backend.store_translations(:en, :test1 => "I have a %{link:link to Rails} in the middle.")
+    I18n.backend.store_translations(:de, :test1 => "Ich habe einen %{link:Link zu Rails} in der Mitte.")
 
     @view = ActionView::Base.new
     @controller = ActionController::Base.new
@@ -18,63 +18,63 @@ describe It::Helper, "#it" do
   end
 
   it "should insert the link into the string" do
-    @view.it("test1", :link => It.link("http://www.rubyonrails.org")).should == 'I\'m containing a <a href="http://www.rubyonrails.org">link to Rails</a> in the middle.'
+    expect(@view.it("test1", :link => It.link("http://www.rubyonrails.org"))).to eq('I have a <a href="http://www.rubyonrails.org">link to Rails</a> in the middle.')
   end
 
   it "should insert the link into the German translation" do
     I18n.locale = :de
-    @view.it("test1", :link => It.link("http://www.rubyonrails.org")).should == 'Ich enthalte einen <a href="http://www.rubyonrails.org">Link zu Rails</a> in der Mitte.'
+    expect(@view.it("test1", :link => It.link("http://www.rubyonrails.org"))).to eq('Ich habe einen <a href="http://www.rubyonrails.org">Link zu Rails</a> in der Mitte.')
   end
 
   it "should allow link options to be set" do
-    @view.it("test1", :link => It.link("http://www.rubyonrails.org", :target => "_blank")).should == 'I\'m containing a <a href="http://www.rubyonrails.org" target="_blank">link to Rails</a> in the middle.'
+    expect(@view.it("test1", :link => It.link("http://www.rubyonrails.org", :target => "_blank"))).to eq('I have a <a href="http://www.rubyonrails.org" target="_blank">link to Rails</a> in the middle.')
   end
 
   it "should support the plain thing" do
-    @view.it("test1", :link => It.plain("%s[http://www.rubyonrails.org]")).should == 'I\'m containing a link to Rails[http://www.rubyonrails.org] in the middle.'
+    expect(@view.it("test1", :link => It.plain("%s[http://www.rubyonrails.org]"))).to eq('I have a link to Rails[http://www.rubyonrails.org] in the middle.')
   end
 
   it "should parse other tags as well" do
-    @view.it("test1", :link => It.tag(:b, :class => "classy")).should == 'I\'m containing a <b class="classy">link to Rails</b> in the middle.'
+    expect(@view.it("test1", :link => It.tag(:b, :class => "classy"))).to eq('I have a <b class="classy">link to Rails</b> in the middle.')
   end
 
   it "should mark the result as html safe" do
-    @view.it("test1", :link => It.link("http://www.rubyonrails.org")).html_safe?.should be_true
+    expect(@view.it("test1", :link => It.link("http://www.rubyonrails.org")).html_safe?).to be_true
   end
 
   it "should escape all html in the translation" do
     I18n.backend.store_translations(:en, :test2 => "<a href=\"hax0r\"> & %{link:link -> Rails} in <b>the middle</b>.")
-    @view.it("test2", :link => It.link("http://www.rubyonrails.org")).should == '&lt;a href=&quot;hax0r&quot;&gt; &amp; <a href="http://www.rubyonrails.org">link -&gt; Rails</a> in &lt;b&gt;the middle&lt;/b&gt;.'
+    expect(@view.it("test2", :link => It.link("http://www.rubyonrails.org"))).to eq('&lt;a href=&quot;hax0r&quot;&gt; &amp; <a href="http://www.rubyonrails.org">link -&gt; Rails</a> in &lt;b&gt;the middle&lt;/b&gt;.')
   end
 
   it "should also work with 2 links" do
     I18n.backend.store_translations(:en, :test3 => "I like %{link1:rails} and %{link2:github}.")
-    @view.it("test3", :link1 => It.link("http://www.rubyonrails.org"), :link2 => It.link("http://www.github.com")).should == 'I like <a href="http://www.rubyonrails.org">rails</a> and <a href="http://www.github.com">github</a>.'
+    expect(@view.it("test3", :link1 => It.link("http://www.rubyonrails.org"), :link2 => It.link("http://www.github.com"))).to eq('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 interpolations" do
-    I18n.backend.store_translations(:en, :test4 => "I'm containing a %{link:link to Rails} in the %{position}.")
-    @view.it("test4", :link => It.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.'
+    I18n.backend.store_translations(:en, :test4 => "I have a %{link:link to Rails} in the %{position}.")
+    expect(@view.it("test4", :link => It.link("http://www.rubyonrails.org"), :position => "middle")).to eq('I have a <a href="http://www.rubyonrails.org">link to Rails</a> in the middle.')
   end
 
-  it "should allow Intergers as normal interpolation" do
+  it "should allow Integers as normal interpolation" do
     I18n.backend.store_translations(:en, :test5 => "Hello %{name}.")
-    @view.it("test5", :name => 2).should == 'Hello 2.'
+    expect(@view.it("test5", :name => 2)).to eq('Hello 2.')
   end
 
   it "should escape the HTML in normal interpolations" do
     I18n.backend.store_translations(:en, :test5 => "Hello %{name}.")
-    @view.it("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;.'
+    expect(@view.it("test5", :name => '<a href="http://evil.haxor.com">victim</a>')).to eq('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.it("test5", :name => '<a href="http://www.rubyonrails.org">Rails</a>'.html_safe).should == 'Hello <a href="http://www.rubyonrails.org">Rails</a>.'
+    expect(@view.it("test5", :name => '<a href="http://www.rubyonrails.org">Rails</a>'.html_safe)).to eq('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.it("test6", :link => It.link("/article/2"), :article => "article").should == 'Did you read our <a href="/article/2">nice article</a>?'
+    expect(@view.it("test6", :link => It.link("/article/2"), :article => "article")).to eq('Did you read our <a href="/article/2">nice article</a>?')
   end
 
   it "should raise a KeyError, if the key was not given" do
@@ -88,32 +88,33 @@ describe It::Helper, "#it" do
 
   it "should allow Strings, if the interpolation name is link" do
     I18n.backend.store_translations(:en, :test8 => "Sign up %{link:here}!")
-    @view.it("test8", :link => "/register").should == 'Sign up <a href="/register">here</a>!'
+    expect(@view.it("test8", :link => "/register")).to eq('Sign up <a href="/register">here</a>!')
   end
 
   it "should allow Strings, if the interpolation name ends with _link" do
     I18n.backend.store_translations(:en, :test8 => "Sign up %{register_link:here}!")
-    @view.it("test8", :register_link => "/register").should == 'Sign up <a href="/register">here</a>!'
+    expect(@view.it("test8", :register_link => "/register")).to eq('Sign up <a href="/register">here</a>!')
   end
 
   it "should allow Strings, if the interpolation name starts with link_" do
     I18n.backend.store_translations(:en, :test8 => "Sign up %{link_to_register:here}!")
-    @view.it("test8", :link_to_register => "/register").should == 'Sign up <a href="/register">here</a>!'
+    expect(@view.it("test8", :link_to_register => "/register")).to eq('Sign up <a href="/register">here</a>!')
   end
 
   it "should work with tags without arguments" do
     I18n.backend.store_translations(:en, :test9 => "We can %{br} do line breaks")
-    @view.it("test9", :br => It.tag(:br)).should == 'We can <br /> do line breaks'
+    expect(@view.it("test9", :br => It.tag(:br))).to eq('We can <br /> do line breaks')
   end
 
   it 'should support dot-prefixed keys' do
     I18n.backend.store_translations(:en, :widgets => { :show => { :all_widgets => "See %{widgets_link:all widgets}" } })
-    @view.instance_variable_set(:"@_virtual_path", "widgets/show")
-    @view.it('.all_widgets', :widgets_link => '/widgets').should == 'See <a href="/widgets">all widgets</a>'
+    @view.instance_variable_set(:"@_virtual_path", "widgets/show") # For Rails 3.0
+    @view.instance_variable_set(:"@virtual_path", "widgets/show") # For Rails 3.1, 3.2 and probably 4.0
+    expect(@view.it('.all_widgets', :widgets_link => '/widgets')).to eq('See <a href="/widgets">all widgets</a>')
   end
 
   it 'should support the locale option' do
-    @view.it('test1', :locale => "de", :link => It.link("http://www.rubyonrails.org")).should == 'Ich enthalte einen <a href="http://www.rubyonrails.org">Link zu Rails</a> in der Mitte.'
+    expect(@view.it('test1', :locale => "de", :link => It.link("http://www.rubyonrails.org"))).to eq('Ich habe einen <a href="http://www.rubyonrails.org">Link zu Rails</a> in der Mitte.')
   end
 
   context "With a pluralized translation" do
@@ -122,15 +123,15 @@ describe It::Helper, "#it" do
     end
 
     it 'should work with count = 0' do
-      @view.it("test10", :count => 0, :link => "/messages").should == 'You have zero messages.'
+      expect(@view.it("test10", :count => 0, :link => "/messages")).to eq('You have zero messages.')
     end
 
     it 'should work with count = 1' do
-      @view.it("test10", :count => 1, :link => "/messages").should == 'You have <a href="/messages">one message</a>.'
+      expect(@view.it("test10", :count => 1, :link => "/messages")).to eq('You have <a href="/messages">one message</a>.')
     end
 
     it 'should work with count > 1' do
-      @view.it("test10", :count => 2, :link => "/messages").should == 'You have <a href="/messages">2 messages</a>.'
+      expect(@view.it("test10", :count => 2, :link => "/messages")).to eq('You have <a href="/messages">2 messages</a>.')
     end
   end
 end

data/spec/it/interpolation_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require 'it'
+
+describe It::Interpolation do
+  subject(:interpolation) { It::Interpolation.new('%{key:label}', { 'key' => It.tag(:b) }) }
+
+  describe '.new' do
+    it 'throws an error with one argument' do
+      expect { It::Interpolation.new('%{key:label}') }.to raise_error(ArgumentError)
+    end
+
+    it 'extracts the key from the string' do
+      expect(interpolation.key).to eq('key')
+    end
+
+    it 'extracts the label from the string' do
+      expect(interpolation.label).to eq('label')
+    end
+
+    it 'assigns nil to the label if not present' do
+      expect(It::Interpolation.new('%{key}', {}).label).to be_nil
+    end
+
+    it 'converts string values to a It::Link if the key is named link' do
+      interpolation = It::Interpolation.new('%{link:label}', 'link' => 'http://github.com')
+
+      expect(interpolation.values['link']).to be_kind_of(It::Link)
+    end
+
+    it 'converts string values to a It::Link if the key starts with link_' do
+      interpolation = It::Interpolation.new('%{link_github:label}', 'link_github' => 'http://github.com')
+
+      expect(interpolation.values['link_github']).to be_kind_of(It::Link)
+    end
+
+    it 'converts string values to a It::Link if the key ends with _link' do
+      interpolation = It::Interpolation.new('%{github_link:label}', 'github_link' => 'http://github.com')
+
+      expect(interpolation.values['github_link']).to be_kind_of(It::Link)
+    end
+  end
+
+  describe '#process' do
+    it 'interpolates the string' do
+      expect(interpolation.process).to eq('<b>label</b>')
+    end
+
+    it 'interpolates the string to an empty tag if no label is present' do
+      interpolation.label = nil
+
+      expect(interpolation.process).to eq('<b />')
+    end
+
+    it 'does the normal interpolation if the value is not a Tag and no label is present' do
+      interpolation.label = nil
+      interpolation.values = { 'key' => 'string'}
+
+      expect(interpolation.process).to eq('string')
+    end
+
+    it 'escapes HTML in the normal interpolation' do
+      interpolation.label = nil
+      interpolation.values = { 'key' => '<b>hallo</b>'}
+
+      expect(interpolation.process).to eq('&lt;b&gt;hallo&lt;/b&gt;')
+    end
+
+    it 'raises an KeyError if the requested key was not provided' do
+      interpolation.values = {}
+
+      expect { interpolation.process }.to raise_error(KeyError)
+    end
+
+    it 'raises an ArgumentError, if a string should be interpolated with a label' do
+      interpolation.values = { 'key' => 'string'}
+
+      expect { interpolation.process }.to raise_error(ArgumentError)
+    end
+  end
+end

data/spec/it/link_spec.rb

@@ -31,12 +31,12 @@ end
 
 describe It::Link, '#tag_name' do
   it "should always return a" do
-    It::Link.new("http://www.rubyonrails.org/").tag_name.should == :a
+    expect(It::Link.new("http://www.rubyonrails.org/").tag_name).to eq(:a)
   end
 end
 
 describe It::Link, '#process' do
   it "should return a link with the options set and the content as label" do
-    It::Link.new("http://www.rubyonrails.org", :target => "_blank").process("Rails").should == '<a href="http://www.rubyonrails.org" target="_blank">Rails</a>'
+    expect(It::Link.new("http://www.rubyonrails.org", :target => "_blank").process("Rails")).to eq('<a href="http://www.rubyonrails.org" target="_blank">Rails</a>')
   end
-end
+end

data/spec/it/parser_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'it'
+
+describe It::Parser do
+  describe '#process' do
+    it 'calls the Interpolation as required' do
+      values = {'b' => It.tag(:b), 'link' => '/messages'}
+      parser = It::Parser.new('You have %{b:%{link:new messages}}!', values)
+
+      return1 = double('It::Interpolation', :process => '<a href="/messages">new messages</a>')
+      It::Interpolation.should_receive(:new).with('%{link:new messages}', values).and_return(return1)
+
+      return2 = double('It::Interpolation', :process => '<b><a href="/messages">new messages</a></b>')
+      It::Interpolation.should_receive(:new).with('%{b:<a href="/messages">new messages</a>}', values).and_return(return2)
+
+      expect(parser.process).to eq('You have <b><a href="/messages">new messages</a></b>!')
+    end
+
+    it 'escapes HTML in the string and the labels' do
+      parser = It::Parser.new('It is a <b>save</b> %{word:<i>world</i>}', 'word' => It.tag(:i))
+
+      expect(parser.process).to eq('It is a &lt;b&gt;save&lt;/b&gt; <i>&lt;i&gt;world&lt;/i&gt;</i>')
+    end
+
+    it 'marks the result as html safe' do
+      parser = It::Parser.new('test', {})
+
+      expect(parser.process).to be_html_safe
+    end
+
+    it 'delegates pluralization to I18n' do
+      I18n.backend.stub(:pluralize).with('en', {:other => 'You have %{count} messages'}, 2) { 'This is the pluralized string' }
+      parser = It::Parser.new({:other => 'You have %{count} messages'}, 'locale' => 'en', 'count' => 2)
+
+      expect(parser.process).to eq('This is the pluralized string')
+    end
+  end
+end

data/spec/it/plain_spec.rb

@@ -11,7 +11,7 @@ describe It::Plain, '.new' do
   end
   
   it "should raise ArgumentError with 2 params" do
-    expect { It::Plain.new("asdf", "asdf")}.to raise_error(ArgumentError, "wrong number of arguments (2 for 1)")
+    expect { It::Plain.new("asdf", "asdf")}.to raise_error(ArgumentError)
   end
   
   it "should raise a TypeError, if the first param is not a String" do
@@ -21,10 +21,10 @@ end
 
 describe It::Plain, '#process' do
   it "should return 'Ruby on Rails', if no param was given" do
-    It::Plain.new.process("Ruby on Rails").should == 'Ruby on Rails'
+    expect(It::Plain.new.process("Ruby on Rails")).to eq('Ruby on Rails')
   end
   
   it "should return 'Ruby on Rails[http://www.rubyonrails.org/]'" do
-    It::Plain.new("%s[http://www.rubyonrails.org/]").process("Ruby on Rails").should == 'Ruby on Rails[http://www.rubyonrails.org/]'
+    expect(It::Plain.new("%s[http://www.rubyonrails.org/]").process("Ruby on Rails")).to eq('Ruby on Rails[http://www.rubyonrails.org/]')
   end
-end
+end

data/spec/it/tag_spec.rb

@@ -31,38 +31,38 @@ end
 
 describe It::Tag, '#tag_name' do
   it "should return the tag as a Symbol if given as a Symbol" do
-    It::Tag.new(:i).tag_name.should == :i
+    expect(It::Tag.new(:i).tag_name).to eq(:i)
   end
   
   it "should return the tag_name as a Symbol if given as a String" do
-    It::Tag.new("i").tag_name.should == :i
+    expect(It::Tag.new("i").tag_name).to eq(:i)
   end
 end
 
 describe It::Tag, '#options' do
   it "should return the options with symbolized keys" do
-    It::Tag.new(:i, "id" => "cool", :class => "classy").options.should == {:id => "cool", :class => "classy"}
+    expect(It::Tag.new(:i, "id" => "cool", :class => "classy").options).to eq({:id => "cool", :class => "classy"})
   end
 end
 
 describe It::Tag, '#process' do
   it "should return a tag with the options as attributes and the param as content" do
-    It::Tag.new(:i, "id" => "cool", "class" => "classy").process("some text").should == '<i class="classy" id="cool">some text</i>'
+    expect(It::Tag.new(:i, "id" => "cool", "class" => "classy").process("some text")).to eq('<i class="classy" id="cool">some text</i>')
   end
   
   it "should be marked as html safe" do
-    It::Tag.new(:i).process("some text").html_safe.should be_true
+    expect(It::Tag.new(:i).process("some text").html_safe).to be_true
   end
   
   it "should escape HTML" do
-    It::Tag.new(:i).process("some text & <b>html</b>").should == '<i>some text &amp; &lt;b&gt;html&lt;/b&gt;</i>'
+    expect(It::Tag.new(:i).process("some text & <b>html</b>")).to eq('<i>some text &amp; &lt;b&gt;html&lt;/b&gt;</i>')
   end
   
   it "should not escape strings marked as HTML safe" do
-    It::Tag.new(:i).process("some text & <b>html</b>".html_safe).should == '<i>some text & <b>html</b></i>'
+    expect(It::Tag.new(:i).process("some text & <b>html</b>".html_safe)).to eq('<i>some text & <b>html</b></i>')
   end
   
   it "should return an empty tag, if no content is provided" do
-    It::Tag.new(:br, "id" => "cool").process.should == '<br id="cool" />'
+    expect(It::Tag.new(:br, "id" => "cool").process).to eq('<br id="cool" />')
   end
-end
+end

data/spec/it_spec.rb

@@ -5,14 +5,14 @@ require 'it'
 
 describe It, '.it' do
   it "should translate inside the controller as well" do
-    I18n.backend.store_translations(:en, :test1 => "I'm containing a %{link:link to Rails} in the middle.")
-    It.it("test1", :link => It.link("http://www.rubyonrails.org")).should == 'I\'m containing a <a href="http://www.rubyonrails.org">link to Rails</a> in the middle.'
+    I18n.backend.store_translations(:en, :test1 => "I have a %{link:link to Rails} in the middle.")
+    expect(It.it("test1", :link => It.link("http://www.rubyonrails.org"))).to eq('I have a <a href="http://www.rubyonrails.org">link to Rails</a> in the middle.')
   end
 end
 
 describe It, '.link' do
   it "should return an It::Link object" do
-    It.link("https://www.github.com").class.should == It::Link
+    expect(It.link("https://www.github.com").class).to eq(It::Link)
   end
 
   it "should accept one param" do
@@ -30,7 +30,7 @@ end
 
 describe It, '.tag' do
   it "should return an It::Tag object" do
-    It.tag(:b).class.should == It::Tag
+    expect(It.tag(:b).class).to eq(It::Tag)
   end
 
   it "should work with a param" do
@@ -48,7 +48,7 @@ end
 
 describe It, '.plain' do
   it "should return an It::Plain object" do
-    It.plain.class.should == It::Plain
+    expect(It.plain.class).to eq(It::Plain)
   end
 
   it "should work without params" do

data/spec/spec_helper.rb

@@ -3,4 +3,11 @@ require 'action_pack'
 require 'action_controller'
 require 'action_view'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+
+RSpec.configure do |config|
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,117 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: it
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+version: !ruby/object:Gem::Version
+  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - Johannes Barre
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: actionpack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: 
 email: igel@igels.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - MIT-LICENSE
 - README.textile
 - Rakefile
 - Gemfile
+- spec/spec_helper.rb
+- spec/it_spec.rb
+- spec/it/link_spec.rb
+- spec/it/helper_spec.rb
+- spec/it/parser_spec.rb
+- spec/it/tag_spec.rb
+- spec/it/plain_spec.rb
+- spec/it/interpolation_spec.rb
 - lib/it.rb
+- lib/it/interpolation.rb
 - lib/it/helper.rb
-- lib/it/tag.rb
+- lib/it/parser.rb
 - lib/it/link.rb
 - lib/it/plain.rb
-- spec/it/helper_spec.rb
-- spec/it/link_spec.rb
-- spec/it/tag_spec.rb
-- spec/it/plain_spec.rb
-- spec/it_spec.rb
-- spec/spec_helper.rb
+- lib/it/tag.rb
 homepage: https://github.com/igel/it
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+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: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0.rc.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A helper for links and other html tags in your translations
-test_files: 
-- spec/it/helper_spec.rb
+test_files:
+- spec/it_spec.rb
 - spec/it/link_spec.rb
+- spec/it/helper_spec.rb
+- spec/it/parser_spec.rb
 - spec/it/tag_spec.rb
 - spec/it/plain_spec.rb
-- spec/it_spec.rb
+- spec/it/interpolation_spec.rb
 - spec/spec_helper.rb