brut 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52658877be0d3d968e4bcf7fea163aded14460e1d5027450f7e981bce2e972be
-  data.tar.gz: 4f415cd218aeec5eb4ad1f30eb686a2b41ac3293a71a6b61635f2913c6afd6a9
+  metadata.gz: 61b4016715aa0ca0ab347e21a91bf8e507665e900f20e505fb0100662fa09aa0
+  data.tar.gz: 7d6934311740a131a9f906d646d00cf3056bb860037cd218ce6c5cd35b84dfb9
 SHA512:
-  metadata.gz: 49bc406aced82e963475446bedd3669133a055440bfaed9da7e6a2c58288b02717a64b4f3ffa4886bb651233d9de42956d973ccb4853235271083f19f7c8a927
-  data.tar.gz: 8e299c68165fc48700d8d7cc85bb7d12ddaf9fa96c7227043d893d4a4a378314a97279767e34425ce729810712eae7dacaa55326452a5ba79c645fe5ab4640e6
+  metadata.gz: 89aebab6c15c42835af1b1161d92cc923ba685c89aab1a848c9a8e7dc6c23b7b96691a2ba2fa219611f2440ea3b6860dcfa5d68fb167b1ada35c8a7cd8db3aee
+  data.tar.gz: fc14225d9512014d5b6e0a07a484407efb07913c86a4c0035adcbc7c4ca8ba477eb7347478e9e31053985fa9d35c4c2f4de097a5f52ff0517ca1b654cee39b67

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brut (0.0.4)
+    brut (0.0.6)
       concurrent-ruby
       i18n
       irb

data/lib/brut/cli/apps/test.rb

@@ -81,15 +81,7 @@ class Brut::CLI::Apps::Test < Brut::CLI::App
       if options.build_assets?
         system!({ "RACK_ENV" => "test" }, "bin/build-assets")
       end
-      begin
-        system!({ "NODE_DISABLE_COLORS" => "1" },"npx mocha #{Brut.container.js_specs_dir} --no-color --extension 'spec.js' --recursive")
-      rescue Brut::CLI::SystemExecError => ex
-        if ex.exit_status == 1
-          out.puts "mocha exited 1 - assuming this is because there are no test files and that this is intentional"
-        else
-          raise ex
-        end
-      end
+      system!({ "NODE_DISABLE_COLORS" => "1" },"npx mocha #{Brut.container.js_specs_dir} --no-color --extension 'spec.js' --recursive")
       0
     end
   end

data/lib/brut/front_end/component.rb

@@ -60,7 +60,7 @@ class Brut::FrontEnd::Component
     if @yielded_block
       @yielded_block.().html_safe!
     else
-      raise Brut::FrontEnd::Errors::Bug, "No block was yielded to #{self.class.name}"
+      raise Brut::Framework::Errors::Bug, "No block was yielded to #{self.class.name}"
 		end
 	end
 
@@ -167,27 +167,7 @@ class Brut::FrontEnd::Component
     # the same value, but with any content hashes that are part of the filename.
     def asset_path(path) = Brut.container.asset_path_resolver.resolve(path)
 
-    # Creates the form surrounding the contents of the block yielded to it. If the form's action is a POST, it will include a CSRF token.
-    # If the form's action is GET, it will not.
-    #
-    # @example Route without parameters
-    #   <%= form_tag(for: NewWidgetForm, class: "new-form") do %>
-    #     <input type="text" name="name">
-    #     <button>Create</button>
-    #   <% end %>
-    #
-    # @example Route with parameters
-    #   <%= form_tag(for: SaveWidgetWithIdForm, route_params: { id: widget.external_id }, class: "new-form") do %>
-    #     <input type="text" name="name">
-    #     <button>Save</button>
-    #   <% end %>
-    #
-    # @param route_params [Hash] if the form requires route parameters, their values must be passed here so that the HTML `action`
-    # attribute can be constructed properly.
-    # @param html_attributes [Hash] any additional attributes for the `<form>` tag
-    # @option html_attributes [Class|Brut::FrontEnd::Form] :for the form object or class representing this HTML form. If you pass this, you may not pass the HTML attributes `:action` or `:method`. Both will be derived from this object.
-    # @option html_attributes [String] «any-other-key» attributes to set on the `<form>` tag
-    # @yield No parameters given. This is expected to return additional markup to appear inside the `<form>` element.
+    # (see Brut::FrontEnd::Components::FormTag)
     def form_tag(route_params: {}, **html_attributes,&contents)
       component(Brut::FrontEnd::Components::FormTag.new(route_params:, **html_attributes,&contents))
     end
@@ -197,9 +177,10 @@ class Brut::FrontEnd::Component
     # @param timestamp [Time] the timestamp to format/render. Mutually exclusive with `date`.
     # @param date [Date] the date to format/render. Mutually exclusive with `timestamp`.
     # @param component_options [Hash] keyword arguments to pass to {Brut::FrontEnd::Components::Time#initialize}
-    def time_tag(timestamp:nil,date:nil, **component_options)
+    # @yield See {Brut::FrontEnd::Components::Time#initialize}
+    def time_tag(timestamp:nil,date:nil, **component_options, &contents)
       args = component_options.merge(timestamp:,date:)
-      component(Brut::FrontEnd::Components::Time.new(**args))
+      component(Brut::FrontEnd::Components::Time.new(**args,&contents))
     end
 
     # Render the {Brut::FrontEnd::Components::ConstraintViolations} component for the given form's input.

data/lib/brut/front_end/components/form_tag.rb

@@ -1,7 +1,27 @@
 require "rexml"
 # Represents a `<form>` HTML element that includes a CSRF token as needed. You likely want to use this class via the {Brut::FrontEnd::Component::Helpers#form_tag} method.
 class Brut::FrontEnd::Components::FormTag < Brut::FrontEnd::Component
-  # (see Brut::FrontEnd::Component::Helpers#form_tag)
+  # Creates the form surrounding the contents of the block yielded to it. If the form's action is a POST, it will include a CSRF token.
+  # If the form's action is GET, it will not.
+  #
+  # @example Route without parameters
+  #   <%= form_tag(for: NewWidgetForm, class: "new-form") do %>
+  #     <input type="text" name="name">
+  #     <button>Create</button>
+  #   <% end %>
+  #
+  # @example Route with parameters
+  #   <%= form_tag(for: SaveWidgetWithIdForm, route_params: { id: widget.external_id }, class: "new-form") do %>
+  #     <input type="text" name="name">
+  #     <button>Save</button>
+  #   <% end %>
+  #
+  # @param route_params [Hash] if the form requires route parameters, their values must be passed here so that the HTML `action`
+  # attribute can be constructed properly.
+  # @param html_attributes [Hash] any additional attributes for the `<form>` tag
+  # @option html_attributes [Class|Brut::FrontEnd::Form] :for the form object or class representing this HTML form *or* the class of a handler the form should submit to. If you pass this, you may not pass the HTML attributes `:action` or `:method`. Both will be derived from this object.
+  # @option html_attributes [String] «any-other-key» attributes to set on the `<form>` tag
+  # @yield No parameters given. This is expected to return additional markup to appear inside the `<form>` element.
   def initialize(route_params: {}, **html_attributes,&contents)
     form_class = html_attributes.delete(:for) # Cannot be a keyword arg, since for is a reserved word
     if !form_class.nil?

data/lib/brut/front_end/components/inputs/text_field.rb

@@ -10,7 +10,6 @@ class Brut::FrontEnd::Components::Inputs::TextField < Brut::FrontEnd::Components
   def self.for_form_input(form:, input_name:, index: nil, html_attributes: {})
     default_html_attributes = {}
     html_attributes = html_attributes.map { |key,value| [ key.to_s, value ] }.to_h
-    index ||= 0
     input = form.input(input_name, index:)
 
     default_html_attributes["required"] = input.required
@@ -40,8 +39,8 @@ class Brut::FrontEnd::Components::Inputs::TextField < Brut::FrontEnd::Components
     value = input.value
 
     if input.type == "checkbox"
-      default_html_attributes["value"] = "true"
-      default_html_attributes["checked"] = value == "true"
+      default_html_attributes["value"] = (index || true).to_s
+      default_html_attributes["checked"] = !!value
     else
       default_html_attributes["value"] = value
     end

data/lib/brut/front_end/components/time.rb

@@ -11,6 +11,9 @@ class Brut::FrontEnd::Components::Time < Brut::FrontEnd::Component
   # @param attribute_format [Symbol] the I18n format key fragment to use to locate the strftime format for formatting *the `datetime` attribute* of the HTML element that this component renders. Generally, you want to leave this as the default of `:iso_8601`, however if you need to change it, you can.  This value is appeneded to `"time.formats."` to form the complete key. `skip_year_if_same` is not used for this value.
   # @param only_contains_class [Hash] exists because `class` is a reserved word
   # @option only_contains_class [String] :class the value to use for the `class` attribute.
+  # @yield No parameters given. This is expected to return markup to appear inside the `<form>` element. If provided, this component
+  # will still render the `datetime` attribute, but not the inside.  This is useful if you have a customized date or time display that
+  # you would like to be accessible.  If omitted, the tag's contents will be the formated date or timestamp.
   def initialize(
     timestamp: nil,
     date: nil,
@@ -18,7 +21,8 @@ class Brut::FrontEnd::Components::Time < Brut::FrontEnd::Component
     skip_year_if_same: true,
     skip_dow_if_not_this_week: true,
     attribute_format: :iso_8601,
-    **only_contains_class
+    **only_contains_class,
+    &contents
   )
     require_exactly_one!(timestamp:,date:)
 
@@ -65,6 +69,7 @@ class Brut::FrontEnd::Components::Time < Brut::FrontEnd::Component
     @format           = found_format.to_sym
     @attribute_format = attribute_format.to_sym
     @class_attribute  = only_contains_class[:class] || ""
+    @contents         = contents
   end
 
   def render(clock:)
@@ -77,7 +82,11 @@ class Brut::FrontEnd::Components::Time < Brut::FrontEnd::Component
     datetime_attribute = ::I18n.l(adjusted_value,format: @attribute_format)
 
     html_tag(:time, class: @class_attribute, datetime: datetime_attribute) do
-      ::I18n.l(adjusted_value,format: @format)
+      if @contents
+        @contents.()
+      else
+        ::I18n.l(adjusted_value,format: @format)
+      end
     end
   end
 

data/lib/brut/front_end/form.rb

@@ -37,7 +37,33 @@ class Brut::FrontEnd::Form
     if unknown_params.any?
       Brut.container.instrumentation.add_attributes(ignored_unknown_params: unknown_params)
     end
-    @params = params.except(*unknown_params)
+    @params = params.except(*unknown_params).map { |name,value|
+        input_definition = begin
+                             self.class.input_definitions[name] || self.class.input_definitions.fetch(name.to_s)
+                           rescue KeyError
+                             raise "cannot find input definition for '#{name}'. Have these: #{self.class.input_definitions.keys.inspect}"
+                           end
+      if value.kind_of?(Array)
+        input_definition = begin
+                             self.class.input_definitions[name] || self.class.input_definitions.fetch(name.to_s)
+                           rescue KeyError
+                             raise "cannot find input definition for '#{name}'. Have these: #{self.class.input_definitions.keys.inspect}"
+                           end
+        if input_definition.respond_to?(:type) && input_definition.type == "checkbox"
+          if value.all? { it.to_s =~ /^\d+$/ }
+            # the values represent the indexes of which checkboxes were checked
+            new_values = []
+            value.each do |index_as_string|
+              index = Integer(index_as_string)
+              new_values[index] = true
+            end
+            value = new_values.map { !!it }
+          end
+        end
+      end
+      [ name, value ]
+    }.to_h
+
     @new = params_empty?(@params)
     @inputs = self.class.input_definitions.map { |name,input_definition|
       value = @params[name] || @params[name.to_sym]

data/lib/brut/front_end/forms/input_declarations.rb

@@ -31,8 +31,7 @@ module Brut::FrontEnd::Forms::InputDeclarations
   # {Brut::FrontEnd::Components::Inputs::RadioButton.for_form_input}.
   #
   # @param [String] name The name of the group (used in the `name` attribute)
-  # @param [Hash] attributes Attributes to be used on the tag that represent its contraints. See
-  # {Brut::FrontEnd::Forms::RadioButtonGroupInputDefinition}
+  # @param [Hash] attributes Attributes to be used on the tag that represent its contraints. See {Brut::FrontEnd::Forms::RadioButtonGroupInputDefinition}
   def radio_button_group(name,attributes={})
     self.add_input_definition(
       Brut::FrontEnd::Forms::RadioButtonGroupInputDefinition.new(**(attributes.merge(name: name)))

data/lib/brut/version.rb

@@ -1,4 +1,4 @@
 module Brut
   # @!visibility private
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: brut
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - David Bryant Copeland
 bindir: exe
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb