forme 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79c0b3986af69becb74de866d9027eafb1af2b148056c60963e8c8c6af04ad3d
-  data.tar.gz: 8478ef6951317b7a33bf7c3b2630291bcd94bb94fcbb2820ef89d08c0addfaec
+  metadata.gz: c0078a295325f1880c32a870466a7e280a0cd324e2f8bf91ea81125bf557d225
+  data.tar.gz: 120e19dde7e39176a4693a4ab46f7f1c2f4d86265f3de4946af6a1d40f5fd524
 SHA512:
-  metadata.gz: c63cedc392288fba47d26da036ed2ad145acf4493683600cbad71238f66fd61dfeb91cadc1db68ab2211ff3cf6cd69622f17934f9ea0be4e4006a53c2baa0a07
-  data.tar.gz: ef4a1d7b5bfdd0dc83d5f52b87f8dbc0785f03ccdfdb8d7e1bdfe160e85636fc2165fae7916489c8d22ba082293a64b3e0a466c67e4a4fe3a90726f4d228ffb1
+  metadata.gz: f13bb7fdfaf90be6af18cc67403d4e36f963c6258eeb49bbc4579b356534172fa4d25380f032ef7a80954f532de3a63f67e3ad3a985c0225d4d21db0245fe387
+  data.tar.gz: 6ec1d4cbee834565239953a12b826b9b190c4f80901b6dc559954c7414889a1c0691e3a16b25dd5d2176a079ae3826a3b9e13bb6c23e323979046af98288208f

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 2.6.0 (2024-06-18)
+
+* Add Roda forme_erubi_capture_block plugin to support erubi/capture_block <%= form do %> <% end %> tags (jeremyevans)
+
+* Support :hr as select option value to use a hr tag instead of an option tag (jeremyevans)
+
+* Support maxlength and minlength options as attributes for textareas (jeremyevans)
+
+* Support minlength option as attribute for text inputs (jeremyevans)
+
 === 2.5.0 (2024-02-13)
 
 * Add hidden inputs to work with formaction/formmethod support in Roda 3.77+ route_csrf plugin (jeremyevans)

data/README.rdoc

@@ -615,8 +615,8 @@ internally).  +forme_parse+ returns a hash with the following keys:
                 check that the submitted values for associated objects match one of the
                 options for the input in the form.
 
-It is possible to use +forme_set+ for the values it can handle, and set other fields manually
-using +set_fields+.
+It is possible to use +forme_set+ for the forms it can handle, and use +forme_parse+ and
++set_fields+ for other forms.
 
 === Roda forme_set plugin
 
@@ -792,6 +792,7 @@ Forme ships with multiple Roda plugins
 * forme_set (discussed above)
 * forme
 * forme_route_csrf
+* forme_erubi_capture_block
 * forme_erubi_capture
 
 == forme_route_csrf and forme plugins
@@ -837,6 +838,26 @@ The forme plugin does not require any csrf plugin, but will transparently use
 Rack::Csrf if it is available. If Rack::Csrf is available a CSRF tag if the form's
 method is +POST+, with no configuration ability.
 
+== forme_erubi_capture_block plugin
+
+The forme_erubi_capture_block plugin builds on the forme_route_csrf plugin, but it supports
+the erubi/capture_block engine, which allows this syntax:
+
+  <%= form(@obj, :action=>'/foo') do |f| %>
+    <%= f.input(:field) %>
+    <%= f.tag(:fieldset) do %>
+      <%= f.input(:field_two) %>
+    <% end %>
+  <% end %>
+
+If you use the forme_erubi_capture)block plugin, you need to manually set Roda to use the
+erubi/capture_block engine, which you can do via:
+
+  require 'erubi/capture_block'
+  app.plugin :render, :engine_opts=>{'erb'=>{:engine_class=>Erubi::CaptureBlockEngine}}
+
+The forme_erubi_capture plugin requires Erubi 1.13.0+.
+
 == forme_erubi_capture plugin
 
 The forme_erubi_capture plugin builds on the forme_route_csrf plugin, but it supports
@@ -982,6 +1003,8 @@ Creates a select tag, containing option tags specified by the :options option.
             array, uses the first entry of the array as the text of the option, and
             the last entry of the array as the value of the option. If the last entry
             of the array is a hash, uses the hash as the attributes for the option.
+            If the option value is +:hr+, uses an hr tag (allowed in recent versions of
+            the HTML standard).
 :selected :: The value that should be selected.  Any options that are equal to
              this value (or included in this value if a multiple select box),
              are set to selected.
@@ -1013,6 +1036,8 @@ Creates a textarea tag.  Options:
 
 :cols :: The number of columns in the text area.
 :rows :: The number of rows in the text area.
+:maxlength :: Use the maxlength attribute on the tag
+:minlength :: Use the minlength attribute on the tag
 
 == all others
 
@@ -1021,6 +1046,7 @@ as text and password, as well as newer HTML5 inputs such as number or email. Opt
 
 :size :: Uses the size attribute on the tag
 :maxlength :: Use the maxlength attribute on the tag
+:minlength :: Use the minlength attribute on the tag
 
 == Form options
 

data/lib/forme/bs3.rb

@@ -356,7 +356,7 @@ module Forme
           case tag.attr[:type].to_sym
           when :checkbox, :radio, :hidden
             # .form-control class causes rendering problems, so remove if found
-            tag.attr[:class].gsub!(/\s*form-control\s*/,'') if tag.attr[:class]
+            tag.attr[:class] = tag.attr[:class].gsub(/\s*form-control\s*/,'') if tag.attr[:class]
             tag.attr[:class] = nil if tag.attr[:class] && tag.attr[:class].empty?
             
           when :file

data/lib/forme/transformers/formatter.rb

@@ -178,7 +178,7 @@ module Forme
     # with the type attribute set to input.
     def _format_input(type)
       @attr[:type] = type
-      copy_options_to_attributes([:size, :maxlength])
+      copy_options_to_attributes([:size, :maxlength, :minlength])
       tag(:input)
     end
 
@@ -277,7 +277,7 @@ module Forme
     # Formats a textarea.  Respects the following options:
     # :value :: Sets value as the child of the textarea.
     def format_textarea
-      copy_options_to_attributes([:cols, :rows])
+      copy_options_to_attributes([:cols, :rows, :maxlength, :minlength])
       if val = @attr.delete(:value)
         tag(:textarea, @attr, [val])
       else
@@ -452,7 +452,9 @@ module Forme
 
       os.map do |x|
         attr = {}
-        if tm
+        if x == :hr
+          next form._tag(:hr, {})
+        elsif tm
           text = x.send(tm)
           val = x.send(vm) if vm
         elsif x.is_a?(Array)

data/lib/forme/transformers/serializer.rb

@@ -9,7 +9,7 @@ module Forme
     Forme.register_transformer(:serializer, :default, new)
 
     # Which tags are self closing (such tags ignore children).
-    SELF_CLOSING = [:img, :input]
+    SELF_CLOSING = [:img, :input, :hr]
 
     # Serialize the tag object to an html string.  Supports +Tag+ instances,
     # +Input+ instances (recursing into +call+ with the result of formatting the input),

data/lib/forme/version.rb

@@ -6,7 +6,7 @@ module Forme
   MAJOR = 2
 
   # The minor version of Forme, updated for new feature releases of Forme.
-  MINOR = 5
+  MINOR = 6
 
   # The patch version of Forme, updated only for bug fixes from the last
   # feature release.

data/lib/forme.rb

@@ -25,16 +25,10 @@ module Forme
     rescue LoadError
       ESCAPE_TABLE = {'&' => '&amp;', '<' => '&lt;', '>' => '&gt;', '"' => '&quot;', "'" => '&#39;'}.freeze
       ESCAPE_TABLE.each_value(&:freeze)
-      if RUBY_VERSION >= '1.9'
-        # Escape the following characters with their HTML/XML
-        # equivalents.
-        def self.h(value)
-          value.to_s.gsub(/[&<>"']/, ESCAPE_TABLE)
-        end
-      else
-        def self.h(value)
-          value.to_s.gsub(/[&<>"']/){|s| ESCAPE_TABLE[s]}
-        end
+      # Escape the following characters with their HTML/XML
+      # equivalents.
+      def self.h(value)
+        value.to_s.gsub(/[&<>"']/, ESCAPE_TABLE)
       end
     end
   end

data/lib/roda/plugins/forme_erubi_capture_block.rb

@@ -0,0 +1,45 @@
+# frozen-string-literal: true
+
+require_relative '../../forme/template'
+
+class Roda
+  module RodaPlugins
+    module FormeErubiCaptureBlock
+      def self.load_dependencies(app)
+        app.plugin :forme_route_csrf
+      end
+
+      class Form < ::Forme::Template::Form
+        %w'inputs tag subform'.each do |meth|
+          class_eval(<<-END, __FILE__, __LINE__+1)
+            def #{meth}(*)
+              if block_given?
+                @scope.instance_variable_get(@scope.render_opts[:template_opts][:outvar]).capture{super}
+              else
+                super
+              end
+            end
+          END
+        end
+      end
+
+      module InstanceMethods
+        def _forme_form(obj, attr, opts, &block)
+          if block && opts[:emit] != false
+            instance_variable_get(render_opts[:template_opts][:outvar]).capture{super}
+          else
+            super
+          end
+        end
+
+        private
+
+        def _forme_form_class
+          Form
+        end
+      end
+    end
+
+    register_plugin(:forme_erubi_capture_block, FormeErubiCaptureBlock)
+  end
+end

data/lib/roda/plugins/forme_set.rb

@@ -7,7 +7,7 @@ class Roda
   module RodaPlugins
     module FormeSet
       # Require the forme_route_csrf plugin.
-      def self.load_dependencies(app, _ = nil)
+      def self.load_dependencies(app, opts = nil, &_)
         app.plugin :forme_route_csrf 
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forme
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -203,6 +203,7 @@ files:
 - lib/forme/version.rb
 - lib/roda/plugins/forme.rb
 - lib/roda/plugins/forme_erubi_capture.rb
+- lib/roda/plugins/forme_erubi_capture_block.rb
 - lib/roda/plugins/forme_route_csrf.rb
 - lib/roda/plugins/forme_set.rb
 - lib/sequel/plugins/forme.rb
@@ -239,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: HTML forms library