brut 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7702194ca39391fce02e749d6050ff7ac0856739d4e635a562d01284eb8d2d95
-  data.tar.gz: b7581e5a3ae897eae7acfb200e8a40c36092992305db27f25e319807d6986882
+  metadata.gz: 37f9d27495d7269447632af6383a1f4e3f24f98bbfcc1838d1a118c09005815f
+  data.tar.gz: ef05ae07379e79cef2914b16567b5d57856cb402c152e823ce658b4bc4cb8a69
 SHA512:
-  metadata.gz: d8cb683694e8a4b1f1d35226d3cc0f60d3b4c6200c81f89a330f4efb74e359a8f31ebee40b2ad9b8264188b960bee505634092417b0e48fa8b71825d7bf01810
-  data.tar.gz: d5ab249e7cdb783a9698af017c8c550910b39863c26842357c422e70716e5ce940ba6150d43e621faa60b9fdeffd578d765479ad2168403c5a2e863c427e8bfe
+  metadata.gz: ba995eb4d298f52064d3866eb7712a8cdf62e92e2e1415fb5545a8f8a8e59c3861da28861175c0b83df8b71428a235404b5170e188faab9f1c2ab18d6e3dfc73
+  data.tar.gz: 2a4ccedddbc0c8ab977124e40a59f12aaae21e7ba140dd7580a709ae17c8de8b8da49d59db473f8270baf8a34c30e36c96e1d937d6b6ce63bec08a6d88e385a3

data/Gemfile.lock

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

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

@@ -37,7 +37,7 @@ class Brut::CLI::Apps::DB < Brut::CLI::App
       seed_data.load_seeds!
       0
     rescue Sequel::UniqueConstraintViolation => ex
-      out.puts "Seed data may have already been loaded: #{ex}"
+      raise "Seed data may have already been loaded: #{ex}"
     end
   end
 

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

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/flash.rb

@@ -35,10 +35,13 @@ class Brut::FrontEnd::Flash
 
   # Set the "notice", which is an informational message.  The value is intended to be an I18N key.
   #
-  # @param [String] notice the I18n key of the notice.  You can use any value you like, but you should decide one way or the other,
-  # because it will be confusing to use an I18n key sometimes and sometimes a message.
+  # @param [String|Array] notice the I18n key of the notice. If this is an array, it will be joined with dots to form an I18n key.
   def notice=(notice)
-    self[:notice] = notice
+    self[:notice] = if notice
+                      Array(notice).map(&:to_s).join(".")
+                    else
+                      notice
+                    end
   end
   # Access the notice. See {#notice=}
   def notice = self[:notice]
@@ -48,10 +51,13 @@ class Brut::FrontEnd::Flash
 
   # Set the "alert", which is an important error message.  The value is intended to be an I18N key.
   #
-  # @param [String] alert the I18n key of the notice.  You can use any value you like, but you should decide one way or the other,
-  # because it will be confusing to use an I18n key sometimes and sometimes a message.
+  # @param [String|Array] alert the I18n key of the notice.  If this is an array, it will be joined with dots to form an I18n eky.
   def alert=(alert)
-    self[:alert] = alert
+    self[:alert] = if alert
+                      Array(alert).map(&:to_s).join(".")
+                    else
+                      alert
+                    end
   end
   # Access the alert. See {#alert=}
   def alert = self[:alert]

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/spec_support/matchers/have_redirected_to.rb

@@ -18,7 +18,17 @@ RSpec::Matchers.define :have_redirected_to do |page_or_uri,**page_params|
     if page_or_uri.kind_of?(URI)
       "Expected #{page_or_uri} but got #{result}"
     elsif page_or_uri.ancestors.include?(Brut::FrontEnd::Page)
-      "Expected #{page_or_uri}'s routing (#{page_or_uri.routing(**page_params)}), but got #{result}"
+      result_explanation = case result
+                           when Brut::FrontEnd::Page
+                             "#{result.page_name} was rendered directly"
+                           when Brut::FrontEnd::HttpStatus
+                             "got HTTP status code #{result}"
+                           when URI
+                             "got a redirect to #{result} instead"
+                           else
+                             "got a #{result.class} instead"
+                           end
+      "Expected redirect to #{page_or_uri}, but #{result_explanation}"
     else
       "Unknown error occured or bug with have_redirected_to"
     end

data/lib/brut/version.rb

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

metadata

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