hanami-helpers 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b8b6087b11385128dca97a30a4b3178c5d087fb533096adf20cc0cb666c6b25
-  data.tar.gz: f1bf68d6b197a0f0a89cc85002355d3f13eecbc65d137a959e67c31adb24134a
+  metadata.gz: 164baa1c2d4f10946f6a48b10d507fc4d98f13d08abbdd3004e6c4ffdbc0a8cb
+  data.tar.gz: 2fdac7777fc6dd841b22d23acb681bcafac842ea2b0cdbf76fdf972fbb6aa61d
 SHA512:
-  metadata.gz: e3faa5e7b7ed1c3dd37452d835938dd7e1a744c90d6587e4642474cd62b97caa3fa4a36ed30194295f65b8ba37e09c09a2a90c1099f0a42310f7604e38626e5d
-  data.tar.gz: d9a471c73b03b00d6d8df9a255c1d0cc7177dc31e6640eb2e6162b2eeaecacc8bd71d51569f28e5cefab4b652f9384217829c0481af4974f3f394f8688c8975e
+  metadata.gz: 27641b03250b80e892697d503323613704f6b03bfd97519e871286e22434b264a71881d5a62fda5ba484da9561588588bb5c0cc57981433b61dd149fbe2955fd
+  data.tar.gz: e062653bf269742f7a5b77d6b0bf72457e8f73f067104845aea23bbfba371bd9b4b04b3c59536bc6d26482f2ad5a301a78856b283c2c938ffd2f4c4e442dd0b0

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Hanami::Helpers
 View helpers for Ruby web applications
 
+## v1.3.2 - 2019-10-31
+### Added
+- [Nenad] Support block syntax for `label` helper
+- [Luca Guidi] Allow `form_for` to accept `params:` argument to override params coming from the view
+
+### Fixed
+- [Danny Santos] When `prompt:` option is used in `select` helper, set to `disabled="disabled"` the related `<option>` HTML tag
+
 ## v1.3.1 - 2019-01-18
 ### Added
 - [Luca Guidi] Official support for Ruby: MRI 2.6

data/hanami-helpers.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler',    '>= 1.6', '< 3'
   spec.add_development_dependency 'dry-struct', '~> 0.3'
-  spec.add_development_dependency 'rake',       '~> 12'
+  spec.add_development_dependency 'rake',       '~> 13'
   spec.add_development_dependency 'rspec',      '~> 3.7'
 end

data/lib/hanami/helpers/form_helper.rb

@@ -230,6 +230,7 @@ module Hanami
       #   @param url [String] the form action URL
       #   @param options [Hash] HTML attributes to pass to the form tag and form values
       #   @option options [Hash] :values An optional payload of objects to pass
+      #   @option options [Hash] :params An optional override of params
       #   @param blk [Proc] A block that describes the contents of the form
       #
       # @overload form_for(form, attributes = {}, &blk)
@@ -409,7 +410,25 @@ module Hanami
       #
       #     <button type="submit">Create</button>
       #   </form>
-      def form_for(name, url = nil, options = {}, &blk)
+      #
+      # @example Override params
+      #   <%=
+      #     form_for :song, routes.songs_path, params: { song: { title: "Envision" } } do
+      #       text_field :title
+      #
+      #       submit 'Create'
+      #     end
+      #   %>
+      #
+      #   <!-- output -->
+      #
+      #   <form action="/songs" accept-charset="utf-8" id="song-form" method="POST">
+      #     <input type="hidden" name="_csrf_token" value="920cd5bfaecc6e58368950e790f2f7b4e5561eeeab230aa1b7de1b1f40ea7d5d">
+      #     <input type="text" name="song[title]" id="song-title" value="Envision">
+      #
+      #     <button type="submit">Create</button>
+      #   </form>
+      def form_for(name, url = nil, options = {}, &blk) # rubocop:disable Metrics/MethodLength
         form = if name.is_a?(Form)
                  options = url || {}
                  name
@@ -417,11 +436,12 @@ module Hanami
                  Form.new(name, url, options.delete(:values))
                end
 
+        params = options.delete(:params)
         opts = options.dup
         opts[:"data-remote"] = opts.delete(:remote) if opts.key?(:remote)
         attributes = { action: form.url, method: form.verb, 'accept-charset': DEFAULT_CHARSET, id: "#{form.name}-form" }.merge(opts)
 
-        FormBuilder.new(form, attributes, self, &blk)
+        FormBuilder.new(form, attributes, self, params, &blk)
       end
 
       # Returns CSRF Protection Token stored in session.

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

@@ -81,11 +81,12 @@ module Hanami
 
         # Instantiate a form builder
         #
-        # @overload initialize(form, attributes, context, &blk)
+        # @overload initialize(form, attributes, context, params, &blk)
         #   Top level form
         #   @param form [Hanami::Helpers:FormHelper::Form] the form
         #   @param attributes [::Hash] a set of HTML attributes
         #   @param context [Hanami::Helpers::FormHelper]
+        #   @param params [Hash] optional set of params to override the ones that are coming from the view context
         #   @param blk [Proc] a block that describes the contents of the form
         #
         # @overload initialize(form, attributes, params, &blk)
@@ -99,7 +100,7 @@ module Hanami
         #
         # @since 0.2.0
         # @api private
-        def initialize(form, attributes, context = nil, &blk) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        def initialize(form, attributes, context = nil, params = nil, &blk) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           super()
 
           @context    = context
@@ -115,7 +116,7 @@ module Hanami
           else
             @form        = form
             @name        = form.name
-            @values      = Values.new(form.values, @context.params)
+            @values      = Values.new(form.values, params || @context.params)
             @attributes  = attributes
             @verb_method = verb_method
             @csrf_token  = csrf_token
@@ -363,16 +364,31 @@ module Hanami
         #   <!-- output -->
         #   <label for="delivery-address-city">City</label>
         #   <input type="text" name="delivery[address][city] id="delivery-address-city" value="">
-        def label(content, attributes = {})
+        #
+        # @example Block syntax
+        #   <%=
+        #     # ...
+        #     label for: :free_shipping do
+        #       text "Free shipping"
+        #       abbr "*", title: "optional", "aria-label": "optional"
+        #     end
+        #   %>
+        #
+        #   <!-- output -->
+        #   <label for="book-free-shipping">
+        #     Free Shipping
+        #     <abbr title="optional" aria-label="optional">*</abbr>
+        #   </label>
+        def label(content = nil, **attributes, &blk)
           attributes = { for: _for(content, attributes.delete(:for)) }.merge(attributes)
           content    = case content
-                       when String, Hanami::Utils::String
+                       when String, Hanami::Utils::String, NilClass
                          content
                        else
                          Utils::String.capitalize(content)
                        end
 
-          super(content, attributes)
+          super(content, attributes, &blk)
         end
 
         # Fieldset
@@ -1224,7 +1240,7 @@ module Hanami
         #
         #   <!-- output -->
         #   <select name="book[store]" id="book-store" class="form-control">
-        #     <option>Select a store</option>
+        #     <option disabled="disabled">Select a store</option>
         #     <option value="it">Italy</option>
         #     <option value="us">United States</option>
         #   </select>
@@ -1287,7 +1303,7 @@ module Hanami
           input_value = _value(name)
 
           super(attributes) do
-            option(prompt) unless prompt.nil?
+            option(prompt, disabled: true) if prompt
 
             already_selected = nil
             values.each do |content, value|

data/lib/hanami/helpers/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-helpers
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Hanami helpers