tiny 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0a25f5692ba1dfbb0a1d206402dc725ef45c0493
-  data.tar.gz: c520045fc273ddb2257ce4e6fe6047bd3513da39
+SHA256:
+  metadata.gz: fe8e793ac657e2b7412bf405aac9039b1306db27c7cb2e06a23a963c43f42e19
+  data.tar.gz: 32280a75554bd9688324a4806baa6639022640962ab71cb9404381c4be7bc5f1
 SHA512:
-  metadata.gz: 98043c8f9fd4d1cc7a19a06c11f5c617797228a854119636551490192aa7688a63fa374539ffb1cf6c015b1730b3625a0bd5a8173469490186068a02b003b15c
-  data.tar.gz: 020ea10b6826e86b562f0d99e1dcd58f998f70a721e5b18f2610911f30e2bdf5cf1a027ae6fa901d01490017f5474d2adf81ff9abad82e7b8705668ecba10133
+  metadata.gz: c1acfa8d3983082fa4a3f3e197ec417d52dec82cec0697dd1890bd9928aa8db84e5d827df4a5b1fa26dd09f853dcc64c4aa4b33a042fc9a964e4c08dc72a35b2
+  data.tar.gz: 30d01e45e02202bc1d6f8be89d9e45303a5678b0e0b82d676ea6d41b156d6ae6ae7446858d47c0a4215852c0c88b088a11a8f701596e6bb021e2983865726443

data/lib/tiny.rb

@@ -108,7 +108,7 @@ module Tiny
     #   </form>
     #
     #
-    def html_tag name, attrs_or_content = {}, attrs = nil, &block
+    def html_tag(name, attrs_or_content = {}, attrs = nil, &block)
       append! Tag.new(name, attrs_or_content, attrs).render(&block)
     end
 
@@ -123,7 +123,7 @@ module Tiny
     #
     # @return [SafeString] HTML content.
     #
-    def comment content
+    def comment(content)
       append! "<!-- #{content.to_s.gsub(/-(?=-)/, '- ')} -->"
     end
 
@@ -138,7 +138,7 @@ module Tiny
     #
     # @return [String] CDATA section.
     #
-    def cdata content
+    def cdata(content)
       content = content.to_s.gsub(']]>', ']]]]><![CDATA[>')
       append! "<![CDATA[#{content}]]>"
     end
@@ -178,7 +178,7 @@ module Tiny
     #
     # @return [String] HTML-escaped.
     #
-    def append string
+    def append(string)
       string = Helpers.sanitize(string)
       if working_buffer
         working_buffer << string.gsub(/(?<!^|\n)\z/, "\n")
@@ -205,7 +205,7 @@ module Tiny
     #
     # @return [SafeString] Non HTML-escaped.
     #
-    def append! content
+    def append!(content)
       append raw(content)
     end
     alias text! append!
@@ -214,7 +214,7 @@ module Tiny
     #
     # @return [SafeString] Considered html safe.
     #
-    def raw val
+    def raw(val)
       SafeString.new val.to_s
     end
 
@@ -246,13 +246,14 @@ module Tiny
     #
     # @return [String] HTML markup.
     #
-    def with_buffer *args, &block
+    def with_buffer(*args)
       buffer_stack << ''
-      yield *args
+      yield(*args)
       buffer_stack.pop
     end
 
     private
+
     # Pushing and popping.
     def buffer_stack
       @buffer_stack ||= []
@@ -278,7 +279,7 @@ module Tiny
     # @yield [*args] HAML block or content block.
     # @return [String] HTML markup.
     #
-    def with_buffer *args, &block
+    def with_buffer(*args, &block)
       defined?(Haml) && Haml::Helpers.block_is_haml?(block) ? capture_haml(*args, &block) : super
     end
   end
@@ -297,7 +298,7 @@ module Tiny
     # @yield [*args] ERB block or content block.
     # @return [String] HTML markup.
     #
-    def with_buffer *args, &block
+    def with_buffer(*args, &block)
       erb_block?(block) ? capture_erb(*args, &block) : super
     end
 
@@ -307,7 +308,7 @@ module Tiny
     # @return [String] HTML markup
     # @yield [*args]
     #
-    def capture_erb *args, &block
+    def capture_erb(*args, &block)
       output_buffer = eval('_buf', block.binding)
       buffer = output_buffer.dup
       output_buffer.clear and yield(*args)
@@ -320,7 +321,7 @@ module Tiny
     #
     # @param block [Proc] a Proc object
     #
-    def erb_block? block
+    def erb_block?(block)
       block && eval('defined?(__in_erb_template)', block.binding)
     end
   end
@@ -337,7 +338,7 @@ module Tiny
     #
     # @return [String] HTML markup
     #
-    def tag name, attrs_or_content = {}, attrs = nil, &block
+    def tag(name, attrs_or_content = {}, attrs = nil, &block)
       html_tag name, attrs_or_content, attrs, &block
     end
 
@@ -348,7 +349,7 @@ module Tiny
     # @param value [String, Object]
     # @return [String]
     #
-    def self.sanitize value
+    def self.sanitize(value)
       if value.respond_to?(:html_safe?) && value.html_safe?
         value.to_s
       else
@@ -356,7 +357,7 @@ module Tiny
       end
     end
 
-    def self.escape_html html
+    def self.escape_html(html)
       CGI.escapeHTML html.to_s
     end
   end
@@ -414,7 +415,7 @@ module Tiny
     # @return [String] HTML markup.
     # @see Widget.
     #
-    def render &block
+    def render(&block)
       output = with_buffer do
         next markup unless block_given?
         markup do |args|
@@ -440,18 +441,18 @@ module Tiny
     # @yield [*args] HAML block or content block.
     # @return [String] HTML markup.
     #
-    def with_buffer *args, &block
+    def with_buffer(*args, &block)
       block_from_template?(block) ? capture(*args, &block) : super
     end
 
     # Appends sanitized text to the content.
     # @see Buffering#append
-    def append markup
+    def append(markup)
       super(markup).html_safe
     end
 
     # Returns true if the block was originated in an ERB or HAML template.
-    def block_from_template? block
+    def block_from_template?(block)
       block && eval('defined?(output_buffer)', block.binding) == 'local-variable'
     end
   end

data/lib/tiny/erubis.rb

@@ -14,22 +14,22 @@ module Tiny
   module Erubis
     # @see Erubis
     class ::String
-      def append= obj
+      def append=(obj)
         self << obj.to_s
       end
 
-      def append_escaped= obj
+      def append_escaped=(obj)
         self << Tiny::Helpers.sanitize(obj.to_s)
       end
     end
 
     # @see Erubis
     module ErubyExtensions
-      def add_expr_literal src, code
+      def add_expr_literal(src, code)
         src << "_buf.append= #{code};"
       end
 
-      def add_expr_escaped src, code
+      def add_expr_escaped(src, code)
         src << "_buf.append_escaped= #{code};"
       end
     end
@@ -49,11 +49,11 @@ module Tiny
       def prepare
         engine_class = options.delete(:engine_class) || Eruby
         engine_class = EscapedEruby if options.delete(:escape_html)
-        options.merge!(:engine_class => engine_class)
+        options.merge!(engine_class: engine_class)
         super
       end
 
-      def precompiled_preamble locals
+      def precompiled_preamble(locals)
         [super, "__in_erb_template=true"].join("\n")
       end
     end

data/lib/tiny/html.rb

@@ -7,18 +7,15 @@ module Tiny
       # Void tag names.
       # Tags that should have no content.
       # @return [Array]
-      def content_tags
-        @content_tags
-      end
+      attr_reader :content_tags
 
       # Content tag names.
       # Tags that can have content.
       # @return [Array]
-      def void_tags
-        @void_tags
-      end
+      attr_reader :void_tags
 
       private
+
       # @macro tag_def
       #  @method $1(attrs_or_content = {}, attrs = nil, &block)
       #  Shortcut for {Markup#html_tag html_tag}(:$1)
@@ -30,7 +27,7 @@ module Tiny
       #
       #  @see Markup#html_tag
       #
-      def tag_def tag_name, void_tag = false
+      def tag_def(tag_name, void_tag = false)
         class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
           def #{tag_name} *args, &block
             html_tag "#{tag_name}", *args, &block

data/lib/tiny/safe_string.rb

@@ -8,7 +8,7 @@ module Tiny
   class SafeString < String
     def html_safe?; true end
 
-    def concat string
+    def concat(string)
       return super unless String === string
       super Helpers.sanitize string
     end

data/lib/tiny/tag.rb

@@ -2,9 +2,9 @@ module Tiny
   # @see Markup#html_tag
   class Tag
     attr_reader :tag_name, :attrs
-    def initialize tag_name, aoc = {}, attrs = nil
+    def initialize(tag_name, aoc = {}, attrs = nil)
       @attrs, @content =
-         Hash === aoc && attrs.nil?? [aoc] : [attrs || {}, aoc]
+         Hash === aoc && attrs.nil? ? [aoc] : [attrs || {}, aoc]
       @content  = Helpers.sanitize(@content) if @content
       @tag_name = tag_name
     end
@@ -18,13 +18,13 @@ module Tiny
           Helpers.escape_html value
         end
 
-        %{#{name}="#{vals.join(' ')}"}
+        %(#{name}="#{vals.join(' ')}")
       end.compact.join(' ')
 
       " #{tag_attrs}" unless tag_attrs.empty?
     end
 
-    def render &block
+    def render(&block)
       if void_tag?
         "<#{tag_name}#{tag_attributes} />"
       else

data/lib/tiny/version.rb

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

data/spec/erubis_spec.rb

@@ -12,17 +12,17 @@ describe 'markup helpers' do
   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 = Tilt['erb'].new(nil, escape_html: true){}.instance_variable_get(:@engine)
     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 = Tilt['erb'].new(nil, escape_html: true) { %(<%= "<p>Hello World!</p>" %>) }
     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 = Tilt['erb'].new(nil, escape_html: false) { %(<%= "<p>Hello World!</p>" %>) }
     expect(template.render).to eq("<p>Hello World!</p>")
   end
 
@@ -37,7 +37,7 @@ describe 'markup helpers' do
   end
 
   it 'should allow block with explicit output' do
-    template = Tilt['erb'].new nil, :escape_html => true do
+    template = Tilt['erb'].new nil, escape_html: true do
       <<-ERB
       <%= [1,2].each do |i| %>
       <% end %>

data/spec/helpers_spec.rb

@@ -12,16 +12,16 @@ describe 'markup helpers' do
     describe 'basic' do
       describe 'attributes and content' do
         before do
-          @output = tag(:li, :class => 'item', :id => 'hello') { text 'Hello' }
+          @output = tag(:li, class: 'item', id: 'hello') { text 'Hello' }
         end
-        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', 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 = tag(:li, class: [], id: nil)
         expect(output).to eq("<li></li>")
       end
 
@@ -41,18 +41,18 @@ describe 'markup helpers' do
       end
 
       it 'should output multiple classes passing an array' do
-        output = tag(:li, :class => %w(item in-stock))
+        output = tag(:li, class: %w(item in-stock))
         expect(output).to eq('<li class="item in-stock"></li>')
       end
 
       it 'should allow passing content as string' do
         expect(tag(:h1, "Hello")).to eq("<h1>Hello</h1>")
-        expect(tag(:h1, "Hello", :class => 'main')).to eq(%{<h1 class="main">Hello</h1>})
+        expect(tag(:h1, "Hello", class: 'main')).to eq(%(<h1 class="main">Hello</h1>))
       end
 
       it 'should escape attribute html' do
-        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>')
+        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 { 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' }
+        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,11 +75,11 @@ describe 'markup helpers' do
             end
           end
         end
-        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',     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', 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 { 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',      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 { 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' }
+        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,13 +125,13 @@ describe 'markup helpers' do
           end
         end
 
-        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' }
+        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
@@ -165,7 +165,7 @@ describe 'markup helpers' do
 
       it 'should buffer with newlines after text' do
         output = tag(:ul) do
-          tag (:li) do
+          tag :li do
             text 'Hi'
             append! 'Hi'
           end
@@ -243,7 +243,7 @@ describe 'markup helpers' do
 
     describe 'content tags' do
       it 'should define content tags' do
-        tags  = %w(
+        tags = %w(
           article aside audio bdi canvas command datalist details
           figcaption figure header hgroup keygen mark meter nav output progress
           section source summary track video wbr a abbr address b bdo big
@@ -274,8 +274,8 @@ describe 'markup helpers' do
     end
 
     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 }
+    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
@@ -284,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
-          expect(self.send(tag_name)).to eq("<#{tag_name} />")
+          expect(send(tag_name)).to eq("<#{tag_name} />")
         end
       end
 
       it "should render attributes" do
-        expect(link(:href => "some.css")).to eq('<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
-          expect(self.send(tag_name)).to eq("<#{tag_name}></#{tag_name}>")
+          expect(send(tag_name)).to eq("<#{tag_name}></#{tag_name}>")
         end
       end
 
       it "should render content and attributes" do
-        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>})
+        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,20 +1,20 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'markup helpers', :type => :request do
+describe 'markup helpers', type: :request do
   include Tiny::Helpers
 
   let(:output) do
     Capybara::Node::Simple.new(@output)
   end
 
-  def span &block
+  def span(&block)
     with_buffer do
       tag(:span, &block)
     end
   end
 
-  def check_block &block
+  def check_block(&block)
     expect(erb_block?(block)).to be_truthy
   end
 
@@ -28,7 +28,7 @@ describe 'markup helpers', :type => :request do
 
   it 'should emit tag' do
     @output = Tilt['erb'].new { '<%= tag(:div) %>' }.render(self)
-    expect(output).to have_css 'div', :count => 1
+    expect(output).to have_css 'div', count: 1
   end
 
   it 'should not buffer multiple tags' do
@@ -44,14 +44,14 @@ describe 'markup helpers', :type => :request do
   end
 
   it 'should concat erb block' do
-    template = Tilt['erb'].new(:outvar => '@_out_buf') { '<%= span do %>Hello<% end %>' }
+    template = Tilt['erb'].new(outvar: '@_out_buf') { '<%= span do %>Hello<% end %>' }
     expect(template.render(self)).to eq("<span>\n  Hello\n</span>\n")
   end
 
   describe 'block passing' do
     describe 'shallow' do
       before do
-        @output = Tilt['erb'].new(:outvar => '@_out_buf') do
+        @output = Tilt['erb'].new(outvar: '@_out_buf') do
           <<-ERB
             <%= tag(:div) do %>
               <%= tag(:a) do %>
@@ -61,9 +61,9 @@ describe 'markup helpers', :type => :request do
           ERB
         end.render(self)
       end
-      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' }
+      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', :type => :request do
+describe 'markup helpers', type: :request do
   include Tiny::Helpers
 
   let(:output) do
@@ -11,7 +11,7 @@ describe 'markup helpers', :type => :request do
   describe 'tag' do
     it 'should emit tag' do
       @output = Tilt['haml'].new { '= tag(:div)' }.render(self)
-      expect(output).to 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', :type => :request do
   Hello
         HAML
       end.render(self)
-      expect(output).to 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', :type => :request do
           HAML
         end.render(self)
       end
-      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' }
+      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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require "#{SUPPORT}/rails_app"
 
-describe 'Rails compatibility', :type => :request do
+describe 'Rails compatibility', type: :request do
   include Rack::Test::Methods
 
   let(:output) do

data/spec/integration/sinatra_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require "#{SUPPORT}/sinatra_app"
 
-describe 'Sinatra compatibility', :type => :request do
+describe 'Sinatra compatibility', type: :request do
   let(:output) do
     Capybara::Node::Simple.new(page.body)
   end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'haml'
 require 'sinatra'
 require 'tiny'
 
-$:.unshift File.dirname(__FILE__)
+$LOAD_PATH.unshift File.dirname(__FILE__)
 require 'support/list_helper'
 
 RSpec.configure do |config|
@@ -21,39 +21,39 @@ FIXTURES = "#{File.dirname __FILE__}/fixtures"
 SUPPORT  = "#{File.dirname __FILE__}/support"
 
 shared_examples_for 'it renders my list' do
-  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',    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' }
+  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 { 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 }
+  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
   include Tiny::Helpers
   include ListHelper
 
-  def initialize template
+  def initialize(template)
     @template = template
   end
 
   def render
-    Tilt.new("#{FIXTURES}/#{@template}", :outvar => '@output').render(self)
+    Tilt.new("#{FIXTURES}/#{@template}", outvar: '@output').render(self)
   end
 end

data/spec/support/form_helper.rb

@@ -5,7 +5,7 @@ module FormHelper
     end
 
     def markup
-      form(:action => @action) do
+      form(action: @action) do
         fieldset do
           yield(self)
         end
@@ -23,8 +23,8 @@ module FormHelper
     end
 
     def markup
-      label(@name.capitalize, :for => @name)
-      input(:type => 'text', :id => @name, :name => @name, :value => @value)
+      label(@name.capitalize, for: @name)
+      input(type: 'text', id: @name, name: @name, value: @value)
     end
   end
 

data/spec/support/list_helper.rb

@@ -1,12 +1,12 @@
 module ListHelper
-  def list &block
+  def list(&block)
     html_tag(:ul, &block)
   end
 
-  def item_content num
+  def item_content(num)
     html_tag(:li) do
       html_tag(:a) do
-        text (num + 64).chr
+        text((num + 64).chr)
         html_tag(:span) { text num }
       end
     end

data/spec/support/rails_app.rb

@@ -5,8 +5,6 @@ ActionController::Base.view_paths = FIXTURES
 
 module RailsTestApp
   class Application < Rails::Application
-    config.secret_token = '572c86f5ede338bd8aba8dae0fd3a326aabababc98d1e6ce34b9f5'
-
     routes.draw do
       get '/erb'          => 'rails_test_app/test#erb'
       get '/erb_helpers'  => 'rails_test_app/test#erb_helpers'
@@ -23,19 +21,19 @@ module RailsTestApp
     end
 
     def erb
-      render :template => "erb_list"
+      render template: "erb_list"
     end
 
     def erb_helpers
-      render :template => "erb_list_with_helpers"
+      render template: "erb_list_with_helpers"
     end
 
     def haml
-      render :template => "haml_list"
+      render template: "haml_list"
     end
 
     def haml_helpers
-      render :template => "haml_list_with_helpers"
+      render template: "haml_list_with_helpers"
     end
   end
 end

data/spec/widget_spec.rb

@@ -21,13 +21,15 @@ describe Tiny::Widget do
     end
 
     it 'should output content with block' do
-      output = Class.new(Tiny::Widget) do
+      widget = Class.new(Tiny::Widget) do
         def markup
           append! "<div>"
           yield
           append! "</div>"
         end
-      end.new.to_html { text 'Hello' }
+      end
+
+      output = widget.new.to_html { text 'Hello' }
       expect(output).to eq("<div>\nHello\n</div>\n")
     end
   end
@@ -45,21 +47,21 @@ describe Tiny::Widget do
     end
 
     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 }
+    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
     before do
       @output = Class.new(Tiny::Widget) do
         def notices
-          div :id => :notices do
+          div id: :notices do
             h1 'Notices'
           end
         end
 
         def main
-          div :id => :content do
+          div id: :content do
             h1 "Content"
           end
         end
@@ -71,10 +73,10 @@ describe Tiny::Widget do
       end.new.to_html
     end
 
-    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 }
+    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
@@ -82,44 +84,44 @@ describe Tiny::Widget do
       @title  = "Content" # no need to smuggle instance variables
       @output = Class.new(Tiny::Widget) do
         def markup
-          div :id => :content do
+          div id: :content do
             yield
           end
         end
       end.new.to_html { tag :h1, @title }
     end
 
-    it { expect(output).to have_css 'div#content', :count => 1 }
-    it { expect(output).to 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
     before do
       @output = Class.new(Tiny::Widget) do
-        def markup &block
-          div(:id => :content, &block)
+        def markup(&block)
+          div(id: :content, &block)
         end
       end.new.to_html { tag(:h1, "Title"); tag(:p, "Content") }
     end
 
-    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 }
+    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
     before do
       widget = Class.new(Tiny::Widget) do
-        def markup &block
-          div(:id => :content, &block)
+        def markup(&block)
+          div(id: :content, &block)
         end
       end.new
-      @output = Tilt['erb'].new { '<%= widget.to_html do %><h1>Title</h1><p>Content</p><% end %>' }.render(self, :widget => widget)
+      @output = Tilt['erb'].new { '<%= widget.to_html do %><h1>Title</h1><p>Content</p><% end %>' }.render(self, widget: widget)
     end
 
-    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 }
+    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

data/tiny.gemspec

@@ -1,5 +1,5 @@
 # encoding: utf-8
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
 require "tiny/version"
 
 Gem::Specification.new do |s|
@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.version     = Tiny::VERSION
   s.authors     = ["Macario"]
   s.email       = ["macarui@gmail.com"]
-  s.homepage    = ""
-  s.summary     = %q{Framework agnostic markup builder, useful for building view helpers or as a micro templating dsl, plays nice with erb and haml}
-  s.description = %q{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}
+  s.homepage    = "https://github.com/maca/tiny"
+  s.summary     = 'Framework agnostic markup builder, useful for building view helpers or as a micro templating dsl, plays nice with erb and haml'
+  s.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'
 
   s.rubyforge_project = "tiny"
 
@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'tilt'
   s.add_runtime_dependency 'erubis'
 
-  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 'sinatra'
-  s.add_development_dependency 'rails', '~> 4.1.0'
+  s.add_development_dependency 'rspec', '~> 3.7.0'
+  s.add_development_dependency 'capybara', '~> 3.2.1'
+  s.add_development_dependency 'haml', '~> 5.0.4'
+  s.add_development_dependency 'sinatra', '~> 2.0.3'
+  s.add_development_dependency 'rails', '~> 5.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Macario
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -44,70 +44,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 5.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.2.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
@@ -145,7 +145,7 @@ files:
 - spec/support/sinatra_app.rb
 - spec/widget_spec.rb
 - tiny.gemspec
-homepage: ''
+homepage: https://github.com/maca/tiny
 licenses: []
 metadata: {}
 post_install_message: 
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tiny
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Framework agnostic markup builder, useful for building view helpers or as
@@ -186,4 +186,3 @@ test_files:
 - spec/support/rails_app.rb
 - spec/support/sinatra_app.rb
 - spec/widget_spec.rb
-has_rdoc: