hanami-helpers 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '0814ab246393d88e2d72ddbd05289c6c20b2f8a5'
-  data.tar.gz: fafb13112606fbc75c3a141e88704c24b01f20ec
+SHA256:
+  metadata.gz: 1505baa1639a4a9bfbf8a7ea317e2385ade8783fe446f526162f26152d0c1c84
+  data.tar.gz: 0071b68be742ee837514e1457fad8503a78cacde1d3d61ea45f8b611a7df9160
 SHA512:
-  metadata.gz: 9cdff443cca897217b8651c2ae9b396c2b07cbcb139216e3e3215a0b3cf208197f4da475e97b8e4062a4b16f0220e83e8c113d978afc00b3de8c2dcff40b0507
-  data.tar.gz: '080ba13083d8ec23da63486a74bfaa5f0c3e81f82b100a35b605b6ead931ee175e7528c09af5aa379a3c8214e5bed222445c3a41a82344b6b421f8a44482a073'
+  metadata.gz: c80db19544ca884289e9086132b611b2ebc7924b5f0de03ed0bf6bd39d2205d0ccfd1f3999735068255d4a61dc1824b5c6d72e3c38cf5d23528abad6b042ea87
+  data.tar.gz: 7e2cf205cae822a23199bfae9787426e55a66ff8118f14cd1235ba0ff4cfd63190eb2f883e651599dbdda39fae9dc589985da7181212996f82004737bb1b8d7e

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Hanami::Helpers
 View helpers for Ruby web applications
 
+## v1.1.1 - 2017-11-28
+### Fixed
+- [Alfonso Uceda] Ensure `#select` form helper to not select options with `nil` value
+- [Alfonso Uceda] Ensure `#fields_for_collection` form helper to produce input fields with correct `name` attribute
+- [Luca Guidi] Ensure `#select` form helper to respect `:selected` option
+
 ## v1.1.0 - 2017-10-25
 
 ## v1.1.0.rc1 - 2017-10-16

data/hanami-helpers.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hanami-utils', '~> 1.1'
 
   spec.add_development_dependency 'bundler',    '~> 1.6'
+  spec.add_development_dependency 'dry-struct', '~> 0.3'
   spec.add_development_dependency 'rake',       '~> 12'
   spec.add_development_dependency 'rspec',      '~> 3.7'
-  spec.add_development_dependency 'dry-struct', '~> 0.3'
 end

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

@@ -814,7 +814,7 @@ module Hanami
         #   <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)
+          attributes = { type: :file, name: _displayed_input_name(name), id: _input_id(name) }.merge(attributes)
 
           input(attributes)
         end
@@ -937,7 +937,7 @@ module Hanami
             content    = nil
           end
 
-          attributes = { name: _input_name(name), id: _input_id(name) }.merge(attributes)
+          attributes = { name: _displayed_input_name(name), id: _input_id(name) }.merge(attributes)
           textarea(content || _value(name), attributes)
         end
 
@@ -1049,7 +1049,7 @@ module Hanami
         #   <input type="radio" name="book[category]" value="Fiction">
         #   <input type="radio" name="book[category]" value="Non-Fiction" checked="checked">
         def radio_button(name, value, attributes = {})
-          attributes = { type: :radio, name: _input_name(name), value: value }.merge(attributes)
+          attributes = { type: :radio, name: _displayed_input_name(name), value: value }.merge(attributes)
           attributes[:checked] = CHECKED if _value(name).to_s == value.to_s
           input(attributes)
         end
@@ -1070,16 +1070,19 @@ module Hanami
         #   <!-- output -->
         #   <input type="password" name="signup[password]" id="signup-password" value="">
         def password_field(name, attributes = {})
-          input({ type: :password, name: _input_name(name), id: _input_id(name), value: nil }.merge(attributes))
+          input({ type: :password, name: _displayed_input_name(name), id: _input_id(name), value: nil }.merge(attributes))
         end
 
         # Select input
         #
         # @param name [Symbol] the input name
         # @param values [Hash] a Hash to generate <tt><option></tt> tags.
-        #   Values correspond to <tt>value</tt> and keys correspond to the content.
         # @param attributes [Hash] HTML attributes to pass to the input tag
         #
+        # Values is used to generate the list of <tt>&lt;option&gt;</tt> tags, it is an
+        # <tt>Enumerable</tt> of pairs of content (the displayed text) and value (the tag's
+        # attribute), in that respective order (please refer to the examples for more clarity).
+        #
         # If request params have a value that corresponds to one of the given values,
         # it automatically sets the <tt>selected</tt> attribute on the <tt><option></tt> tag.
         # This Hanami::Controller integration happens without any developer intervention.
@@ -1090,11 +1093,11 @@ module Hanami
         #   <%=
         #     # ...
         #     values = Hash['Italy' => 'it', 'United States' => 'us']
-        #     select :store, values, class: "form-control"
+        #     select :store, values
         #   %>
         #
         #   <!-- output -->
-        #   <select name="book[store]" id="book-store" class="form-control">
+        #   <select name="book[store]" id="book-store">
         #     <option value="it">Italy</option>
         #     <option value="us">United States</option>
         #   </select>
@@ -1103,11 +1106,11 @@ module Hanami
         #   <%=
         #     # ...
         #     values = Hash['Italy' => 'it', 'United States' => 'us']
-        #     select :store, values
+        #     select :store, values, class: "form-control"
         #   %>
         #
         #   <!-- output -->
-        #   <select name="book[store]" id="book-store">
+        #   <select name="book[store]" id="book-store" class="form-control">
         #     <option value="it">Italy</option>
         #     <option value="us">United States</option>
         #   </select>
@@ -1121,7 +1124,7 @@ module Hanami
         #
         #   <%=
         #     # ...
-        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     values = Hash['Italy' => 'it', 'United States' => 'us']
         #     select :store, values
         #   %>
         #
@@ -1134,7 +1137,7 @@ module Hanami
         # @example Prompt option
         #   <%=
         #     # ...
-        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     values = Hash['Italy' => 'it', 'United States' => 'us']
         #     select :store, values, options: { prompt: 'Select a store' }
         #   %>
         #
@@ -1148,7 +1151,7 @@ module Hanami
         # @example Selected option
         #   <%=
         #     # ...
-        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     values = Hash['Italy' => 'it', 'United States' => 'us']
         #     select :store, values, options: { selected: book.store }
         #   %>
         #
@@ -1161,7 +1164,7 @@ module Hanami
         # @example Prompt option and HTML attributes
         #   <%=
         #     # ...
-        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     values = Hash['Italy' => 'it', 'United States' => 'us']
         #     select :store, values, options: { prompt: 'Select a store' }, class: "form-control"
         #   %>
         #
@@ -1175,7 +1178,7 @@ module Hanami
         # @example Multiple select
         #   <%=
         #     # ...
-        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     values = Hash['Italy' => 'it', 'United States' => 'us']
         #     select :stores, values, multiple: true
         #   %>
         #
@@ -1188,7 +1191,7 @@ module Hanami
         # @example Multiple select and HTML attributes
         #   <%=
         #     # ...
-        #     values = Hash['it' => 'Italy', 'us' => 'United States']
+        #     values = Hash['Italy' => 'it', 'United States' => 'us']
         #     select :stores, values, multiple: true, class: "form-control"
         #   %>
         #
@@ -1197,6 +1200,30 @@ module Hanami
         #     <option value="it">Italy</option>
         #     <option value="us">United States</option>
         #   </select>
+        #
+        # @example Array with repeated entries
+        #   <%=
+        #     # ...
+        #     values = [['Italy', 'it'],
+        #               ['---', ''],
+        #               ['Afghanistan', 'af'],
+        #               ...
+        #               ['Italy', 'it'],
+        #               ...
+        #               ['Zimbabwe', 'zw']]
+        #     select :stores, values
+        #   %>
+        #
+        #   <!-- output -->
+        #   <select name="book[store]" id="book-store">
+        #     <option value="it">Italy</option>
+        #     <option value="">---</option>
+        #     <option value="af">Afghanistan</option>
+        #     ...
+        #     <option value="it">Italy</option>
+        #     ...
+        #     <option value="zw">Zimbabwe</option>
+        #   </select>
         def select(name, values, attributes = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           options    = attributes.delete(:options) { {} }
           attributes = { name: _select_input_name(name, attributes[:multiple]), id: _input_id(name) }.merge(attributes)
@@ -1206,8 +1233,9 @@ module Hanami
           super(attributes) do
             option(prompt) unless prompt.nil?
 
+            already_selected = nil
             values.each do |content, value|
-              if _select_option_selected?(value, selected, _value(name), attributes[:multiple])
+              if (attributes[:multiple] || !already_selected) && (already_selected = _select_option_selected?(value, selected, _value(name), attributes[:multiple]))
                 option(content, { value: value, selected: SELECTED }.merge(options))
               else
                 option(content, { value: value }.merge(options))
@@ -1509,7 +1537,7 @@ module Hanami
 
           input(
             type:  :hidden,
-            name:  attributes[:name] || _input_name(name),
+            name:  attributes[:name] || _displayed_input_name(name),
             value: attributes.delete(:unchecked_value) || DEFAULT_UNCHECKED_VALUE
           )
         end
@@ -1523,7 +1551,7 @@ module Hanami
         def _attributes_for_check_box(name, attributes)
           attributes = {
             type:  :checkbox,
-            name:  _input_name(name),
+            name:  _displayed_input_name(name),
             id:    _input_id(name),
             value: attributes.delete(:checked_value) || DEFAULT_CHECKED_VALUE
           }.merge(attributes)
@@ -1535,7 +1563,7 @@ module Hanami
 
         # @api private
         def _select_input_name(name, multiple)
-          select_name = _input_name(name)
+          select_name = _displayed_input_name(name)
           select_name = "#{select_name}[]" if multiple
           select_name
         end
@@ -1547,8 +1575,10 @@ module Hanami
         # 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.to_s == input_value.to_s || (multiple && (input_value.is_a?(Array) && input_value.include?(value)))
+          value == selected ||
+            (multiple && (selected.is_a?(Array) && selected.include?(value))) ||
+            (!input_value.nil? && (value.to_s == input_value.to_s)) ||
+            (multiple && (input_value.is_a?(Array) && input_value.include?(value)))
         end
         # rubocop:enable Metrics/PerceivedComplexity
         # rubocop:enable Metrics/CyclomaticComplexity

data/lib/hanami/helpers/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-helpers
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '12'
 - !ruby/object:Gem::Dependency
-  name: dry-struct
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.7'
 description: View helpers for Ruby applications
 email:
 - me@lucaguidi.com
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Hanami helpers