padrino-helpers 0.9.24 → 0.9.25

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

@@ -1,6 +1,5 @@
 module Padrino
   module Helpers
-
     module OutputHelpers
       class HamlHandler < AbstractHandler
         ##
@@ -46,9 +45,19 @@ module Padrino
           template.haml_concat(text)
           nil
         end
-      end # HamlHandler
 
+        ##
+        # Returns an array of engines used for the template
+        #
+        # ==== Examples
+        #
+        #   @handler.engines => [:erb, :erubis]
+        #
+        def engines
+          @_engines ||= [:haml]
+        end
+      end # HamlHandler
       OutputHelpers.register(HamlHandler)
     end # OutputHelpers
-  end
-end
+  end # Helpers
+end # Padrino

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

@@ -0,0 +1,82 @@
+# Make slim works with sinatra/padrino
+Slim::Engine.set_default_options(:buffer => '@_out_buf', :generator => Temple::Generators::StringBuffer) if defined?(Slim)
+
+module Padrino
+  module Helpers
+    module OutputHelpers
+      class SlimHandler < AbstractHandler
+        attr_reader :output_buffer
+
+        def initialize(template)
+          super
+          @output_buffer = template.instance_variable_get(:@_out_buf)
+        end
+
+        ##
+        # Returns true if the current template type is same as this handlers; false otherwise.
+        #
+        # ==== Examples
+        #
+        #  @handler.is_type? => true
+        #
+        def is_type?
+          !self.output_buffer.nil?
+        end
+
+        # Captures the html from a block of template code for this handler
+        #
+        # ==== Examples
+        #
+        #  @handler.capture_from_template(&block) => "...html..."
+        #
+        def capture_from_template(*args, &block)
+          self.output_buffer, _buf_was = "", self.output_buffer
+          block.call(*args)
+          ret = eval("@_out_buf", block.binding)
+          self.output_buffer = _buf_was
+          ret
+        end
+
+        ##
+        # Outputs the given text to the templates buffer directly
+        #
+        # ==== Examples
+        #
+        #   @handler.concat_to_template("This will be output to the template buffer")
+        #
+        def concat_to_template(text="")
+          self.output_buffer << text if is_type? && text
+          nil
+        end
+
+        ##
+        # Returns true if the block given is of the handler's template type; false otherwise.
+        #
+        # ==== Examples
+        #
+        #  @handler.block_is_type?(block) => true
+        #
+        def block_is_type?(block)
+          is_type? || (block && eval('defined? __in_erb_template', block.binding))
+        end
+
+        ##
+        # Returns an array of engines used for the template
+        #
+        # ==== Examples
+        #
+        #   @handler.engines => [:erb, :erubis]
+        #
+        def engines
+          @_engines ||= [:slim]
+        end
+
+        protected
+          def output_buffer=(val)
+            template.instance_variable_set(:@_out_buf, val)
+          end
+        end # ErbHandler
+        OutputHelpers.register(SlimHandler)
+    end # OutputHelpers
+  end # Helpers
+end # Padrino

data/lib/padrino-helpers/render_helpers.rb

@@ -20,7 +20,7 @@ module Padrino
         if collection = options.delete(:collection)
           options.delete(:object)
           counter = 0
-          collection.collect { |member|
+          collection.map { |member|
             counter += 1
             options[:locals].merge!(object_name => member, "#{object_name}_counter".to_sym => counter)
             render(template_path, nil, options.dup)

data/lib/padrino-helpers/tag_helpers.rb

@@ -42,7 +42,7 @@ module Padrino
         content, open_tag = options.delete(:content), options.delete(:open)
         content = content.join("\n") if content.respond_to?(:join)
         identity_tag_attributes.each { |attr| options[attr] = attr.to_s if options[attr]  }
-        html_attrs = options.collect { |a, v| v.nil? || v == false ? nil : "#{a}=\"#{v}\"" }.compact.join(" ")
+        html_attrs = options.map { |a, v| v.nil? || v == false ? nil : "#{a}=\"#{v}\"" }.compact.join(" ")
         base_tag = (html_attrs.present? ? "<#{name} #{html_attrs}" : "<#{name}")
         base_tag << (open_tag ? ">" : (content ? ">#{content}</#{name}>" : " />"))
       end

data/test/fixtures/markup_app/app.rb

@@ -1,5 +1,7 @@
 require 'sinatra/base'
 require 'haml'
+require 'erubis'
+require 'slim'
 
 class MarkupDemo < Sinatra::Base
   register Padrino::Helpers
@@ -28,15 +30,15 @@ class MarkupDemo < Sinatra::Base
       concat_content "<p>#{content_html}</p>"
     end
 
+    def determine_block_is_template(name, &block)
+      concat_content "<p class='is_template'>The #{name} block passed in is a template</p>" if block_is_template?(block)
+    end
+
     def ruby_not_template_block
       determine_block_is_template('ruby') do
         content_tag(:span, "This not a template block")
       end
     end
-
-    def determine_block_is_template(name, &block)
-      concat_content "<p class='is_template'>The #{name} block passed in is a template</p>" if block_is_template?(block)
-    end
   end
 end
 

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

@@ -0,0 +1,13 @@
+-@content = captured_content do
+  span Captured Line 1
+  span Captured Line 2
+
+==@content
+
+==determine_block_is_template('slim') do
+  span This is slim
+  span This is slim
+
+==concat_in_p('Concat Line 3')
+
+==ruby_not_template_block

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

@@ -0,0 +1,9 @@
+- content_for :demo do
+  h1 This is content yielded from a content_for
+
+.demo== yield_content :demo
+
+- content_for :demo2 do |fname, lname|
+  h1 This is content yielded with name #{fname + " " + lname}
+
+.demo2== yield_content :demo2, "Johnny", "Smith"

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

@@ -0,0 +1,9 @@
+==content_tag :p, "Test 1", :class => 'test', :id => "test1"
+
+== content_tag :p, "Test 2"
+
+==content_tag(:p, :class => 'test', :id => 'test3') do
+  span Test 3
+
+==content_tag(:p) do
+  span Test 4

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

@@ -0,0 +1,5 @@
+<p class="start"><%= current_engine %></p>
+<p class="haml"><%= haml :'partials/_haml' %></p>
+<p class="erb"><%= erb  :'partials/_erb' %></p>
+<p class="slim"><%= slim :'partials/_slim' %></p>
+<p class="end"><%= current_engine %></p>

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

@@ -0,0 +1,5 @@
+%p.start= current_engine
+%p.haml= haml :'partials/_haml'
+%p.erb= erb  :'partials/_erb'
+%p.slim= slim :'partials/_slim'
+%p.end= current_engine

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

@@ -0,0 +1,5 @@
+p.start= current_engine
+p.haml= haml :'partials/_haml'
+p.erb= erb  :'partials/_erb'
+p.slim= slim :'partials/_slim'
+p.end= current_engine

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

@@ -7,7 +7,7 @@
   <% end %>
   <% f.fields_for :telephone do |child_form| %>
     <%= child_form.label :number %>
-    <%= child_form.text_field :number %> 
+    <%= child_form.text_field :number %>
   <% end %>
   <% f.fields_for :addresses do |child_form| %>
     <%= child_form.label :name %>

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

@@ -6,10 +6,10 @@
     = permission.check_box :can_delete
   - f.fields_for :telephone do |child_form|
     = child_form.label :number
-    = child_form.text_field :number 
-  - f.fields_for :addresses do |child_form| 
-    = child_form.label :name 
-    = child_form.text_field :name 
-    - unless child_form.object.new_record? 
-      = child_form.check_box '_destroy' 
-      = child_form.label '_destroy', :caption => 'Remove' 
+    = child_form.text_field :number
+  - f.fields_for :addresses do |child_form|
+    = child_form.label :name
+    = child_form.text_field :name
+    - unless child_form.object.new_record?
+      = child_form.check_box '_destroy'
+      = child_form.label '_destroy', :caption => 'Remove'

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

@@ -0,0 +1,15 @@
+- @user = MarkupUser.new
+== form_for @user , '/demo1', :id => 'demo-fields-for' do |f|
+  == f.text_field :gender
+  == fields_for @user.permission do |permission|
+    == permission.check_box :can_edit
+    == permission.check_box :can_delete
+  == f.fields_for :telephone do |child_form|
+    == child_form.label :number
+    == child_form.text_field :number
+  == f.fields_for :addresses do |child_form|
+    == child_form.label :name
+    == child_form.text_field :name
+    - unless child_form.object.new_record?
+      == child_form.check_box '_destroy'
+      == child_form.label '_destroy', :caption => 'Remove'

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

@@ -0,0 +1,47 @@
+== form_for MarkupUser.new, '/demo', :id => 'demo' do |f|
+  == f.error_messages(:header_message => "custom MarkupUser cannot be saved!")
+  == f.hidden_field :session_id
+  p
+    == f.label :username, :caption => "Login: ", :class => 'user-label'
+    == f.text_field :username, :class => 'user-text', :value => "John"
+  p
+    == f.label :email, :caption => "Email", :class => 'user-email'
+    == f.text_field :email
+  p
+    == f.label :password
+    == f.password_field :password, :class => 'user-password', :value => "secret"
+  p
+    == f.label :photo
+    == f.file_field :photo, :class => 'user-photo'
+  p
+    == f.label :about, :caption => "About Me: "
+    == f.text_area :about, :class => 'user-about'
+  p
+    == f.label :gender, :caption => "Your gender: "
+    == f.radio_button :gender, :value => 'male'
+    == f.radio_button :gender, :value => 'female'
+  p
+    == f.label :country, :caption => "Your country"
+    == f.select :country, :options => ['USA', 'Canada', 'Mexico'], :selected => 'USA', :class => 'selector'
+  p
+    == f.label :remember_me
+    == f.check_box :remember_me, :value => "1"
+  p
+    == f.submit "Create", :class => 'success', :id => 'demo-button'
+  p
+    == f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button'
+
+== form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f|
+  == f.error_messages :header_message => "custom MarkupUser cannot be saved!"
+  == f.hidden_field :session_id
+  == f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname: ', :class => 'label' }
+  == f.password_field_block :code, { :class => 'input' }
+  == f.text_area_block :about, { :class => 'textarea' }
+  == f.file_field_block :photo, { :class => 'upload' }
+  == f.check_box_block :remember_me, { :class => 'checker' }
+  == f.select_block :state, :options => ['California', 'Texas'], :class => 'selector'
+  == f.submit_block "Create", { :class => 'button' }
+  == f.image_submit_block "buttons/ok.png", { :class => 'image' }
+
+== form_for :markup_user, '/third_demo', :id => 'demo3', :method => 'get' do |f|
+  == f.text_field_block :username

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

@@ -0,0 +1,45 @@
+== form_tag '/simple', :class => 'simple-form' do
+  == error_messages_for nil
+  == field_set_tag do
+    == hidden_field_tag :session_id, :value => "__secret__"
+    == label_tag :username
+    == text_field_tag :username
+    == label_tag :password
+    == password_field_tag :password
+    == label_tag  :color
+    == select_tag :color, :options => ['green', 'orange', 'purple']
+    == label_tag  :gender
+    == radio_button_tag :gender, :value => 'male'
+    == radio_button_tag :gender, :value => 'female'
+    == check_box_tag :remember_me
+    == submit_tag
+
+== form_tag '/advanced', :id => 'advanced', :class => 'advanced-form', :method => 'get' do
+  == error_messages_for MarkupUser.new, :header_message => "There are problems with saving user!"
+  == hidden_field_tag :session_id, :value => "__secret__"
+  == field_set_tag "Advanced", :class => 'advanced-field-set' do
+    p
+      == label_tag :username, :class => 'first', :caption => "Nickname"
+      == text_field_tag :username, :value => params[:username], :id => 'the_username'
+    p
+      == label_tag :password, :class => 'first'
+      == password_field_tag :password, :value => params[:password]
+    p
+      == label_tag :about, :class => 'about', :caption => "About Me"
+      == text_area_tag :about, :class => 'large'
+    p
+      == label_tag :gender, :class => 'gender'
+      == radio_button_tag :gender, :value => 'male', :checked => true
+      == radio_button_tag :gender, :value => 'female'
+    p
+      == label_tag :photo, :class => 'photo'
+      == file_field_tag :photo, :class => 'upload'
+    p
+      == label_tag :fav_color
+      == select_tag :fav_color, :options => [ ['green', '1'], ['orange', '2'], ['purple', '3'] ], :selected => '2'
+    p
+      == check_box_tag :remember_me, :value => "1", :checked => true
+  == field_set_tag(:class => 'buttons') do
+    == submit_tag "Login"
+    == button_tag "Cancel"
+    == image_submit_tag "buttons/submit.png"

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

@@ -0,0 +1,4 @@
+= link_to "Test 1 No Block", '/test1', :class => 'test', :id => 'test1'
+
+- link_to("/test2", :class => 'test', :id => 'test2') do
+  span Test 2 With Block

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

@@ -0,0 +1,3 @@
+p.simple== mail_to 'test@demo.com'
+
+p.captioned== mail_to 'test@demo.com', "Click my Email"

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

@@ -0,0 +1,3 @@
+== meta_tag "weblog,news", :name => "keywords"
+
+== meta_tag "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"

data/test/fixtures/markup_app/views/partials/_erb.erb

@@ -0,0 +1 @@
+<%= current_engine %>

data/test/fixtures/markup_app/views/partials/_haml.haml

@@ -0,0 +1 @@
+=current_engine

data/test/fixtures/markup_app/views/partials/_slim.slim

@@ -0,0 +1 @@
+=current_engine

data/test/fixtures/render_app/app.rb

@@ -11,6 +11,16 @@ end
 class RenderDemo < Padrino::Application
   register Padrino::Helpers
 
+  configure do
+    set :logging, false
+    set :padrino_logging, false
+  end
+
+  # get current engines from partials
+  get '/current_engine' do
+    render :current_engine
+  end
+
   # partial with object
   get '/partial/object' do
     partial 'template/user', :object => RenderUser.new('John'), :locals => { :extra => "bar" }

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

@@ -0,0 +1,5 @@
+%p.start= current_engine
+%p.haml= partial 'current_engines/haml'
+%p.erb= partial 'current_engines/erb'
+%p.slim= partial 'current_engines/slim'
+%p.end= current_engine

data/test/fixtures/render_app/views/current_engines/_erb.erb

@@ -0,0 +1 @@
+<%= current_engine %>

data/test/fixtures/render_app/views/current_engines/_haml.haml

@@ -0,0 +1 @@
+=current_engine

data/test/fixtures/render_app/views/current_engines/_slim.slim

@@ -0,0 +1 @@
+=current_engine

data/test/helper.rb

@@ -5,18 +5,7 @@ require 'mocha'
 require 'rack/test'
 require 'webrat'
 require 'padrino-helpers'
-
-# We need some extension for do our tests
-begin
-  # As 2.3.x
-  require 'active_support/core_ext/date'
-  require 'active_support/core_ext/time'
-  require 'active_support/core_ext/numeric'
-  require 'active_support/duration'
-rescue LoadError
-  # As 3.x
-  require 'active_support/time'
-end
+require 'active_support/time'
 
 class Test::Unit::TestCase
   include Padrino::Helpers::OutputHelpers

data/test/test_asset_tag_helpers.rb

@@ -26,39 +26,48 @@ class TestAssetTagHelpers < Test::Unit::TestCase
     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
       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
       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
       actual_link = link_to('Sign up', :class => "test")
       assert_has_tag('a', :content => "Sign up", :href => 'javascript:void(0);', :class => 'test') { actual_link }
     end
+
     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
       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
       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
       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 "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
       visit '/erb/link_to'
       assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
@@ -96,6 +105,12 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       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
+      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
@@ -103,20 +118,29 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       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
       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
       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
       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
+      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
@@ -124,29 +148,35 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       time = stop_time_for_test
       assert_has_tag('img', :src => "/absolute/pic.gif?#{time.to_i}") { image_tag('/absolute/pic.gif') }
     end
+
     should "display image tag absolute 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
       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
       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
       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
       self.class.expects(:asset_stamp).returns(false)
       assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
     end
+
     should "have xhtml convention tag" do
       self.class.expects(:asset_stamp).returns(false)
       assert_equal image_tag('/absolute/pic.gif'), '<img src="/absolute/pic.gif" />'
@@ -159,18 +189,21 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
       assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}")) { stylesheet_link_tag('style') }
     end
+
     should "display stylesheet link item for long relative path" do
       time = stop_time_for_test
       expected_options = { :media => "screen", :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
       time = stop_time_for_test
       expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
       actual_html = stylesheet_link_tag('/css/style')
       assert_has_tag('link', expected_options.merge(:href => "/css/style.css?#{time.to_i}")) { actual_html }
     end
+
     should "display stylesheet link item with uri root" do
       self.class.stubs(:uri_root).returns("/blog")
       time = stop_time_for_test
@@ -178,6 +211,7 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       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
       time = stop_time_for_test
       actual_html = stylesheet_link_tag('style', 'layout.css', 'http://google.com/style.css')
@@ -185,7 +219,9 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       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
       self.class.expects(:asset_stamp).returns(false)
       expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
@@ -199,32 +235,38 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       actual_html = javascript_include_tag('application')
       assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
+
     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
       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
       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
       time = stop_time_for_test
       actual_html = javascript_include_tag('/js/application')
       assert_has_tag('script', :src => "/js/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
+
     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 "display javascript items" do
       time = stop_time_for_test
       actual_html = javascript_include_tag('application', 'base.js', 'http://google.com/lib.js')
@@ -232,7 +274,9 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       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_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
       self.class.expects(:asset_stamp).returns(false)
       actual_html = javascript_include_tag('application')
@@ -246,11 +290,13 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       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
       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
       time = stop_time_for_test
       actual_html = favicon_tag('favicon.png', :type => 'image/ico')
@@ -262,9 +308,11 @@ class TestAssetTagHelpers < Test::Unit::TestCase
     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
       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
       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