padrino-helpers 0.13.3 → 0.13.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fae667093f9d16b75e8d85e0285d3c312aecb800
-  data.tar.gz: 989e8e9811af48ac97cab76747c9eb367ad91a8f
+  metadata.gz: 5dd540d3a9472d8c134bab1741faf3f69ae62166
+  data.tar.gz: 036a523946eefb56ec7892ead4e6df2c5f200d87
 SHA512:
-  metadata.gz: de540aac4ac602e597a8f86f15a5517fc078fa93a6ad85d392c7e8a4106e4d365ce46b9159cead733851e87df240a956a92c9fa3543797f6324546424ece56c1
-  data.tar.gz: c26cff77011c615f9b81662ffa2e4215e864e915a454093fc693bebf23d57fda2cad5dcafa8cbcbe5b3c539385b430679f2f55607d51ce13113b05b7914dc057
+  metadata.gz: 734ebfd2d7817d8feb9221f9037df2da53923552cc961b7a6a60573539410dab665fbcc99f40296492f8cca611147c0aef6d64b533ba27d93f974f34c0e378b8
+  data.tar.gz: f8b6b1a10621c16c53786bc20b3494508f07e160bf94b788020a55e407ac443ebcb779e33c7282d7a1b47238e8b9f111b36c306eb1bbc8cd04d3250bfd1d5b1c

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -32,9 +32,9 @@ module Padrino
       def flash_tag(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         bootstrap = options.delete(:bootstrap) if options[:bootstrap]
-        args.inject(ActiveSupport::SafeBuffer.new) do |html,kind|
-          flash_text = ActiveSupport::SafeBuffer.new << flash[kind]
-          next html if flash_text.blank?
+        args.inject(SafeBuffer.new) do |html,kind|
+          next html unless flash[kind]
+          flash_text = SafeBuffer.new << flash[kind]
           flash_text << content_tag(:button, '&times;'.html_safe, {:type => :button, :class => :close, :'data-dismiss' => :alert}) if bootstrap
           html << content_tag(:div, flash_text, { :class => kind }.update(options))
         end
@@ -243,8 +243,8 @@ module Padrino
         options = {
           :rel => 'stylesheet',
           :type => 'text/css'
-        }.update(sources.last.is_a?(Hash) ? sources.pop.symbolize_keys : {})
-        sources.flatten.inject(ActiveSupport::SafeBuffer.new) do |all,source|
+        }.update(sources.last.is_a?(Hash) ? Utils.symbolize_keys(sources.pop) : {})
+        sources.flatten.inject(SafeBuffer.new) do |all,source|
           all << tag(:link, { :href => asset_path(:css, source) }.update(options))
         end
       end
@@ -266,8 +266,8 @@ module Padrino
       def javascript_include_tag(*sources)
         options = {
           :type => 'text/javascript'
-        }.update(sources.last.is_a?(Hash) ? sources.pop.symbolize_keys : {})
-        sources.flatten.inject(ActiveSupport::SafeBuffer.new) do |all,source|
+        }.update(sources.last.is_a?(Hash) ? Utils.symbolize_keys(sources.pop) : {})
+        sources.flatten.inject(SafeBuffer.new) do |all,source|
           all << content_tag(:script, nil, { :src => asset_path(:js, source) }.update(options))
         end
       end

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

@@ -155,7 +155,7 @@ module Padrino
           include_index = default_collection.respond_to?(:each)
 
           nested_options = { :parent => self, :association => child_association }
-          Array(collection).each_with_index.inject(ActiveSupport::SafeBuffer.new) do |all,(child_instance,index)|
+          Array(collection).each_with_index.inject(SafeBuffer.new) do |all,(child_instance,index)|
             nested_options[:index] = options[:index] || (include_index ? index : nil)
             all << @template.fields_for(child_instance,  { :nested => nested_options, :builder => self.class }, &block) << "\n"
           end
@@ -196,7 +196,7 @@ module Padrino
         # field_name(:street) => "user[addresses_attributes][0][street]"
         def field_name(field=nil)
           result = field_name_fragment
-          result << "[#{field}]" unless field.blank?
+          result << "[#{field}]" if field
           result
         end
 
@@ -209,8 +209,8 @@ module Padrino
         def field_id(field=nil, value=nil)
           result = (namespace && !is_nested) ? "#{namespace}_" : ''
           result << field_id_fragment
-          result << "_#{field}" unless field.blank?
-          result << "_#{value}" unless value.blank?
+          result << "_#{field}" if field
+          result << "_#{value}" if value
           result
         end
 
@@ -242,7 +242,7 @@ module Padrino
           options = { :id => field_id(field), :selected => field_value(field) }.update(options)
           options.update(error_class(field)){ |_,*values| values.compact.join(' ') }
           selected_values = resolve_checked_values(field, options)
-          variants_for_group(options).inject(ActiveSupport::SafeBuffer.new) do |html, (caption,value)|
+          variants_for_group(options).inject(SafeBuffer.new) do |html, (caption,value)|
             variant_id = "#{options[:id]}_#{value}"
             attributes = { :value => value, :id => variant_id, :checked => selected_values.include?(value) }
             caption = yield(attributes) << ' ' << caption
@@ -308,7 +308,7 @@ module Padrino
 
         def error_class(field)
           error = @object.errors[field] if @object.respond_to?(:errors)
-          error.blank? ? {} : { :class => 'invalid' }
+          error.nil? || error.empty? ? {} : { :class => 'invalid' }
         end
 
         def default_options(field, options, defaults={})

data/lib/padrino-helpers/form_helpers.rb

@@ -121,7 +121,7 @@ module Padrino
       #   hidden_form_method_field('delete')
       #
       def hidden_form_method_field(desired_method)
-        return ActiveSupport::SafeBuffer.new if desired_method.blank? || desired_method.to_s =~ /get|post/i
+        return SafeBuffer.new if desired_method.nil? || desired_method.to_s =~ /get|post/i
         hidden_field_tag(:_method, :value => desired_method)
       end
 
@@ -144,7 +144,7 @@ module Padrino
       #
       def field_set_tag(*args, &block)
         options = args.last.is_a?(Hash) ? args.pop : {}
-        legend_html = args.empty? ? ActiveSupport::SafeBuffer.new : content_tag(:legend, args.first)
+        legend_html = args.empty? ? SafeBuffer.new : content_tag(:legend, args.first)
         concat_content content_tag(:fieldset, legend_html << capture_html(&block), options)
       end
 
@@ -168,7 +168,7 @@ module Padrino
       #
       def label_tag(name, options={}, &block)
         options = { :caption => "#{name.to_s.humanize}: ", :for => name }.update(options)
-        caption_text = ActiveSupport::SafeBuffer.new << options.delete(:caption)
+        caption_text = SafeBuffer.new << options.delete(:caption)
         caption_text << "<span class='required'>*</span> ".html_safe if options.delete(:required)
 
         if block_given?

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

@@ -37,10 +37,10 @@ module Padrino
         #   error_messages_for :user
         #
         def error_messages_for(*objects)
-          options = objects.last.is_a?(Hash) ? objects.pop.symbolize_keys : {}
+          options = objects.last.is_a?(Hash) ? Utils.symbolize_keys(objects.pop) : {}
           objects = objects.map{ |obj| resolve_object(obj) }.compact
           count   = objects.inject(0){ |sum, object| sum + object.errors.count }
-          return ActiveSupport::SafeBuffer.new if count.zero?
+          return SafeBuffer.new if count.zero?
 
           content_tag(:div, error_contents(objects, count, options), error_html_attributes(options))
         end
@@ -78,7 +78,7 @@ module Padrino
         # @api public
         def error_message_on(object, field, options={})
           error = Array(resolve_object(object).errors[field]).first
-          return ActiveSupport::SafeBuffer.new unless error
+          return SafeBuffer.new unless error
           options = { :tag => :span, :class => :error }.update(options)
           tag   = options.delete(:tag)
           error = [options.delete(:prepend), error, options.delete(:append)].compact.join(" ")
@@ -90,7 +90,7 @@ module Padrino
         def error_contents(objects, count, options)
           object_name = options[:object_name] || objects.first.class.to_s.underscore.gsub(/\//, ' ')
 
-          contents = ActiveSupport::SafeBuffer.new
+          contents = SafeBuffer.new
           contents << error_header_tag(options, object_name, count)
           contents << error_body_tag(options)
           contents << error_list_tag(objects, object_name)
@@ -98,7 +98,7 @@ module Padrino
 
         def error_list_tag(objects, object_name)
           errors = objects.inject({}){ |all,object| all.update(object.errors) }
-          error_messages = errors.inject(ActiveSupport::SafeBuffer.new) do |all, (field, message)|
+          error_messages = errors.inject(SafeBuffer.new) do |all, (field, message)|
             field_name = I18n.t(field, :default => field.to_s.humanize, :scope => [:models, object_name, :attributes])
             all << content_tag(:li, "#{field_name} #{message}")
           end
@@ -110,19 +110,19 @@ module Padrino
             model_name = I18n.t(:name, :default => object_name.humanize, :scope => [:models, object_name], :count => 1)
             I18n.t :header, :count => count, :model => model_name, :locale => options[:locale], :scope => [:models, :errors, :template]
           end
-          content_tag(options[:header_tag] || :h2, header_message) if header_message.present?
+          content_tag(options[:header_tag] || :h2, header_message) unless header_message.empty?
         end
 
         def error_body_tag(options)
           body_message = options[:message] || I18n.t(:body, :locale => options[:locale], :scope => [:models, :errors, :template])
-          content_tag(:p, body_message) if body_message.present?
+          content_tag(:p, body_message) unless body_message.empty?
         end
 
         def error_html_attributes(options)
           [:id, :class, :style].each_with_object({}) do |key,all|
             if options.include?(key)
               value = options[key]
-              all[key] = value unless value.blank?
+              all[key] = value if value
             else
               all[key] = 'field-errors' unless key == :style
             end

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

@@ -55,7 +55,7 @@ module Padrino
         # Returns the options tags for a select based on the given option items.
         #
         def options_for_select(option_items, state = {})
-          return [] if option_items.blank?
+          return [] if option_items.count == 0
           option_items.map do |caption, value, attributes|
             html_attributes = { :value => value || caption }.merge(attributes||{})
             html_attributes[:selected] ||= option_is_selected?(html_attributes[:value], caption, state[:selected])

data/lib/padrino-helpers/format_helpers.rb

@@ -216,7 +216,7 @@ module Padrino
       def highlight(text, words, *args)
         options = { :highlighter => '<strong class="highlight">\1</strong>' }.update(args.last.is_a?(Hash) ? args.pop : {})
 
-        if text.blank? || words.blank?
+        if text.empty? || words.empty?
           text
         else
           match = Array(words).map { |p| Regexp.escape(p) }.join('|')

data/lib/padrino-helpers/number_helpers.rb

@@ -41,7 +41,7 @@ module Padrino
       #   # => 1234567890,50 £
       #
       def number_to_currency(number, options = {})
-        options.symbolize_keys!
+        options = Utils.symbolize_keys(options)
 
         defaults  = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
         currency  = I18n.translate(:'number.currency.format', :locale => options[:locale], :raise => true) rescue {}
@@ -89,7 +89,7 @@ module Padrino
       #   number_to_percentage(302.24398923423, :precision => 5)           # => 302.24399%
       #
       def number_to_percentage(number, options = {})
-        options.symbolize_keys!
+        options = Utils.symbolize_keys(options)
 
         defaults   = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
         percentage = I18n.translate(:'number.percentage.format', :locale => options[:locale], :raise => true) rescue {}
@@ -134,8 +134,7 @@ module Padrino
       #   # => 98 765 432,98
       #
       def number_with_delimiter(number, *args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        options.symbolize_keys!
+        options = args.last.is_a?(Hash) ? Utils.symbolize_keys(args.pop) : {}
 
         defaults = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
 
@@ -178,8 +177,7 @@ module Padrino
       #   # => 1.111,23
       #
       def number_with_precision(number, *args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        options.symbolize_keys!
+        options = args.last.is_a?(Hash) ? Utils.symbolize_keys(args.pop) : {}
 
         defaults           = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
         precision_defaults = I18n.translate(:'number.precision.format', :locale => options[:locale],
@@ -239,8 +237,7 @@ module Padrino
       def number_to_human_size(number, *args)
         return nil if number.nil?
 
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        options.symbolize_keys!
+        options = args.last.is_a?(Hash) ? Utils.symbolize_keys(args.pop) : {}
 
         defaults = I18n.translate(:'number.format', :locale => options[:locale], :raise => true) rescue {}
         human    = I18n.translate(:'number.human.format', :locale => options[:locale], :raise => true) rescue {}

data/lib/padrino-helpers/output_helpers.rb

@@ -53,9 +53,9 @@ module Padrino
       #   capture_html(object_for_block, &block) => "...html..."
       #
       # @example
-      #   ActiveSupport::SafeBuffer.new + capture_html { "<foo>" }
+      #   SafeBuffer.new + capture_html { "<foo>" }
       #   # => "&lt;foo&gt;"
-      #   ActiveSupport::SafeBuffer.new.safe_concat(capture_html { "<foo>" })
+      #   SafeBuffer.new.safe_concat(capture_html { "<foo>" })
       #   # => "<foo>"
       #
       def capture_html(*args, &block)
@@ -181,7 +181,7 @@ module Padrino
       def yield_content(key, *args)
         blocks = content_blocks[key.to_sym]
         return nil if blocks.empty?
-        blocks.inject(ActiveSupport::SafeBuffer.new){ |all,content| all << capture_html(*args, &content) }
+        blocks.inject(SafeBuffer.new){ |all,content| all << capture_html(*args, &content) }
       end
 
       protected
@@ -213,7 +213,7 @@ module Padrino
       #
       # @param [String, Array<String>] the values to be marked safe.
       #
-      # @return [ActiveSupport::SafeBuffer, Array<ActiveSupport::SafeBuffer>]
+      # @return [SafeBuffer, Array<SafeBuffer>]
       def mark_safe(value)
         if value.respond_to? :map!
           value.map!{|v| v.html_safe if v }

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

@@ -29,7 +29,7 @@ module Padrino
         #   @handler.capture_from_template(&block) => "...html..."
         #
         def capture_from_template(*args, &block)
-          self.output_buffer, _buf_was = ActiveSupport::SafeBuffer.new, self.output_buffer
+          self.output_buffer, _buf_was = SafeBuffer.new, self.output_buffer
           raw = yield(*args)
           captured = template.instance_variable_get(:@_out_buf)
           self.output_buffer = _buf_was

data/lib/padrino-helpers/render_helpers.rb

@@ -34,8 +34,8 @@ module Padrino
         options = { :locals => {}, :layout => false }.update(options)
         explicit_engine = options.delete(:engine)
 
-        path, name = File.split(template.to_s)
-        template_path = File.join(path,"_#{name}").to_sym
+        path, _, name = template.to_s.rpartition(File::SEPARATOR)
+        template_path = path.empty? ? :"_#{name}" : :"#{path}#{File::SEPARATOR}_#{name}"
         item_name = name.partition('.').first.to_sym
 
         items, counter = if options[:collection].respond_to?(:inject)
@@ -45,7 +45,7 @@ module Padrino
         end
 
         locals = options[:locals]
-        items.each_with_object(ActiveSupport::SafeBuffer.new) do |item,html|
+        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 =

data/lib/padrino-helpers/tag_helpers.rb

@@ -124,7 +124,7 @@ module Padrino
 
         options    = parse_data_options(name, options)
         attributes = tag_attributes(options)
-        output = ActiveSupport::SafeBuffer.new
+        output = SafeBuffer.new
         output.safe_concat "<#{name}#{attributes}>"
         if content.respond_to?(:each) && !content.is_a?(String)
           content.each{ |item| output.concat item; output.safe_concat NEWLINE }

data/lib/padrino/core_ext/output_safety.rb

@@ -0,0 +1,25 @@
+if defined?(ActiveSupport::SafeBuffer)
+  SafeBuffer = ActiveSupport::SafeBuffer
+else
+  require 'padrino/safe_buffer'
+
+  SafeBuffer = Padrino::SafeBuffer
+
+  class String
+    def html_safe
+      SafeBuffer.new(self)
+    end
+  end
+
+  class Object
+    def html_safe?
+      false
+    end
+  end
+
+  class Numeric
+    def html_safe?
+      true
+    end
+  end
+end

data/lib/padrino/rendering.rb

@@ -1,3 +1,4 @@
+require 'padrino/core_ext/output_safety'
 require 'padrino-support'
 require 'pathname'
 
@@ -206,7 +207,7 @@ module Padrino
 
         # Cleanup the template.
         @current_engine, engine_was = engine, @current_engine
-        @_out_buf,  buf_was = ActiveSupport::SafeBuffer.new, @_out_buf
+        @_out_buf,  buf_was = SafeBuffer.new, @_out_buf
 
         # Pass arguments to Sinatra render method.
         super(engine, data, with_layout(options), locals, &block)
@@ -276,7 +277,7 @@ module Padrino
           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?
+          fail TemplateNotFound, "Layout '#{template_path}' not found in '#{layouts_path}'" if !selected_template && layout
           selected_template
         end
       end
@@ -287,7 +288,7 @@ module Padrino
         return options if layout == false
 
         layout = @layout if !layout || layout == true
-        return options if settings.templates.has_key?(:layout) && layout.blank?
+        return options if settings.templates.has_key?(:layout) && !layout
 
         if layout.kind_of?(String) && Pathname.new(layout).absolute?
           layout_path, _, layout = layout.rpartition('/')
@@ -300,8 +301,8 @@ module Padrino
 
       def glob_templates(views_path, template_path)
         parts = []
-        parts << views_path if views_path.present?
-        if respond_to?(:request) && request.respond_to?(:controller) && request.controller.present? && Pathname.new(template_path).relative?
+        parts << views_path if views_path
+        if respond_to?(:request) && request.respond_to?(:controller) && request.controller && Pathname.new(template_path).relative?
           parts << "{,#{request.controller}}"
         end
         parts << template_path.chomp(File.extname(template_path)) + '.*'

data/lib/padrino/rendering/erb_template.rb

@@ -16,7 +16,7 @@ module Padrino
       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.pre_cmd = ["#{eoutvar} = SafeBuffer.new"]
         compiler.post_cmd = ["#{eoutvar}.force_encoding(__ENCODING__)"]
       end
     end

data/lib/padrino/rendering/erubis_template.rb

@@ -2,7 +2,7 @@ module Padrino
   module Rendering
     ##
     # SafeBufferEnhancer is an Erubis Enhancer that compiles templates that
-    # are fit for using ActiveSupport::SafeBuffer as a Buffer.
+    # are fit for using SafeBuffer as a Buffer.
     #
     # @api private
     module SafeBufferEnhancer
@@ -53,7 +53,7 @@ module Padrino
       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"
+        "__in_erb_template = true\n" << original.rpartition("\n").first << "#{@outvar} = _buf = SafeBuffer.new\n"
       end
     end
   end

data/lib/padrino/rendering/slim_template.rb

@@ -1,5 +1,21 @@
 module Padrino
   module Rendering
+    class SlimOutputBuffer < 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 SlimTemplate < Slim::Template
       include SafeTemplate
 
@@ -13,7 +29,7 @@ end
 Tilt.prefer(Padrino::Rendering::SlimTemplate, :slim)
 
 Padrino::Rendering.engine_configurations[:slim] = {
-  :generator => Temple::Generators::RailsOutputBuffer,
+  :generator => Padrino::Rendering::SlimOutputBuffer,
   :buffer => "@_out_buf",
   :use_html_safe => true,
   :disable_capture => true,

data/lib/padrino/safe_buffer.rb

@@ -0,0 +1,118 @@
+module Padrino
+  ##
+  # Padrino::SafeBuffer is based on ActiveSupport::SafeBuffer
+  #
+  class SafeBuffer < String
+    UNSAFE_STRING_METHODS = %w(
+      capitalize chomp chop delete downcase gsub lstrip next reverse rstrip
+      slice squeeze strip sub succ swapcase tr tr_s upcase
+    )
+
+    alias_method :original_concat, :concat
+    private :original_concat
+
+    class SafeConcatError < StandardError
+      def initialize
+        super "Could not concatenate to the buffer because it is not html safe."
+      end
+    end
+
+    def [](*args)
+      if args.size < 2
+        super
+      else
+        if html_safe?
+          new_safe_buffer = super
+
+          if new_safe_buffer
+            new_safe_buffer.instance_variable_set :@html_safe, true
+          end
+
+          new_safe_buffer
+        else
+          to_str[*args]
+        end
+      end
+    end
+
+    def safe_concat(value)
+      raise SafeConcatError unless html_safe?
+      original_concat(value)
+    end
+
+    def initialize(str = "")
+      @html_safe = true
+      super
+    end
+
+    def initialize_copy(other)
+      super
+      @html_safe = other.html_safe?
+    end
+
+    def clone_empty
+      self[0, 0]
+    end
+
+    def concat(value)
+      super(html_escape_interpolated_argument(value))
+    end
+    alias << concat
+
+    def prepend(value)
+      super(html_escape_interpolated_argument(value))
+    end
+
+    def +(other)
+      dup.concat(other)
+    end
+
+    def %(args)
+      case args
+      when Hash
+        escaped_args = Hash[args.map { |k,arg| [k, html_escape_interpolated_argument(arg)] }]
+      else
+        escaped_args = Array(args).map { |arg| html_escape_interpolated_argument(arg) }
+      end
+
+      self.class.new(super(escaped_args))
+    end
+
+    def html_safe?
+      defined?(@html_safe) && @html_safe
+    end
+
+    def to_s
+      self
+    end
+
+    def to_param
+      to_str
+    end
+
+    def encode_with(coder)
+      coder.represent_object nil, to_str
+    end
+
+    UNSAFE_STRING_METHODS.each do |unsafe_method|
+      if unsafe_method.respond_to?(unsafe_method)
+        class_eval <<-EOT, __FILE__, __LINE__ + 1
+          def #{unsafe_method}(*args, &block)       # def capitalize(*args, &block)
+            to_str.#{unsafe_method}(*args, &block)  #   to_str.capitalize(*args, &block)
+          end                                       # end
+
+          def #{unsafe_method}!(*args)              # def capitalize!(*args)
+            @html_safe = false                      #   @html_safe = false
+            super                                   #   super
+          end                                       # end
+        EOT
+      end
+    end
+
+    private
+
+    def html_escape_interpolated_argument(arg)
+      (!html_safe? || arg.html_safe?) ? arg : CGI.escapeHTML(arg.to_s)
+    end
+  end
+end

data/test/helper.rb

@@ -44,8 +44,8 @@ class MiniTest::Spec
     FileUtils.mkdir_p(File.dirname(__FILE__) + "/views")
     FileUtils.mkdir_p(File.dirname(__FILE__) + "/views/layouts")
     path  = "/views/#{name}"
-    path += ".#{options.delete(:locale)}" if options[:locale].present?
-    path += ".#{options[:format]}" if options[:format].present?
+    path += ".#{options.delete(:locale)}" if options[:locale]
+    path += ".#{options[:format]}" if options[:format]
     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

data/test/test_format_helpers.rb

@@ -209,23 +209,23 @@ describe "FormatHelpers" do
   describe 'for #js_escape_html method' do
     it 'should escape double quotes' do
       assert_equal "\\\"hello\\\"", js_escape_html('"hello"')
-      assert_equal "\\\"hello\\\"", js_escape_html(ActiveSupport::SafeBuffer.new('"hello"'))
+      assert_equal "\\\"hello\\\"", js_escape_html(SafeBuffer.new('"hello"'))
     end
     it 'should escape single quotes' do
       assert_equal "\\'hello\\'", js_escape_html("'hello'")
-      assert_equal "\\'hello\\'", js_escape_html(ActiveSupport::SafeBuffer.new("'hello'"))
+      assert_equal "\\'hello\\'", js_escape_html(SafeBuffer.new("'hello'"))
     end
     it 'should escape html tags and breaks' do
       assert_equal "\\n\\n<p>hello<\\/p>\\n", js_escape_html("\n\r<p>hello</p>\r\n")
-      assert_equal "\\n\\n<p>hello<\\/p>\\n", js_escape_html(ActiveSupport::SafeBuffer.new("\n\r<p>hello</p>\r\n"))
+      assert_equal "\\n\\n<p>hello<\\/p>\\n", js_escape_html(SafeBuffer.new("\n\r<p>hello</p>\r\n"))
     end
     it 'should escape data-confirm attribute' do
       assert_equal "<data-confirm=\\\"are you sure\\\">", js_escape_html("<data-confirm=\"are you sure\">")
-      assert_equal "<data-confirm=\\\"are you sure\\\">", js_escape_html(ActiveSupport::SafeBuffer.new("<data-confirm=\"are you sure\">"))
+      assert_equal "<data-confirm=\\\"are you sure\\\">", js_escape_html(SafeBuffer.new("<data-confirm=\"are you sure\">"))
     end
     it 'should keep html_safe content html_safe' do
       assert_equal false, js_escape_html('"hello"').html_safe?
-      assert_equal true, js_escape_html(ActiveSupport::SafeBuffer.new('"hello"')).html_safe?
+      assert_equal true, js_escape_html(SafeBuffer.new('"hello"')).html_safe?
     end
   end
 end

data/test/test_render_helpers.rb

@@ -253,5 +253,15 @@ describe "RenderHelpers" do
       end
       assert_equal 'existing', Standalone3.new.partial('none')
     end
+
+    it 'should not add "./" to partial template name' do
+      class Standalone4
+        def render(_, file, *)
+          file.to_s
+        end
+        include Padrino::Helpers::RenderHelpers
+      end
+      assert_equal '_none', Standalone4.new.partial('none')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.3.1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-30 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.13.3
+        version: 0.13.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.13.3.1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -120,11 +120,13 @@ files:
 - lib/padrino-helpers/render_helpers.rb
 - lib/padrino-helpers/tag_helpers.rb
 - lib/padrino-helpers/translation_helpers.rb
+- lib/padrino/core_ext/output_safety.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
+- lib/padrino/safe_buffer.rb
 - padrino-helpers.gemspec
 - test/fixtures/apps/.components
 - test/fixtures/apps/.gitignore
@@ -245,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-helpers
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Helpers for padrino