hanami-helpers 1.2.0.rc1 → 1.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a38e49189c590ded98fadc810ff68f04582332eca3dda5476a4ffc15b54ced
-  data.tar.gz: 6913af558d44a221a2a114eef67edd07d202554fe1943cda1000cec0342aa140
+  metadata.gz: 403c3f57961c9fd5bd281e742f370e631e047caac752d206d5a7a1037a81edde
+  data.tar.gz: 997fb95bcba56d0fe55c19760ea3eceb5e0b3d3a791403bb39ba6a6987f74660
 SHA512:
-  metadata.gz: 3f197533772d142548b5fcf451742689389450f59fcf09578f5a360144560c686c5d41fd7bf26621a5a119f179806c24c03dfcbe104a5fb79883e7819dc5e1b7
-  data.tar.gz: 176d3b231eabc901adaf1747d35d957429bb1d93f606f58460e1a83871fa7dad5d51bb48258322b8c80067ff43f61ebee59aa02e274b6005f373616252a1de6d
+  metadata.gz: c79301dfc9c74430890b2ffe1ebea44d4051fd290ea2fb05b8d6c1d1ee6263a2a3b139452832f0244a3e0138e43a71315ab756dedc3c4389f701ed7955289bb6
+  data.tar.gz: cd4bedad0aa5b9b39dd0a955aa2723ad9570c4797c23e4a7a88d6d360c1033cd11fcd4ab1a78992552e95cc7359474f1915f5ad7fe516899550a684b38528d57

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Hanami::Helpers
 View helpers for Ruby web applications
 
+## v1.2.0.rc2 - 2018-04-06
+### Added
+- [Ponomarev Ilya] Allow `submit` and `button` form helpers to accept blocks
+- [Ferdinand Niedermann] let `fields_for_collection` to iterate thru the given collection and yield current index and value
+
 ## v1.2.0.rc1 - 2018-03-30
 ### Fixed
 - [Gustavo Caso] Ensure `select` helper to set the `selected` attribute properly when an `<option>` has a `nil` value
@@ -8,11 +13,15 @@ View helpers for Ruby web applications
 ## v1.2.0.beta2 - 2018-03-23
 
 ## v1.2.0.beta1 - 2018-02-28
-## Added
+### Added
 - [Luca Guidi] Introduced `csrf_meta_tags` helper to print meta tags for CSRF protection
 - [Luca Guidi] Added support for `form_for(..., remote: true)` which translates to `<form ... data-remote="true">`
 - [Sean Collins] Allow HTML attributes to be specified as an array of strings or symbols (eg `<%= html.span("foo", class: %w(ui form)) %>`)
 
+## 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

data/hanami-helpers.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_dependency 'hanami-utils', '1.2.0.rc1'
+  spec.add_dependency 'hanami-utils', '1.2.0.rc2'
 
   spec.add_development_dependency 'bundler',    '~> 1.6'
   spec.add_development_dependency 'dry-struct', '~> 0.3'

data/lib/hanami/helpers/form_helper.rb

@@ -232,7 +232,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
@@ -409,9 +409,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

@@ -148,6 +148,9 @@ module Hanami
         # @param name [Symbol] the nested name, it's used to generate input
         #   names, ids, and to lookup params to fill values.
         #
+        # @yield [index]
+        # @yieldparam [Integer] index iterative index (it starts from zero)
+        #
         # @since 0.2.0
         #
         # @example Basic usage
@@ -200,10 +203,10 @@ module Hanami
         #
         #     <button type="submit">Create</button>
         #   </form>
-        def fields_for(name)
+        def fields_for(name, value = nil)
           current_name = @name
           @name        = _input_name(name)
-          yield(name)
+          yield(name, value)
         ensure
           @name = current_name
         end
@@ -216,6 +219,10 @@ module Hanami
         # @param name [Symbol] the nested name, it's used to generate input
         #   names, ids, and to lookup params to fill values.
         #
+        # @yield [index, value]
+        # @yieldparam [Integer] index iterative index (it starts from zero)
+        # @yieldparam [Object] value an item of the collection
+        #
         # @example Basic usage
         #   <%=
         #     form_for :delivery, routes.deliveries_path do
@@ -238,13 +245,60 @@ module Hanami
         #
         #     <button type="submit">Create</button>
         #   </form>
+        #
+        # @example Yield index and value
+        #   <%=
+        #     form_for(:bill, routes.bill_path(id: bill.id), { bill: bill }, method: :patch, class: 'form-horizontal') do
+        #       fieldset do
+        #         legend "Addresses"
+        #
+        #         fields_for_collection :addresses do |i, address|
+        #           div class: "form-group" do
+        #             text "Address id: #{address.id}"
+        #
+        #             label :street
+        #             input_text :street, class: "form-control", placeholder: "Street", "data-funky": "index-#{i}"
+        #           end
+        #         end
+        #
+        #         label :ensure_names
+        #       end
+        #
+        #       submit submit_label, class: "btn btn-default"
+        #     end
+        #   %>
+        #
+        #   <!-- output -->
+        #   <form action="/bills/1" method="POST" accept-charset="utf-8" id="bill-form" class="form-horizontal">
+        #     <input type="hidden" name="_method" value="PATCH">
+        #     <input type="hidden" name="_csrf_token" value="920cd5bfaecc6e58368950e790f2f7b4e5561eeeab230aa1b7de1b1f40ea7d5d">
+        #     <fieldset>
+        #       <legend>Addresses</legend>
+        #
+        #       <div class="form-group">
+        #         Address id: 23
+        #         <label for="bill-addresses-0-street">Street</label>
+        #         <input type="text" name="bill[addresses][][street]" id="bill-addresses-0-street" value="5th Ave" class="form-control" placeholder="Street" data-funky="index-0">
+        #       </div>
+        #
+        #       <div class="form-group">
+        #         Address id: 42
+        #         <label for="bill-addresses-1-street">Street</label>
+        #         <input type="text" name="bill[addresses][][street]" id="bill-addresses-1-street" value="4th Ave" class="form-control" placeholder="Street" data-funky="index-1">
+        #       </div>
+        #
+        #       <label for="bill-ensure-names">Ensure names</label>
+        #     </fieldset>
+        #
+        #     <button type="submit" class="btn btn-default">Update</button>
+        #   </form>
         def fields_for_collection(name, &block)
           current_name = @name
           base_value = _value(name)
           @name = _input_name(name)
 
-          base_value.count.times do |index|
-            fields_for(index, &block)
+          base_value.each_with_index do |value, index|
+            fields_for(index, value, &block)
           end
         ensure
           @name = current_name
@@ -1328,8 +1382,15 @@ module Hanami
 
         # Button
         #
-        # @param content [String] The content
-        # @param attributes [Hash] HTML attributes to pass to the button tag
+        # @overload button(content, attributes = {})
+        #   Use string content
+        #   @param content [String] The content
+        #   @param attributes [Hash] HTML attributes to pass to the button tag
+        #
+        # @overload button(attributes = {}, &blk)
+        #   Use block content
+        #   @param attributes [Hash] HTML attributes to pass to the button tag
+        #   @param blk [Proc] the block content
         #
         # @since 1.0.0
         #
@@ -1350,8 +1411,25 @@ module Hanami
         #
         #   <!-- output -->
         #   <button class="btn btn-secondary">Click me</button>
-        def button(content, attributes = {})
-          # This is here only for documentation purposes
+        #
+        # @example Block
+        #   <%=
+        #     # ...
+        #     button class: "btn btn-secondary" do
+        #       span class: 'oi oi-check'
+        #     end
+        #   %>
+        #
+        #   <!-- output -->
+        #   <button class="btn btn-secondary">
+        #     <span class="oi oi-check"></span>
+        #   </button>
+        def button(content, attributes = {}, &blk)
+          if content.is_a?(::Hash)
+            attributes = content
+            content = nil
+          end
+
           super
         end
 
@@ -1393,8 +1471,15 @@ module Hanami
 
         # Submit button
         #
-        # @param content [String] The content
-        # @param attributes [Hash] HTML attributes to pass to the button tag
+        # @overload submit(content, attributes = {})
+        #   Use string content
+        #   @param content [String] The content
+        #   @param attributes [Hash] HTML attributes to pass to the button tag
+        #
+        # @overload submit(attributes = {}, &blk)
+        #   Use block content
+        #   @param attributes [Hash] HTML attributes to pass to the button tag
+        #   @param blk [Proc] the block content
         #
         # @since 0.2.0
         #
@@ -1415,9 +1500,27 @@ module Hanami
         #
         #   <!-- output -->
         #   <button type="submit" class="btn btn-primary">Create</button>
-        def submit(content, attributes = {})
+        #
+        # @example Block
+        #   <%=
+        #     # ...
+        #     button class: "btn btn-primary" do
+        #       span class: 'oi oi-check'
+        #     end
+        #   %>
+        #
+        #   <!-- output -->
+        #   <button type="submit" class="btn btn-primary">
+        #     <span class="oi oi-check"></span>
+        #   </button>
+        def submit(content, attributes = {}, &blk)
+          if content.is_a?(::Hash)
+            attributes = content
+            content = nil
+          end
+
           attributes = { type: :submit }.merge(attributes)
-          button(content, attributes)
+          button(content, attributes, &blk)
         end
 
         protected

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

@@ -379,8 +379,8 @@ module Hanami
         #
         # @since 0.1.0
         # @api private
-        def method_missing(m, *args, &blk)
-          @context.__send__(m, *args, &blk)
+        def method_missing(method_name, *args, &blk)
+          @context.__send__(method_name, *args, &blk)
         end
       end
     end

data/lib/hanami/helpers/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Define version
     #
     # @since 0.1.0
-    VERSION = '1.2.0.rc1'.freeze
+    VERSION = '1.2.0.rc2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-helpers
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc1
+        version: 1.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc1
+        version: 1.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Hanami helpers