tiny 0.2.6 → 0.2.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0a25f5692ba1dfbb0a1d206402dc725ef45c0493
+  data.tar.gz: c520045fc273ddb2257ce4e6fe6047bd3513da39
+SHA512:
+  metadata.gz: 98043c8f9fd4d1cc7a19a06c11f5c617797228a854119636551490192aa7688a63fa374539ffb1cf6c015b1730b3625a0bd5a8173469490186068a02b003b15c
+  data.tar.gz: 020ea10b6826e86b562f0d99e1dcd58f998f70a721e5b18f2610911f30e2bdf5cf1a027ae6fa901d01490017f5474d2adf81ff9abad82e7b8705668ecba10133

data/lib/tiny.rb

@@ -1,6 +1,6 @@
 require 'erubis'
 require 'tilt'
-require 'escape_utils'
+require 'cgi'
 
 require 'tiny/version'
 require 'tiny/erubis'
@@ -43,6 +43,8 @@ module Tiny
     #   # => <textarea disabled></textarea>
     #   html_tag(:textarea, :disabled => false)
     #   # => <textarea></textarea>
+    #   html_tag(:textarea, :disabled => nil)
+    #   # => <textarea></textarea>
     #
     # @example HTML-escaping
     #
@@ -350,9 +352,13 @@ module Tiny
       if value.respond_to?(:html_safe?) && value.html_safe?
         value.to_s
       else
-        EscapeUtils.escape_html value.to_s
+        escape_html value.to_s
       end
     end
+
+    def self.escape_html html
+      CGI.escapeHTML html.to_s
+    end
   end
 
   # Support for HTML markup generation for classes, can be included in

data/lib/tiny/tag.rb

@@ -15,7 +15,7 @@ module Tiny
         next name if val == true
 
         vals = [*val].map do |value|
-          EscapeUtils.escape_html value.to_s, false
+          Helpers.escape_html value
         end
 
         %{#{name}="#{vals.join(' ')}"}

data/lib/tiny/version.rb

@@ -1,3 +1,3 @@
 module Tiny
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/erubis_spec.rb

@@ -2,28 +2,28 @@ require 'spec_helper'
 
 describe 'markup helpers' do
   it "should register tiny erubis templates for '.erubis' files" do
-    Tilt['erubis'].should == Tiny::Erubis::ErubisTemplate
-    Tilt['erb'].should == Tiny::Erubis::ErubisTemplate
+    expect(Tilt['erubis']).to eq(Tiny::Erubis::ErubisTemplate)
+    expect(Tilt['erb']).to eq(Tiny::Erubis::ErubisTemplate)
   end
 
   it 'should default to tiny erubis engine' do
     engine = Tilt['erb'].new{}.instance_variable_get(:@engine)
-    engine.should be_a Tiny::Erubis::Eruby
+    expect(engine).to be_a Tiny::Erubis::Eruby
   end
 
   it 'should use tiny escaped erubis engine for escaping html' do
     engine = Tilt['erb'].new(nil, :escape_html => true){}.instance_variable_get(:@engine)
-    engine.should be_a Tiny::Erubis::EscapedEruby
+    expect(engine).to be_a Tiny::Erubis::EscapedEruby
   end
 
   it 'should escape html when passing :escape_html => true option' do
     template = Tilt['erb'].new(nil, :escape_html => true) { %(<%= "<p>Hello World!</p>" %>) }
-    template.render.should == "&lt;p&gt;Hello World!&lt;&#47;p&gt;"
+    expect(template.render).to eq("&lt;p&gt;Hello World!&lt;/p&gt;")
   end
 
   it 'should not escape htmle when passing :escape_html => false option' do
     template = Tilt['erb'].new(nil, :escape_html => false) { %(<%= "<p>Hello World!</p>" %>) }
-    template.render.should == "<p>Hello World!</p>"
+    expect(template.render).to eq("<p>Hello World!</p>")
   end
 
   it 'should allow block with explicit output' do
@@ -33,7 +33,7 @@ describe 'markup helpers' do
       <% end %>
       ERB
     end
-    template.render.should include "[1, 2]"
+    expect(template.render).to include "[1, 2]"
   end
 
   it 'should allow block with explicit output' do
@@ -43,6 +43,6 @@ describe 'markup helpers' do
       <% end %>
       ERB
     end
-    template.render.should include "[1, 2]"
+    expect(template.render).to include "[1, 2]"
   end
 end

data/spec/helpers_spec.rb

@@ -14,45 +14,45 @@ describe 'markup helpers' do
         before do
           @output = tag(:li, :class => 'item', :id => 'hello') { text 'Hello' }
         end
-        it { output.should have_css 'li', :count => 1 }
-        it { output.should have_css 'li', :text => "Hello" }
-        it { output.should have_css 'li.item' }
-        it { output.should have_css 'li#hello' }
+        it { expect(output).to have_css 'li', :count => 1 }
+        it { expect(output).to have_css 'li', :text => "Hello" }
+        it { expect(output).to have_css 'li.item' }
+        it { expect(output).to have_css 'li#hello' }
       end
 
       it 'should not use blank attribute values' do
         output = tag(:li, :class => [], :id => nil)
-        output.should == "<li></li>"
+        expect(output).to eq("<li></li>")
       end
 
       it 'should not emit value for an atribute value of true' do
         output = tag(:li, 'data-something' => true)
-        output.should == "<li data-something></li>"
+        expect(output).to eq("<li data-something></li>")
       end
 
       it 'should not emit value if value is false' do
         output = tag(:li, 'data-something' => false)
-        output.should == "<li></li>"
+        expect(output).to eq("<li></li>")
       end
 
       it 'should not allow passing text without #text' do
         output = tag(:li) { 'Hello' }
-        output.should == '<li></li>'
+        expect(output).to eq('<li></li>')
       end
 
       it 'should output multiple classes passing an array' do
         output = tag(:li, :class => %w(item in-stock))
-        output.should == '<li class="item in-stock"></li>'
+        expect(output).to eq('<li class="item in-stock"></li>')
       end
 
       it 'should allow passing content as string' do
-        tag(:h1, "Hello").should == "<h1>Hello</h1>"
-        tag(:h1, "Hello", :class => 'main').should == %{<h1 class="main">Hello</h1>}
+        expect(tag(:h1, "Hello")).to eq("<h1>Hello</h1>")
+        expect(tag(:h1, "Hello", :class => 'main')).to eq(%{<h1 class="main">Hello</h1>})
       end
 
       it 'should escape attribute html' do
-        tag(:a, :href => '<script>').should == '<a href="&lt;script&gt;"></a>'
-        tag(:a, :href => 'art&copy').should == '<a href="art&amp;copy"></a>'
+        expect(tag(:a, :href => '<script>')).to eq('<a href="&lt;script&gt;"></a>')
+        expect(tag(:a, :href => 'art&copy')).to eq('<a href="art&amp;copy"></a>')
       end
     end
 
@@ -61,9 +61,9 @@ describe 'markup helpers' do
         before do
           @output = tag(:div) { tag(:a) { text 'Hello' } }
         end
-        it { output.should have_css 'div', :count => 1 }
-        it { output.should have_css 'a',   :count => 1 }
-        it { output.should have_css 'div > a', :text => 'Hello' }
+        it { expect(output).to have_css 'div', :count => 1 }
+        it { expect(output).to have_css 'a',   :count => 1 }
+        it { expect(output).to have_css 'div > a', :text => 'Hello' }
       end
 
       describe 'deeper blocks' do
@@ -75,12 +75,12 @@ describe 'markup helpers' do
             end
           end
         end
-        it { output.should have_css 'div',     :count => 1 }
-        it { output.should have_css 'a',       :count => 1 }
-        it { output.should have_css 'div > a' }
-        it { output.should have_css 'div > a', :text => 'Hello' }
-        it { output.should have_css 'img',     :count => 1 }
-        it { output.should have_css 'div > a > img' }
+        it { expect(output).to have_css 'div',     :count => 1 }
+        it { expect(output).to have_css 'a',       :count => 1 }
+        it { expect(output).to have_css 'div > a' }
+        it { expect(output).to have_css 'div > a', :text => 'Hello' }
+        it { expect(output).to have_css 'img',     :count => 1 }
+        it { expect(output).to have_css 'div > a > img' }
       end
     end
 
@@ -94,9 +94,9 @@ describe 'markup helpers' do
           end
         end
 
-        it { output.should have_css 'ul',      :count => 1 }
-        it { output.should have_css 'li',      :count => 3 }
-        it { output.should have_css 'ul > li', :count => 3 }
+        it { expect(output).to have_css 'ul',      :count => 1 }
+        it { expect(output).to have_css 'li',      :count => 3 }
+        it { expect(output).to have_css 'ul > li', :count => 3 }
       end
 
       describe 'concatenation with text' do
@@ -108,12 +108,12 @@ describe 'markup helpers' do
           end
         end
 
-        it { output.should have_css 'ul',      :count => 1 }
-        it { output.should have_css 'li',      :count => 3 }
-        it { output.should have_css 'ul > li', :count => 3 }
-        it { output.should have_css 'ul > li', :text => 'One' }
-        it { output.should have_css 'ul > li', :text => 'Two' }
-        it { output.should have_css 'ul > li', :text => 'Three' }
+        it { expect(output).to have_css 'ul',      :count => 1 }
+        it { expect(output).to have_css 'li',      :count => 3 }
+        it { expect(output).to have_css 'ul > li', :count => 3 }
+        it { expect(output).to have_css 'ul > li', :text => 'One' }
+        it { expect(output).to have_css 'ul > li', :text => 'Two' }
+        it { expect(output).to have_css 'ul > li', :text => 'Three' }
       end
 
       describe 'nested' do
@@ -125,19 +125,19 @@ describe 'markup helpers' do
           end
         end
 
-        it { output.should have_css 'ul',          :count => 1 }
-        it { output.should have_css 'li',          :count => 3 }
-        it { output.should have_css 'ul > li',     :count => 3 }
-        it { output.should have_css 'a',           :count => 3 }
-        it { output.should have_css 'ul > li > a', :text => 'One' }
-        it { output.should have_css 'ul > li > a', :text => 'Two' }
-        it { output.should have_css 'ul > li > a', :text => 'Three' }
+        it { expect(output).to have_css 'ul',          :count => 1 }
+        it { expect(output).to have_css 'li',          :count => 3 }
+        it { expect(output).to have_css 'ul > li',     :count => 3 }
+        it { expect(output).to have_css 'a',           :count => 3 }
+        it { expect(output).to have_css 'ul > li > a', :text => 'One' }
+        it { expect(output).to have_css 'ul > li > a', :text => 'Two' }
+        it { expect(output).to have_css 'ul > li > a', :text => 'Three' }
       end
 
       describe 'outside content block' do
         it 'should not buffer contiguous tags' do
           tag(:span)
-          tag(:a).should == '<a></a>'
+          expect(tag(:a)).to eq('<a></a>')
         end
       end
     end
@@ -145,12 +145,12 @@ describe 'markup helpers' do
     describe 'text' do
       it 'should escape text' do
         @output = tag(:li){ text '&<>' }
-        @output.should =~ /&amp;&lt;&gt;/
+        expect(@output).to match(/&amp;&lt;&gt;/)
       end
 
       it 'should allow not scaped text' do
         @output = tag(:li){ append! '&<>' }
-        @output.should =~ /&<>/
+        expect(@output).to match(/&<>/)
       end
     end
 
@@ -160,7 +160,7 @@ describe 'markup helpers' do
           tag :li
           tag :li
         end
-        output.should == "<ul>\n  <li></li>\n  <li></li>\n</ul>"
+        expect(output).to eq("<ul>\n  <li></li>\n  <li></li>\n</ul>")
       end
 
       it 'should buffer with newlines after text' do
@@ -170,7 +170,7 @@ describe 'markup helpers' do
             append! 'Hi'
           end
         end
-        output.should == "<ul>\n  <li>\n    Hi\n    Hi\n  </li>\n</ul>"
+        expect(output).to eq("<ul>\n  <li>\n    Hi\n    Hi\n  </li>\n</ul>")
       end
     end
   end
@@ -178,44 +178,44 @@ describe 'markup helpers' do
   describe 'special nodes' do
     describe 'comments' do
       it 'should emit comment' do
-        comment('Hello').should == "<!-- Hello -->"
-        comment('Hello -- world').should == "<!-- Hello - - world -->"
-        comment('Hello -- -- world').should == "<!-- Hello - - - - world -->"
+        expect(comment('Hello')).to eq("<!-- Hello -->")
+        expect(comment('Hello -- world')).to eq("<!-- Hello - - world -->")
+        expect(comment('Hello -- -- world')).to eq("<!-- Hello - - - - world -->")
       end
 
       it 'should buffer comments' do
-        tag(:div) do
+        expect(tag(:div) do
           comment 'foo'
           comment 'bar'
-        end.should == "<div>\n  <!-- foo -->\n  <!-- bar -->\n</div>"
+        end).to eq("<div>\n  <!-- foo -->\n  <!-- bar -->\n</div>")
       end
     end
 
     describe 'cdata' do
       it 'should emit cdata' do
-        cdata('Hello').should == "<![CDATA[Hello]]>"
+        expect(cdata('Hello')).to eq("<![CDATA[Hello]]>")
       end
 
       it 'should buffer cdata' do
-        tag(:div) do
+        expect(tag(:div) do
           cdata('foo')
           cdata('bar')
-        end.should == "<div>\n  <![CDATA[foo]]>\n  <![CDATA[bar]]>\n</div>"
+        end).to eq("<div>\n  <![CDATA[foo]]>\n  <![CDATA[bar]]>\n</div>")
       end
 
       it 'should not "escape" cdata terminator' do
-        cdata(']]>').should == "<![CDATA[]]]]><![CDATA[>]]>"
+        expect(cdata(']]>')).to eq("<![CDATA[]]]]><![CDATA[>]]>")
       end
     end
 
     describe 'doctype' do
       it 'should emit html5 doctype' do
-        doctype.should == '<!DOCTYPE html>'
+        expect(doctype).to eq('<!DOCTYPE html>')
       end
 
       it 'should buffer doctype' do
         output = with_buffer{ doctype and tag(:html) }
-        output.should == "<!DOCTYPE html>\n<html></html>\n"
+        expect(output).to eq("<!DOCTYPE html>\n<html></html>\n")
 
       end
     end
@@ -224,18 +224,18 @@ describe 'markup helpers' do
   describe 'tag closing' do
     describe 'void tags' do
       it 'should define void tags' do
-        Tiny::HTML.void_tags.should == %w(area base br col hr img input link meta param embed)
+        expect(Tiny::HTML.void_tags).to eq(%w(area base br col hr img input link meta param embed))
       end
 
       Tiny::HTML.void_tags.each do |tag_name|
         describe tag_name do
           it 'sould autoclose' do
-            tag(tag_name).should == "<#{tag_name} />"
-            tag(tag_name.to_sym).should == "<#{tag_name} />"
+            expect(tag(tag_name)).to eq("<#{tag_name} />")
+            expect(tag(tag_name.to_sym)).to eq("<#{tag_name} />")
           end
 
           it 'should omit content' do
-            tag(tag_name){ text 'hi' }.should == "<#{tag_name} />"
+            expect(tag(tag_name){ text 'hi' }).to eq("<#{tag_name} />")
           end
         end
       end
@@ -253,13 +253,13 @@ describe 'markup helpers' do
           ruby s samp script select small span strike strong style sub sup table
           tbody td textarea tfoot th thead time title tr tt u ul var
         )
-        Tiny::HTML.content_tags.should == tags
+        expect(Tiny::HTML.content_tags).to eq(tags)
       end
 
       Tiny::HTML.content_tags.each do |tag_name|
         it "should not autoclose #{tag_name} if not empty" do
-          tag(tag_name).should == "<#{tag_name}></#{tag_name}>"
-          tag(tag_name.to_sym).should == "<#{tag_name}></#{tag_name}>"
+          expect(tag(tag_name)).to eq("<#{tag_name}></#{tag_name}>")
+          expect(tag(tag_name.to_sym)).to eq("<#{tag_name}></#{tag_name}>")
         end
       end
     end
@@ -273,10 +273,9 @@ describe 'markup helpers' do
       end
     end
 
-    it { output.should have_css 'head', :count => 1 }
-    it { output.should have_css 'head > title', :text => "Tiny Page!", :count => 1 }
-    it { output.should have_css 'body', :count => 1 }
-    it { output.should have_css 'body > h1', :text => "Hello Tiny!", :count => 1 }
+    it { expect(output).to have_title "Tiny Page!" }
+    it { expect(output).to have_css 'body', :count => 1 }
+    it { expect(output).to have_css 'body > h1', :text => "Hello Tiny!", :count => 1 }
   end
 
   describe 'dsl' do
@@ -285,25 +284,25 @@ describe 'markup helpers' do
     describe 'void tags' do
       Tiny::HTML.void_tags.each do |tag_name|
         it "should render '#{tag_name}'" do
-          self.send(tag_name).should == "<#{tag_name} />"
+          expect(self.send(tag_name)).to eq("<#{tag_name} />")
         end
       end
 
       it "should render attributes" do
-        link(:href => "some.css").should == '<link href="some.css" />'
+        expect(link(:href => "some.css")).to eq('<link href="some.css" />')
       end
     end
 
     describe 'content tags' do
       Tiny::HTML.content_tags.each do |tag_name|
         it "should render '#{tag_name}'" do
-          self.send(tag_name).should == "<#{tag_name}></#{tag_name}>"
+          expect(self.send(tag_name)).to eq("<#{tag_name}></#{tag_name}>")
         end
       end
 
       it "should render content and attributes" do
-        h1(:class => 'main') { text "Hello" }.should == %{<h1 class="main">\n  Hello\n</h1>}
-        h1("Hello", :class => 'main').should == %{<h1 class="main">Hello</h1>}
+        expect(h1(:class => 'main') { text "Hello" }).to eq(%{<h1 class="main">\n  Hello\n</h1>})
+        expect(h1("Hello", :class => 'main')).to eq(%{<h1 class="main">Hello</h1>})
       end
     end
   end

data/spec/integration/erb_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'markup helpers' do
+describe 'markup helpers', :type => :request do
   include Tiny::Helpers
 
   let(:output) do
@@ -15,7 +15,7 @@ describe 'markup helpers' do
   end
 
   def check_block &block
-    erb_block?(block).should be_true
+    expect(erb_block?(block)).to be_truthy
   end
 
   it 'should determine block origin' do
@@ -23,29 +23,29 @@ describe 'markup helpers' do
   end
 
   it 'should capture erb' do
-    Tilt['erb'].new { '<% mk = with_buffer("Tiny!") do |s| %>Hello <%= s %><% end %><%- mk.should == "Hello Tiny!" %>' }.render(self)
+    Tilt['erb'].new { '<% mk = with_buffer("Tiny!") do |s| %>Hello <%= s %><% end %><%- expect(mk).to eq "Hello Tiny!" %>' }.render(self)
   end
 
   it 'should emit tag' do
     @output = Tilt['erb'].new { '<%= tag(:div) %>' }.render(self)
-    output.should have_css 'div', :count => 1
+    expect(output).to have_css 'div', :count => 1
   end
 
   it 'should not buffer multiple tags' do
     template = Tilt['erb'].new { '<%= yield %>' }
     output   = template.render(self) { tag(:span); tag(:a) }
-    output.should == '<a></a>'
+    expect(output).to eq('<a></a>')
   end
 
   it 'should buffer multiple tags inside with_buffer block' do
     template = Tilt['erb'].new { '<%= yield %>' }
     output   = template.render(self) { with_buffer { tag(:span); tag(:a) }  }
-    output.should == "<span></span>\n<a></a>\n"
+    expect(output).to eq("<span></span>\n<a></a>\n")
   end
 
   it 'should concat erb block' do
     template = Tilt['erb'].new(:outvar => '@_out_buf') { '<%= span do %>Hello<% end %>' }
-    template.render(self).should == "<span>\n  Hello\n</span>\n"
+    expect(template.render(self)).to eq("<span>\n  Hello\n</span>\n")
   end
 
   describe 'block passing' do
@@ -61,9 +61,9 @@ describe 'markup helpers' do
           ERB
         end.render(self)
       end
-      it { output.should have_css 'div',     :count => 1 }
-      it { output.should have_css 'a',       :count => 1 }
-      it { output.should have_css 'div > a', :text => 'Hello' }
+      it { expect(output).to have_css 'div',     :count => 1 }
+      it { expect(output).to have_css 'a',       :count => 1 }
+      it { expect(output).to have_css 'div > a', :text => 'Hello' }
     end
 
     describe 'nested' do

data/spec/integration/haml_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'markup helpers' do
+describe 'markup helpers', :type => :request do
   include Tiny::Helpers
 
   let(:output) do
@@ -11,7 +11,7 @@ describe 'markup helpers' do
   describe 'tag' do
     it 'should emit tag' do
       @output = Tilt['haml'].new { '= tag(:div)' }.render(self)
-      output.should have_css 'div', :count => 1
+      expect(output).to have_css 'div', :count => 1
     end
 
     it 'should emit haml block' do
@@ -21,7 +21,7 @@ describe 'markup helpers' do
   Hello
         HAML
       end.render(self)
-      output.should have_css 'div', :text => "Hello", :count => 1
+      expect(output).to have_css 'div', :text => "Hello", :count => 1
     end
   end
 
@@ -36,9 +36,9 @@ describe 'markup helpers' do
           HAML
         end.render(self)
       end
-      it { output.should have_css 'div',     :count => 1 }
-      it { output.should have_css 'a',       :count => 1 }
-      it { output.should have_css 'div > a', :text => 'Hello' }
+      it { expect(output).to have_css 'div',     :count => 1 }
+      it { expect(output).to have_css 'a',       :count => 1 }
+      it { expect(output).to have_css 'div > a', :text => 'Hello' }
     end
 
     describe 'nested' do

data/spec/integration/rails_spec.rb

@@ -16,27 +16,27 @@ describe 'Rails compatibility', :type => :request do
     before do
       visit '/erb'
     end
-    it_should_behave_like 'it renders my list'
+    it_behaves_like 'it renders my list'
   end
 
   describe 'using Tiny helpers from erb template' do
     before do
       visit '/erb_helpers'
     end
-    it_should_behave_like 'it renders my list'
+    it_behaves_like 'it renders my list'
   end
 
   describe 'using Tiny from haml template' do
     before do
       visit '/haml'
     end
-    it_should_behave_like 'it renders my list'
+    it_behaves_like 'it renders my list'
   end
 
   describe 'using Tiny helpers from haml template' do
     before do
       visit '/haml_helpers'
     end
-    it_should_behave_like 'it renders my list'
+    it_behaves_like 'it renders my list'
   end
 end

data/spec/integration/sinatra_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 require "#{SUPPORT}/sinatra_app"
 
 describe 'Sinatra compatibility', :type => :request do
-  include Rack::Test::Methods
-
   let(:output) do
     Capybara::Node::Simple.new(page.body)
   end
@@ -16,27 +14,27 @@ describe 'Sinatra compatibility', :type => :request do
     before do
       visit '/erb'
     end
-    it_should_behave_like 'it renders my list'
+    it_behaves_like 'it renders my list'
   end
 
   describe 'using Tiny helpers from erb template' do
     before do
       visit '/erb_helpers'
     end
-    it_should_behave_like 'it renders my list'
+    it_behaves_like 'it renders my list'
   end
 
   describe 'using Tiny from haml template' do
     before do
       visit '/haml'
     end
-    it_should_behave_like 'it renders my list'
+    it_behaves_like 'it renders my list'
   end
 
   describe 'using Tiny helpers from haml template' do
     before do
       visit '/haml_helpers'
     end
-    it_should_behave_like 'it renders my list'
+    it_behaves_like 'it renders my list'
   end
 end

data/spec/spec_helper.rb

@@ -12,32 +12,37 @@ require 'tiny'
 $:.unshift File.dirname(__FILE__)
 require 'support/list_helper'
 
+RSpec.configure do |config|
+  config.include Capybara::DSL,       type: :request
+  config.include Rack::Test::Methods, type: :request
+end
+
 FIXTURES = "#{File.dirname __FILE__}/fixtures"
 SUPPORT  = "#{File.dirname __FILE__}/support"
 
 shared_examples_for 'it renders my list' do
-  it { output.should have_css 'ul',    :count => 1 }
-  it { output.should have_css 'li',    :count => 3 }
-  it { output.should have_css 'a',     :count => 3 }
-  it { output.should have_css 'span',  :count => 3 }
-  it { output.should have_css 'ul > li' }
-  it { output.should have_css 'ul > li > a' }
-  it { output.should have_css 'ul > li > a', :text => 'A' }
-  it { output.should have_css 'ul > li > a > span', :text => '1' }
-  it { output.should have_css 'ul > li > a', :text => 'B' }
-  it { output.should have_css 'ul > li > a > span', :text => '2' }
-  it { output.should have_css 'ul > li > a', :text => 'C' }
-  it { output.should have_css 'ul > li > a > span', :text => '3' }
+  it { expect(output).to have_css 'ul',    :count => 1 }
+  it { expect(output).to have_css 'li',    :count => 3 }
+  it { expect(output).to have_css 'a',     :count => 3 }
+  it { expect(output).to have_css 'span',  :count => 3 }
+  it { expect(output).to have_css 'ul > li' }
+  it { expect(output).to have_css 'ul > li > a' }
+  it { expect(output).to have_css 'ul > li > a', :text => 'A' }
+  it { expect(output).to have_css 'ul > li > a > span', :text => '1' }
+  it { expect(output).to have_css 'ul > li > a', :text => 'B' }
+  it { expect(output).to have_css 'ul > li > a > span', :text => '2' }
+  it { expect(output).to have_css 'ul > li > a', :text => 'C' }
+  it { expect(output).to have_css 'ul > li > a > span', :text => '3' }
 end
 
 shared_examples_for 'it renders my form' do
-  it { output.should have_css 'form', :count => 1 }
-  it { output.should have_css 'form[action="/login"]', :count => 1 }
-  it { output.should have_css 'form > fieldset', :count => 1 }
-  it { output.should have_css 'form > fieldset > label', :count => 1}
-  it { output.should have_css 'form > fieldset > label[for=email]', :text => 'Email', :count => 1}
-  it { output.should have_css 'form > fieldset > input', :count => 1}
-  it { output.should have_css 'form > fieldset > input#email[type=text][value="email@example.com"]', :count => 1 }
+  it { expect(output).to have_css 'form', :count => 1 }
+  it { expect(output).to have_css 'form[action="/login"]', :count => 1 }
+  it { expect(output).to have_css 'form > fieldset', :count => 1 }
+  it { expect(output).to have_css 'form > fieldset > label', :count => 1}
+  it { expect(output).to have_css 'form > fieldset > label[for=email]', :text => 'Email', :count => 1}
+  it { expect(output).to have_css 'form > fieldset > input', :count => 1}
+  it { expect(output).to have_css 'form > fieldset > input#email[type=text][value="email@example.com"]', :count => 1 }
 end
 
 class Renderer

data/spec/widget_spec.rb

@@ -16,8 +16,8 @@ describe Tiny::Widget do
           append! '<div></div>'
         end
       end.new.to_html
-      output.should == "<div></div>\n"
-      output.should be_html_safe
+      expect(output).to eq("<div></div>\n")
+      expect(output).to be_html_safe
     end
 
     it 'should output content with block' do
@@ -28,7 +28,7 @@ describe Tiny::Widget do
           append! "</div>"
         end
       end.new.to_html { text 'Hello' }
-      output.should == "<div>\nHello\n</div>\n"
+      expect(output).to eq("<div>\nHello\n</div>\n")
     end
   end
 
@@ -36,16 +36,17 @@ describe Tiny::Widget do
     before do
       @output = Class.new(Tiny::Widget) do
         def markup
-          head { title "Tiny Page!" }
-          body { h1 "Hello Tiny!" }
+          html {
+            head { title "Tiny Page!" }
+            body { h1 "Hello Tiny!" }
+          }
         end
       end.new.to_html
     end
 
-    it { output.should have_css 'head', :count => 1 }
-    it { output.should have_css 'head > title', :text => "Tiny Page!", :count => 1 }
-    it { output.should have_css 'body', :count => 1 }
-    it { output.should have_css 'body > h1', :text => "Hello Tiny!", :count => 1 }
+    it { expect(output).to have_title "Tiny Page!" }
+    it { expect(output).to have_css 'body', :count => 1 }
+    it { expect(output).to have_css 'body > h1', :text => "Hello Tiny!", :count => 1 }
   end
 
   describe 'content from different methods' do
@@ -70,10 +71,10 @@ describe Tiny::Widget do
       end.new.to_html
     end
 
-    it { output.should have_css 'div#notices', :count => 1 }
-    it { output.should have_css 'div#notices > h1', :text => "Notices", :count => 1 }
-    it { output.should have_css 'div#content', :count => 1 }
-    it { output.should have_css 'div#content > h1', :text => "Content", :count => 1 }
+    it { expect(output).to have_css 'div#notices', :count => 1 }
+    it { expect(output).to have_css 'div#notices > h1', :text => "Notices", :count => 1 }
+    it { expect(output).to have_css 'div#content', :count => 1 }
+    it { expect(output).to have_css 'div#content > h1', :text => "Content", :count => 1 }
   end
 
   describe 'rendering a tag from outside' do
@@ -88,8 +89,8 @@ describe Tiny::Widget do
       end.new.to_html { tag :h1, @title }
     end
 
-    it { output.should have_css 'div#content', :count => 1 }
-    it { output.should have_css 'div#content > h1', :text => "Content", :count => 1 }
+    it { expect(output).to have_css 'div#content', :count => 1 }
+    it { expect(output).to have_css 'div#content > h1', :text => "Content", :count => 1 }
   end
 
   describe 'rendering a block from outside with concatenated tags' do
@@ -101,9 +102,9 @@ describe Tiny::Widget do
       end.new.to_html { tag(:h1, "Title"); tag(:p, "Content") }
     end
 
-    it { output.should have_css 'div#content', :count => 1 }
-    it { output.should have_css 'div#content > h1', :text => "Title", :count => 1 }
-    it { output.should have_css 'div#content > p', :text => "Content", :count => 1 }
+    it { expect(output).to have_css 'div#content', :count => 1 }
+    it { expect(output).to have_css 'div#content > h1', :text => "Title", :count => 1 }
+    it { expect(output).to have_css 'div#content > p', :text => "Content", :count => 1 }
   end
 
   describe 'rendering an erb block' do
@@ -116,16 +117,16 @@ describe Tiny::Widget do
       @output = Tilt['erb'].new { '<%= widget.to_html do %><h1>Title</h1><p>Content</p><% end %>' }.render(self, :widget => widget)
     end
 
-    it { output.should have_css 'div#content', :count => 1 }
-    it { output.should have_css 'div#content > h1', :text => "Title", :count => 1 }
-    it { output.should have_css 'div#content > p', :text => "Content", :count => 1 }
+    it { expect(output).to have_css 'div#content', :count => 1 }
+    it { expect(output).to have_css 'div#content > h1', :text => "Title", :count => 1 }
+    it { expect(output).to have_css 'div#content > p', :text => "Content", :count => 1 }
   end
 
   describe 'widget with no content overriden' do
     it 'should raise not implemented' do
-      lambda do
+      expect do
         Class.new(Tiny::Widget).new.to_html
-      end.should raise_error(NotImplementedError)
+      end.to raise_error(NotImplementedError)
     end
   end
 

data/tiny.gemspec

@@ -18,15 +18,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'tilt', '~> 1.3'
-  s.add_runtime_dependency 'erubis', '~> 2.7'
-  s.add_runtime_dependency 'escape_utils' # simple api
+  s.add_runtime_dependency 'tilt'
+  s.add_runtime_dependency 'erubis'
 
-  s.add_development_dependency 'rspec', '~> 2.11'
-  s.add_development_dependency 'nokogiri', '1.5.2'
-  s.add_development_dependency 'capybara', '~> 1.1'
+  s.add_development_dependency 'rspec', '~> 3.1.0'
+  s.add_development_dependency 'capybara', '~> 2.4.0'
   s.add_development_dependency 'haml', '~> 3.1'
-  s.add_development_dependency 'tilt', '~> 1.3'
-  s.add_development_dependency 'sinatra' # I trust Sinatra
-  s.add_development_dependency 'rails', '~> 3.2'
+  s.add_development_dependency 'sinatra'
+  s.add_development_dependency 'rails', '~> 4.1.0'
 end

metadata

@@ -1,176 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: tiny
 version: !ruby/object:Gem::Version
-  version: 0.2.6
-  prerelease: 
+  version: 0.2.7
 platform: ruby
 authors:
 - Macario
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: escape_utils
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.0
 description: Tiny is a tiny framework agnostic markup builder, useful for building
   view helpers on inclusion only adds three public methods, tag (for generating html
   tags), capture and concat, works as pure ruby and with erb and haml
@@ -180,8 +117,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - README.md
 - Rakefile
@@ -210,27 +147,26 @@ files:
 - tiny.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: tiny
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Framework agnostic markup builder, useful for building view helpers or as
   a micro templating dsl, plays nice with erb and haml
 test_files: