padrino-helpers 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 040e93999ca90d71fb40e3a334b1d2a504dfbd5c
-  data.tar.gz: 0fcdcd695f6de6325e60a2905c3e9b4bc3f8dfcf
+  metadata.gz: 228ed24dba7a04edaa171094b1a4b80fc755bb69
+  data.tar.gz: ccb711977c96a4543ffc80e2151a2575cf2bc89a
 SHA512:
-  metadata.gz: eb323c9277dc1a8c80ba5fb7d75bbb38797564fcd4030ca01a727814d0404cd8850bfb700894f979afd3a6c9183d12ac31948605739b005133891e0ba6ebecc6
-  data.tar.gz: e7cc3cba87861d21228c4b66470467edadcfd0920449b6e3b5837e741388e3c7fa8f403eec8cc08f9bab68926745dc8fcfe2891c0f5636899b8394fc52ccd0f8
+  metadata.gz: 69fbd42b69b64106ce3845dc94411a0ec3d67d829085fe8fa5ec4920682ed0ac888703ac91c49179a2fe971a23867d1fdc3f034fe6562ec61d02bb51a83c0525
+  data.tar.gz: 3222dff475ea7f212338858a203d2fde7d8f2a44b72ba64235a85aa877317feae0efe88c126937aac4a909396e06accaa2c532fb45823933f4cb5f37b0692f0b

data/lib/padrino-helpers.rb

@@ -6,7 +6,6 @@ require 'active_support/core_ext/string/conversions'  # to_date
 require 'active_support/option_merger'                # with_options
 require 'active_support/core_ext/object/with_options' # with_options
 require 'active_support/inflector'                    # humanize
-require 'active_support/core_ext/hash/except'         # Hash#except
 require 'padrino/rendering'
 
 FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__)

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

@@ -37,7 +37,9 @@ module Padrino
         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)
+          defaults = default_options(field, options)
+          defaults.delete(:value)
+          @template.label_tag(field_id(field), defaults, &block)
         end
 
         def hidden_field(field, options={})
@@ -110,7 +112,9 @@ module Padrino
 
         def file_field(field, options={})
           self.multipart = true
-          @template.file_field_tag field_name(field), default_options(field, options).except(:value)
+          defaults = default_options(field, options)
+          defaults.delete(:value)
+          @template.file_field_tag field_name(field), defaults
         end
 
         def submit(*args)
@@ -150,6 +154,13 @@ module Padrino
           [:hidden_field, :text_field, :text_area, :password_field, :file_field, :radio_button, :check_box, :select]
         end
 
+        ##
+        # Returns the human name of the field. Look that use builtin I18n.
+        #
+        def field_human_name(field)
+          I18n.translate("#{object_model_name}.attributes.#{field}", :count => 1, :default => field.to_s.humanize, :scope => :models)
+        end
+
         ##
         # Returns the name for the given field.
         # field_name(:username) => "user[username]"

data/lib/padrino-helpers/form_helpers.rb

@@ -45,7 +45,9 @@ module Padrino
         instance = builder_instance(object, options)
         # this can erect instance.multipart flag if the block calls instance.file_field
         html = capture_html(instance, &block)
-        options = { :multipart => instance.multipart }.update(options.except(:namespace, :as))
+        options = { :multipart => instance.multipart }.update(options)
+        options.delete(:as)
+        options.delete(:namespace)
         form_tag(url, options) { html }
       end
 
@@ -398,8 +400,7 @@ module Padrino
       #
       def text_area_tag(name, options={})
         inner_html = TagHelpers::NEWLINE + options.delete(:value).to_s
-        options = { :name => name, :rows => "", :cols => "" }.update(options)
-        content_tag(:textarea, inner_html, options)
+        content_tag(:textarea, inner_html, { :name => name }.update(options))
       end
 
       ##

data/lib/padrino/rendering.rb

@@ -34,6 +34,11 @@ module Padrino
       /~$/ # This is for Gedit
     ] unless defined?(IGNORE_FILE_PATTERN)
 
+    ##
+    # Defines common content-type alias mappings.
+    #
+    CONTENT_TYPE_ALIASES = { :htm => :html }
+
     ##
     # Default options used in the resolve_template-method.
     #
@@ -221,7 +226,7 @@ module Padrino
         # This means that no engine was explicitly defined
         data, engine = resolve_template(engine, options) if data.nil?
 
-        options[:layout] ||= false unless Rendering.engine_configurations.has_key?(engine)
+        ensure_rendering_engine(engine) || (options[:layout] ||= @layout || false)
 
         # Cleanup the template.
         @current_engine, engine_was = engine, @current_engine
@@ -345,13 +350,14 @@ module Padrino
       end
 
       def select_template(templates, template_path, content_type, _locale)
-        simple_content_type = [:html, :plain].include?(content_type)
+        symbol = content_type_symbol(content_type)
+        simple_content_type = [:html, :plain].include?(symbol)
         target_path, target_engine = path_and_engine(template_path)
 
-        templates.find{ |file,_| file.to_s == "#{target_path}.#{locale}.#{content_type}" } ||
+        templates.find{ |file,_| file.to_s == "#{target_path}.#{locale}.#{symbol}" } ||
         templates.find{ |file,_| file.to_s == "#{target_path}.#{locale}" && simple_content_type } ||
         templates.find{ |file,engine| engine == target_engine || File.extname(file.to_s) == ".#{target_engine}" } ||
-        templates.find{ |file,_| file.to_s == "#{target_path}.#{content_type}" } ||
+        templates.find{ |file,_| file.to_s == "#{target_path}.#{symbol}" } ||
         templates.find{ |file,_| file.to_s == "#{target_path}" && simple_content_type }
       end
 
@@ -361,7 +367,24 @@ module Padrino
         path = path.chomp(extname)
         path.insert(0, '/') unless Pathname.new(path).absolute?
         path = path.squeeze('/').sub(relative, '') if relative
-        [path.to_sym, engine]
+        [path.to_sym, engine.to_sym]
+      end
+
+      def ensure_rendering_engine(engine)
+        return true if settings.respond_to?(engine)
+        return nil unless engine == :erb
+        require 'erb'
+      rescue LoadError
+      else
+        require 'padrino/rendering/erb_template'
+        settings.set :erb, Padrino::Rendering.engine_configurations[:erb]
+      end
+
+      def content_type_symbol(type)
+        if defined?(::Rack::Mime::MIME_TYPES) && type.kind_of?(String)
+          type = ::Rack::Mime::MIME_TYPES.key(type).sub(/\./,'').to_sym
+        end
+        CONTENT_TYPE_ALIASES[type] || type
       end
     end
   end
@@ -395,13 +418,3 @@ unless defined? Padrino::Rendering::SlimTemplate
     require 'padrino/rendering/slim_template'
   end
 end
-
-if Padrino::Rendering.engine_configurations.empty? && !defined?(Padrino::IGNORE_NO_RENDERING_ENGINE)
-  warn <<-EOT
-WARNING: no supported rendering engine found. To use Padrino::Helpers and 
-Padrino::Rendering properly you should include `gem 'erubis'`, `gem 'haml'` 
-or `gem 'slim'` in your Gemfile. If you are confident about using 
-Padrino::Helpers without Padrino::Rendering, please define constant 
-`Padrino::IGNORE_NO_RENDERING_ENGINE = true` before `require 'padrino-helpers'`.
-  EOT
-end

data/lib/padrino/rendering/erb_template.rb

@@ -0,0 +1,40 @@
+module Padrino
+  module Rendering
+    class SafeERB < ::ERB
+      def set_eoutvar(compiler, eoutvar = '_erbout')
+        compiler.put_cmd = "#{eoutvar}.safe_concat"
+        compiler.insert_cmd = "#{eoutvar}.concat"
+        compiler.pre_cmd = ["#{eoutvar} = ActiveSupport::SafeBuffer.new"]
+        compiler.post_cmd = ["#{eoutvar}.force_encoding(__ENCODING__)"]
+      end
+    end
+
+    class ERBTemplate < Tilt::ERBTemplate
+      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[:safe_buffer])
+        super
+      end
+
+      def prepare
+        @outvar = options[:outvar] || self.class.default_output_variable
+        options[:trim] = '<>' if !(options[:trim] == false) && (options[:trim].nil? || options[:trim] == true)
+        @engine = SafeERB.new(data, options[:safe], options[:trim], @outvar)
+      end
+
+      def precompiled_preamble(locals)
+        original = super
+        return original unless @is_padrino_app
+        "__in_erb_template = true\n" << original
+      end
+    end
+  end
+end
+
+Tilt.prefer(Padrino::Rendering::ERBTemplate, :erb)
+
+Padrino::Rendering.engine_configurations[:erb] = {
+  :safe_buffer => true
+}

data/test/helper.rb

@@ -68,7 +68,7 @@ class MiniTest::Spec
     path  = "/views/#{name}"
     path += ".#{options.delete(:locale)}" if options[:locale].present?
     path += ".#{options[:format]}" if options[:format].present?
-    path += ".erb" unless options[:format].to_s =~ /erb|slim|haml|rss|atom|builder/
+    path += ".erb" unless options[:format].to_s =~ /erb|slim|haml|rss|atom|builder|liquid/
     path += ".builder" if options[:format].to_s =~ /rss|atom/
     file  = File.dirname(__FILE__) + path
     File.open(file, 'w') { |io| io.write content }

data/test/test_rendering.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'slim'
+require 'liquid'
 
 describe "Rendering" do
   def setup
@@ -87,6 +88,26 @@ describe "Rendering" do
       assert_equal "js file", body
     end
 
+    it 'should set and restore layout in controllers' do
+      create_layout :boo, "boo is a <%= yield %>"
+      create_layout :moo, "moo is a <%= yield %>"
+      create_view :foo, "liquid file", :format => :liquid
+      mock_app do
+        layout :boo
+        controller :moo do
+          layout :moo
+          get('/liquid') { render :foo }
+        end
+        controller :boo do
+          get('/liquid') { render :foo }
+        end
+      end
+      get "/moo/liquid"
+      assert_equal "moo is a liquid file", body
+      get "/boo/liquid"
+      assert_equal "boo is a liquid file", body
+    end
+
     it 'should use correct layout for each format' do
       create_layout :application, "this is an <%= yield %>"
       create_layout :application, "document start <%= yield %> end", :format => :xml
@@ -116,6 +137,20 @@ describe "Rendering" do
       assert_equal "html file", body
     end
 
+    it 'should find proper templates when content_type is set by string' do
+      create_layout :error, "layout<%= yield %>"
+      create_view :e404, "404 file"
+
+      mock_app do
+        not_found do
+          content_type 'text/html'
+          render 'e404', :layout => :error
+        end
+      end
+      get '/missing'
+      assert_equal 'layout404 file', body
+    end
+
     it 'should not use html file when DEFAULT_RENDERING_OPTIONS[:strict_format] == true' do
       create_layout :foo, "html file", :format => :html
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,46 +19,46 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.5
+        version: 0.12.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.5
+        version: 0.12.6
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.7
 description: Tag helpers, asset helpers, form helpers, form builders and many more
@@ -69,9 +69,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".yardopts"
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -116,6 +116,7 @@ files:
 - lib/padrino-helpers/tag_helpers.rb
 - lib/padrino-helpers/translation_helpers.rb
 - lib/padrino/rendering.rb
+- lib/padrino/rendering/erb_template.rb
 - lib/padrino/rendering/erubis_template.rb
 - lib/padrino/rendering/haml_template.rb
 - lib/padrino/rendering/slim_template.rb
@@ -224,22 +225,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-helpers
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Helpers for padrino