padrino-helpers 0.14.0.2 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c4121918eb605bf34851cc7eb66d3e04cde3075
-  data.tar.gz: e702062920b5999b527ed97848e84e8eabd9576a
+  metadata.gz: 0aedec3da2a6164e6ea901cd5c17d5d96a45ac18
+  data.tar.gz: 23448eb96d10c43b54da803996c142b92aa0dffa
 SHA512:
-  metadata.gz: e07cca38d7a864db57fd2a80e66c68084122fac37455456beea4e2c7683745d5c70915d0d27d591469a0602e44cf049038d222d9490e23df4e630addf1188b5b
-  data.tar.gz: 57d06a0d13bda7e6356e02f81ddaf901e08582bf71d99e38d54e3bd3a82ddf165dcbd6c86c4fff479bf0fe3cbfaf4addd07d9353bd8be224fbd69e6244e6cb5c
+  metadata.gz: 037c40c71d6f0ef00f9f58ee6c9ffac3dd68b656013ddd7c3ec4dfe01d99f9cfce19653530f924a32d77535223e1cce07e4b4f8a185b920c07e981d2205e832e
+  data.tar.gz: 8ad075ff1b96642c437ba95655299154c621bb5a441c96ef84f6098b2b0614464fd3e637b01fa66ccd73e0e0904446e9fa80723ba702678d394b4461e9748512

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

@@ -1,25 +1,41 @@
 module Padrino
   module Helpers
     module OutputHelpers
-      ##
-      # Handler for Haml templates.
-      #
-      class HamlHandler < AbstractHandler
+      # Haml and Hamlit require different detection code
+      if Tilt.template_for('.haml').to_s == "Padrino::Rendering::HamlTemplate"
         ##
-        # Returns true if the block is for Haml
+        # Handler for Haml templates.
         #
-        def engine_matches?(block)
-          template.block_is_haml?(block)
-        end
+        class HamlHandler < AbstractHandler
+          ##
+          # Returns true if the block is for Haml
+          #
+          def engine_matches?(block)
+            template.block_is_haml?(block)
+          end
 
+          ##
+          # Captures the html from a block of template code for this handler.
+          #
+          def capture_from_template(*args, &block)
+            engine_matches?(block) ? template.capture_haml(*args, &block) : yield(*args)
+          end
+        end
+        OutputHelpers.register(:haml, HamlHandler)
+      else
         ##
-        # Captures the html from a block of template code for this handler.
+        # Handler for Haml templates.
         #
-        def capture_from_template(*args, &block)
-          engine_matches?(block) ? template.capture_haml(*args, &block) : yield(*args)
+        class HamlitHandler < AbstractHandler
+          ##
+          # Returns true if the block is for Hamlit.
+          #
+          def engine_matches?(block)
+            block.binding.eval('defined? __in_hamlit_template')
+          end
         end
+        OutputHelpers.register(:haml, HamlitHandler)
       end
-      OutputHelpers.register(:haml, HamlHandler)
     end
   end
 end

data/lib/padrino-helpers/render_helpers.rb

@@ -65,6 +65,7 @@ module Padrino
             fail "gem 'tilt' is required" unless defined?(::Tilt)
 
             def render(engine, file=nil, options={}, locals=nil, &block)
+              options.delete(:layout)
               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

data/lib/padrino/rendering.rb

@@ -179,6 +179,50 @@ module Padrino
 
       private
 
+      def render_like_sinatra(engine, data, options={}, locals={}, &block)
+        # merge app-level options
+        engine_options = settings.respond_to?(engine) ? settings.send(engine) : {}
+        options = engine_options.merge(options)
+
+        # extract generic options
+        locals          = options.delete(:locals) || locals         || {}
+        views           = options.delete(:views)  || settings.views || "./views"
+        layout          = options[:layout]
+        layout          = false if layout.nil? && options.include?(:layout)
+        eat_errors      = layout.nil?
+        layout          = engine_options[:layout] if layout.nil? or (layout == true && engine_options[:layout] != false)
+        layout          = @default_layout         if layout.nil? or layout == true
+        layout_options  = options.delete(:layout_options) || {}
+        content_type    = options.delete(:default_content_type)
+        content_type    = options.delete(:content_type)   || content_type
+        layout_engine   = options.delete(:layout_engine)  || engine
+        scope           = options.delete(:scope)          || self
+        options.delete(:layout)
+
+        # set some defaults
+        options[:default_encoding] ||= settings.default_encoding
+
+        # compile and render template
+        begin
+          layout_was      = @default_layout
+          @default_layout = false
+          template        = compile_template(engine, data, options, views)
+          output          = template.render(scope, locals, &block)
+        ensure
+          @default_layout = layout_was
+        end
+
+        # render layout
+        if layout
+          layout_engine_options = settings.respond_to?(layout_engine) ? settings.send(layout_engine).dup : {}
+          options = layout_engine_options.update(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope).update(layout_options)
+          catch(:layout_missing) { return render_like_sinatra(layout_engine, layout, options, locals) { output } }
+        end
+
+        output.extend(Sinatra::Base::ContentTyped).content_type = content_type if content_type
+        output
+      end
+
       ##
       # Enhancing Sinatra render functionality for:
       #
@@ -210,7 +254,7 @@ module Padrino
         @_out_buf,  buf_was = SafeBuffer.new, @_out_buf
 
         # Pass arguments to Sinatra render method.
-        super(engine, data, with_layout(options), locals, &block)
+        render_like_sinatra(engine, data, with_layout(options), locals, &block)
       ensure
         @current_engine = engine_was
         @_out_buf = buf_was
@@ -365,6 +409,15 @@ unless defined? Padrino::Rendering::HamlTemplate
   end
 end
 
+unless defined? Padrino::Rendering::HamlitTemplate
+  begin
+    require 'hamlit'
+  rescue LoadError
+  else
+    require 'padrino/rendering/hamlit_template'
+  end
+end
+
 unless defined? Padrino::Rendering::ErubisTemplate
   begin
     require 'erubis'

data/lib/padrino/rendering/erb_template.rb

@@ -48,5 +48,6 @@ end
 Tilt.prefer(Padrino::Rendering::ERBTemplate, :erb)
 
 Padrino::Rendering.engine_configurations[:erb] = {
-  :safe_buffer => true
+  :safe_buffer => true,
+  :outvar => '@_out_buf',
 }

data/lib/padrino/rendering/erubis_template.rb

@@ -63,4 +63,5 @@ Tilt.prefer(Padrino::Rendering::ErubisTemplate, :erb)
 
 Padrino::Rendering.engine_configurations[:erb] = {
   :engine_class => Padrino::Rendering::SafeEruby,
+  :outvar => '@_out_buf',
 }

data/lib/padrino/rendering/hamlit_template.rb

@@ -0,0 +1,35 @@
+module Padrino
+  module Rendering
+    class HamlitOutputBuffer < Temple::Generators::StringBuffer
+      define_options :buffer_class => 'SafeBuffer'
+
+      def call(exp)
+        [preamble, compile(exp), postamble].flatten.compact.join('; '.freeze)
+      end
+
+      def create_buffer
+        "#{buffer} = #{options[:buffer_class]}.new"
+      end
+
+      def concat(str)
+        "#{buffer}.safe_concat((#{str}))"
+      end
+    end
+
+    class HamlitTemplate < Hamlit::Template
+      include SafeTemplate
+
+      def precompiled_preamble(locals)
+        "__in_hamlit_template = true\n" << super
+      end
+    end
+  end
+end
+
+Tilt.prefer(Padrino::Rendering::HamlitTemplate, :haml)
+
+Padrino::Rendering.engine_configurations[:haml] = {
+  :generator => Padrino::Rendering::HamlitOutputBuffer,
+  :buffer => "@_out_buf",
+  :use_html_safe => true,
+}

data/test/test_rendering_extensions.rb

@@ -3,6 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 describe "Rendering Extensions" do
   describe 'for haml' do
     it 'should render haml_tag correctly' do
+      skip unless Padrino::Helpers::OutputHelpers.handlers[:haml].to_s == "Padrino::Helpers::OutputHelpers::HamlHandler"
+
       mock_app do
         get('/') { render :haml, '-haml_tag :div'}
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.14.0.2
+  version: 0.14.1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-16 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.14.0.2
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.2
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - lib/padrino/rendering/erubi_template.rb
 - lib/padrino/rendering/erubis_template.rb
 - lib/padrino/rendering/haml_template.rb
+- lib/padrino/rendering/hamlit_template.rb
 - lib/padrino/rendering/slim_template.rb
 - lib/padrino/safe_buffer.rb
 - padrino-helpers.gemspec