padrino-helpers 0.14.0.rc2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d09f356d574dade9184047d8cfea562f7c05dc
-  data.tar.gz: e22cdc11c645e69234b352533d57f1d178f933fc
+  metadata.gz: b68d97255577ac8149b6bcb22bbd28d9c3d7e17c
+  data.tar.gz: 963950d1cabb60cd1df99fa50d3e2a4ceef23479
 SHA512:
-  metadata.gz: fb80bdd1e58b3f2f53509ca8d4bae186a4a75799c2f4e191ebccffbe7325364b7d25fac93f6a9ff4360709972759fd12cc4b043f333e1bae4343b12731b1a595
-  data.tar.gz: 7e3506a11a695b0755abc1e5f8bf892566ee2bcb8e0b55146f78c4d0b24226bf572cf327ffdc91918e985f9adddc9165936ce13acf36b56db3f9552961c36dc1
+  metadata.gz: 51a22336e7d329069ad6722eba3f853e2230e212105dcedd64b2dc417cb236d4776f9d7bf656ec8b849e9f4186b57af92c0d9eb45b40bc2c6e0456d299ee0fe8
+  data.tar.gz: 0e020f0a6b89ed5d496b02c595ecee89849a63398cdfc599d738f43a0365f2d85e696b8b6886b1f78921cbb202bb518aaf0bbf34d408a677da3b86916f01beb8

data/lib/padrino-helpers/locale/es.yml

@@ -99,5 +99,5 @@ es:
       template:
         header:
           one:    "1 error impidió que %{model} se guardara"
-          other:  "%{count} erroress impidieron que %{model} se guardara"
+          other:  "%{count} errores impidieron que %{model} se guardara"
         body: "Hay problemas con los siguientes campos:"

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

@@ -23,6 +23,7 @@ module Padrino
       end
       OutputHelpers.register(:erb, ErbHandler)
       OutputHelpers.register(:erubis, ErbHandler)
+      OutputHelpers.register(:erubi, ErbHandler)
     end
   end
 end

data/lib/padrino-helpers/render_helpers.rb

@@ -31,7 +31,7 @@ module Padrino
       # @note If using this from Sinatra, pass explicit +:engine+ option
       #
       def partial(template, options={}, &block)
-        options = { :locals => {}, :layout => false }.update(options)
+        options = options.dup
         explicit_engine = options.delete(:engine)
 
         path, _, name = template.to_s.rpartition(File::SEPARATOR)
@@ -44,15 +44,15 @@ module Padrino
           [[options.delete(:object)], nil]
         end
 
-        locals = options[:locals]
+        locals = options.delete(:locals) || {}
         items.each_with_object(SafeBuffer.new) do |item,html|
           locals[item_name] = item if item
           locals["#{item_name}_counter".to_sym] = counter += 1 if counter
           content =
             if block_given?
-              concat_content render(explicit_engine, template_path, options){ capture_html(&block) }
+              concat_content(render(explicit_engine, template_path, options, locals) { capture_html(&block) })
             else
-              render(explicit_engine, template_path, options)
+              render(explicit_engine, template_path, options, locals)
             end
           html.safe_concat content if content
         end
@@ -65,7 +65,6 @@ module Padrino
             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

data/lib/padrino/rendering.rb

@@ -382,3 +382,12 @@ unless defined? Padrino::Rendering::SlimTemplate
     require 'padrino/rendering/slim_template'
   end
 end
+
+unless defined? Padrino::Rendering::ErubiTemplate
+  begin
+    require 'erubi'
+  rescue LoadError
+  else
+    require 'padrino/rendering/erubi_template'
+  end
+end

data/lib/padrino/rendering/erubi_template.rb

@@ -0,0 +1,37 @@
+module Padrino
+  module Rendering
+    module Erubi
+      module SafeBufferEnhancer
+        def add_expression_result(code)
+          @src << " @__in_ruby_literal = true; #{bufvar}.concat((" << code << ').to_s); @__in_ruby_literal = false;'
+        end
+
+        def add_expression_result_escaped(code)
+          @src << " #{bufvar}.safe_concat (" << code << ");"
+        end
+
+        def add_text(text)
+          @src << " #{bufvar}.safe_concat '" << text.gsub(/['\\]/, '\\\\\&') << "';" unless text.empty?
+        end
+      end
+    end
+
+    class SafeErubi < ::Erubi::Engine
+      include Erubi::SafeBufferEnhancer
+    end
+
+    class ErubiTemplate < Tilt::ErubiTemplate
+      def precompiled_preamble(*)
+        "__in_erb_template = true\n" << super
+      end
+    end
+  end
+end
+
+Tilt.prefer(Padrino::Rendering::ErubiTemplate, :erb)
+
+Padrino::Rendering.engine_configurations[:erb] = {
+  :bufval => "SafeBuffer.new",
+  :bufvar => "@_out_buf",
+  :engine_class => Padrino::Rendering::SafeErubi
+}

data/test/test_rendering.rb

@@ -622,6 +622,23 @@ describe "Rendering" do
       assert_equal 'this is a <span>span</span>', body
     end
 
+    it 'should render unescaped html on == token (Erubis and Erubi)' do
+      skip if ENV['ERB_ENGINE'] == 'stdlib'
+      mock_app do
+        layout do
+          "<%= yield %>"
+        end
+
+        get "/" do
+          render  :erb, '<%== "<script></script>" %>'
+        end
+      end
+
+      get "/"
+      assert ok?
+      assert_equal "<script></script>", body
+    end
+
     it 'should render haml to a SafeBuffer' do
       mock_app do
         layout do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.14.0.rc2
+  version: 0.14.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-03-15 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.rc2
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc2
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,7 @@ files:
 - lib/padrino/core_ext/output_safety.rb
 - lib/padrino/rendering.rb
 - lib/padrino/rendering/erb_template.rb
+- lib/padrino/rendering/erubi_template.rb
 - lib/padrino/rendering/erubis_template.rb
 - lib/padrino/rendering/haml_template.rb
 - lib/padrino/rendering/slim_template.rb
@@ -242,12 +243,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: padrino-helpers
-rubygems_version: 2.6.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Helpers for padrino