hanami-helpers 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00c50648c23a0d34befe080287206beb9e46aa34
-  data.tar.gz: 2be73f77dead23bc48142b567b0a2595d9ba6a00
+  metadata.gz: e90f277e6ff4d461bd7ebcc45e48de6c03f91e70
+  data.tar.gz: 8d97b52cf45b16454acf597a6fe198b3a549148a
 SHA512:
-  metadata.gz: ce6e712b2a0e0aaf38e79a682112a51929ec62fb77cc2f2af17c0645fddc28d56654e0c0b8dd4acf4c707c502ea7cc6dc19870e1ed7ca027304755d90dde9826
-  data.tar.gz: 75c87873818c331507ce01574fbd5652a9be6f8e782805e4f731377f37e81429578384cc9dde5b7a1f521d6c0473ab4e6f4057ff9593fcee49bf68bdd9f6d419
+  metadata.gz: 21d4b2160f0d6af94d099ec8f765bbcce309b22623aff0ce3190f50b7fb2fec228fde3b6f330a47242455ab7989144e8c04b5a146170399d74f914ba0facc79f
+  data.tar.gz: f898b3a411eb8d77e776a398ef2873bc6b6e8ef39fffd59602f8d0b7cd53a5662ea767665a95e7da228271bb3f16cf635f3df12d28feceed507177b2e621134c

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Hanami::Helpers
 View helpers for Ruby web applications
 
+## v0.4.0 - 2016-07-22
+### Added
+- [Luca Guidi] Allow `link_to` to be concat with other helpers. Eg `link_to(...) + link_to(...)`, `span(...) + link_to(...)`.
+- [Anton Davydov] Support blank `<option>` tag for `select` form helper. Eg. `select :store, [...], options: { prompt: '' }`
+- [Sebastjan Hribar] Support selected `<option>` for `select` form helper. Eg. `select :store, [...], options: { selected: 'it' }`
+- [Cang Ta] Added `datalist` form helper
+
+### Changed
+– [Luca Guidi] Drop support for Ruby 2.0 and 2.1. Official support for JRuby 9.0.5.0+.
+- [Luca Guidi] Inverted options (label, value) for `select` form helper. Now the syntax is `select :store, { 'Italy' => 'it', 'United States' => 'us' }`
+
+### Fixed
+– [Nikolay Shebanov] Explicitly require some `hanami-utils` dependencies
+
 ## v0.3.0 - 2016-01-22
 ### Changed
 - [Luca Guidi] Renamed the project

data/hanami-helpers.gemspec

@@ -8,20 +8,21 @@ Gem::Specification.new do |spec|
   spec.version       = Hanami::Helpers::VERSION
   spec.authors       = ['Luca Guidi', 'Trung Lê', 'Alfonso Uceda']
   spec.email         = ['me@lucaguidi.com', 'trung.le@ruby-journal.com', 'uceda73@gmail.com']
-  spec.summary       = %q{Hanami helpers}
-  spec.description   = %q{View helpers for Ruby applications}
+  spec.summary       = 'Hanami helpers'
+  spec.description   = 'View helpers for Ruby applications'
   spec.homepage      = 'http://hanamirb.org'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -- lib/* CHANGELOG.md LICENSE.md README.md hanami-helpers.gemspec`.split($/)
+  spec.files         = `git ls-files -- lib/* CHANGELOG.md LICENSE.md README.md hanami-helpers.gemspec`.split($/) # rubocop:disable Style/SpecialGlobalVars
+
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_dependency 'hanami-utils', '~> 0.7'
+  spec.add_dependency 'hanami-utils', '~> 0.8'
 
   spec.add_development_dependency 'bundler',  '~> 1.6'
-  spec.add_development_dependency 'rake',     '~> 10.0'
+  spec.add_development_dependency 'rake',     '~> 11'
   spec.add_development_dependency 'minitest', '~> 5.5'
 end

data/lib/hanami-helpers.rb

@@ -1 +1 @@
-require 'hanami/helpers'
+require 'hanami/helpers' # rubocop:disable Style/FileName

data/lib/hanami/helpers/escape_helper.rb

@@ -4,7 +4,7 @@ module Hanami
   module Helpers
     # Escape helpers
     #
-    # You can include this module inside your view and 
+    # You can include this module inside your view and
     # the view will have access all methods.
     #
     # By including <tt>Hanami::Helpers::EscapeHelper</tt> it will inject private
@@ -13,6 +13,7 @@ module Hanami
     # @since 0.1.0
     module EscapeHelper
       private
+
       # Escape the given HTML tag content.
       #
       # This should be used only for untrusted contents: user input.
@@ -75,7 +76,7 @@ module Hanami
       end
 
       # @since 0.1.0
-      alias_method :h, :escape_html
+      alias h escape_html
 
       # Escape the given HTML tag attribute.
       #
@@ -147,7 +148,7 @@ module Hanami
       end
 
       # @since 0.1.0
-      alias_method :ha, :escape_html_attribute
+      alias ha escape_html_attribute
 
       # Escape an URL to be used in HTML attributes
       #
@@ -225,7 +226,7 @@ module Hanami
       end
 
       # @since 0.1.0
-      alias_method :hu, :escape_url
+      alias hu escape_url
 
       # Bypass escape.
       #

data/lib/hanami/helpers/form_helper.rb

@@ -28,22 +28,24 @@ module Hanami
     #
     # Supported tags and inputs:
     #
+    #   * <tt>check_box</tt>
     #   * <tt>color_field</tt>
     #   * <tt>date_field</tt>
     #   * <tt>datetime_field</tt>
     #   * <tt>datetime_local_field</tt>
     #   * <tt>email_field</tt>
-    #   * <tt>hidden_field</tt>
-    #   * <tt>file_field</tt>
     #   * <tt>fields_for</tt>
+    #   * <tt>file_field</tt>
     #   * <tt>form_for</tt>
+    #   * <tt>hidden_field</tt>
     #   * <tt>label</tt>
-    #   * <tt>text_area</tt>
-    #   * <tt>text_field</tt>
+    #   * <tt>number_field</tt>
     #   * <tt>password_field</tt>
     #   * <tt>radio_button</tt>
     #   * <tt>select</tt>
     #   * <tt>submit</tt>
+    #   * <tt>text_area</tt>
+    #   * <tt>text_field</tt>
     #
     # @since 0.2.0
     #
@@ -395,13 +397,13 @@ module Hanami
       #     # </form>
       def form_for(name, url, options = {}, &blk)
         form = if name.is_a?(Form)
-          options = url
-          name
-        else
-          Form.new(name, url, options.delete(:values))
-        end
+                 options = url
+                 name
+               else
+                 Form.new(name, url, options.delete(:values))
+               end
 
-        attributes = { action: form.url, method: form.verb, :'accept-charset' => DEFAULT_CHARSET, id: "#{ form.name }-form" }.merge(options)
+        attributes = { action: form.url, method: form.verb, :'accept-charset' => DEFAULT_CHARSET, id: "#{form.name}-form" }.merge(options)
         FormBuilder.new(form, attributes, self, &blk)
       end
 

data/lib/hanami/helpers/form_helper/form_builder.rb

@@ -11,18 +11,18 @@ module Hanami
       # @since 0.2.0
       #
       # @see Hanami::Helpers::HtmlHelper::HtmlBuilder
-      class FormBuilder < ::Hanami::Helpers::HtmlHelper::HtmlBuilder
+      class FormBuilder < ::Hanami::Helpers::HtmlHelper::HtmlBuilder # rubocop:disable Metrics/ClassLength
         # Set of HTTP methods that are understood by web browsers
         #
         # @since 0.2.0
         # @api private
-        BROWSER_METHODS = ['GET', 'POST'].freeze
+        BROWSER_METHODS = %w(GET POST).freeze
 
         # Set of HTTP methods that should NOT generate CSRF token
         #
         # @since 0.2.0
         # @api private
-        EXCLUDED_CSRF_METHODS = ['GET'].freeze
+        EXCLUDED_CSRF_METHODS = %w(GET).freeze
 
         # Checked attribute value
         #
@@ -104,11 +104,13 @@ module Hanami
         #
         # @since 0.2.0
         # @api private
-        def initialize(form, attributes, context = nil, &blk)
+        def initialize(form, attributes, context = nil, &blk) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           super()
 
-          @context = context
-          @blk     = blk
+          @context    = context
+          @blk        = blk
+          @verb       = nil
+          @csrf_token = nil
 
           # Nested form
           if @context.nil? && attributes.is_a?(Values)
@@ -361,7 +363,7 @@ module Hanami
         #   #  <input type="checkbox" name="book[languages][]" value="italian" checked="checked">
         #   #  <input type="checkbox" name="book[languages][]" value="english">
         def check_box(name, attributes = {})
-          _hidden_field_for_check_box(    name, attributes)
+          _hidden_field_for_check_box(name, attributes)
           input _attributes_for_check_box(name, attributes)
         end
 
@@ -486,6 +488,7 @@ module Hanami
         # @param name [Symbol] the input name
         # @param attributes [Hash] HTML attributes to pass to the input tag
         # @option attributes [String,Array] :accept Optional set of accepted MIME Types
+        # @option attributes [TrueClass,FalseClass] :multiple Optional, allow multiple file upload
         #
         # @since 0.2.0
         #
@@ -515,6 +518,15 @@ module Hanami
         #
         #   # Output:
         #   #  <input type="file" name="user[resume]" id="user-resume" accept="application/pdf,application/ms-word">
+        #
+        # @example Accepted multiple file upload (as array)
+        #   <%=
+        #     # ...
+        #     file_field :resume, multiple: true
+        #   %>
+        #
+        #   # Output:
+        #   #  <input type="file" name="user[resume]" id="user-resume" multiple="multiple">
         def file_field(name, attributes = {})
           attributes[:accept] = Array(attributes[:accept]).join(ACCEPT_SEPARATOR) if attributes.key?(:accept)
           attributes = { type: :file, name: _input_name(name), id: _input_id(name) }.merge(attributes)
@@ -609,7 +621,7 @@ module Hanami
             content    = nil
           end
 
-          attributes = {name: _input_name(name), id: _input_id(name)}.merge(attributes)
+          attributes = { name: _input_name(name), id: _input_id(name) }.merge(attributes)
           textarea(content || _value(name), attributes)
         end
 
@@ -631,7 +643,7 @@ module Hanami
         def text_field(name, attributes = {})
           input _attributes(:text, name, attributes)
         end
-        alias_method :input_text, :text_field
+        alias input_text text_field
 
         # Radio input
         #
@@ -701,7 +713,7 @@ module Hanami
         #
         # @param name [Symbol] the input name
         # @param values [Hash] a Hash to generate <tt><option></tt> tags.
-        #   Keys correspond to <tt>value</tt> and values correspond to the content.
+        #   Values correspond to <tt>value</tt> and keys correspond to the content.
         # @param attributes [Hash] HTML attributes to pass to the input tag
         #
         # If request params have a value that corresponds to one of the given values,
@@ -713,7 +725,7 @@ module Hanami
         # @example Basic usage
         #   <%=
         #     # ...
-        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     values = Hash['Italy' => 'it', 'United States' => 'us']
         #     select :stores, values
         #   %>
         #
@@ -741,21 +753,132 @@ module Hanami
         #   #    <option value="it" selected="selected">Italy</option>
         #   #    <option value="us">United States</option>
         #   #  </select>
-        def select(name, values, attributes = {})
-          options    = attributes.delete(:options) || {}
+        #
+        # @example Prompt option
+        #   <%=
+        #     # ...
+        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     select :stores, values, options: {prompt: 'Select a store'}
+        #   %>
+        #
+        #   # Output:
+        #   #  <select name="book[store]" id="book-store">
+        #   #    <option>Select a store</option>
+        #   #    <option value="it">Italy</option>
+        #   #    <option value="us">United States</option>
+        #   #  </select>
+        #
+        # @example Selected option
+        #   <%=
+        #     # ...
+        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     select :stores, values, options: {selected: book.store}
+        #   %>
+        #
+        #   # Output:
+        #   #  <select name="book[store]" id="book-store">
+        #   #    <option value="it" selected="selected">Italy</option>
+        #   #    <option value="us">United States</option>
+        #   #  </select>
+        def select(name, values, attributes = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          options    = attributes.delete(:options) { {} }
           attributes = { name: _input_name(name), id: _input_id(name) }.merge(attributes)
+          prompt     = options.delete(:prompt)
+          selected   = options.delete(:selected)
 
           super(attributes) do
-            values.each do |value, content|
-              if _value(name) == value
-                option(content, {value: value, selected: SELECTED}.merge(options))
+            option(prompt) unless prompt.nil?
+
+            values.each do |content, value|
+              if selected == value || _value(name) == value
+                option(content, { value: value, selected: SELECTED }.merge(options))
               else
-                option(content, {value: value}.merge(options))
+                option(content, { value: value }.merge(options))
               end
             end
           end
         end
 
+        # Datalist input
+        #
+        # @param name [Symbol] the input name
+        # @param values [Array,Hash] a collection that is transformed into <tt><option></tt> tags.
+        # @param list [String] the name of list for the text input, it's also the id of datalist
+        # @param attributes [Hash] HTML attributes to pass to the input tag
+        #
+        # @since 0.4.0
+        #
+        # @example Basic Usage
+        #   <%=
+        #     # ...
+        #     values = ['Italy', 'United States']
+        #     datalist :stores, values, 'books'
+        #   %>
+        #
+        #   # Output:
+        #   #  <input type="text" name="book[store]" id="book-store" value="" list="books">
+        #   #  <datalist id="books">
+        #   #    <option value="Italy"></option>
+        #   #    <option value="United States"></option>
+        #   #  </datalist>
+        #
+        # @example Options As Hash
+        #   <%=
+        #     # ...
+        #     values = Hash['Italy' => 'it', 'United States' => 'us']
+        #     datalist :stores, values, 'books'
+        #   %>
+        #
+        #   # Output:
+        #   #  <input type="text" name="book[store]" id="book-store" value="" list="books">
+        #   #  <datalist id="books">
+        #   #    <option value="Italy">it</option>
+        #   #    <option value="United States">us</option>
+        #   #  </datalist>
+        #
+        # @example Specify Custom Attributes For Datalist Input
+        #   <%=
+        #     # ...
+        #     values = ['Italy', 'United States']
+        #     datalist :stores, values, 'books', datalist: { class: 'form-control' }
+        #   %>
+        #
+        #   # Output:
+        #   #  <input type="text" name="book[store]" id="book-store" value="" list="books">
+        #   #  <datalist id="books" class="form-control">
+        #   #    <option value="Italy"></option>
+        #   #    <option value="United States"></option>
+        #   #  </datalist>
+        #
+        # @example Specify Custom Attributes For Options List
+        #   <%=
+        #     # ...
+        #     values = ['Italy', 'United States']
+        #     datalist :stores, values, 'books', options: { class: 'form-control' }
+        #   %>
+        #
+        #   # Output:
+        #   #  <input type="text" name="book[store]" id="book-store" value="" list="books">
+        #   #  <datalist id="books">
+        #   #    <option value="Italy" class="form-control"></option>
+        #   #    <option value="United States" class="form-control"></option>
+        #   #  </datalist>
+        def datalist(name, values, list, attributes = {}) # rubocop:disable Metrics/MethodLength
+          attrs    = attributes.dup
+          options  = attrs.delete(:options)  || {}
+          datalist = attrs.delete(:datalist) || {}
+
+          attrs[:list]  = list
+          datalist[:id] = list
+
+          text_field(name, attrs)
+          super(datalist) do
+            values.each do |value, content|
+              option(content, { value: value }.merge(options))
+            end
+          end
+        end
+
         # Submit button
         #
         # @param content [String] The content
@@ -777,6 +900,7 @@ module Hanami
         end
 
         protected
+
         # A set of options to pass to the sub form helpers.
         #
         # @api private
@@ -786,6 +910,7 @@ module Hanami
         end
 
         private
+
         # Check the current builder is top-level
         #
         # @api private
@@ -835,7 +960,7 @@ module Hanami
         # @api private
         # @since 0.2.0
         def _input_name(name)
-          "#{ @name }[#{ name }]"
+          "#{@name}[#{name}]"
         end
 
         # Input <tt>id</tt> HTML attribute
@@ -877,11 +1002,11 @@ module Hanami
         # @see Hanami::Helpers::FormHelper::FormBuilder#check_box
         def _hidden_field_for_check_box(name, attributes)
           if attributes[:value].nil? || !attributes[:unchecked_value].nil?
-            input({
+            input(
               type:  :hidden,
               name:  attributes[:name] || _input_name(name),
               value: attributes.delete(:unchecked_value) || DEFAULT_UNCHECKED_VALUE
-            })
+            )
           end
         end
 
@@ -900,8 +1025,8 @@ module Hanami
           }.merge(attributes)
 
           value = _value(name)
-          attributes[:checked] = CHECKED if value &&
-            ( value == attributes[:value] || value.include?(attributes[:value]) )
+          attributes[:checked] = CHECKED if !value.nil? &&
+                                            (value == attributes[:value] || value.include?(attributes[:value]))
 
           attributes
         end

data/lib/hanami/helpers/form_helper/html_node.rb

@@ -34,6 +34,7 @@ module Hanami
         end
 
         private
+
         # Resolve the (nested) content
         #
         # @return [String] the content
@@ -68,9 +69,9 @@ module Hanami
         def _csrf_protection!
           return if @csrf_token.nil?
 
-          _csrf_token = @csrf_token
+          csrf_token = @csrf_token
           @builder.resolve do
-            input(type: :hidden, name: FormHelper::CSRF_TOKEN, value: _csrf_token)
+            input(type: :hidden, name: FormHelper::CSRF_TOKEN, value: csrf_token)
           end
         end
       end

data/lib/hanami/helpers/form_helper/values.rb

@@ -3,19 +3,37 @@ require 'hanami/utils/hash'
 module Hanami
   module Helpers
     module FormHelper
+      # Values from params and form helpers.
+      #
+      # It's responsible to populate input values with data coming from params
+      # and inline values specified via form helpers like `text_field`.
+      #
+      # @since 0.2.0
+      # @api private
       class Values
+        # @since 0.2.0
+        # @api private
         GET_SEPARATOR = '.'.freeze
 
+        # @since 0.2.0
+        # @api private
         def initialize(values, params)
           @values = Utils::Hash.new(values).stringify!
           @params = params
         end
 
+        # Returns the value for the given key, if present
+        #
+        # @since 0.2.0
+        # @api private
         def get(key)
           @params.get(key) || _get_from_values(key)
         end
 
         private
+
+        # @since 0.2.0
+        # @api private
         def _get_from_values(key)
           initial_key, *keys = key.to_s.split(GET_SEPARATOR)
           result             = @values[initial_key]
@@ -23,11 +41,9 @@ module Hanami
           Array(keys).each do |k|
             break if result.nil?
 
-            result = if result.respond_to?(k)
-              result.public_send(k)
-            else
-              nil
-            end
+            result = if result.respond_to?(k) # rubocop:disable Style/IfUnlessModifier
+                       result.public_send(k)
+                     end
           end
 
           result

data/lib/hanami/helpers/html_helper.rb

@@ -185,6 +185,7 @@ module Hanami
     #     #    </div>
     module HtmlHelper
       private
+
       # Instantiate an HTML builder
       #
       # @param blk [Proc,Hanami::Helpers::HtmlHelper::HtmlBuilder,NilClass] the optional content block

data/lib/hanami/helpers/html_helper/empty_html_node.rb

@@ -12,15 +12,54 @@ module Hanami
         # @api private
         #
         # @see http://www.w3.org/html/wg/drafts/html/master/infrastructure.html#boolean-attribute
-        BOOLEAN_ATTRIBUTES = %w{allowfullscreen async autobuffer autofocus
-          autoplay checked compact controls declare default defaultchecked
-          defaultmuted defaultselected defer disabled draggable enabled
-          formnovalidate hidden indeterminate inert ismap itemscope loop
-          multiple muted nohref noresize noshade novalidate nowrap open
-          pauseonexit pubdate readonly required reversed scoped seamless
-          selected sortable spellcheck translate truespeed typemustmatch
+        BOOLEAN_ATTRIBUTES = %w(
+          allowfullscreen
+          async
+          autobuffer
+          autofocus
+          autoplay
+          checked
+          compact
+          controls
+          declare
+          default
+          defaultchecked
+          defaultmuted
+          defaultselected
+          defer
+          disabled
+          draggable
+          enabled
+          formnovalidate
+          hidden
+          indeterminate
+          inert
+          ismap
+          itemscope
+          loop
+          multiple
+          muted
+          nohref
+          noresize
+          noshade
+          novalidate
+          nowrap
+          open
+          pauseonexit
+          pubdate
+          readonly
+          required
+          reversed
+          scoped
+          seamless
+          selected
+          sortable
+          spellcheck
+          translate
+          truespeed
+          typemustmatch
           visible
-        }.freeze
+        ).freeze
 
         # Attributes separator
         #
@@ -49,10 +88,11 @@ module Hanami
         # @since 0.1.0
         # @api private
         def to_s
-          %(<#{ @name }#{attributes}>)
+          %(<#{@name}#{attributes}>)
         end
 
         private
+
         # Resolve the attributes
         #
         # @return [String,NilClass] the tag attributes
@@ -60,7 +100,7 @@ module Hanami
         # @since 0.1.0
         # @api private
         def attributes
-          return if @attributes.nil?
+          return unless defined?(@attributes) && !@attributes.nil?
           result = ''
 
           @attributes.each do |attribute_name, value|
@@ -79,12 +119,12 @@ module Hanami
         end
 
         # Do not render boolean attributes when their value is _false_.
-        def boolean_attribute(attribute_name, value)
-          %(#{ATTRIBUTES_SEPARATOR}#{ attribute_name }="#{ attribute_name }")
+        def boolean_attribute(attribute_name, _value)
+          %(#{ATTRIBUTES_SEPARATOR}#{attribute_name}="#{attribute_name}")
         end
 
         def attribute(attribute_name, value)
-          %(#{ATTRIBUTES_SEPARATOR}#{ attribute_name }="#{ value }")
+          %(#{ATTRIBUTES_SEPARATOR}#{attribute_name}="#{value}")
         end
       end
     end

data/lib/hanami/helpers/html_helper/html_builder.rb

@@ -12,7 +12,7 @@ module Hanami
       # HTML Builder
       #
       # @since 0.1.0
-      class HtmlBuilder
+      class HtmlBuilder # rubocop:disable Metrics/ClassLength
         # HTML5 content tags
         #
         # @since 0.1.0
@@ -20,103 +20,103 @@ module Hanami
         #
         # @see Hanami::Helpers::HtmlHelper::HtmlNode
         # @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element
-        CONTENT_TAGS = [
-          'a',
-          'abbr',
-          'address',
-          'article',
-          'aside',
-          'audio',
-          'b',
-          'bdi',
-          'bdo',
-          'blockquote',
-          'body',
-          'button',
-          'canvas',
-          'caption',
-          'cite',
-          'code',
-          'colgroup',
-          'data',
-          'datalist',
-          'del',
-          'details',
-          'dfn',
-          'div',
-          'dl',
-          'dt',
-          'dd',
-          'em',
-          'fieldset',
-          'figcaption',
-          'figure',
-          'footer',
-          'form',
-          'h1',
-          'h2',
-          'h3',
-          'h4',
-          'h5',
-          'h6',
-          'head',
-          'header',
-          'i',
-          'iframe',
-          'ins',
-          'kbd',
-          'label',
-          'legend',
-          'li',
-          'link',
-          'main',
-          'map',
-          'mark',
-          'math',
-          'menu',
-          'meter',
-          'nav',
-          'noscript',
-          'object',
-          'ol',
-          'optgroup',
-          'option',
-          'output',
-          'p',
-          'pre',
-          'progress',
-          'q',
-          'rp',
-          'rt',
-          'ruby',
-          's',
-          'samp',
-          'script',
-          'section',
-          'select',
-          'small',
-          'span',
-          'strong',
-          'style',
-          'sub',
-          'summary',
-          'sup',
-          'svg',
-          'table',
-          'tbody',
-          'td',
-          'template',
-          'textarea',
-          'tfoot',
-          'th',
-          'thead',
-          'time',
-          'title',
-          'tr',
-          'u',
-          'ul',
-          'video',
-        ].freeze
+        CONTENT_TAGS = %w(
+          a
+          abbr
+          address
+          article
+          aside
+          audio
+          b
+          bdi
+          bdo
+          blockquote
+          body
+          button
+          canvas
+          caption
+          cite
+          code
+          colgroup
+          data
+          datalist
+          del
+          details
+          dfn
+          div
+          dl
+          dt
+          dd
+          em
+          fieldset
+          figcaption
+          figure
+          footer
+          form
+          h1
+          h2
+          h3
+          h4
+          h5
+          h6
+          head
+          header
+          i
+          iframe
+          ins
+          kbd
+          label
+          legend
+          li
+          link
+          main
+          map
+          mark
+          math
+          menu
+          meter
+          nav
+          noscript
+          object
+          ol
+          optgroup
+          option
+          output
+          p
+          pre
+          progress
+          q
+          rp
+          rt
+          ruby
+          s
+          samp
+          script
+          section
+          select
+          small
+          span
+          strong
+          style
+          sub
+          summary
+          sup
+          svg
+          table
+          tbody
+          td
+          template
+          textarea
+          tfoot
+          th
+          thead
+          time
+          title
+          tr
+          u
+          ul
+          video
+        ).freeze
 
         # HTML5 empty tags
         #
@@ -125,24 +125,24 @@ module Hanami
         #
         # @see Hanami::Helpers::HtmlHelper::EmptyHtmlNode
         # @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element
-        EMPTY_TAGS = [
-          'area',
-          'base',
-          'br',
-          'col',
-          'embed',
-          'hr',
-          'img',
-          'input',
-          'keygen',
-          'link',
-          'menuitem',
-          'meta',
-          'param',
-          'source',
-          'track',
-          'wbr',
-        ].freeze
+        EMPTY_TAGS = %w(
+          area
+          base
+          br
+          col
+          embed
+          hr
+          img
+          input
+          keygen
+          link
+          menuitem
+          meta
+          param
+          source
+          track
+          wbr
+        ).freeze
 
         # New line separator
         #
@@ -152,8 +152,8 @@ module Hanami
 
         CONTENT_TAGS.each do |tag|
           class_eval %{
-            def #{ tag }(content = nil, attributes = nil, &blk)
-              @nodes << self.class.html_node.new(:#{ tag }, blk || content, attributes || content, options)
+            def #{tag}(content = nil, attributes = nil, &blk)
+              @nodes << self.class.html_node.new(:#{tag}, blk || content, attributes || content, options)
               self
             end
           }
@@ -161,8 +161,8 @@ module Hanami
 
         EMPTY_TAGS.each do |tag|
           class_eval %{
-            def #{ tag }(attributes = nil)
-              @nodes << EmptyHtmlNode.new(:#{ tag }, attributes)
+            def #{tag}(attributes = nil)
+              @nodes << EmptyHtmlNode.new(:#{tag}, attributes)
               self
             end
           }
@@ -310,7 +310,7 @@ module Hanami
 
         # @since 0.2.5
         # @api private
-        alias_method :+, :text
+        alias + text
 
         # Resolves all the nodes and generates the markup
         #

data/lib/hanami/helpers/html_helper/html_fragment.rb

@@ -1,3 +1,5 @@
+require 'hanami/utils/escape'
+
 module Hanami
   module Helpers
     module HtmlHelper
@@ -36,7 +38,7 @@ module Hanami
           if @builder.nested?
             @builder.to_s
           else
-            "#{ Utils::Escape.html(result) }"
+            Utils::Escape.html(result)
           end
         end
       end

data/lib/hanami/helpers/html_helper/html_node.rb

@@ -1,4 +1,5 @@
 require 'hanami/helpers/html_helper/empty_html_node'
+require 'hanami/utils/escape'
 
 module Hanami
   module Helpers
@@ -15,10 +16,10 @@ module Hanami
         # @param name [Symbol,String] the name of the tag
         # @param content [String,Proc,Hanami::Helpers::HtmlHelper::HtmlBuilder,NilClass] the optional content
         # @param attributes [Hash,NilClass] the optional tag attributes
-        # @param options [Hash] a optional set of data
+        # @param _options [Hash] a optional set of data
         #
         # @return [Hanami::Helpers::HtmlHelper::HtmlNode]
-        def initialize(name, content, attributes, options = {})
+        def initialize(name, content, attributes, _options = {})
           @builder = HtmlBuilder.new
           @name    = name
           @content = case content
@@ -40,25 +41,26 @@ module Hanami
         #
         # @see Hanami::Helpers::HtmlHelper::EmptyHtmlNode#to_s
         def to_s
-          %(#{ super }#{ content }</#{ @name }>)
+          %(#{super}#{content}</#{@name}>)
         end
 
         private
+
         # Resolve the (nested) content
         #
         # @return [String] the content
         #
         # @since 0.1.0
         # @api private
-        def content
+        def content # rubocop:disable Metrics/MethodLength
           case @content
           when Proc
             result = @builder.resolve(&@content)
 
             if @builder.nested?
-              "\n#{ @builder }\n"
+              "\n#{@builder}\n"
             else
-              "\n#{ Utils::Escape.html(result) }\n"
+              "\n#{Utils::Escape.html(result)}\n"
             end
           else
             Utils::Escape.html(@content)

data/lib/hanami/helpers/html_helper/text_node.rb

@@ -1,3 +1,5 @@
+require 'hanami/utils/escape'
+
 module Hanami
   module Helpers
     module HtmlHelper

data/lib/hanami/helpers/link_to_helper.rb

@@ -115,7 +115,7 @@ module Hanami
       # @example With only content
       #   <%= link_to 'Home' %>
       #     # => ArgumentError
-      def link_to(content, url = nil, options = {}, &blk)
+      def link_to(content, url = nil, options = {}, &blk) # rubocop:disable Metrics/MethodLength
         if block_given?
           options = url || {}
           url     = content
@@ -128,7 +128,7 @@ module Hanami
           raise ArgumentError
         end
 
-        html.a(blk || content, options).to_s
+        html.a(blk || content, options)
       end
     end
   end

data/lib/hanami/helpers/number_formatting_helper.rb

@@ -1,3 +1,5 @@
+require 'hanami/utils/kernel'
+
 module Hanami
   module Helpers
     # Number formatter
@@ -11,6 +13,7 @@ module Hanami
     # @since 0.2.0
     module NumberFormattingHelper
       private
+
       # Format the given number, according to the options
       #
       # It accepts a number (<tt>Numeric</tt>) or a string representation.

data/lib/hanami/helpers/routing_helper.rb

@@ -1,3 +1,5 @@
+require 'hanami/utils/string'
+
 module Hanami
   module Helpers
     # Routing helper for full stack Hanami web applications.
@@ -39,11 +41,11 @@ module Hanami
     #   # <%= link_to_home %>
     module RoutingHelper
       def self.included(base)
-        factory = "#{ Utils::String.new(base).namespace }::Routes"
+        factory = "#{Utils::String.new(base).namespace}::Routes"
 
         base.class_eval <<-END_EVAL, __FILE__, __LINE__
           def routes
-            #{ factory }
+            #{factory}
           end
         END_EVAL
       end

data/lib/hanami/helpers/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Define version
     #
     # @since 0.1.0
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-helpers
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -118,9 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Hanami helpers
 test_files: []
-has_rdoc: