padrino-helpers 0.12.8.1 → 0.12.9

data/lib/padrino-helpers/output_helpers/erb_handler.rb

@@ -8,7 +8,8 @@ module Padrino
         ##
         # Outputs the given text to the templates buffer directly.
         #
-        def concat_to_template(text="")
+        def concat_to_template(text="", context=nil)
+          return text if context && context.eval("@__in_ruby_literal")
           output_buffer << text
           nil
         end

data/lib/padrino-helpers/render_helpers.rb

@@ -34,8 +34,8 @@ module Padrino
         options = { :locals => {}, :layout => false }.update(options)
         explicit_engine = options.delete(:engine)
 
-        path,_,name = template.to_s.rpartition(File::SEPARATOR)
-        template_path = File.join(path,"_#{name}").to_sym
+        path, _, name = template.to_s.rpartition(File::SEPARATOR)
+        template_path = path.empty? ? :"_#{name}" : :"#{path}#{File::SEPARATOR}_#{name}"
         item_name = name.partition('.').first.to_sym
 
         items, counter = if options[:collection].respond_to?(:inject)
@@ -58,6 +58,27 @@ module Padrino
         end
       end
       alias :render_partial :partial
+
+      def self.included(base)
+        unless base.instance_methods.include?(:render) || base.private_instance_methods.include?(:render)
+          base.class_eval do
+            fail "gem 'tilt' is required" unless defined?(::Tilt)
+
+            def render(engine, file=nil, options={}, locals=nil, &block)
+              locals ||= options[:locals] || {}
+              engine, file = file, engine if file.nil?
+              template_engine = engine ? ::Tilt[engine] : ::Tilt.default_mapping[file]
+              fail "Engine #{engine.inspect} is not registered with Tilt" unless template_engine
+              unless File.file?(file.to_s)
+                engine_extensions = ::Tilt.default_mapping.extensions_for(template_engine)
+                file = Dir.glob("#{file}.{#{engine_extensions.join(',')}}").first || fail("Template '#{file}' not found")
+              end
+              template = template_engine.new(file.to_s, options)
+              template.render(options[:scope] || self, locals, &block)
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/padrino-helpers/tag_helpers.rb

@@ -235,6 +235,19 @@ module Padrino
         "<#{name}#{attributes}#{open ? '>' : ' />'}".html_safe
       end
 
+      ##
+      # Returns an escaped document link.
+      #
+      # @example
+      #   escape_link('http://example.com/spaced link')
+      #   # => 'http://example.com/spaced%20link'
+      #   escape_link('already%20partially escaped')
+      #   # => 'already%20partially%20escaped'
+      #
+      def escape_link(link)
+        link.gsub(' ', '%20')
+      end
+
       private
 
       ##

data/lib/padrino/rendering.rb

@@ -381,7 +381,8 @@ module Padrino
       end
 
       def content_type_symbol(type)
-        if defined?(::Rack::Mime::MIME_TYPES) && type.kind_of?(String)
+        if defined?(::Rack::Mime::MIME_TYPES) && type.kind_of?(String) &&
+           ::Rack::Mime::MIME_TYPES.key(type)
           type = ::Rack::Mime::MIME_TYPES.key(type).sub(/\./,'').to_sym
         end
         CONTENT_TYPE_ALIASES[type] || type

data/lib/padrino/rendering/erb_template.rb

@@ -1,6 +1,18 @@
 module Padrino
   module Rendering
     class SafeERB < ::ERB
+      class Compiler < ::ERB::Compiler
+        def add_insert_cmd(out, content)
+          out.push("@__in_ruby_literal = true")
+          super
+          out.push("@__in_ruby_literal = false")
+        end
+      end
+
+      def make_compiler(trim_mode)
+        Compiler.new(trim_mode)
+      end
+
       def set_eoutvar(compiler, eoutvar = '_erbout')
         compiler.put_cmd = "#{eoutvar}.safe_concat"
         compiler.insert_cmd = "#{eoutvar}.concat"

data/lib/padrino/rendering/erubis_template.rb

@@ -7,7 +7,7 @@ module Padrino
     # @api private
     module SafeBufferEnhancer
       def add_expr_literal(src, code)
-        src << " #{@bufvar}.concat((" << code << ').to_s);'
+        src << " @__in_ruby_literal = true; #{@bufvar}.concat((" << code << ').to_s); @__in_ruby_literal = false;'
       end
 
       def add_stmt(src, code)

data/padrino-helpers.gemspec

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

data/test/fixtures/markup_app/views/form_for.erb

@@ -50,6 +50,34 @@
     <%= f.label :remember_me %>
     <%= f.check_box :remember_me, :value => '1' %>
   </p>
+  <p>
+    <%= f.label :datetime %>
+    <%= f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0) %>
+  </p>
+  <p>
+    <%= f.label :datetime_local %>
+    <%= f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0) %>
+  </p>
+  <p>
+    <%= f.label :date %>
+    <%= f.date_field :date, :max => DateTime.new(2000, 4, 1) %>
+  </p>
+  <p>
+    <%= f.label :month %>
+    <%= f.month_field :month, :max => DateTime.new(2000, 4, 1) %>
+  </p>
+  <p>
+    <%= f.label :week %>
+    <%= f.week_field :week, :max => DateTime.new(2000, 4, 1) %>
+  </p>
+  <p>
+    <%= f.label :time %>
+    <%= f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0) %>
+  </p>
+  <p>
+    <%= f.label :color %>
+    <%= f.color_field :color, :value => "#f00" %>
+  </p>
   <p><%= f.submit "Create", :class => 'success', :id => 'demo-button' %></p>
   <p><%= f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button' %></p>
 <% end %>

data/test/fixtures/markup_app/views/form_for.haml

@@ -38,6 +38,28 @@
   %p
     = f.label :remember_me
     = f.check_box :remember_me, :value => "1"
+  %p
+    = f.label :datetime
+    = f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
+  %p
+    = f.label :datetime_local
+    = f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
+  %p
+    = f.label :date
+    = f.date_field :date, :max => DateTime.new(2000, 4, 1)
+  %p
+    = f.label :month
+    = f.month_field :month, :max => DateTime.new(2000, 4, 1)
+  %p
+    = f.label :week
+    = f.week_field :week, :max => DateTime.new(2000, 4, 1)
+  %p
+    = f.label :time
+    = f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0)
+  %p
+    = f.label :color
+    = f.color_field :color, :value => "#f00"
+  </p>
   %p
     = f.submit "Create", :class => 'success', :id => 'demo-button'
   %p

data/test/fixtures/markup_app/views/form_for.slim

@@ -38,6 +38,27 @@
   p
     = f.label :remember_me
     = f.check_box :remember_me, :value => "1"
+  p
+    = f.label :datetime
+    = f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
+  p
+    = f.label :datetime_local
+    = f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
+  p
+    = f.label :date
+    = f.date_field :date, :max => DateTime.new(2000, 4, 1)
+  p
+    = f.label :month
+    = f.month_field :month, :max => DateTime.new(2000, 4, 1)
+  p
+    = f.label :week
+    = f.week_field :week, :max => DateTime.new(2000, 4, 1)
+  p
+    = f.label :time
+    = f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0)
+  p
+    = f.label :color
+    = f.color_field :color, :value => "#f00"
   p
     = f.submit "Create", :class => 'success', :id => 'demo-button'
   p

data/test/fixtures/markup_app/views/form_tag.erb

@@ -83,6 +83,27 @@
       <%= range_field_tag('ranger_with_min_max', :min => 1, :max => 50) %>
       <%= range_field_tag('ranger_with_range', :range => 1..5) %>
     </p>
+    <p>
+      <%= datetime_field_tag :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0) %>
+    </p>
+    <p>
+      <%= datetime_local_field_tag :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0) %>
+    </p>
+    <p>
+      <%= date_field_tag :date, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) %>
+    </p>
+    <p>
+      <%= month_field_tag :month, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) %>
+    </p>
+    <p>
+      <%= week_field_tag :week, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) %>
+    </p>
+    <p>
+      <%= time_field_tag :time, :max => Time.new(2008, 6, 21, 13, 30, 0), :min => Time.new(1993, 2, 24, 1, 19, 12), :value => Time.new(2008, 6, 21, 13, 30, 0) %>
+    </p>
+    <p>
+      <%= color_field_tag :color, :value => "#f00" %>
+    </p>
   <% end %>
   <% field_set_tag(:class => 'buttons') do %>
     <%= submit_tag "Login" %>

data/test/fixtures/markup_app/views/form_tag.haml

@@ -69,6 +69,20 @@
     %p
       = range_field_tag('ranger_with_min_max', :min => 1, :max => 50)
       = range_field_tag('ranger_with_range', :range => 1..5)
+    %p
+      = datetime_field_tag :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0)
+    %p
+      = datetime_local_field_tag :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0)
+    %p
+      = date_field_tag :date, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
+    %p
+      = month_field_tag :month, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
+    %p
+      = week_field_tag :week, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
+    %p
+      = time_field_tag :time, :max => Time.new(2008, 6, 21, 13, 30, 0), :min => Time.new(1993, 2, 24, 1, 19, 12), :value => Time.new(2008, 6, 21, 13, 30, 0)
+    %p
+      = color_field_tag :color, :value => "#f00"
   = field_set_tag(:class => 'buttons') do
     = submit_tag "Login"
     = button_tag "Cancel"

data/test/fixtures/markup_app/views/form_tag.slim

@@ -69,6 +69,20 @@
     p
       = range_field_tag('ranger_with_min_max', :min => 1, :max => 50)
       = range_field_tag('ranger_with_range', :range => 1..5)
+    p
+      = datetime_field_tag :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0)
+    p
+      = datetime_local_field_tag :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0)
+    p
+      = date_field_tag :date, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
+    p
+      = month_field_tag :month, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
+    p
+      = week_field_tag :week, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
+    p
+      = time_field_tag :time, :max => Time.new(2008, 6, 21, 13, 30, 0), :min => Time.new(1993, 2, 24, 1, 19, 12), :value => Time.new(2008, 6, 21, 13, 30, 0)
+    p
+      = color_field_tag :color, :value => "#f00"
 
   = field_set_tag(:class => 'buttons') do
     = submit_tag "Login"

data/test/helper.rb

@@ -1,26 +1,25 @@
 ENV['RACK_ENV'] = 'test'
 
-require File.expand_path('../../../load_paths', __FILE__)
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'mocha/setup'
 require 'rack/test'
-require 'webrat'
-require 'padrino-helpers'
-require 'active_support/time'
 require 'builder'
+require 'padrino-helpers'
+require 'padrino/rendering'
+require 'tilt/liquid'
+require 'tilt/builder'
+
+require 'ext/minitest-spec'
+require 'ext/rack-test-methods'
+require 'padrino/test-methods'
 
 class MiniTest::Spec
   include Padrino::Helpers::OutputHelpers
   include Padrino::Helpers::TagHelpers
   include Padrino::Helpers::AssetTagHelpers
   include Rack::Test::Methods
-  include Webrat::Methods
-  include Webrat::Matchers
-
-  Webrat.configure do |config|
-    config.mode = :rack
-  end
+  include Padrino::TestMethods
 
   def stop_time_for_test
     time = Time.now
@@ -28,32 +27,6 @@ class MiniTest::Spec
     return time
   end
 
-  # assert_has_tag(:h1, :content => "yellow") { "<h1>yellow</h1>" }
-  # In this case, block is the html to evaluate
-  def assert_has_tag(name, attributes = {})
-    html = yield if block_given?
-    assert html.html_safe?, 'html_safe? failed'
-    matcher = HaveSelector.new(name, attributes)
-    raise "Please specify a block!" if html.blank?
-    assert matcher.matches?(html), matcher.failure_message
-  end
-
-  # assert_has_no_tag, tag(:h1, :content => "yellow") { "<h1>green</h1>" }
-  # In this case, block is the html to evaluate
-  def assert_has_no_tag(name, attributes = {})
-    html = yield if block_given?
-    attributes.merge!(:count => 0)
-    matcher = HaveSelector.new(name, attributes)
-    raise "Please specify a block!" if html.blank?
-    assert matcher.matches?(html), matcher.failure_message
-  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
-
   # mock_model("Business", :new_record? => true) => <Business>
   def mock_model(klazz, options={})
     options.reverse_merge!(:class => klazz, :new_record? => false, :id => 20, :errors => {})
@@ -82,50 +55,23 @@ class MiniTest::Spec
   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)
+  def mock_app(base=Padrino::Application, &block)
+    @app = Sinatra.new base do
+      register Padrino::Helpers
+      instance_eval &block
+    end
   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
-  module Logging
-    def logger # @private
-      @logger = nil
-    end
-  end
 end

data/test/test_asset_tag_helpers.rb

@@ -14,94 +14,114 @@ describe "AssetTagHelpers" 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) }
+      assert_html_has_tag(flash_tag(:notice), 'div.notice', :content => "Demo notice")
     end
     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 }
+      assert_html_has_tag(actual_html, 'div.notice#notice-area', :content => "Demo notice")
     end
     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')
-      assert_has_tag('div.success#area', :content => flash[:success]) { actual_html }
-      assert_has_tag('div.error#area', :content => flash[:error]) { actual_html }
-      assert_has_no_tag('div.notice') { actual_html }
+      assert_html_has_tag(actual_html, 'div.success#area', :content => flash[:success])
+      assert_html_has_tag(actual_html, 'div.error#area', :content => flash[:error])
+      assert_html_has_no_tag(actual_html, 'div.warning')
     end
   end
 
   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') }
+      assert_html_has_tag(link_to('Sign up', '/register'), 'a', :content => "Sign up", :href => '/register')
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'a#linky.first', :content => "Sign up", :href => '/register')
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'a', :content => "Anchor", :href => '/anchor#foo')
     end
 
     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 }
+      assert_html_has_tag(actual_link, 'a', :content => "Sign up", :href => '#', :class => 'test')
     end
 
     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 }
+      assert_html_has_tag(actual_link, 'a', :content => "Sign up", :href => '/register', 'data-remote' => 'true')
     end
 
     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 }
+      assert_html_has_tag(actual_link, 'a', :content => "Sign up", :href => '/register', 'data-method' => 'delete', :rel => 'nofollow')
     end
 
     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 }
+      assert_html_has_tag(actual_link, 'a', :content => "Sign up", :href => '/register', 'data-confirm' => 'Are you sure?')
     end
 
     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 }
+      assert_html_has_tag(actual_link, 'a#binky.first', :content => "Sign up", :href => '/register')
     end
 
     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_html_has_tag(actual_link, 'a#binky.first', :href => '/register')
       assert_match "&lt;&amp;&gt;", actual_link
     end
 
+    it 'should escape the link href' do
+      actual_link = link_to('Sign up', '/register new%20user')
+      assert_html_has_tag(actual_link, 'a', :href => '/register%20new%20user')
+    end
+
     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 }
+      assert_html_has_tag(actual_link, 'img', :src => "/my/fancy/image.png")
+    end
+
+    it 'should render alt text by default' do
+      actual_tag = image_tag("/my/fancy/image.png")
+      assert_html_has_tag(actual_tag, 'img', :src => "/my/fancy/image.png", :alt => "Image")
+    end
+
+    it 'should render humanized alt text' do
+      actual_tag = image_tag("/my/fancy/image_white.png")
+      assert_html_has_tag(actual_tag, 'img', :src => "/my/fancy/image_white.png", :alt => "Image white")
+    end
+
+    it 'should remove hash value from src path' do
+      actual_tag = image_tag("/my/fancy/sprite-47bce5c74f589f4867dbd57e9ca9f808.png")
+      assert_html_has_tag(actual_tag, 'img', :src => "/my/fancy/sprite-47bce5c74f589f4867dbd57e9ca9f808.png", :alt => "Sprite")
     end
 
     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'
+      get "/haml/link_to"
+      assert_response_has_tag :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
+      assert_response_has_tag :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
 
     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'
+      get "/erb/link_to"
+      assert_response_has_tag :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
+      assert_response_has_tag :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
 
     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'
+      get "/slim/link_to"
+      assert_response_has_tag :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
+      assert_response_has_tag :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
 
     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 }
+      assert_html_has_tag(actual_link, 'a', :href => '?a=1&b=2')
       assert_match %r{&amp;}, actual_link
       refute_match %r{&amp;amp;}, actual_link
     end
@@ -115,17 +135,17 @@ describe "AssetTagHelpers" 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 }
+      assert_html_has_tag(actual_html, :a, :href => "mailto:test@demo.com", :content => 'test@demo.com')
     end
 
     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 }
+      assert_html_has_tag(actual_html, :a, :href => "mailto:test@demo.com", :content => 'My Email', :class => 'demo')
     end
 
     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_html_has_tag(actual_html, :a, :class => 'demo')
       assert_match %r{mailto\:test\@demo.com\?}, actual_html
       assert_match %r{cc=foo\@test\.com}, actual_html
       assert_match %r{subject\=demo\%20test}, actual_html
@@ -138,97 +158,92 @@ describe "AssetTagHelpers" do
     end
 
     it 'should not double-escape ampersands in query' do
-      actual_html = mail_to('to@demo.com', "Email", :subject => 'Hi there', :bcc => 'bcc@test.com')
-      assert_has_tag(:a, :href => 'mailto:to@demo.com?bcc=bcc@test.com&subject=Hi%20there', :content => 'Email') { actual_html }
+      actual_html = mail_to('to@demo.com', "Email", :bcc => 'bcc@test.com', :subject => 'Hi there')
+      assert_html_has_tag(actual_html, :a, :href => 'mailto:to@demo.com?bcc=bcc@test.com&subject=Hi%20there', :content => 'Email')
       assert_match %r{&amp;}, actual_html
       refute_match %r{&amp;amp;}, actual_html
     end
 
     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'
+      get "/haml/mail_to"
+      assert_response_has_tag 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
+      assert_response_has_tag 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
     end
 
     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'
+      get "/erb/mail_to"
+      assert_response_has_tag 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
+      assert_response_has_tag 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
     end
 
     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'
+      get "/slim/mail_to"
+      assert_response_has_tag 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
+      assert_response_has_tag 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
     end
   end
 
   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 }
+      assert_html_has_tag(actual_html, "meta", :name => "keywords", :content => "weblog,news")
     end
 
     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 }
+      assert_html_has_tag(actual_html, "meta", :"http-equiv" => "Content-Type", :content => "text/html; charset=UTF-8")
     end
 
     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"
+      get "/haml/meta_tag"
+      assert_response_has_tag 'meta', :content => "weblog,news", :name => "keywords"
+      assert_response_has_tag 'meta', :content => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
     end
 
     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"
+      get "/erb/meta_tag"
+      assert_response_has_tag 'meta', :content => "weblog,news", :name => "keywords"
+      assert_response_has_tag 'meta', :content => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
     end
 
     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"
+      get "/slim/meta_tag"
+      assert_response_has_tag 'meta', :content => "weblog,news", :name => "keywords"
+      assert_response_has_tag 'meta', :content => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
     end
   end
 
   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') }
+      assert_html_has_tag(image_tag('/absolute/pic.gif'), 'img', :src => "/absolute/pic.gif")
     end
 
     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') }
+      assert_html_has_tag(image_tag('relative/pic.gif'), 'img', :src => "/blog/images/relative/pic.gif?#{time.to_i}")
     end
 
     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') }
+      assert_html_has_tag(image_tag('relative/pic.gif', :class => 'photo'), 'img.photo', :src => "/images/relative/pic.gif?#{time.to_i}")
     end
 
     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') }
+      assert_html_has_tag(image_tag('http://demo.org/pic.gif', :class => 'photo'), 'img.photo', :src => "http://demo.org/pic.gif")
     end
 
     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')
-      }
+      assert_html_has_tag(image_tag(' relative/ pic.gif  ', :class => 'photo'), 'img.photo', :src => "/images/%20relative/%20pic.gif%20%20?#{time.to_i}")
     end
 
     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') }
+      assert_html_has_tag(image_tag('/absolute/pic.gif'), 'img', :src => "/absolute/pic.gif")
     end
 
     it 'should have xhtml convention tag' do
-      assert_equal image_tag('/absolute/pic.gif'), '<img src="/absolute/pic.gif" />'
+      assert_equal image_tag('/absolute/pic.gif'), '<img src="/absolute/pic.gif" alt="Pic" />'
     end
   end
 
@@ -237,7 +252,7 @@ describe "AssetTagHelpers" do
       time = stop_time_for_test
       actual_html = stylesheet_link_tag('style')
       expected_options = { :rel => "stylesheet", :type => "text/css" }
-      assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}")) { actual_html }
+      assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}"))
       assert actual_html.html_safe?
     end
 
@@ -245,14 +260,14 @@ describe "AssetTagHelpers" do
       time = stop_time_for_test
       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 }
+      assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/stylesheets/example/demo/style.css?#{time.to_i}"))
     end
 
     it 'should display stylesheet link item with absolute path' do
       time = stop_time_for_test
       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 }
+      assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/css/style.css"))
     end
 
     it 'should display stylesheet link item with uri root' do
@@ -260,27 +275,27 @@ describe "AssetTagHelpers" do
       time = stop_time_for_test
       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 }
+      assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/blog/stylesheets/style.css?#{time.to_i}"))
     end
 
     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', :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_html_has_tag(actual_html, 'link', :rel => "stylesheet", :type => "text/css", :count => 3)
+      assert_html_has_tag(actual_html, 'link', :href => "/stylesheets/style.css?#{time.to_i}")
+      assert_html_has_tag(actual_html, 'link', :href => "/stylesheets/layout.css?#{time.to_i}")
+      assert_html_has_tag(actual_html, 'link', :href => "http://google.com/style.css")
       assert_equal actual_html, stylesheet_link_tag(['style', 'layout.css', 'http://google.com/style.css'])
     end
 
     it 'should not use a timestamp if stamp setting is false' do
       self.class.expects(:asset_stamp).returns(false)
       expected_options = { :rel => "stylesheet", :type => "text/css" }
-      assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css")) { stylesheet_link_tag('style') }
+      assert_html_has_tag(stylesheet_link_tag('style'), 'link', expected_options.merge(:href => "/stylesheets/style.css"))
     end
 
     it 'should display stylesheet link used custom options' do
-      assert_has_tag('link', :rel => 'stylesheet', :media => 'screen') { stylesheet_link_tag('style', :media => 'screen') }
+      assert_html_has_tag(stylesheet_link_tag('style', :media => 'screen'), 'link', :rel => 'stylesheet', :media => 'screen')
     end
   end
 
@@ -288,7 +303,7 @@ describe "AssetTagHelpers" 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_html_has_tag(actual_html, 'script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript")
       assert actual_html.html_safe?
     end
 
@@ -297,60 +312,58 @@ describe "AssetTagHelpers" do
       self.class.stubs(:js_asset_folder).returns('js')
       assert_equal 'js', asset_folder_name(:js)
       actual_html = javascript_include_tag('application')
-      assert_has_tag('script', :src => "/js/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :src => "/js/application.js?#{time.to_i}", :type => "text/javascript")
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/example/demo/application.js?#{time.to_i}", :type => "text/javascript")
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/test/jquery.json?#{time.to_i}", :type => "text/javascript")
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/test/jquery.min.js?#{time.to_i}", :type => "text/javascript")
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'script', :src => "/js/application.js", :type => "text/javascript")
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'script', :src => "/blog/javascripts/application.js?#{time.to_i}", :type => "text/javascript")
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'script', :src => "https://maps.googleapis.com/maps/api/js?key=value&sensor=false")
     end
 
     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 }
-      assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}") { actual_html }
-      assert_has_tag('script', :src => "/javascripts/base.js?#{time.to_i}") { actual_html }
-      assert_has_tag('script', :src => "http://google.com/lib.js") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :type => "text/javascript", :count => 3)
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/application.js?#{time.to_i}")
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/base.js?#{time.to_i}")
+      assert_html_has_tag(actual_html, 'script', :src => "http://google.com/lib.js")
       assert_equal actual_html, javascript_include_tag(['application', 'base.js', 'http://google.com/lib.js'])
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/application.js", :type => "text/javascript")
     end
   end
 
@@ -358,33 +371,33 @@ describe "AssetTagHelpers" 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 }
+      assert_html_has_tag(actual_html, 'link', :rel => 'icon', :type => 'image/png', :href => "/images/icons/favicon.png?#{time.to_i}")
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.ico?#{time.to_i}")
     end
 
     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 }
+      assert_html_has_tag(actual_html, 'link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.png?#{time.to_i}")
     end
   end
 
   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" }
+      assert_html_has_tag(feed_tag(:rss, "/blog/post.rss"), 'link', :type => 'application/rss+xml', :rel => 'alternate', :href => "/blog/post.rss", :title => 'rss')
     end
 
     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" }
+      assert_html_has_tag(feed_tag(:atom, "/blog/post.atom"), 'link', :type => 'application/atom+xml', :rel => 'alternate', :href => "/blog/post.atom", :title => 'atom')
     end
 
     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" }
+      assert_html_has_tag(feed_tag(:rss, "/blog/post.rss", :type => "my-type", :rel => "my-rel", :title => "my-title"), 'link', :type => 'my-type', :rel => 'my-rel', :href => "/blog/post.rss", :title => 'my-title')
     end
   end