padrino-helpers 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9de9c68240b6a030c87053b1f781ef7152ef5bfc
-  data.tar.gz: a9a5d042cd4ed7d6dd52d9977b4421c0a40389e2
+  metadata.gz: febadf7b3fad75194b40771bb1d5c414303b6786
+  data.tar.gz: 3e5d9099e89fa2d58a149b09c54f993ff7a14c53
 SHA512:
-  metadata.gz: f0d72f6b0c05eaae7fb28d4fd7c85d7d76a9e2e7a7ef719f42040b0148cdbfb19ccdd3f790ef592328ec341edaf15acf74cda7b6e24b21aa4ce25beaa2af44fa
-  data.tar.gz: 97eb607b9c2caf7c9242c39afa18ceac5f63e7306d46c0e01d3041e93bf3008fef4e0a7b7f03bfc5ba9624b3cb6a7bd2fc9520e63cc9a85396af7d52c621e347
+  metadata.gz: 56a145692e0257c6c8d938da7218807ee0ea528c8ff2b3b29ededf270faabed6a30bbd8e690d1326ce9f9745203634948ae756fbff06ce11c1c9a5304051cea4
+  data.tar.gz: 7650154ec4c435655aa9e2414b71c00f9aaec7516c8d875855689b51e9f55c274b6d3080ad4f8174c4ecf85731dbe2143239209d488e09f0e68aec79db39f792

data/lib/padrino-helpers.rb

@@ -45,17 +45,20 @@ module Padrino
       def registered(app)
         app.register Padrino::Rendering
         app.set :default_builder, 'StandardFormBuilder'
-        app.helpers Padrino::Helpers::OutputHelpers
-        app.helpers Padrino::Helpers::TagHelpers
-        app.helpers Padrino::Helpers::AssetTagHelpers
-        app.helpers Padrino::Helpers::FormHelpers
-        app.helpers Padrino::Helpers::FormatHelpers
-        app.helpers Padrino::Helpers::RenderHelpers
-        app.helpers Padrino::Helpers::NumberHelpers
-        app.helpers Padrino::Helpers::TranslationHelpers
-        app.helpers Padrino::Helpers::Breadcrumbs
+        included(app)
+      end
+
+      def included(base)
+        base.send :include, Padrino::Helpers::OutputHelpers
+        base.send :include, Padrino::Helpers::TagHelpers
+        base.send :include, Padrino::Helpers::AssetTagHelpers
+        base.send :include, Padrino::Helpers::FormHelpers
+        base.send :include, Padrino::Helpers::FormatHelpers
+        base.send :include, Padrino::Helpers::RenderHelpers
+        base.send :include, Padrino::Helpers::NumberHelpers
+        base.send :include, Padrino::Helpers::TranslationHelpers
+        base.send :include, Padrino::Helpers::Breadcrumbs
       end
-      alias :included :registered
     end
   end
 end

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -52,10 +52,6 @@ module Padrino
       #   @param [Hash]    options  The html options.
       #   @param [Proc]    block    The link content.
       #
-      # @option options [String] :anchor
-      #   The anchor for the link (i.e #something).
-      # @option options [String] :fragment
-      #   Synonym for anchor.
       # @option options [Boolean] :if
       #   If true, the link will appear, otherwise not.
       # @option options [Boolean] :unless
@@ -80,17 +76,14 @@ module Padrino
       #
       def link_to(*args, &block)
         options  = args.extract_options!
-        fragment = options.delete(:anchor).to_s if options[:anchor]
-        fragment = options.delete(:fragment).to_s if options[:fragment]
         name = block_given? ? '' : args.shift
-        if url = args.first
-          url << '#' << fragment if fragment
-        else
-          url = '#'
-          url << fragment if fragment
+        href = args.first
+        if fragment = options[:fragment] || options[:anchor]
+          warn 'Options :anchor and :fragment are deprecated for #link_to. Please use :fragment for #url'
+          href << '#' << fragment.to_s
         end
-        options.reverse_merge!(:href => url)
-        return name unless parse_conditions(url, options)
+        options.reverse_merge!(:href => href || '#')
+        return name unless parse_conditions(href, options)
         block_given? ? content_tag(:a, options, &block) : content_tag(:a, name, options)
       end
 
@@ -147,7 +140,7 @@ module Padrino
       #
       def mail_to(email, caption=nil, mail_options={})
         html_options = mail_options.slice!(:cc, :bcc, :subject, :body)
-        mail_query = Rack::Utils.build_query(mail_options).gsub(/\+/, '%20').gsub('%40', '@').gsub('&', '&amp;')
+        mail_query = Rack::Utils.build_query(mail_options).gsub(/\+/, '%20').gsub('%40', '@')
         mail_href = "mailto:#{email}"; mail_href << "?#{mail_query}" if mail_query.present?
         link_to((caption || email), mail_href, html_options)
       end

data/lib/padrino-helpers/form_builder/abstract_form_builder.rb

@@ -35,6 +35,7 @@ module Padrino
         end
 
         def label(field, options={}, &block)
+          options[:id] ||= nil
           options[:caption] ||= I18n.t("#{model_name}.attributes.#{field}", :count => 1, :default => field.to_s.humanize, :scope => :models) + ': '
           @template.label_tag(field_id(field), default_options(field, options), &block)
         end

data/lib/padrino-helpers/form_helpers.rb

@@ -102,7 +102,7 @@ module Padrino
           options[:method] = 'post'
         end
         inner_form_html = hidden_form_method_field(desired_method)
-        inner_form_html << csrf_token_field if options[:protect_from_csrf]
+        inner_form_html << csrf_token_field if options.delete(:protect_from_csrf)
         concat_content content_tag(:form, inner_form_html << capture_html(&block), options)
       end
 
@@ -459,10 +459,12 @@ module Padrino
       #   grouped_options = {'Friends' => ['Yoda',['Obiwan',1]],'Enemies' => ['Palpatine',['Darth Vader',3]]}
       #   select_tag(:color, :grouped_options => [['warm',['red','yellow']],['cool',['blue', 'purple']]])
       #
-      #   # Optgroups can be generated using :grouped_options => (Hash or nested Array)
-      #   grouped_options = [['Friends',['Yoda',['Obiwan',1]]],['Enemies',['Palpatine',['Darth Vader',3]]]]
-      #   grouped_options = {'Friends' => ['Yoda',['Obiwan',1]],'Enemies' => ['Palpatine',['Darth Vader',3]]}
-      #   select_tag(:color, :grouped_options => [['warm',['red','yellow']],['cool',['blue', 'purple']]])
+      #   # Optgroups can be generated using the rails-style attribute hash.
+      #   grouped_options = {
+      #     "Friends" => ["Yoda", ["Obiwan", 2, {:magister => 'no'}], {:lame => 'yes'}],
+      #     "Enemies" => [["Palpatine", "Palpatine", {:scary => 'yes', :old => 'yes'}], ["Darth Vader", 3, {:disabled => true}]]
+      #   }
+      #   select_tag(:name, :grouped_options => grouped_options)
       #
       # @param [String] name
       #   The name of the input field.

data/lib/padrino-helpers/form_helpers/options.rb

@@ -12,7 +12,7 @@ module Padrino
           else
             options_for_select(extract_option_items!(options), state)
           end
-          if prompt = options[:include_blank]
+          if prompt = options.delete(:include_blank)
             option_tags.unshift(blank_option(prompt))
           end
           option_tags
@@ -55,7 +55,7 @@ module Padrino
         def options_for_select(option_items, state = {})
           return [] if option_items.blank?
           option_items.map do |caption, value, attributes|
-            html_attributes = { :value => value || caption  }.merge(attributes||{})
+            html_attributes = { :value => value ||= caption }.merge(attributes||{})
             html_attributes[:selected] ||= option_is_selected?(value, caption, state[:selected])
             html_attributes[:disabled] ||= option_is_selected?(value, caption, state[:disabled])
             content_tag(:option, caption, html_attributes)

data/lib/padrino-helpers/output_helpers.rb

@@ -125,14 +125,20 @@ module Padrino
       # @overload content_for(key, content)
       #   @param [Symbol] key      Name of your key for the content yield.
       #   @param [String] content  Text to be stored for this key.
+      #   @param [Hash]   options  Options associated with this method.
       # @overload content_for(key, &block)
       #   @param [Symbol] key      Name of your key for the content yield.
       #   @param [Proc]   block    Block to be stored as content for this key.
+      #   @param [Hash]   options  Options associated with this method.
+      #
+      # @option options [Boolean] :flush
+      #   Specifies whether to replace the content.
       #
       # @example
       #   content_for(:name) { ...content... }
       #   content_for(:name) { |name| ...content... }
       #   content_for(:name, "I'm Jeff")
+      #   content_for(:name, :flush => true) { ...new content... }
       #
       def content_for(key, content = nil, options = {}, &block)
         options = content if content.is_a?(Hash)

data/lib/padrino/rendering.rb

@@ -298,26 +298,18 @@ module Padrino
         I18n.locale if defined?(I18n)
       end
 
-      LAYOUT_EXTENSIONS = %w[.slim .erb .haml].freeze
-
       def resolve_layout(layout, options={})
         layouts_path = options[:layout_options] && options[:layout_options][:views] || options[:views] || settings.views || "./views"
         template_path = settings.fetch_layout_path(layout, layouts_path)
         rendering_options = [template_path, content_type || :html, locale]
 
-        layout, engine =
-          settings.cache_template_path(rendering_options) do
-            template_candidates = glob_templates(layouts_path, template_path)
-            selected_template = select_template(template_candidates, *rendering_options)
-
-            fail TemplateNotFound, "Layout '#{template_path}' not found in '#{layouts_path}'" if !selected_template && layout.present?
-            selected_template
-          end
-
-        is_included_extension = LAYOUT_EXTENSIONS.include?(File.extname(template_path.to_s))
-        layout = false unless is_included_extension ? engine : engine == @current_engine
+        settings.cache_template_path(rendering_options) do
+          template_candidates = glob_templates(layouts_path, template_path)
+          selected_template = select_template(template_candidates, *rendering_options)
 
-        [layout, engine]
+          fail TemplateNotFound, "Layout '#{template_path}' not found in '#{layouts_path}'" if !selected_template && layout.present?
+          selected_template
+        end
       end
 
       def with_layout(options)
@@ -344,7 +336,7 @@ module Padrino
           parts << "{,#{request.controller}}"
         end
         parts << template_path.chomp(File.extname(template_path)) + '.*'
-        Dir.glob(File.join(parts)).sort.inject([]) do |all,file|
+        Dir.glob(File.join(parts)).inject([]) do |all,file|
           next all if IGNORE_FILE_PATTERN.any?{ |pattern| file.to_s =~ pattern }
           all << path_and_engine(file, views_path)
         end
@@ -373,6 +365,31 @@ module Padrino
   end
 end
 
-require 'padrino/rendering/extensions/haml'
-require 'padrino/rendering/extensions/erubis'
-require 'padrino/rendering/extensions/slim'
+unless defined? Padrino::Rendering::HamlTemplate
+  begin
+    require 'haml'
+    require 'haml/helpers/xss_mods'
+    require 'haml/helpers/action_view_extensions'
+  rescue LoadError
+  else
+    require 'padrino/rendering/haml_template'
+  end
+end
+
+unless defined? Padrino::Rendering::ErubisTemplate
+  begin
+    require 'erubis'
+  rescue LoadError
+  else
+    require 'padrino/rendering/erubis_template'
+  end
+end
+
+unless defined? Padrino::Rendering::SlimTemplate
+  begin
+    require 'slim'
+  rescue LoadError
+  else
+    require 'padrino/rendering/slim_template'
+  end
+end

data/lib/padrino/rendering/erubis_template.rb

@@ -0,0 +1,66 @@
+module Padrino
+  module Rendering
+    ##
+    # 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 Eruby engine, augmented with SafeBufferEnhancer.
+    #
+    # @api private
+    class SafeEruby < ::Erubis::Eruby
+      include SafeBufferEnhancer
+    end
+
+    ##
+    # Modded ErubisTemplate that doesn't insist in an String as output
+    # buffer.
+    #
+    # @api private
+    class ErubisTemplate < 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::Rendering::SafeEruby)
+        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::Rendering::ErubisTemplate, :erb)
+
+Padrino::Rendering.engine_configurations[:erb] = {
+  :engine_class => Padrino::Rendering::SafeEruby,
+}

data/lib/padrino/rendering/haml_template.rb

@@ -0,0 +1,26 @@
+module Haml
+  module Helpers
+    include XssMods
+    include ActionViewExtensions
+  end
+
+  module Util
+    def self.rails_xss_safe?
+      true
+    end
+  end
+end
+
+module Padrino
+  module Rendering
+    class HamlTemplate < Tilt::HamlTemplate
+      include SafeTemplate
+    end
+  end
+end
+
+Tilt.prefer(Padrino::Rendering::HamlTemplate, :haml)
+
+Padrino::Rendering.engine_configurations[:haml] = {
+  :escape_html => true,
+}

data/lib/padrino/rendering/slim_template.rb

@@ -0,0 +1,20 @@
+module Padrino
+  module Rendering
+    class SlimTemplate < Slim::Template
+      include SafeTemplate
+
+      def precompiled_preamble(locals)
+        "__in_slim_template = true\n" << super
+      end
+    end
+  end
+end
+
+Tilt.prefer(Padrino::Rendering::SlimTemplate, :slim)
+
+Padrino::Rendering.engine_configurations[:slim] = {
+  :generator => Temple::Generators::RailsOutputBuffer,
+  :buffer => "@_out_buf",
+  :use_html_safe => true,
+  :disable_capture => true,
+}

data/test/test_asset_tag_helpers.rb

@@ -102,6 +102,8 @@ describe "AssetTagHelpers" 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 }
+      assert_match %r{&}, actual_link
+      refute_match %r{&}, actual_link
     end
 
     it 'should escape scary things' do
@@ -135,6 +137,13 @@ describe "AssetTagHelpers" do
       assert_match 'My&Email', actual_html
     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 }
+      assert_match %r{&}, actual_html
+      refute_match %r{&}, 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'

data/test/test_form_builder.rb

@@ -273,6 +273,7 @@ describe "FormBuilder" do
     it 'should display correct label html' do
       actual_html = standard_builder.label(:first_name, :class => 'large', :caption => "F. Name: ")
       assert_has_tag('label', :class => 'large', :for => 'user_first_name', :content => "F. Name: ") { actual_html }
+      assert_has_no_tag('label#user_first_name') { actual_html }
     end
 
     it 'should set specific content inside the label if a block was provided' do

data/test/test_form_helpers.rb

@@ -97,6 +97,11 @@ describe "FormHelpers" do
       assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
     end
 
+    it 'should not include protect_from_csrf as an attribute of form element' do
+      actual_html = form_tag('/superadmindelete', :protect_from_csrf => true){ "Demo" }
+      assert_has_no_tag(:form, protect_from_csrf: "true"){ actual_html }
+    end
+
     it 'should display correct forms in erb' do
       visit '/erb/form_tag'
       assert_have_selector 'form.simple-form', :action => '/simple'
@@ -657,6 +662,13 @@ describe "FormHelpers" do
       assert_has_tag('select option:first-child', :value => "", :content => "") { actual_html }
     end
 
+    it 'should include blank as caption' do
+      opts = { "Red"  => ["Rose","Fire"], "Blue" => ["Sky","Sea"] }
+      actual_html = select_tag( 'color', :grouped_options => opts, :include_blank => 'Choose your destiny' )
+      assert_has_tag('select option:first-child', :value => "", :content => "Choose your destiny") { actual_html }
+      assert_has_no_tag('select[include_blank]') { actual_html }
+    end
+
     it 'should display select tag with grouped options for a nested array' do
       opts = [
         ["Friends",["Yoda",["Obiwan",2]]],
@@ -775,6 +787,13 @@ describe "FormHelpers" do
       assert_has_tag('select option', :content => 'Black', :value => 'black1', :selected => 'selected') { actual_html }
     end
 
+    it 'should not misselect options with default value' do
+      options = ['Green', 'Blue']
+      actual_html = select_tag(:favorite_color, :options => options, :selected => ['Green', ''])
+      assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
+      assert_has_tag('select option', :content => 'Green', :value => 'Green', :selected => 'selected') { actual_html }
+    end
+
     it 'should display options selected only for exact match' do
       options = [['One', '1'], ['1', '10'], ['Two', "-1"]]
       actual_html = select_tag(:range, :options => options, :selected => '-1')

data/test/test_helpers.rb

@@ -0,0 +1,10 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "Padrino::Helpers" do
+  it 'should allow including without registering' do
+    class Foo
+      include Padrino::Helpers
+    end
+    assert_equal '<div>bar</div>', Foo.new.content_tag(:div, 'bar')
+  end
+end

data/test/test_rendering.rb

@@ -190,25 +190,6 @@ describe "Rendering" do
     assert_equal "bar layout bar", body
   end
 
-  it 'should render correctly if layout was not found or not exist' do
-    create_layout :application, "application layout for <%= yield %>"
-    create_view :foo, "index", :format => :html
-    create_view :foo, "xml.rss", :format => :rss
-    mock_app do
-      get("/foo", :provides => [:html, :rss]) { render('foo') }
-      get("/baz", :provides => :js) { render(:erb, 'baz') }
-      get("/bar") { render :haml, "haml" }
-    end
-    get "/foo"
-    assert_equal "application layout for index", body
-    get "/foo.rss"
-    assert_equal "<rss/>", body.chomp
-    get "/baz.js"
-    assert_equal "baz", body
-    get "/bar"
-    assert_equal "haml", body.chomp
-  end
-
   it 'should allow to render template with layout option that using other template engine.' do
     create_layout :"layouts/foo", "application layout for <%= yield %>", :format => :erb
     create_view :slim, "| slim", :format => :slim
@@ -246,6 +227,25 @@ describe "Rendering" do
     assert_equal "application layout for erb", body.chomp
   end
 
+  it 'should find a layout by symbol' do
+    create_layout :"layouts/bar", "application layout for <%= yield %>", :format => :erb
+    create_view :slim, "| slim", :format => :slim
+    create_view :haml, "haml", :format => :haml
+    create_view :erb, "erb", :format => :erb
+    mock_app do
+      layout :bar
+      get("/slim") { render("slim.slim") }
+      get("/haml") { render("haml.haml") }
+      get("/erb") { render("erb.erb") }
+    end
+    get "/slim"
+    assert_equal "application layout for slim", body.chomp
+    get "/haml"
+    assert_equal "application layout for haml", body.chomp
+    get "/erb"
+    assert_equal "application layout for erb", body.chomp
+  end
+
   describe 'for application render functionality' do
 
     it 'should work properly with logging and missing layout' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -117,9 +117,9 @@ files:
 - lib/padrino-helpers/tag_helpers.rb
 - lib/padrino-helpers/translation_helpers.rb
 - lib/padrino/rendering.rb
-- lib/padrino/rendering/extensions/erubis.rb
-- lib/padrino/rendering/extensions/haml.rb
-- lib/padrino/rendering/extensions/slim.rb
+- lib/padrino/rendering/erubis_template.rb
+- lib/padrino/rendering/haml_template.rb
+- lib/padrino/rendering/slim_template.rb
 - padrino-helpers.gemspec
 - test/fixtures/apps/.components
 - test/fixtures/apps/.gitignore
@@ -206,6 +206,7 @@ files:
 - test/test_form_builder.rb
 - test/test_form_helpers.rb
 - test/test_format_helpers.rb
+- test/test_helpers.rb
 - test/test_locale.rb
 - test/test_number_helpers.rb
 - test/test_output_helpers.rb
@@ -324,6 +325,7 @@ test_files:
 - test/test_form_builder.rb
 - test/test_form_helpers.rb
 - test/test_format_helpers.rb
+- test/test_helpers.rb
 - test/test_locale.rb
 - test/test_number_helpers.rb
 - test/test_output_helpers.rb

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

@@ -1,74 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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