hanami-helpers 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e90f277e6ff4d461bd7ebcc45e48de6c03f91e70
-  data.tar.gz: 8d97b52cf45b16454acf597a6fe198b3a549148a
+  metadata.gz: 8e1a90723c16139a6a3c5fdd84e0d85f732ed886
+  data.tar.gz: 1edccf5044d1185147cf0d0e51fe863d78467e03
 SHA512:
-  metadata.gz: 21d4b2160f0d6af94d099ec8f765bbcce309b22623aff0ce3190f50b7fb2fec228fde3b6f330a47242455ab7989144e8c04b5a146170399d74f914ba0facc79f
-  data.tar.gz: f898b3a411eb8d77e776a398ef2873bc6b6e8ef39fffd59602f8d0b7cd53a5662ea767665a95e7da228271bb3f16cf635f3df12d28feceed507177b2e621134c
+  metadata.gz: 98e536f514a1e3d152ab3f16b059592f0d8c1b7b2f83688cedf3641a397c8db506fbefd6855fc5acb9b0feeadf991501d9dc9f62e9c3e2f555837b9085f5aa6c
+  data.tar.gz: fac6a702eb642517b6e5c31d3a1bdbf784ebccf5ed7938665ed0dfb7234205074fae945f42ce2f343ebfc2b254ddb4e90fe5032f8472308378d688e303b8aefa

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Hanami::Helpers
 View helpers for Ruby web applications
 
+## v0.5.0 - 2016-11-15
+### Added
+- [Marion Duprey] Allow `select` form helper to generate a multiple select (via `multiple: true` option)
+
+### Fixed
+- [Luca Guidi] Ensure `form_for` to be compatible with params passed as `Hash`. This is useful for unit tests.
+
+### Changed
+- [Luca Guidi] Official support for Ruby: MRI 2.3+ and JRuby 9.1.5.0+
+
 ## 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(...)`.

data/README.md

@@ -22,7 +22,7 @@ View helpers for Ruby applications
 
 ## Rubies
 
-__Hanami::Helpers__ supports Ruby (MRI) 2.2+
+__Hanami::Helpers__ supports Ruby (MRI) 2.3+ and JRuby 9.1.5.0+
 
 ## Installation
 

data/hanami-helpers.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   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.2.0'
+  spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_dependency 'hanami-utils', '~> 0.8'
+  spec.add_dependency 'hanami-utils', '~> 0.9'
 
   spec.add_development_dependency 'bundler',  '~> 1.6'
   spec.add_development_dependency 'rake',     '~> 11'

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

@@ -56,14 +56,6 @@ module Hanami
         # @see Hanami::Helpers::FormHelper::FormBuilder#_input_id
         INPUT_ID_REPLACEMENT = '-\k<token>'.freeze
 
-        # Replacement for input value interpolation
-        #
-        # @since 0.2.0
-        # @api private
-        #
-        # @see Hanami::Helpers::FormHelper::FormBuilder#_value
-        INPUT_VALUE_REPLACEMENT = '.\k<token>'.freeze
-
         # Default value for unchecked check box
         #
         # @since 0.2.0
@@ -780,9 +772,22 @@ module Hanami
         #   #    <option value="it" selected="selected">Italy</option>
         #   #    <option value="us">United States</option>
         #   #  </select>
+        #
+        # @example Multiple select
+        #   <%=
+        #     # ...
+        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     select :stores, values, multiple: true
+        #   %>
+        #
+        #   # Output:
+        #   # <select name="book[store][]" id="book-store" multiple="multiple">
+        #   #   <option value="it">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)
+          attributes = { name: _select_input_name(name, attributes[:multiple]), id: _input_id(name) }.merge(attributes)
           prompt     = options.delete(:prompt)
           selected   = options.delete(:selected)
 
@@ -790,7 +795,7 @@ module Hanami
             option(prompt) unless prompt.nil?
 
             values.each do |content, value|
-              if selected == value || _value(name) == value
+              if _select_option_selected?(value, selected, _value(name), attributes[:multiple])
                 option(content, { value: value, selected: SELECTED }.merge(options))
               else
                 option(content, { value: value }.merge(options))
@@ -977,8 +982,9 @@ module Hanami
         # @api private
         # @since 0.2.0
         def _value(name)
-          name = _input_name(name).gsub(/\[(?<token>[[:word:]]*)\]/, INPUT_VALUE_REPLACEMENT)
-          @values.get(name)
+          @values.get(
+            *_input_name(name).split(/[\[\]]+/).map(&:to_sym)
+          )
         end
 
         # Input <tt>for</tt> HTML attribute
@@ -1001,13 +1007,13 @@ 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(
-              type:  :hidden,
-              name:  attributes[:name] || _input_name(name),
-              value: attributes.delete(:unchecked_value) || DEFAULT_UNCHECKED_VALUE
-            )
-          end
+          return unless attributes[:value].nil? || !attributes[:unchecked_value].nil?
+
+          input(
+            type:  :hidden,
+            name:  attributes[:name] || _input_name(name),
+            value: attributes.delete(:unchecked_value) || DEFAULT_UNCHECKED_VALUE
+          )
         end
 
         # HTML attributes for check box
@@ -1030,6 +1036,23 @@ module Hanami
 
           attributes
         end
+
+        def _select_input_name(name, multiple)
+          select_name = _input_name(name)
+          select_name = "#{select_name}[]" if multiple
+          select_name
+        end
+
+        # TODO: this has to be refactored
+        #
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/PerceivedComplexity
+        def _select_option_selected?(value, selected, input_value, multiple)
+          value == selected || (multiple && (selected.is_a?(Array) && selected.include?(value))) ||
+            value == input_value || (multiple && (input_value.is_a?(Array) && input_value.include?(value)))
+        end
+        # rubocop:enable Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/CyclomaticComplexity
       end
     end
   end

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

@@ -18,27 +18,34 @@ module Hanami
         # @since 0.2.0
         # @api private
         def initialize(values, params)
-          @values = Utils::Hash.new(values).stringify!
+          @values = Utils::Hash.new(values || {}).symbolize!
           @params = params
         end
 
-        # Returns the value for the given key, if present
+        # Returns the value (if present) for the given key.
+        # Nested values are expressed with an array if symbols.
         #
         # @since 0.2.0
         # @api private
-        def get(key)
-          @params.get(key) || _get_from_values(key)
+        def get(*keys)
+          _get_from_params(*keys) || _get_from_values(*keys)
         end
 
         private
 
+        # @since 0.5.0
+        # @api private
+        def _get_from_params(*keys)
+          @params.dig(*keys)
+        end
+
         # @since 0.2.0
         # @api private
-        def _get_from_values(key)
-          initial_key, *keys = key.to_s.split(GET_SEPARATOR)
-          result             = @values[initial_key]
+        def _get_from_values(*keys)
+          head, *tail = *keys
+          result      = @values[head]
 
-          Array(keys).each do |k|
+          tail.each do |k|
             break if result.nil?
 
             result = if result.respond_to?(k) # rubocop:disable Style/IfUnlessModifier

data/lib/hanami/helpers/number_formatting_helper.rb

@@ -110,7 +110,7 @@ module Hanami
 
         # Default precision
         #
-        # @return [String] default precision
+        # @return [Integer] default precision
         #
         # @since 0.2.0
         # @api private

data/lib/hanami/helpers/routing_helper.rb

@@ -5,7 +5,7 @@ module Hanami
     # Routing helper for full stack Hanami web applications.
     #
     # For a given application called <tt>Web::Application</tt>, at runtime
-    # Hanami creates a routes factory called <tt>Web::Routes</tt>.
+    # Hanami creates a routes factory called <tt>Web.routes</tt>.
     #
     # By including this module in a view, it makes that factory avaliable as
     # <tt>routes</tt>.
@@ -41,7 +41,7 @@ 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

data/lib/hanami/helpers/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-helpers
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-11-15 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.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="