padrino-helpers 0.16.0.pre4 → 0.16.0

data/lib/padrino-helpers/output_helpers.rb

@@ -59,13 +59,13 @@ module Padrino
       #   # => "<foo>"
       #
       def capture_html(*args, &block)
-        if handler = find_proper_handler
+        if (handler = find_proper_handler)
           handler.capture_from_template(*args, &block)
         else
           yield(*args)
         end
       end
-      alias :capture :capture_html
+      alias capture capture_html
 
       ##
       # Outputs the given text to the templates buffer directly.
@@ -78,14 +78,14 @@ module Padrino
       # @example
       #   concat_content("This will be output to the template buffer")
       #
-      def concat_content(text="")
-        if handler = find_proper_handler
+      def concat_content(text = '')
+        if (handler = find_proper_handler)
           handler.concat_to_template(text, binding)
         else
           text
         end
       end
-      alias :concat :concat_content
+      alias concat concat_content
 
       ##
       # Outputs the given text to the templates buffer directly,
@@ -97,7 +97,7 @@ module Padrino
       # @example
       #   concat_safe_content("This will be output to the template buffer")
       #
-      def concat_safe_content(text="")
+      def concat_safe_content(text = '')
         concat_content text.html_safe
       end
 
@@ -114,8 +114,7 @@ module Padrino
       # @return [Boolean] True if the block is a template; false otherwise.
       #
       def block_is_template?(block)
-        handler = find_proper_handler
-        block && handler && handler.engine_matches?(block)
+        block && find_proper_handler&.engine_matches?(block)
       end
 
       ##
@@ -138,12 +137,12 @@ module Padrino
       #   content_for(:name) { ...content... }
       #   content_for(:name) { |name| ...content... }
       #   content_for(:name, "I'm Jeff")
-      #   content_for(:name, :flush => true) { ...new content... }
+      #   content_for(:name, flush: true) { ...new content... }
       #
       def content_for(key, content = nil, options = {}, &block)
         options = content if content.is_a?(Hash)
         content_blocks[key.to_sym].clear if options[:flush]
-        content_blocks[key.to_sym] << (block_given? ? block : Proc.new { content })
+        content_blocks[key.to_sym] << (block_given? ? block : proc { content })
       end
 
       ##
@@ -155,7 +154,7 @@ module Padrino
       # @return [TrueClass,FalseClass] Result html for the given +key+
       #
       # @example
-      #   content_for? :header => true
+      #   content_for?(:header) => true
       #
       def content_for?(key)
         !content_blocks[key.to_sym].empty?
@@ -181,10 +180,11 @@ module Padrino
       def yield_content(key, *args)
         blocks = content_blocks[key.to_sym]
         return nil if blocks.empty?
-        blocks.inject(SafeBuffer.new){ |all,content| all << capture_html(*args, &content) }
+        blocks.inject(SafeBuffer.new) { |all, content| all << capture_html(*args, &content) }
       end
 
       protected
+
       ##
       # Retrieves content_blocks stored by content_for or within yield_content.
       #
@@ -192,7 +192,7 @@ module Padrino
       #   content_blocks[:name] => ['...', '...']
       #
       def content_blocks
-        @content_blocks ||= Hash.new { |h,k| h[k] = [] }
+        @content_blocks ||= Hash.new { |h, k| h[k] = [] }
       end
 
       ##
@@ -203,8 +203,7 @@ module Padrino
       #   find_proper_handler => <OutputHelpers::HamlHandler>
       #
       def find_proper_handler
-        handler_class = OutputHelpers.handlers[current_engine]
-        handler_class && handler_class.new(self)
+        OutputHelpers.handlers[current_engine]&.new(self)
       end
 
       ##
@@ -216,9 +215,9 @@ module Padrino
       # @return [SafeBuffer, Array<SafeBuffer>]
       def mark_safe(value)
         if value.respond_to? :map!
-          value.map!{|v| v.html_safe if v }
+          value.map! { |v| v&.html_safe }
         else
-          value.html_safe if value
+          value&.html_safe
         end
       end
     end

data/lib/padrino-helpers/render_helpers.rb

@@ -23,29 +23,30 @@ module Padrino
       # @return [String] The html generated from this partial.
       #
       # @example
-      #   partial 'photo/item', :object => @photo
-      #   partial 'photo/item', :collection => @photos
-      #   partial 'photo/item', :locals => { :foo => :bar }
-      #   partial 'photo/item', :engine => :erb
+      #   partial 'photo/item', object: @photo
+      #   partial 'photo/item', collection: @photos
+      #   partial 'photo/item', locals: { foo: :bar }
+      #   partial 'photo/item', engine: :erb
       #
       # @note If using this from Sinatra, pass explicit +:engine+ option
       #
-      def partial(template, options={}, &block)
-        options = { :layout => false }.update(options)
+      def partial(template, options = {}, &block)
+        options = { layout: false }.update(options)
         explicit_engine = options.delete(:engine)
 
         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)
-          [options.delete(:collection), 0]
-        else
-          [[options.delete(:object)], nil]
-        end
+        items, counter =
+          if options[:collection].respond_to?(:inject)
+            [options.delete(:collection), 0]
+          else
+            [[options.delete(:object)], nil]
+          end
 
         locals = options.delete(:locals) || {}
-        items.each_with_object(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 =
@@ -57,25 +58,25 @@ module Padrino
           html.safe_concat content if content
         end
       end
-      alias :render_partial :partial
+      alias render_partial partial
 
       def self.included(base)
-        unless base.instance_methods.include?(:render) || base.private_instance_methods.include?(:render)
-          base.class_eval do
-            fail "gem 'tilt' is required" unless defined?(::Tilt)
+        return if base.instance_methods.include?(:render) || base.private_instance_methods.include?(:render)
+
+        base.class_eval do
+          raise "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
-              unless File.file?(file.to_s)
-                engine_extensions = ::Tilt.default_mapping.extensions_for(template_engine)
-                file = Dir.glob("#{file}.{#{engine_extensions.join(',')}}").first || fail("Template '#{file}' not found")
-              end
-              template = template_engine.new(file.to_s, options)
-              template.render(options[:scope] || self, locals, &block)
+          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]
+            raise "Engine #{engine.inspect} is not registered with Tilt" unless template_engine
+            unless File.file?(file.to_s)
+              engine_extensions = ::Tilt.default_mapping.extensions_for(template_engine)
+              file = Dir.glob("#{file}.{#{engine_extensions.join(',')}}").first || raise("Template '#{file}' not found")
             end
+            template = template_engine.new(file.to_s, options)
+            template.render(options[:scope] || self, locals, &block)
           end
         end
       end

data/lib/padrino-helpers/tag_helpers.rb

@@ -8,10 +8,10 @@ module Padrino
       # Tag values escaped to html entities.
       #
       ESCAPE_VALUES = {
-        "&" => "&",
-        "<" => "&lt;",
-        ">" => "&gt;",
-        '"' => "&quot;"
+        '&' => '&amp;',
+        '<' => '&lt;',
+        '>' => '&gt;',
+        '"' => '&quot;'
       }.freeze
 
       ##
@@ -20,25 +20,25 @@ module Padrino
       #
       ESCAPE_REGEXP = Regexp.union(*ESCAPE_VALUES.keys).freeze
 
-      BOOLEAN_ATTRIBUTES = [
-        :autoplay,
-        :autofocus,
-        :formnovalidate,
-        :checked,
-        :disabled,
-        :hidden,
-        :loop,
-        :multiple,
-        :muted,
-        :readonly,
-        :required,
-        :selected,
-        :declare,
-        :defer,
-        :ismap,
-        :itemscope,
-        :noresize,
-        :novalidate
+      BOOLEAN_ATTRIBUTES = %i[
+        autoplay
+        autofocus
+        formnovalidate
+        checked
+        disabled
+        hidden
+        loop
+        multiple
+        muted
+        readonly
+        required
+        selected
+        declare
+        defer
+        ismap
+        itemscope
+        noresize
+        novalidate
       ].freeze
 
       ##
@@ -46,14 +46,10 @@ module Padrino
       # feel free to update with yours:
       #
       #   Padrino::Helpers::TagHelpers::DATA_ATTRIBUTES.push(:dialog)
-      #   text_field :foo, :dialog => true
+      #   text_field :foo, dialog: true
       #   # Generates: <input type="text" data-dialog="true" name="foo" />
       #
-      DATA_ATTRIBUTES = [
-        :method,
-        :remote,
-        :confirm
-      ]
+      DATA_ATTRIBUTES = %i[method remote confirm]
 
       ##
       # A html_safe newline string to avoid allocating a new on each
@@ -102,13 +98,13 @@ module Padrino
       #   Generated HTML with specified +options+.
       #
       # @example
-      #   content_tag(:p, 'Hello World', :class => 'light')
+      #   content_tag(:p, 'Hello World', class: 'light')
       #
       #   # => <p class="light">
       #   # =>   Hello World
       #   # => </p>
       #
-      #   content_tag(:p, :class => 'dark') do
+      #   content_tag(:p, class: 'dark') do
       #     link_to 'Padrino', 'http://www.padrinorb.com'
       #   end
       #
@@ -125,9 +121,13 @@ module Padrino
         options    = parse_data_options(name, options)
         attributes = tag_attributes(options)
         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 }
+          content.each do |item|
+            output.concat item
+            output.safe_concat NEWLINE
+          end
         else
           output.concat content.to_s
         end
@@ -187,20 +187,20 @@ module Padrino
       #   Generated HTML with specified +options+.
       #
       # @example
-      #   input_tag :text, :name => 'handle'
+      #   input_tag :text, name: 'handle'
       #   # => <input type="test" name="handle" />
       #
-      #   input_tag :password, :name => 'password', :size => 20
+      #   input_tag :password, name: 'password', size: 20
       #   # => <input type="password" name="password" size="20" />
       #
-      #   input_tag :text, :name => 'username', :required => true, :autofocus => true
+      #   input_tag :text, name: 'username', required: true, autofocus: true
       #   # => <input type="text" name="username" required autofocus />
       #
-      #   input_tag :number, :name => 'credit_card', :autocomplete => :off
-      #   # => <input type="number" name="credit_card" autocomplete="off" />  
+      #   input_tag :number, name: 'credit_card', autocomplete: :off
+      #   # => <input type="number" name="credit_card" autocomplete="off" />
       #
       def input_tag(type, options = {})
-        tag(:input, { :type => type }.update(options))
+        tag(:input, { type: type }.update(options))
       end
 
       ##
@@ -217,16 +217,16 @@ module Padrino
       #   Generated HTML with specified +options+.
       #
       # @example
-      #   tag :hr, :class => 'dotted'
+      #   tag :hr, class: 'dotted'
       #   # => <hr class="dotted" />
       #
-      #   tag :input, :name => 'username', :type => :text
+      #   tag :input, name: 'username', type: :text
       #   # => <input name="username" type="text" />
       #
-      #   tag :img, :src => 'images/pony.jpg', :alt => 'My Little Pony'
+      #   tag :img, src: 'images/pony.jpg', alt: 'My Little Pony'
       #   # => <img src="images/pony.jpg" alt="My Little Pony" />
       #
-      #   tag :img, :src => 'sinatra.jpg', :data => { :nsfw => false, :geo => [34.087, -118.407] }
+      #   tag :img, src: 'sinatra.jpg', data: { nsfw: false, geo: [34.087, -118.407] }
       #   # => <img src="sinatra.jpg" data-nsfw="false" data-geo="34.087 -118.407" />
       #
       def tag(name, options = nil, open = false)
@@ -255,16 +255,19 @@ module Padrino
       #
       def tag_attributes(options)
         return '' unless options
-        options.inject('') do |all,(key,value)|
+
+        options.inject('') do |all, (key, value)|
           next all unless value
+
           all << ' ' if all.empty?
-          all << if value.is_a?(Hash)
-            nested_values(key, value)
-          elsif BOOLEAN_ATTRIBUTES.include?(key)
-            %(#{key}="#{key}" )
-          else
-            %(#{key}="#{escape_value(value)}" )
-          end
+          all <<
+            if value.is_a?(Hash)
+              nested_values(key, value)
+            elsif BOOLEAN_ATTRIBUTES.include?(key)
+              %(#{key}="#{key}" )
+            else
+              %(#{key}="#{escape_value(value)}" )
+            end
         end.chomp!(' ')
       end
 
@@ -272,7 +275,7 @@ module Padrino
       # Escape tag values to their HTML/XML entities.
       #
       def escape_value(string)
-        string =  string.collect(&:to_s).join(' ') if string.is_a?(Array)
+        string = string.collect(&:to_s).join(' ') if string.is_a?(Array)
         string.to_s.gsub(ESCAPE_REGEXP, ESCAPE_VALUES)
       end
 
@@ -280,13 +283,14 @@ module Padrino
       # Iterate through nested values.
       #
       def nested_values(attribute, hash)
-        hash.inject('') do |all,(key,value)|
+        hash.inject('') do |all, (key, value)|
           attribute_with_name = "#{attribute}-#{key.to_s.tr('_', '-')}"
-          all << if value.is_a?(Hash)
-            nested_values(attribute_with_name, value)
-          else
-            %(#{attribute_with_name}="#{escape_value(value)}" )
-          end
+          all <<
+            if value.is_a?(Hash)
+              nested_values(attribute_with_name, value)
+            else
+              %(#{attribute_with_name}="#{escape_value(value)}" )
+            end
         end
       end
 
@@ -296,7 +300,7 @@ module Padrino
       def parse_data_options(tag, options)
         return unless options
         parsed_options = options.dup
-        options.each do |key, value|
+        options.each_key do |key|
           next if !DATA_ATTRIBUTES.include?(key) || (tag.to_s == 'form' && key == :method)
           parsed_options["data-#{key}"] = parsed_options.delete(key)
           parsed_options[:rel] = 'nofollow' if key == :method

data/lib/padrino-helpers/translation_helpers.rb

@@ -17,7 +17,7 @@ module Padrino
         options = args.last.is_a?(Hash) ? args.pop : {}
         I18n.translate(*args, **options)
       end
-      alias :t :translate
+      alias t translate
 
       ##
       # Delegates to I18n.localize with no additional functionality.
@@ -31,7 +31,7 @@ module Padrino
       def localize(*args)
         I18n.localize(*args)
       end
-      alias :l :localize
+      alias l localize
     end
   end
 end

data/lib/padrino-helpers.rb

@@ -1,13 +1,12 @@
 require 'padrino-support'
 require 'padrino-support/inflections'
 require 'i18n'
-require 'enumerator'
 
 # remove at 0.14
 require 'padrino/rendering'
 
 FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__)
-I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-helpers/locale/*.yml"]
+I18n.load_path += Dir["#{__dir__}/padrino-helpers/locale/*.yml"]
 I18n.enforce_available_locales = true
 
 module Padrino

data/padrino-helpers.gemspec

@@ -1,28 +1,28 @@
 #!/usr/bin/env gem build
 # encoding: utf-8
 
-require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require File.expand_path('../padrino-core/lib/padrino-core/version.rb', __dir__)
 
 Gem::Specification.new do |s|
-  s.name = "padrino-helpers"
-  s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.email = "padrinorb@gmail.com"
-  s.summary = "Helpers for padrino"
-  s.homepage = "http://www.padrinorb.com"
-  s.description = "Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino"
-  s.required_rubygems_version = ">= 1.3.6"
+  s.name = 'padrino-helpers'
+  s.authors = ['Padrino Team', 'Nathan Esquenazi', "Davide D'Agostino", 'Arthur Chiu']
+  s.email = 'padrinorb@gmail.com'
+  s.summary = 'Helpers for padrino'
+  s.homepage = 'http://www.padrinorb.com'
+  s.description = 'Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino'
+  s.required_rubygems_version = '>= 1.3.6'
   s.version = Padrino.version
-  s.date = Time.now.strftime("%Y-%m-%d")
-  s.license = "MIT"
+  s.date = Time.now.strftime('%Y-%m-%d')
+  s.license = 'MIT'
 
-  s.extra_rdoc_files = Dir["*.rdoc"]
+  s.extra_rdoc_files = Dir['*.rdoc']
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  s.rdoc_options  = ["--charset=UTF-8"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
+  s.rdoc_options  = ['--charset=UTF-8']
 
-  s.add_dependency("padrino-support", Padrino.version)
-  s.add_dependency("tilt", ">= 2.1", "< 3")
-  s.add_dependency("i18n", ">= 0.6.7", "< 2")
+  s.add_dependency('padrino-support', Padrino.version)
+  s.add_dependency('tilt', '>= 2.1', '< 3')
+  s.add_dependency('i18n', '>= 0.6.7', '< 2')
 end

data/test/fixtures/apps/render.rb

@@ -1,4 +1,4 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 class RenderDemo2 < Padrino::Application
   register Padrino::Rendering
@@ -12,7 +12,7 @@ RenderDemo2.controllers :blog do
   end
 
   get '/override' do
-    render 'post', :layout => RenderDemo2.layout_path('specific') 
+    render 'post', layout: RenderDemo2.layout_path('specific')
   end
 end
 

data/test/fixtures/markup_app/app.rb

@@ -7,7 +7,7 @@ class MarkupDemo < Sinatra::Base
     set :logging, false
     set :padrino_logging, false
     set :environment, :test
-    set :root, File.dirname(__FILE__)
+    set :root, __dir__
     set :sessions, true
     set :protect_from_csrf, true
   end
@@ -38,26 +38,26 @@ class MarkupDemo < Sinatra::Base
 
     def concat_ruby_not_template_block
       concat_if_block_is_template('ruby') do
-        content_tag(:span, "This not a template block")
+        content_tag(:span, 'This not a template block')
       end
     end
 
     def content_tag_with_block
       one = content_tag(:p) do
-        "one"
+        'one'
       end
       two = content_tag(:p) do
-        "two"
+        'two'
       end
       one << two
-    rescue
-      "<p>failed</p>".html_safe
+    rescue StandardError
+      '<p>failed</p>'.html_safe
     end
   end
 end
 
 class MarkupUser
-  def errors; { :fake => "must be valid", :second => "must be present", :third  => "must be a number", :email => "must be an email"}; end
+  def errors; { fake: 'must be valid', second: 'must be present', third: 'must be a number', email: 'must be an email' }; end
   def session_id; 45; end
   def gender; 'male'; end
   def remember_me; '1'; end
@@ -67,11 +67,12 @@ class MarkupUser
 end
 
 class Telephone
-  def number; "62634576545"; end
+  def number; '62634576545'; end
 end
 
 class Address
   attr_accessor :name
+
   def initialize(name, existing); @name, @existing = name, existing; end
   def new_record?; !@existing; end
   def id; @existing ? 25 : nil; end

data/test/fixtures/markup_app/views/button_to.erb

@@ -1,8 +1,8 @@
-<% button_to 'Foo button', '/foo', :class => 'foo-form' do %>
+<% button_to 'Foo button', '/foo', class: 'foo-form' do %>
   <% field_set_tag do %>
-    <%= hidden_field_tag :session_id, :value => "__secret__" %>
+    <%= hidden_field_tag :session_id, value: "__secret__" %>
     <%= label_tag :username %>
   <% end %>
 <% end %>
-<%= content_tag(:p, 'button_to test', :id => 'test-point') %>
+<%= content_tag(:p, 'button_to test', id: 'test-point') %>
 <%= button_to 'Bar button', '/bar' %>

data/test/fixtures/markup_app/views/button_to.haml

@@ -1,5 +1,5 @@
-= button_to 'Foo button', '/foo', :class => 'foo-form' do
+= button_to 'Foo button', '/foo', class: 'foo-form' do
   = field_set_tag do
     = label_tag :username
-= content_tag(:p, 'button_to test', :id => 'test-point')
+= content_tag(:p, 'button_to test', id: 'test-point')
 = button_to 'Bar button', '/bar'

data/test/fixtures/markup_app/views/button_to.slim

@@ -1,6 +1,6 @@
-= button_to 'Foo button', '/foo', :class => 'foo-form' do
+= button_to 'Foo button', '/foo', class: 'foo-form' do
   = field_set_tag do
-    = hidden_field_tag :session_id, :value => "__secret__"
+    = hidden_field_tag :session_id, value: '__secret__'
     = label_tag :username
-= content_tag(:p, 'button_to test', :id => 'test-point')
+= content_tag(:p, 'button_to test', id: 'test-point')
 = button_to 'Bar button', '/bar'

data/test/fixtures/markup_app/views/content_for.erb

@@ -2,13 +2,13 @@
   <h1>This is content yielded from a content_for</h1>
 <% end %>
 
-<div class='demo'><%= yield_content :demo %></div>
+<div class="demo"><%= yield_content :demo %></div>
 
 <% content_for :demo2 do |fname, lname| %>
-  <h1>This is content yielded with name <%= fname + " " + lname %></h1>
+  <h1>This is content yielded with name <%= "#{fname} #{lname}" %></h1>
 <% end %>
 
-<div class='demo2'><%= yield_content :demo2, "Johnny", "Smith" %></div>
+<div class="demo2"><%= yield_content :demo2, 'Johnny', 'Smith' %></div>
 
 <div class="demo_has_content"><%= content_for?(:demo).to_s %>
 <div class="fake_has_content"><%= content_for?(:fake).to_s %>
@@ -16,7 +16,7 @@
 <% content_for :demo3 do %>
   <p class="duplication">One</p>
 <% end %>
-<% content_for :demo3, :flush => true do %>
+<% content_for :demo3, flush: true do %>
   <p class="duplication">Two</p>
 <% end %>
 

data/test/fixtures/markup_app/views/content_for.haml

@@ -6,14 +6,14 @@
 - content_for :demo2 do |fname, lname|
   %h1 This is content yielded with name #{fname + " " + lname}
 
-.demo2= yield_content :demo2, "Johnny", "Smith"
+.demo2= yield_content :demo2, 'Johnny', 'Smith'
 
 .demo_has_content= content_for?(:demo)
 .fake_has_content= content_for?(:fake)
 
 - content_for :demo3 do
-  %p{:class => "duplication"} One
-- content_for :demo3, :flush => true do
-  %p{:class => "duplication"} Two
+  %p{class: 'duplication'} One
+- content_for :demo3, flush: true do
+  %p{class: 'duplication'} Two
 
 .demo3= yield_content :demo3