hanami-helpers 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1505baa1639a4a9bfbf8a7ea317e2385ade8783fe446f526162f26152d0c1c84
-  data.tar.gz: 0071b68be742ee837514e1457fad8503a78cacde1d3d61ea45f8b611a7df9160
+  metadata.gz: 2240795ff1bddb8305850e8473c60580701e7175528edcc25f83bad073a49fc9
+  data.tar.gz: 704af3c5d22e74509806c87c17bb368b0935dafe6ff276d2532bbc010c59eba2
 SHA512:
-  metadata.gz: c80db19544ca884289e9086132b611b2ebc7924b5f0de03ed0bf6bd39d2205d0ccfd1f3999735068255d4a61dc1824b5c6d72e3c38cf5d23528abad6b042ea87
-  data.tar.gz: 7e2cf205cae822a23199bfae9787426e55a66ff8118f14cd1235ba0ff4cfd63190eb2f883e651599dbdda39fae9dc589985da7181212996f82004737bb1b8d7e
+  metadata.gz: 94778d91a095e8e7e41d58c0fa9477de162960fab463f2c8eb593b03f27ba2ac3dc7041d6fdab42b7f46783838510f0532191d678c4d5cd2225b454251b0c499
+  data.tar.gz: 6a5c35fd9efdc2c5db4d763398e10bc51de1cf2b429e28bfcfc5b2694e2dc3a68d24d6b22658965e85e5b85202a3c1f206d920badc5bf6e70ae75335dd4d8410

data/CHANGELOG.md

@@ -1,7 +1,11 @@
 # Hanami::Helpers
 View helpers for Ruby web applications
 
-## v1.1.1 - 2017-11-28
+## v1.1.2 - 2018-04-05
+### Fixed
+- [Luca Guidi] Ensure correct arity of `#form_for`, to be used in conjuction with `Hanami::Helpers::FormHelper::Form` (eg. `<%= form_for(form) { ... } %>`)
+
+## v1.1.1 - 2018-02-27
 ### 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

data/lib/hanami/helpers/form_helper.rb

@@ -229,7 +229,7 @@ module Hanami
       #   @option options [Hash] :values An optional payload of objects to pass
       #   @param blk [Proc] A block that describes the contents of the form
       #
-      # @overload form_for(form, attributes, &blk)
+      # @overload form_for(form, attributes = {}, &blk)
       #   Use Form
       #   @param form [Hanami::Helpers::FormHelper::Form] a form object
       #   @param attributes [Hash] HTML attributes to pass to the form tag and form values
@@ -406,9 +406,9 @@ module Hanami
       #
       #     <button type="submit">Create</button>
       #   </form>
-      def form_for(name, url, options = {}, &blk)
+      def form_for(name, url = nil, options = {}, &blk)
         form = if name.is_a?(Form)
-                 options = url
+                 options = url || {}
                  name
                else
                  Form.new(name, url, options.delete(:values))

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

@@ -81,11 +81,11 @@ module Hanami
 
         # Instantiate a form builder
         #
-        # @overload initialize(form, attributes, params, &blk)
+        # @overload initialize(form, attributes, context, &blk)
         #   Top level form
         #   @param form [Hanami::Helpers:FormHelper::Form] the form
         #   @param attributes [::Hash] a set of HTML attributes
-        #   @param params [Hanami::Action::Params] request params
+        #   @param context [Hanami::Helpers::FormHelper]
         #   @param blk [Proc] a block that describes the contents of the form
         #
         # @overload initialize(form, attributes, params, &blk)
@@ -1225,17 +1225,19 @@ module Hanami
         #     <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)
-          prompt     = options.delete(:prompt)
-          selected   = options.delete(:selected)
+          options     = attributes.delete(:options) { {} }
+          multiple    = attributes[:multiple]
+          attributes  = { name: _select_input_name(name, multiple), id: _input_id(name) }.merge(attributes)
+          prompt      = options.delete(:prompt)
+          selected    = options.delete(:selected)
+          input_value = _value(name)
 
           super(attributes) do
             option(prompt) unless prompt.nil?
 
             already_selected = nil
             values.each do |content, value|
-              if (attributes[:multiple] || !already_selected) && (already_selected = _select_option_selected?(value, selected, _value(name), attributes[:multiple]))
+              if (multiple || !already_selected) && (already_selected = _select_option_selected?(value, selected, input_value, multiple))
                 option(content, { value: value, selected: SELECTED }.merge(options))
               else
                 option(content, { value: value }.merge(options))
@@ -1568,20 +1570,35 @@ module Hanami
           select_name
         end
 
-        # TODO: this has to be refactored
-        #
         # @api private
-        #
-        # 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))) ||
-            (!input_value.nil? && (value.to_s == input_value.to_s)) ||
-            (multiple && (input_value.is_a?(Array) && input_value.include?(value)))
+          if input_value && selected.nil?
+            value.to_s == input_value
+          else
+            (value == selected) ||
+              _is_in_selected_values?(multiple, selected, value) ||
+              _is_current_value?(input_value, value) ||
+              _is_in_input_values?(multiple, input_value, value)
+          end
+        end
+
+        # @api private
+        def _is_current_value?(input_value, value)
+          return unless input_value
+          value.to_s == input_value.to_s
+        end
+
+        # @api private
+        def _is_in_selected_values?(multiple, selected, value)
+          return unless multiple && selected.is_a?(Array)
+          selected.include?(value)
+        end
+
+        # @api private
+        def _is_in_input_values?(multiple, input_value, value)
+          return unless multiple && input_value.is_a?(Array)
+          input_value.include?(value)
         end
-        # rubocop:enable Metrics/PerceivedComplexity
-        # rubocop:enable Metrics/CyclomaticComplexity
 
         # @api private
         def _check_box_checked?(value, input_value)

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

@@ -160,7 +160,7 @@ module Hanami
               @nodes << self.class.html_node.new(:#{tag}, blk || content, attributes || content, options)
               self
             end
-          }
+          }, __FILE__, __LINE__ - 5
         end
 
         EMPTY_TAGS.each do |tag|
@@ -169,7 +169,7 @@ module Hanami
               @nodes << EmptyHtmlNode.new(:#{tag}, attributes)
               self
             end
-          }
+          }, __FILE__, __LINE__ - 5
         end
 
         include Utils::ClassAttribute
@@ -369,7 +369,7 @@ module Hanami
           # @since 0.1.0
           # @api private
           def resolve(&blk)
-            @context = eval 'self', blk.binding
+            @context = eval('self', blk.binding, __FILE__, __LINE__)
             instance_exec(&blk)
           end
         end

data/lib/hanami/helpers/routing_helper.rb

@@ -45,7 +45,7 @@ module Hanami
       def self.included(base)
         factory = "#{Utils::String.namespace(base)}.routes"
 
-        base.class_eval <<-END_EVAL, __FILE__, __LINE__
+        base.class_eval <<-END_EVAL, __FILE__, __LINE__ + 1
           def routes
             #{factory}
           end

data/lib/hanami/helpers/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-helpers
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Hanami helpers