padrino-helpers 0.16.0.pre4 → 0.16.0

data/lib/padrino/safe_buffer.rb

@@ -3,35 +3,29 @@ module Padrino
   # Padrino::SafeBuffer is based on ActiveSupport::SafeBuffer
   #
   class SafeBuffer < String
-    UNSAFE_STRING_METHODS = %w(
+    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
+    alias original_concat concat
     private :original_concat
 
     class SafeConcatError < StandardError
       def initialize
-        super "Could not concatenate to the buffer because it is not html safe."
+        super 'Could not concatenate to the buffer because it is not html safe.'
       end
     end
 
     def [](*args)
       if args.size < 2
         super
+      elsif html_safe?
+        new_safe_buffer = super
+        new_safe_buffer&.instance_variable_set :@html_safe, true
+        new_safe_buffer
       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
+        to_str[*args]
       end
     end
 
@@ -40,7 +34,7 @@ module Padrino
       original_concat(value)
     end
 
-    def initialize(str = "")
+    def initialize(str = '')
       @html_safe = true
       super
     end
@@ -67,13 +61,14 @@ module Padrino
       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
+    def %(other)
+      escaped_args =
+        case other
+        when Hash
+          other.transform_values { |arg| html_escape_interpolated_argument(arg) }
+        else
+          Array(other).map { |arg| html_escape_interpolated_argument(arg) }
+        end
 
       self.class.new(super(escaped_args))
     end
@@ -95,24 +90,24 @@ module Padrino
     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
+      next unless unsafe_method.respond_to?(unsafe_method)
+
+      class_eval <<~RUBY, __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
+      RUBY
     end
 
     private
 
     def html_escape_interpolated_argument(arg)
-      (!html_safe? || arg.html_safe?) ? arg : CGI.escapeHTML(arg.to_s)
+      !html_safe? || arg.html_safe? ? arg : CGI.escapeHTML(arg.to_s)
     end
   end
 end

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -4,11 +4,11 @@ module Padrino
     # Helpers related to producing assets (images, stylesheets, js, etc) within templates.
     #
     module AssetTagHelpers
-      APPEND_ASSET_EXTENSIONS = ["js", "css"]
+      APPEND_ASSET_EXTENSIONS = %w[js css]
       ABSOLUTE_URL_PATTERN = %r{^(https?://)}
       ASSET_FOLDERS = {
-        :js => 'javascripts',
-        :css => 'stylesheets',
+        js: 'javascripts',
+        css: 'stylesheets'
       }
 
       ##
@@ -18,12 +18,12 @@ module Padrino
       #   The type of flash to display in the tag.
       # @param [Hash] options
       #   The html options for this section.
-      #   use :bootstrap => true to support Twitter's bootstrap dismiss alert button.
+      #   use +bootstrap: true+ to support Twitter's bootstrap dismiss alert button.
       #
       # @return [String] Flash tag html with specified +options+.
       #
       # @example
-      #   flash_tag(:notice, :id => 'flash-notice')
+      #   flash_tag(:notice, id: 'flash-notice')
       #   # Generates: <div class="notice" id="flash-notice">flash-notice</div>
       #   flash_tag(:error, :success)
       #   # Generates: <div class="error">flash-error</div>
@@ -32,11 +32,11 @@ module Padrino
       def flash_tag(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         bootstrap = options.delete(:bootstrap) if options[:bootstrap]
-        args.inject(SafeBuffer.new) do |html,kind|
+        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))
+          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
       end
 
@@ -66,16 +66,16 @@ module Padrino
       # @return [String] Link tag html with specified +options+.
       #
       # @example
-      #   link_to('click me', '/dashboard', :class => 'linky')
+      #   link_to('click me', '/dashboard', class: 'linky')
       #   # Generates <a class="linky" href="/dashboard">click me</a>
       #
-      #   link_to('click me', '/dashboard', :remote => true)
+      #   link_to('click me', '/dashboard', remote: true)
       #   # Generates <a href="/dashboard" data-remote="true">click me</a>
       #
-      #   link_to('click me', '/dashboard', :method => :delete)
+      #   link_to('click me', '/dashboard', method: :delete)
       #   # Generates <a href="/dashboard" data-method="delete" rel="nofollow">click me</a>
       #
-      #   link_to('/dashboard', :class => 'blocky') { 'click me' }
+      #   link_to('/dashboard', class: 'blocky') { 'click me' }
       #   # Generates <a class="blocky" href="/dashboard">click me</a>
       #
       # Note that you can pass :+if+ or :+unless+ conditions, but if you provide :current as
@@ -85,7 +85,7 @@ module Padrino
         options = args.last.is_a?(Hash) ? args.pop : {}
         name = block_given? ? '' : args.shift
         href = args.first
-        options = { :href => href ? escape_link(href) : '#' }.update(options)
+        options = { href: href ? escape_link(href) : '#' }.update(options)
         return name unless parse_conditions(href, options)
         block_given? ? content_tag(:a, options, &block) : content_tag(:a, name, options)
       end
@@ -109,14 +109,14 @@ module Padrino
       # @return [String] Feed link html tag with specified +options+.
       #
       # @example
-      #   feed_tag :atom, url(:blog, :posts, :format => :atom), :title => "ATOM"
+      #   feed_tag :atom, url(:blog, :posts, format: :atom), title: "ATOM"
       #   # Generates: <link type="application/atom+xml" rel="alternate" href="/blog/posts.atom" title="ATOM" />
-      #   feed_tag :rss, url(:blog, :posts, :format => :rss)
+      #   feed_tag :rss, url(:blog, :posts, format: :rss)
       #   # Generates: <link type="application/rss+xml" rel="alternate" href="/blog/posts.rss" title="rss" />
       #
-      def feed_tag(mime, url, options={})
-        full_mime = (mime == :atom) ? 'application/atom+xml' : 'application/rss+xml'
-        tag(:link, { :rel => 'alternate', :type => full_mime, :title => mime, :href => url }.update(options))
+      def feed_tag(mime, url, options = {})
+        full_mime = mime == :atom ? 'application/atom+xml' : 'application/rss+xml'
+        tag(:link, { rel: 'alternate', type: full_mime, title: mime, href: url }.update(options))
       end
 
       ##
@@ -142,12 +142,12 @@ module Padrino
       #   mail_to "me@demo.com", "My Email"
       #   # Generates: <a href="mailto:me@demo.com">My Email</a>
       #
-      def mail_to(email, caption=nil, mail_options={})
-        mail_options, html_options = mail_options.partition{ |key,_| [:cc, :bcc, :subject, :body].include?(key) }
+      def mail_to(email, caption = nil, mail_options = {})
+        mail_options, html_options = mail_options.partition { |key, _| %i[cc bcc subject body].include?(key) }
         mail_query = Rack::Utils.build_query(Hash[mail_options]).gsub(/\+/, '%20').gsub('%40', '@')
         mail_href = "mailto:#{email}"
         mail_href << "?#{mail_query}" unless mail_query.empty?
-        link_to((caption || email), mail_href, Hash[html_options])
+        link_to(caption || email, mail_href, Hash[html_options])
       end
 
       ##
@@ -161,14 +161,14 @@ module Padrino
       # @return [String] Meta html tag with specified +options+.
       #
       # @example
-      #   meta_tag "weblog,news", :name => "keywords"
+      #   meta_tag 'weblog,news', name: 'keywords'
       #   # Generates: <meta name="keywords" content="weblog,news" />
       #
-      #   meta_tag "text/html; charset=UTF-8", 'http-equiv' => "Content-Type"
+      #   meta_tag 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'
       #   # Generates: <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       #
-      def meta_tag(content, options={})
-        options = { "content" => content }.update(options)
+      def meta_tag(content, options = {})
+        options = { 'content' => content }.update(options)
         tag(:meta, options)
       end
 
@@ -186,11 +186,11 @@ module Padrino
       #   favicon_tag 'favicon.png'
       #   favicon_tag 'icons/favicon.png'
       #   # or override some options
-      #   favicon_tag 'favicon.png', :type => 'image/ico'
+      #   favicon_tag 'favicon.png', type: 'image/ico'
       #
-      def favicon_tag(source, options={})
-        type = File.extname(source).sub('.','')
-        options = { :href => image_path(source), :rel => 'icon', :type => "image/#{type}" }.update(options)
+      def favicon_tag(source, options = {})
+        type = File.extname(source).sub('.', '')
+        options = { href: image_path(source), rel: 'icon', type: "image/#{type}" }.update(options)
         tag(:link, options)
       end
 
@@ -207,8 +207,8 @@ module Padrino
       # @example
       #   image_tag('icons/avatar.png')
       #
-      def image_tag(url, options={})
-        options = { :src => image_path(url) }.update(options)
+      def image_tag(url, options = {})
+        options = { src: image_path(url) }.update(options)
         options[:alt] ||= image_alt(url) unless url.to_s =~ /\A(?:cid|data):|\A\Z/
         tag(:img, options)
       end
@@ -241,11 +241,11 @@ module Padrino
       # @api public.
       def stylesheet_link_tag(*sources)
         options = {
-          :rel => 'stylesheet',
-          :type => 'text/css'
+          rel: 'stylesheet',
+          type: 'text/css'
         }.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))
+        sources.flatten.inject(SafeBuffer.new) do |all, source|
+          all << tag(:link, { href: asset_path(:css, source) }.update(options))
         end
       end
 
@@ -265,10 +265,10 @@ module Padrino
       #
       def javascript_include_tag(*sources)
         options = {
-          :type => 'text/javascript'
+          type: 'text/javascript'
         }.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))
+        sources.flatten.inject(SafeBuffer.new) do |all, source|
+          all << content_tag(:script, nil, { src: asset_path(:js, source) }.update(options))
         end
       end
 
@@ -316,7 +316,7 @@ module Padrino
       def asset_path(kind, source = nil)
         kind, source = source, kind if source.nil?
         source = asset_normalize_extension(kind, escape_link(source.to_s))
-        return source if source =~ ABSOLUTE_URL_PATTERN || source =~ /^\//
+        return source if source =~ ABSOLUTE_URL_PATTERN || source =~ %r{^/}
         source = File.join(asset_folder_name(kind), source)
         timestamp = asset_timestamp(source)
         result_path = uri_root_path(source)
@@ -329,8 +329,8 @@ module Padrino
       # Returns the URI root of the application with optional paths appended.
       #
       # @example
-      #   uri_root_path("/some/path") => "/root/some/path"
-      #   uri_root_path("javascripts", "test.js") => "/uri/root/javascripts/test.js"
+      #   uri_root_path('/some/path') => "/root/some/path"
+      #   uri_root_path('javascripts', 'test.js') => "/uri/root/javascripts/test.js"
       #
       def uri_root_path(*paths)
         root_uri = self.class.uri_root if self.class.respond_to?(:uri_root)
@@ -341,12 +341,12 @@ module Padrino
       # Returns the timestamp mtime for an asset.
       #
       # @example
-      #   asset_timestamp("some/path/to/file.png") => "?154543678"
+      #   asset_timestamp('some/path/to/file.png') => "?154543678"
       #
       def asset_timestamp(file_path)
         return nil if file_path =~ /\?/ || (self.class.respond_to?(:asset_stamp) && !self.class.asset_stamp)
         public_path = self.class.public_folder if self.class.respond_to?(:public_folder)
-        public_path ||= Padrino.root("public") if Padrino.respond_to?(:root)
+        public_path ||= Padrino.root('public') if Padrino.respond_to?(:root)
         public_file_path = File.join(public_path, file_path) if public_path
         stamp = File.mtime(public_file_path).to_i if public_file_path && File.exist?(public_file_path)
         stamp ||= Time.now.to_i
@@ -377,8 +377,8 @@ module Padrino
       #
       #  @example
       #
-      #    asset_normalize_extension(:images, "/foo/bar/baz.png") => "/foo/bar/baz.png"
-      #    asset_normalize_extension(:js, "/foo/bar/baz") => "/foo/bar/baz.js"
+      #    asset_normalize_extension(:images, '/foo/bar/baz.png') => "/foo/bar/baz.png"
+      #    asset_normalize_extension(:js, '/foo/bar/baz') => "/foo/bar/baz.js"
       #
       def asset_normalize_extension(kind, source)
         ignore_extension = !APPEND_ASSET_EXTENSIONS.include?(kind.to_s)
@@ -390,13 +390,13 @@ module Padrino
       # Parses link_to options for given correct conditions.
       #
       # @example
-      #   parse_conditions("/some/url", :if => false) => true
+      #   parse_conditions("/some/url", if: false) => true
       #
       def parse_conditions(url, options)
-        if options.has_key?(:if)
+        if options.key?(:if)
           condition = options.delete(:if)
           condition == :current ? url == request.path_info : condition
-        elsif condition = options.delete(:unless)
+        elsif (condition = options.delete(:unless))
           condition == :current ? url != request.path_info : !condition
         else
           true