katalyst-koi 4.5.8 → 4.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02aaba817c8e75d9eed8d2dca586a03a28731c89746a94e92b7c8c0e0e6bc024
-  data.tar.gz: fb4ccd92543436bd7516f4077b3924e4a55be01552e0ed69dab552e87ddce4c2
+  metadata.gz: '08771b81c4521daf6ece3e3772876dd33aae6b5f28c9192f20f098b7044a6fec'
+  data.tar.gz: 255024e1221fcaac47c145a866d331a8ed135686cad306e7104578602c72ac2f
 SHA512:
-  metadata.gz: 350338e7f380b480e18cb126895475cefb02bf890d39fdc6ec7bf1ea0bcf3aba30732f25bf9b33168eb186a7161e09a10a50ade515bea63ee61d0e4f15b58389
-  data.tar.gz: 962680c5043e50c1e0b38a36ebf2caf712a40ed9c4f49c33614bcacdf3882ba72157649d5bfe793649dc2ab03a919b42037ffb8e4cbce0516e7aba0048488399
+  metadata.gz: 4835ecf31eccc9160aa3ba9ed93cdb0d8391f63996046f74bf82a5d25991ba9b9b546ad7c4750e470fcffcf398b74118ecf4525bab059bb560e2374f99cf9722
+  data.tar.gz: 9195e5a7a56909414f36ce7bdf2ebd714ca7b9525577f2c8a6bb816ae74712e985098418e1a5897ee64c33f031ac14f4b8c32e54a94af2468d451274d4f77ad8

data/lib/govuk_design_system_formbuilder/elements/document.rb

@@ -7,15 +7,11 @@ module GOVUKDesignSystemFormBuilder
     class Document < Base
       include FileElement
 
-      MIME_TYPES = %w[
-        image/png image/gif image/jpeg image/webp
-        application/pdf audio/*
-      ].freeze
-
-      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, **kwargs, &block)
+      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, mime_types:,
+                     **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @mime_types      = kwargs.fetch(:mime_types, MIME_TYPES)
+        @mime_types      = mime_types
         @label           = label
         @caption         = caption
         @hint            = hint
@@ -57,9 +53,17 @@ module GOVUKDesignSystemFormBuilder
     # @example A upload field with label as a proc
     #   = f.govuk_document_field :data, label: -> { tag.h3('Upload your document') }
     #
-    def govuk_document_field(attribute_name, label: {}, caption: {}, hint: {}, form_group: {}, **kwargs, &block)
-      Elements::Document.new(self, object_name, attribute_name, label:, caption:, hint:, form_group:, **kwargs,
-                             &block).html
+    def govuk_document_field(attribute_name,
+                             label: {},
+                             caption: {},
+                             hint: {},
+                             form_group: {},
+                             mime_types: Koi.config.document_mime_types,
+                             **kwargs,
+                             &block)
+      Elements::Document.new(
+        self, object_name, attribute_name, label:, caption:, hint:, form_group:, mime_types:, **kwargs, &block
+      ).html
     end
   end
 end

data/lib/govuk_design_system_formbuilder/elements/image.rb

@@ -8,12 +8,11 @@ module GOVUKDesignSystemFormBuilder
     class Image < Base
       include FileElement
 
-      MIME_TYPES = %w[image/png image/gif image/jpeg image/webp].freeze
-
-      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, **kwargs, &block)
+      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, mime_types:,
+                     **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @mime_types      = kwargs[:mime_types] || MIME_TYPES
+        @mime_types      = mime_types
         @label           = label
         @caption         = caption
         @hint            = hint
@@ -84,9 +83,17 @@ module GOVUKDesignSystemFormBuilder
     # @example A image upload field with label as a proc
     #   = f.govuk_image_field :image, label: -> { tag.h3('Upload your image') }
     #
-    def govuk_image_field(attribute_name, label: {}, caption: {}, hint: {}, form_group: {}, **kwargs, &block)
-      Elements::Image.new(self, object_name, attribute_name,
-                          label:, caption:, hint:, form_group:, **kwargs, &block).html
+    def govuk_image_field(attribute_name,
+                          label: {},
+                          caption: {},
+                          hint: {},
+                          form_group: {},
+                          mime_types: Koi.config.image_mime_types,
+                          **kwargs,
+                          &block)
+      Elements::Image.new(
+        self, object_name, attribute_name, label:, caption:, hint:, form_group:, mime_types:, **kwargs, &block
+      ).html
     end
   end
 end

data/lib/koi/config.rb

@@ -9,8 +9,18 @@ module Koi
 
     config_accessor(:resource_name_candidates) { %i[title name] }
 
-    config_accessor(:image_size_limit) { 10.megabytes }
-
     config_accessor(:admin_stylesheet) { "koi/admin" }
+
+    config_accessor(:document_mime_types) do
+      %w[image/png image/gif image/jpeg image/webp application/pdf audio/*].freeze
+    end
+
+    config_accessor(:document_size_limit) { 10.megabytes }
+
+    config_accessor(:image_mime_types) do
+      %w[image/png image/gif image/jpeg image/webp].freeze
+    end
+
+    config_accessor(:image_size_limit) { 10.megabytes }
   end
 end

data/lib/koi/form_builder.rb

@@ -36,28 +36,24 @@ module Koi
 
     # @api internal
     # @see GOVUKDesignSystemFormBuilder::Builder#govuk_document_field
-    def govuk_document_field(attribute_name, hint: {}, **kwargs, &block)
-      max_size = hint[:max_size] || Koi.config.image_size_limit
-      super(attribute_name, hint:, **kwargs) do
-        if block
-          concat(yield)
-        else
-          concat(t("helpers.hint.default.document", max_size: @template.number_to_human_size(max_size)))
-        end
+    def govuk_document_field(attribute_name, hint: {}, **, &)
+      if hint.is_a?(Hash)
+        max_size = hint.fetch(:max_size, Koi.config.document_size_limit)
+        hint[:text] ||= t("helpers.hint.default.document", max_size: @template.number_to_human_size(max_size))
       end
+
+      super(attribute_name, hint:, **, &)
     end
 
     # @api internal
     # @see GOVUKDesignSystemFormBuilder::Builder#govuk_image_field
-    def govuk_image_field(attribute_name, hint: {}, **kwargs, &block)
-      max_size = hint[:max_size] || Koi.config.image_size_limit
-      super(attribute_name, hint:, **kwargs) do
-        if block
-          concat(yield)
-        else
-          concat(t("helpers.hint.default.image", max_size: @template.number_to_human_size(max_size)))
-        end
+    def govuk_image_field(attribute_name, hint: {}, **, &)
+      if hint.is_a?(Hash)
+        max_size = hint.fetch(:max_size, Koi.config.image_size_limit)
+        hint[:text] ||= t("helpers.hint.default.document", max_size: @template.number_to_human_size(max_size))
       end
+
+      super(attribute_name, hint:, **, &)
     end
 
     # Use content editor trix setup by default.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 4.5.8
+  version: 4.5.9
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-27 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails