padrino-helpers 0.12.0 → 0.12.1

data/lib/padrino/rendering/extensions/erubis.rb

@@ -0,0 +1,74 @@
+begin
+  require 'erubis'
+
+  module Padrino
+    module Erubis
+      ##
+      # SafeBufferEnhancer is an Erubis Enhancer that compiles templates that
+      # are fit for using ActiveSupport::SafeBuffer as a Buffer.
+      #
+      # @api private
+      module SafeBufferEnhancer
+        def add_expr_literal(src, code)
+          src << " #{@bufvar}.concat((" << code << ').to_s);'
+        end
+
+        def add_stmt(src, code)
+          code = code.sub('end', 'nil;end') if code =~ /\A\s*end\s*\Z/
+          src << code
+          src << ';' unless code[-1] == ?\n
+        end
+
+        def add_expr_escaped(src, code)
+          src << " #{@bufvar}.safe_concat " << code << ';'
+        end
+
+        def add_text(src, text)
+          src << " #{@bufvar}.safe_concat '" << escape_text(text) << "';" unless text.empty?
+        end
+      end
+
+      ##
+      # SafeBufferTemplate is the classic Erubis template, augmented with
+      # SafeBufferEnhancer.
+      #
+      # @api private
+      class SafeBufferTemplate < ::Erubis::Eruby
+        include SafeBufferEnhancer
+      end
+
+      ##
+      # Modded ErubisTemplate that doesn't insist in an String as output
+      # buffer.
+      #
+      # @api private
+      class Template < Tilt::ErubisTemplate
+        def render(*args)
+          app       = args.first
+          app_class = app.class
+          @is_padrino_app = (defined?(Padrino::Application) && app.kind_of?(Padrino::Application)) || 
+                            (app_class.respond_to?(:erb) && app_class.erb[:engine_class] == Padrino::Erubis::SafeBufferTemplate)
+          super
+        end
+
+        ##
+        # In preamble we need a flag `__in_erb_template` and SafeBuffer for padrino apps.
+        #
+        def precompiled_preamble(locals)
+          original = super
+          return original unless @is_padrino_app
+          "__in_erb_template = true\n" << original.rpartition("\n").first << "#{@outvar} = _buf = ActiveSupport::SafeBuffer.new\n"
+        end
+      end
+    end
+  end
+
+  Tilt.prefer(Padrino::Erubis::Template, :erb)
+
+  if defined? Padrino::Rendering
+    Padrino::Rendering.engine_configurations[:erb] = {
+      :engine_class => Padrino::Erubis::SafeBufferTemplate,
+    }
+  end
+rescue LoadError
+end

data/lib/padrino/rendering/extensions/haml.rb

@@ -0,0 +1,29 @@
+begin
+  require 'haml'
+  require 'haml/helpers/xss_mods'
+  require 'haml/helpers/action_view_extensions'
+
+  module Haml
+    module Helpers
+      include XssMods
+      include ActionViewExtensions
+    end
+
+    module Util
+      def self.rails_xss_safe?
+        true
+      end
+    end
+  end
+
+  if defined? Padrino::Rendering
+    Padrino::Rendering.engine_configurations[:haml] = {
+      :escape_html => true,
+    }
+
+    class Tilt::HamlTemplate
+      include Padrino::Rendering::SafeTemplate
+    end
+  end
+rescue LoadError
+end

data/lib/padrino/rendering/extensions/slim.rb

@@ -0,0 +1,21 @@
+begin
+  require 'slim'
+
+  if defined? Padrino::Rendering
+    Padrino::Rendering.engine_configurations[:slim] = {
+      :generator => Temple::Generators::RailsOutputBuffer,
+      :buffer => "@_out_buf",
+      :use_html_safe => true,
+      :disable_capture => true,
+    }
+
+    class Slim::Template
+      include Padrino::Rendering::SafeTemplate
+
+      def precompiled_preamble(locals)
+        "__in_slim_template = true\n" << super
+      end
+    end
+  end
+rescue LoadError
+end

data/padrino-helpers.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rdoc_options  = ["--charset=UTF-8"]
 
-  s.add_dependency("padrino-core", Padrino.version)
+  s.add_dependency("padrino-support", Padrino.version)
+  s.add_dependency("tilt", "~> 1.4.1")
   s.add_dependency("i18n", "~> 0.6", ">= 0.6.7")
 end

data/test/fixtures/apps/.components

@@ -0,0 +1,6 @@
+--- 
+:test: bacon
+:mock: mocha
+:orm: datamapper
+:renderer: erb
+:script: jquery

data/test/fixtures/apps/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+log/**/*
+tmp/**/*
+vendor/gems/gems
+vendor/gems/specifications
+vendor/gems/doc
+vendor/gems/environment.rb

data/test/fixtures/apps/render.rb

@@ -0,0 +1,25 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+class RenderDemo2 < Padrino::Application
+  register Padrino::Rendering
+
+  set :reload, true
+end
+
+RenderDemo2.controllers :blog do
+  get '/' do
+    render 'post'
+  end
+
+  get '/override' do
+    render 'post', :layout => RenderDemo2.layout_path('specific') 
+  end
+end
+
+RenderDemo2.controllers :article, :comment do
+  get '/' do
+    render 'show'
+  end
+end
+
+Padrino.load!

data/test/fixtures/apps/views/article/comment/show.slim

@@ -0,0 +1 @@
+| okay comment

data/test/fixtures/apps/views/blog/post.erb

@@ -0,0 +1 @@
+okay

data/test/fixtures/apps/views/layouts/specific.erb

@@ -0,0 +1 @@
+otay

data/test/fixtures/apps/views/test/post.erb

@@ -0,0 +1 @@
+test

data/test/fixtures/layouts/layout.erb

@@ -0,0 +1 @@
+<%= yield %> absolute layout

data/test/fixtures/markup_app/app.rb

@@ -2,7 +2,6 @@ require 'padrino-core'
 
 class MarkupDemo < Sinatra::Base
   register Padrino::Helpers
-  register Padrino::Rendering
 
   configure do
     set :logging, false

data/test/fixtures/render_app/app.rb

@@ -9,7 +9,6 @@ class RenderUser
 end
 
 class RenderDemo < Padrino::Application
-  register Padrino::Rendering
   register Padrino::Helpers
 
   configure do
@@ -36,6 +35,10 @@ class RenderDemo < Padrino::Application
     render "wrong_capture_#{params[:ext]}"
   end
 
+  get '/ruby_block_capture_:ext' do
+    render "ruby_block_capture_#{params[:ext]}"
+  end
+
   # partial with object
   get '/partial/object' do
     partial 'template/user', :object => RenderUser.new('John'), :locals => { :extra => "bar" }
@@ -46,6 +49,11 @@ class RenderDemo < Padrino::Application
     partial 'template/user', :collection => [RenderUser.new('John'), RenderUser.new('Billy')], :locals => { :extra => "bar" }
   end
 
+  # partial with collection and ext
+  get '/partial/collection.ext' do
+    partial 'template/user.haml', :collection => [RenderUser.new('John'), RenderUser.new('Billy')], :locals => { :extra => "bar" }
+  end
+
   # partial with locals
   get '/partial/locals' do
     partial 'template/user', :locals => { :user => RenderUser.new('John'), :extra => "bar" }
@@ -56,6 +64,22 @@ class RenderDemo < Padrino::Application
     partial '/template/user', :object => RenderUser.new('John'), :locals => { :extra => "bar" }
   end
 
+  # partial with unsafe engine
+  get '/partial/unsafe' do
+    block = params[:block] ? proc{ params[:block] } : nil
+    partial 'unsafe.html.builder', &block
+  end
+
+  get '/partial/unsafe_one' do
+    block = params[:block] ? proc{ params[:block] } : nil
+    partial 'unsafe_object', :object => 'Mary', &block
+  end
+
+  get '/partial/unsafe_many' do
+    block = params[:block] ? proc{ params[:block] } : nil
+    partial 'unsafe_object', :collection => ['John', 'Mary'], &block
+  end
+
   get '/render_block_:ext' do
     render "render_block_#{params[:ext]}" do
       content_tag :div, 'go block!'

data/test/fixtures/render_app/views/_unsafe.html.builder

@@ -0,0 +1,2 @@
+xml.h1 'User name is John'
+xml.div{ |x| x << yield } if block_given?

data/test/fixtures/render_app/views/_unsafe_object.html.builder

@@ -0,0 +1,2 @@
+xml.h1 "User name is #{unsafe_object}"
+xml.div{ |x| x << yield } if block_given?

data/test/fixtures/render_app/views/ruby_block_capture_erb.erb

@@ -0,0 +1 @@
+<%= content_tag(:a) { content_tag :b, 'c' } %>

data/test/fixtures/render_app/views/ruby_block_capture_haml.haml

@@ -0,0 +1 @@
+= content_tag(:a) { content_tag :b, 'c' }

data/test/fixtures/render_app/views/ruby_block_capture_slim.slim

@@ -0,0 +1 @@
+= content_tag(:a) { content_tag :b, 'c' }

data/test/helper.rb

@@ -1,9 +1,14 @@
+ENV['RACK_ENV'] = 'test'
+
 require File.expand_path('../../../load_paths', __FILE__)
-require File.join(File.dirname(__FILE__), '..', '..', 'padrino-core', 'test', 'mini_shoulda')
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'mocha/setup'
 require 'rack/test'
 require 'webrat'
 require 'padrino-helpers'
 require 'active_support/time'
+require 'builder'
 
 class MiniTest::Spec
   include Padrino::Helpers::OutputHelpers
@@ -56,6 +61,65 @@ class MiniTest::Spec
     record.stubs(:to_ary => [record])
     record
   end
+
+  def create_template(name, content, options={})
+    FileUtils.mkdir_p(File.dirname(__FILE__) + "/views")
+    FileUtils.mkdir_p(File.dirname(__FILE__) + "/views/layouts")
+    path  = "/views/#{name}"
+    path += ".#{options.delete(:locale)}" if options[:locale].present?
+    path += ".#{options[:format]}" if options[:format].present?
+    path += ".erb" unless options[:format].to_s =~ /erb|slim|haml|rss|atom/
+    path += ".builder" if options[:format].to_s =~ /rss|atom/
+    file  = File.dirname(__FILE__) + path
+    File.open(file, 'w') { |io| io.write content }
+    file
+  end
+  alias :create_view   :create_template
+  alias :create_layout :create_template
+
+  def remove_views
+    FileUtils.rm_rf(File.dirname(__FILE__) + "/views")
+  end
+
+  def with_template(name, content, options={})
+    # Build a temp layout
+    template = create_template(name, content, options)
+    yield
+  ensure
+    # Remove temp layout
+    File.unlink(template) rescue nil
+    remove_views
+  end
+  alias :with_view   :with_template
+  alias :with_layout :with_template
+
+  def mock_app(base=Padrino::Application.dup, &block)
+    base.register Padrino::Rendering
+    @app = Sinatra.new(base, &block)
+  end
+
+  def app
+    Rack::Lint.new(@app)
+  end
+
+  # Asserts that a file matches the pattern
+  def assert_match_in_file(pattern, file)
+    assert File.exist?(file), "File '#{file}' does not exist!"
+    assert_match pattern, File.read(file)
+  end
+
+  # Delegate other missing methods to response.
+  def method_missing(name, *args, &block)
+    if response && response.respond_to?(name)
+      response.send(name, *args, &block)
+    else
+      super(name, *args, &block)
+    end
+  rescue Rack::Test::Error # no response yet
+    super(name, *args, &block)
+  end
+
+  alias :response :last_response
 end
 
 module Webrat

data/test/test_asset_tag_helpers.rb

@@ -12,15 +12,15 @@ describe "AssetTagHelpers" do
     @_flash ||= { :notice => "Demo notice" }
   end
 
-  context 'for #flash_tag method' do
-    should "display flash with no given attributes" do
+  describe 'for #flash_tag method' do
+    it 'should display flash with no given attributes' do
       assert_has_tag('div.notice', :content => "Demo notice") { flash_tag(:notice) }
     end
-    should "display flash with given attributes" do
+    it 'should display flash with given attributes' do
       actual_html = flash_tag(:notice, :class => 'notice', :id => 'notice-area')
       assert_has_tag('div.notice#notice-area', :content => "Demo notice") { actual_html }
     end
-    should "display multiple flash tags with given attributes" do
+    it 'should display multiple flash tags with given attributes' do
       flash[:error] = 'wrong'
       flash[:success] = 'okey'
       actual_html = flash_tag(:success, :warning, :error, :id => 'area')
@@ -30,98 +30,98 @@ describe "AssetTagHelpers" do
     end
   end
 
-  context 'for #link_to method' do
-    should "display link element with no given attributes" do
+  describe 'for #link_to method' do
+    it 'should display link element with no given attributes' do
       assert_has_tag('a', :content => "Sign up", :href => '/register') { link_to('Sign up', '/register') }
     end
 
-    should "display link element with given attributes" do
+    it 'should display link element with given attributes' do
       actual_html = link_to('Sign up', '/register', :class => 'first', :id => 'linky')
       assert_has_tag('a#linky.first', :content => "Sign up", :href => '/register') { actual_html }
     end
 
-    should "display link element with anchor attribute" do
+    it 'should display link element with anchor attribute' do
       actual_html = link_to("Anchor", "/anchor", :anchor => :foo)
       assert_has_tag('a', :content => "Anchor", :href => '/anchor#foo') { actual_html }
     end
 
-    should "display link element with void url and options" do
+    it 'should display link element with void url and options' do
       actual_link = link_to('Sign up', :class => "test")
       assert_has_tag('a', :content => "Sign up", :href => '#', :class => 'test') { actual_link }
     end
 
-    should "display link element with remote option" do
+    it 'should display link element with remote option' do
       actual_link = link_to('Sign up', '/register', :remote => true)
       assert_has_tag('a', :content => "Sign up", :href => '/register', 'data-remote' => 'true') { actual_link }
     end
 
-    should "display link element with method option" do
+    it 'should display link element with method option' do
       actual_link = link_to('Sign up', '/register', :method => :delete)
       assert_has_tag('a', :content => "Sign up", :href => '/register', 'data-method' => 'delete', :rel => 'nofollow') { actual_link }
     end
 
-    should "display link element with confirm option" do
+    it 'should display link element with confirm option' do
       actual_link = link_to('Sign up', '/register', :confirm => "Are you sure?")
       assert_has_tag('a', :content => "Sign up", :href => '/register', 'data-confirm' => 'Are you sure?') { actual_link }
     end
 
-    should "display link element with ruby block" do
+    it 'should display link element with ruby block' do
       actual_link = link_to('/register', :class => 'first', :id => 'binky') { "Sign up" }
       assert_has_tag('a#binky.first', :content => "Sign up", :href => '/register') { actual_link }
     end
 
-    should "escape the link text" do
+    it 'should escape the link text' do
       actual_link = link_to('/register', :class => 'first', :id => 'binky') { "<&>" }
       assert_has_tag('a#binky.first', :href => '/register') { actual_link }
       assert_match "&lt;&amp;&gt;", actual_link
     end
 
-    should "not escape image_tag" do
+    it 'should not escape image_tag' do
       actual_link = link_to(image_tag("/my/fancy/image.png"), :class => 'first', :id => 'binky')
       assert_has_tag('img', :src => "/my/fancy/image.png") { actual_link }
     end
 
-    should "display link block element in haml" do
+    it 'should display link block element in haml' do
       visit '/haml/link_to'
       assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
       assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
 
-    should "display link block element in erb" do
+    it 'should display link block element in erb' do
       visit '/erb/link_to'
       assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
       assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
 
-    should "display link block element in slim" do
+    it 'should display link block element in slim' do
       visit '/slim/link_to'
       assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
       assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
 
-    should "not double-escape" do
+    it 'should not double-escape' do
       actual_link = link_to('test escape', '?a=1&b=2')
       assert_has_tag('a', :href => '?a=1&b=2') { actual_link }
     end
 
-    should "escape scary things" do
+    it 'should escape scary things' do
       actual_link = link_to('test escape<adfs>', '?a=1&b=<script>alert(1)</script>')
-      assert_no_match('<script', actual_link)
+      refute_match('<script', actual_link)
     end
   end
 
-  context 'for #mail_to method' do
-    should "display link element for mail to no caption" do
+  describe 'for #mail_to method' do
+    it 'should display link element for mail to no caption' do
       actual_html = mail_to('test@demo.com')
       assert_has_tag(:a, :href => "mailto:test@demo.com", :content => 'test@demo.com') { actual_html }
     end
 
-    should "display link element for mail to with caption" do
+    it 'should display link element for mail to with caption' do
       actual_html = mail_to('test@demo.com', "My Email", :class => 'demo')
       assert_has_tag(:a, :href => "mailto:test@demo.com", :content => 'My Email', :class => 'demo') { actual_html }
     end
 
-    should "display link element for mail to with caption and mail options" do
+    it 'should display link element for mail to with caption and mail options' do
       actual_html = mail_to('test@demo.com', "My Email", :subject => 'demo test', :class => 'demo', :cc => 'foo@test.com')
       assert_has_tag(:a, :class => 'demo') { actual_html }
       assert_match %r{mailto\:test\@demo.com\?}, actual_html
@@ -129,157 +129,161 @@ describe "AssetTagHelpers" do
       assert_match %r{subject\=demo\%20test}, actual_html
     end
 
-    should "escape & with encoded string and &amp; in HTML" do
+    it 'should escape & with encoded string and &amp; in HTML' do
       actual_html = mail_to('test@demo.com', "My&Email", :subject => "this&that")
       assert_match 'this%26that', actual_html
       assert_match 'My&amp;Email', actual_html
     end
 
-    should "display mail link element in haml" do
+    it 'should display mail link element in haml' do
       visit '/haml/mail_to'
       assert_have_selector 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
       assert_have_selector 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
     end
 
-    should "display mail link element in erb" do
+    it 'should display mail link element in erb' do
       visit '/erb/mail_to'
       assert_have_selector 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
       assert_have_selector 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
     end
 
-    should "display mail link element in slim" do
+    it 'should display mail link element in slim' do
       visit '/slim/mail_to'
       assert_have_selector 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
       assert_have_selector 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
     end
   end
 
-  context 'for #meta_tag method' do
-    should "display meta tag with given content and name" do
+  describe 'for #meta_tag method' do
+    it 'should display meta tag with given content and name' do
       actual_html = meta_tag("weblog,news", :name => "keywords")
       assert_has_tag("meta", :name => "keywords", "content" => "weblog,news") { actual_html }
     end
 
-    should "display meta tag with given content and http-equiv" do
+    it 'should display meta tag with given content and http-equiv' do
       actual_html = meta_tag("text/html; charset=UTF-8", :"http-equiv" => "Content-Type")
       assert_has_tag("meta", :"http-equiv" => "Content-Type", "content" => "text/html; charset=UTF-8") { actual_html }
     end
 
-    should "display meta tag element in haml" do
+    it 'should display meta tag element in haml' do
       visit '/haml/meta_tag'
       assert_have_selector 'meta', "content" => "weblog,news", :name => "keywords"
       assert_have_selector 'meta', "content" => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
     end
 
-    should "display meta tag element in erb" do
+    it 'should display meta tag element in erb' do
       visit '/erb/meta_tag'
       assert_have_selector 'meta', "content" => "weblog,news", :name => "keywords"
       assert_have_selector 'meta', "content" => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
     end
 
-    should "display meta tag element in slim" do
+    it 'should display meta tag element in slim' do
       visit '/slim/meta_tag'
       assert_have_selector 'meta', "content" => "weblog,news", :name => "keywords"
       assert_have_selector 'meta', "content" => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
     end
   end
 
-  context 'for #image_tag method' do
-    should "display image tag absolute link with no options" do
+  describe 'for #image_tag method' do
+    it 'should display image tag absolute link with no options' do
       time = stop_time_for_test
       assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
     end
 
-    should "display image tag relative link with specified uri root" do
+    it 'should display image tag relative link with specified uri root' do
       time = stop_time_for_test
       self.class.stubs(:uri_root).returns("/blog")
       assert_has_tag('img', :src => "/blog/images/relative/pic.gif?#{time.to_i}") { image_tag('relative/pic.gif') }
     end
 
-    should "display image tag relative link with options" do
+    it 'should display image tag relative link with options' do
       time = stop_time_for_test
       assert_has_tag('img.photo', :src => "/images/relative/pic.gif?#{time.to_i}") {
         image_tag('relative/pic.gif', :class => 'photo') }
     end
 
-    should "display image tag uri link with options" do
+    it 'should display image tag uri link with options' do
       time = stop_time_for_test
       assert_has_tag('img.photo', :src => "http://demo.org/pic.gif") { image_tag('http://demo.org/pic.gif', :class => 'photo') }
     end
 
-    should "display image tag relative link with incorrect spacing" do
+    it 'should display image tag relative link with incorrect spacing' do
       time = stop_time_for_test
       assert_has_tag('img.photo', :src => "/images/%20relative/%20pic.gif%20%20?#{time.to_i}") {
         image_tag(' relative/ pic.gif  ', :class => 'photo')
       }
     end
 
-    should "not use a timestamp if stamp setting is false" do
+    it 'should not use a timestamp if stamp setting is false' do
       assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
     end
 
-    should "have xhtml convention tag" do
+    it 'should have xhtml convention tag' do
       assert_equal image_tag('/absolute/pic.gif'), '<img src="/absolute/pic.gif" />'
     end
   end
 
-  context 'for #stylesheet_link_tag method' do
-    should "display stylesheet link item" do
+  describe 'for #stylesheet_link_tag method' do
+    it 'should display stylesheet link item' do
       time = stop_time_for_test
       actual_html = stylesheet_link_tag('style')
-      expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
+      expected_options = { :rel => "stylesheet", :type => "text/css" }
       assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}")) { actual_html }
       assert actual_html.html_safe?
     end
 
-    should "display stylesheet link item for long relative path" do
+    it 'should display stylesheet link item for long relative path' do
       time = stop_time_for_test
-      expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
+      expected_options = { :rel => "stylesheet", :type => "text/css" }
       actual_html = stylesheet_link_tag('example/demo/style')
       assert_has_tag('link', expected_options.merge(:href => "/stylesheets/example/demo/style.css?#{time.to_i}")) { actual_html }
     end
 
-    should "display stylesheet link item with absolute path" do
+    it 'should display stylesheet link item with absolute path' do
       time = stop_time_for_test
-      expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
+      expected_options = { :rel => "stylesheet", :type => "text/css" }
       actual_html = stylesheet_link_tag('/css/style')
       assert_has_tag('link', expected_options.merge(:href => "/css/style.css")) { actual_html }
     end
 
-    should "display stylesheet link item with uri root" do
+    it 'should display stylesheet link item with uri root' do
       self.class.stubs(:uri_root).returns("/blog")
       time = stop_time_for_test
-      expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
+      expected_options = { :rel => "stylesheet", :type => "text/css" }
       actual_html = stylesheet_link_tag('style')
       assert_has_tag('link', expected_options.merge(:href => "/blog/stylesheets/style.css?#{time.to_i}")) { actual_html }
     end
 
-    should "display stylesheet link items" do
+    it 'should display stylesheet link items' do
       time = stop_time_for_test
       actual_html = stylesheet_link_tag('style', 'layout.css', 'http://google.com/style.css')
-      assert_has_tag('link', :media => "screen", :rel => "stylesheet", :type => "text/css", :count => 3) { actual_html }
+      assert_has_tag('link', :rel => "stylesheet", :type => "text/css", :count => 3) { actual_html }
       assert_has_tag('link', :href => "/stylesheets/style.css?#{time.to_i}") { actual_html }
       assert_has_tag('link', :href => "/stylesheets/layout.css?#{time.to_i}") { actual_html }
       assert_has_tag('link', :href => "http://google.com/style.css") { actual_html }
       assert_equal actual_html, stylesheet_link_tag(['style', 'layout.css', 'http://google.com/style.css'])
     end
 
-    should "not use a timestamp if stamp setting is false" do
+    it 'should not use a timestamp if stamp setting is false' do
       self.class.expects(:asset_stamp).returns(false)
-      expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
+      expected_options = { :rel => "stylesheet", :type => "text/css" }
       assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css")) { stylesheet_link_tag('style') }
     end
+
+    it 'should display stylesheet link used custom options' do
+      assert_has_tag('link', :rel => 'stylesheet', :media => 'screen') { stylesheet_link_tag('style', :media => 'screen') }
+    end
   end
 
-  context 'for #javascript_include_tag method' do
-    should "display javascript item" do
+  describe 'for #javascript_include_tag method' do
+    it 'should display javascript item' do
       time = stop_time_for_test
       actual_html = javascript_include_tag('application')
       assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
       assert actual_html.html_safe?
     end
 
-    should "respond to js_asset_folder setting" do
+    it 'should respond to js_asset_folder setting' do
       time = stop_time_for_test
       self.class.stubs(:js_asset_folder).returns('js')
       assert_equal 'js', asset_folder_name(:js)
@@ -287,44 +291,44 @@ describe "AssetTagHelpers" do
       assert_has_tag('script', :src => "/js/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
 
-    should "display javascript item for long relative path" do
+    it 'should display javascript item for long relative path' do
       time = stop_time_for_test
       actual_html = javascript_include_tag('example/demo/application')
       assert_has_tag('script', :src => "/javascripts/example/demo/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
 
-    should "display javascript item for path containing js" do
+    it 'should display javascript item for path containing js' do
       time = stop_time_for_test
       actual_html = javascript_include_tag 'test/jquery.json'
       assert_has_tag('script', :src => "/javascripts/test/jquery.json?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
 
-    should "display javascript item for path containing period" do
+    it 'should display javascript item for path containing period' do
       time = stop_time_for_test
       actual_html = javascript_include_tag 'test/jquery.min'
       assert_has_tag('script', :src => "/javascripts/test/jquery.min.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
 
-    should "display javascript item with absolute path" do
+    it 'should display javascript item with absolute path' do
       time = stop_time_for_test
       actual_html = javascript_include_tag('/js/application')
       assert_has_tag('script', :src => "/js/application.js", :type => "text/javascript") { actual_html }
     end
 
-    should "display javascript item with uri root" do
+    it 'should display javascript item with uri root' do
       self.class.stubs(:uri_root).returns("/blog")
       time = stop_time_for_test
       actual_html = javascript_include_tag('application')
       assert_has_tag('script', :src => "/blog/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
 
-    should "not append extension to absolute paths" do
+    it 'should not append extension to absolute paths' do
       time = stop_time_for_test
       actual_html = javascript_include_tag('https://maps.googleapis.com/maps/api/js?key=value&sensor=false')
       assert_has_tag('script', :src => "https://maps.googleapis.com/maps/api/js?key=value&sensor=false") { actual_html }
     end
 
-    should "display javascript items" do
+    it 'should display javascript items' do
       time = stop_time_for_test
       actual_html = javascript_include_tag('application', 'base.js', 'http://google.com/lib.js')
       assert_has_tag('script', :type => "text/javascript", :count => 3) { actual_html }
@@ -334,59 +338,59 @@ describe "AssetTagHelpers" do
       assert_equal actual_html, javascript_include_tag(['application', 'base.js', 'http://google.com/lib.js'])
     end
 
-    should "not use a timestamp if stamp setting is false" do
+    it 'should not use a timestamp if stamp setting is false' do
       self.class.expects(:asset_stamp).returns(false)
       actual_html = javascript_include_tag('application')
       assert_has_tag('script', :src => "/javascripts/application.js", :type => "text/javascript") { actual_html }
     end
   end
 
-  context "for #favicon_tag method" do
-    should "display favicon" do
+  describe "for #favicon_tag method" do
+    it 'should display favicon' do
       time = stop_time_for_test
       actual_html = favicon_tag('icons/favicon.png')
       assert_has_tag('link', :rel => 'icon', :type => 'image/png', :href => "/images/icons/favicon.png?#{time.to_i}") { actual_html }
     end
 
-    should "match type with file ext" do
+    it 'should match type with file ext' do
       time = stop_time_for_test
       actual_html = favicon_tag('favicon.ico')
       assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.ico?#{time.to_i}") { actual_html }
     end
 
-    should "allow option overrides" do
+    it 'should allow option overrides' do
       time = stop_time_for_test
       actual_html = favicon_tag('favicon.png', :type => 'image/ico')
       assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.png?#{time.to_i}") { actual_html }
     end
   end
 
-  context 'for #feed_tag method' do
-    should "generate correctly link tag for rss" do
+  describe 'for #feed_tag method' do
+    it 'should generate correctly link tag for rss' do
       assert_has_tag('link', :type => 'application/rss+xml', :rel => 'alternate', :href => "/blog/post.rss", :title => 'rss') { feed_tag :rss, "/blog/post.rss" }
     end
 
-    should "generate correctly link tag for atom" do
+    it 'should generate correctly link tag for atom' do
       assert_has_tag('link', :type => 'application/atom+xml', :rel => 'alternate', :href => "/blog/post.atom", :title => 'atom') { feed_tag :atom, "/blog/post.atom" }
     end
 
-    should "override options" do
+    it 'should override options' do
       assert_has_tag('link', :type => 'my-type', :rel => 'my-rel', :href => "/blog/post.rss", :title => 'my-title') { feed_tag :rss, "/blog/post.rss", :type => "my-type", :rel => "my-rel", :title => "my-title" }
     end
   end
 
-  context 'for #asset_path method' do
-    should 'generate proper paths for js and css' do
+  describe 'for #asset_path method' do
+    it 'should generate proper paths for js and css' do
       assert_match /\/javascripts\/app.js\?\d+/, asset_path(:js, 'app')
       assert_match /\/stylesheets\/app.css\?\d+/, asset_path(:css, 'app')
     end
 
-    should 'generate proper paths for images and other files' do
+    it 'should generate proper paths for images and other files' do
       assert_match /\/images\/app.png\?\d+/, asset_path(:images, 'app.png')
       assert_match /\/documents\/app.pdf\?\d+/, asset_path(:documents, 'app.pdf')
     end
 
-    should 'generate proper paths for public folder' do
+    it 'should generate proper paths for public folder' do
       assert_match /\/files\/file.ext\?\d+/, asset_path('files/file.ext')
     end
   end