padrino-helpers 0.10.7 → 0.11.0

data/test/fixtures/markup_app/app.rb

@@ -2,12 +2,19 @@ require 'sinatra/base'
 require 'haml'
 require 'erubis'
 require 'slim'
+require 'padrino-core/application/rendering/extensions/erubis'
+require 'padrino-core/application/rendering/extensions/haml'
+require 'padrino-core/application/rendering/extensions/slim'
 
 class MarkupDemo < Sinatra::Base
   register Padrino::Helpers
 
   configure do
     set :root, File.dirname(__FILE__)
+    set :erb, :engine_class => Padrino::Erubis::SafeBufferTemplate
+    set :haml, :escape_html => true
+    set :slim, :generator => Temple::Generators::RailsOutputBuffer,
+               :buffer => "out_buf"
   end
 
   get '/:engine/:file' do
@@ -23,19 +30,19 @@ class MarkupDemo < Sinatra::Base
 
     def captured_content(&block)
       content_html = capture_html(&block)
-      "<p>#{content_html}</p>"
+      "<p>#{content_html}</p>".html_safe
     end
 
     def concat_in_p(content_html)
-      concat_content "<p>#{content_html}</p>"
+      concat_safe_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)
+    def concat_if_block_is_template(name, &block)
+      concat_safe_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
+    def concat_ruby_not_template_block
+      concat_if_block_is_template('ruby') do
         content_tag(:span, "This not a template block")
       end
     end

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

@@ -6,9 +6,9 @@
 
 <% concat_in_p('Concat Line 3') %>
 
-<% determine_block_is_template('erb') do %>
+<% concat_if_block_is_template('erb') do %>
   <span>This is erb</span>
   <span>This is erb</span>
 <% end %>
 
-<% ruby_not_template_block %>
+<% concat_ruby_not_template_block %>

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

@@ -5,8 +5,8 @@
 
 - concat_in_p('Concat Line 3')
 
-- determine_block_is_template('haml') do
+- concat_if_block_is_template('haml') do
   %span This is haml
   %span This is haml
 
-- ruby_not_template_block
+- concat_ruby_not_template_block

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

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

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

@@ -1,12 +1,12 @@
 - content_for :demo do
   h1 This is content yielded from a content_for
 
-.demo== yield_content :demo
+.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"
+.demo2= yield_content :demo2, "Johnny", "Smith"
 
-.demo_has_content== content_for?(:demo)
-.fake_has_content== content_for?(:fake)
+.demo_has_content= content_for?(:demo)
+.fake_has_content= content_for?(:fake)

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

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

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

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

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

@@ -1,15 +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
+= 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'
+      = child_form.check_box '_destroy'
+      = child_form.label '_destroy', :caption => 'Remove'

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

@@ -1,59 +1,59 @@
-== form_for MarkupUser.new, '/demo', :id => 'demo' do |f|
-  == f.error_messages(:header_message => "custom MarkupUser cannot be saved!")
-  == f.hidden_field :session_id
+= 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"
+    = f.label :username, :caption => "Login: ", :class => 'user-label'
+    = f.text_field :username, :class => 'user-text', :value => "John"
   p
-    == f.label :password
-    == f.password_field :password, :class => 'user-password', :value => "secret"
+    = f.label :password
+    = f.password_field :password, :class => 'user-password', :value => "secret"
   p
-    == f.label :age
-    == f.number_field :age, :class => 'numeric'
+    = f.label :age
+    = f.number_field :age, :class => 'numeric'
   p
-    == f.label :telephone
-    == f.telephone_field :telephone, :class => 'numeric'
+    = f.label :telephone
+    = f.telephone_field :telephone, :class => 'numeric'
   p
-    == f.label :email, :caption => 'Email Address: '
-    == f.email_field :email, :class => 'string'
+    = f.label :email, :caption => 'Email Address: '
+    = f.email_field :email, :class => 'string'
   p
-    == f.label :webpage, :caption => 'Your Web Page: '
-    == f.url_field :webpage, :class => 'string'
+    = f.label :webpage, :caption => 'Your Web Page: '
+    = f.url_field :webpage, :class => 'string'
   p
-    == f.label :search
-    == f.search_field :search, :class => 'string'
+    = f.label :search
+    = f.search_field :search, :class => 'string'
   p
-    == f.label :photo
-    == f.file_field :photo, :class => 'user-photo'
+    = f.label :photo
+    = f.file_field :photo, :class => 'user-photo'
   p
-    == f.label :about, :caption => "About Me: "
-    == f.text_area :about, :class => 'user-about'
+    = 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'
+    = 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'
+    = 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"
+    = f.label :remember_me
+    = f.check_box :remember_me, :value => "1"
   p
-    == f.submit "Create", :class => 'success', :id => 'demo-button'
+    = f.submit "Create", :class => 'success', :id => 'demo-button'
   p
-    == f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button'
+    = 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 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
+= 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

@@ -1,70 +1,70 @@
-== 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 :email
-    == email_field_tag :email
-    == label_tag :age
-    == number_field_tag :age
-    == label_tag :telephone
-    == telephone_field_tag :telephone
-    == label_tag :webpage
-    == url_field_tag :webpage
-    == label_tag :search
-    == search_field_tag :search
-    == 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 '/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 :email
+    = email_field_tag :email
+    = label_tag :age
+    = number_field_tag :age
+    = label_tag :telephone
+    = telephone_field_tag :telephone
+    = label_tag :webpage
+    = url_field_tag :webpage
+    = label_tag :search
+    = search_field_tag :search
+    = 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
+= 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'
+      = 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]
+      = label_tag :password, :class => 'first'
+      = password_field_tag :password, :value => params[:password]
     p
-      == label_tag :email, :caption => 'Email Address'
-      == email_field_tag :email, :class => 'string'
+      = label_tag :email, :caption => 'Email Address'
+      = email_field_tag :email, :class => 'string'
     p
-      == label_tag :age, :class => 'age'
-      == number_field_tag :age, :class => 'numeric'
+      = label_tag :age, :class => 'age'
+      = number_field_tag :age, :class => 'numeric'
     p
-      == label_tag :telephone, :class => 'telephone'
-      == telephone_field_tag :telephone, :class => 'numeric'
+      = label_tag :telephone, :class => 'telephone'
+      = telephone_field_tag :telephone, :class => 'numeric'
     p
-      == label_tag :webpage, :caption => 'Your Home Page'
-      == url_field_tag :webpage, :class => 'string'
+      = label_tag :webpage, :caption => 'Your Home Page'
+      = url_field_tag :webpage, :class => 'string'
     p
-      == label_tag :search
-      == search_field_tag :search, :class => 'string'
+      = label_tag :search
+      = search_field_tag :search, :class => 'string'
     p
-      == label_tag :about, :class => 'about', :caption => "About Me"
-      == text_area_tag :about, :class => 'large'
+      = 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'
+      = 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'
+      = 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'
+      = 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"
+      = 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

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

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

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

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

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

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

@@ -1 +1 @@
-=current_engine
+= current_engine

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

@@ -1 +1 @@
-p.slim= partial 'partials/slim', :engine => "slim"
+p.slim= partial 'partials/slim', :engine => "slim"

data/test/fixtures/render_app/app.rb

@@ -16,6 +16,9 @@ class RenderDemo < Padrino::Application
   configure do
     set :logging, false
     set :padrino_logging, false
+    set :erb, :engine_class => Padrino::Erubis::SafeBufferTemplate
+    set :haml, :escape_html => true
+    set :slim, :generator => Temple::Generators::RailsOutputBuffer
   end
 
   # get current engines from partials

data/test/test_asset_tag_helpers.rb

@@ -70,6 +70,17 @@ describe "AssetTagHelpers" do
       assert_has_tag('a#binky.first', :content => "Sign up", :href => '/register') { actual_link }
     end
 
+    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;&gt;", actual_link
+    end
+
+    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
       visit '/haml/link_to'
       assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
@@ -183,16 +194,15 @@ describe "AssetTagHelpers" do
     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') }
+        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" />'
     end
   end
@@ -200,8 +210,10 @@ describe "AssetTagHelpers" do
   context 'for #stylesheet_link_tag method' do
     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" }
-      assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}")) { stylesheet_link_tag('style') }
+      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
@@ -248,6 +260,7 @@ describe "AssetTagHelpers" 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 "display javascript item for long relative path" do