hiccdown 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d04561bd25ef616c71cafb7500943039904cc59269de01b7536b3fefdf68a787
-  data.tar.gz: 51088222ce3a32d48df3fe339a96a0ba98f9051745823ef9ca915a413867d141
+  metadata.gz: 36a1c3617a8af680f1b88452903b7a0c08ccdb333ec08606c5ed2bab3516aa49
+  data.tar.gz: 3274a2355fc775d86fd63c31f8ddf8f8becbc3ffc131886da2037961f991b7c7
 SHA512:
-  metadata.gz: fe92789f9e885d48745adfeea619c85e9357c640af4c3675d8869c979a9bcdc813da0c1b6cb1c509f6dc69e8946fc987e2e4b0e75d3989b7b12fcda7fd2b1a2f
-  data.tar.gz: 9d24cb9dcbf33caf43b204ccc7b616070918263d0f3c70078d953ef0cabd4e6b10506aa57ed3ed3864517c49e8bf037b8a0e115c5462542b97d7c096e2ed4377
+  metadata.gz: b42be7e28718f8f6874ad99655720d11965ae4c3d8ae416c5dd72bbfdf956ffa59206d3cb5fa0d36a43155c0a9725b3cda1d135d79df00a2ee72a6353c4abf9e
+  data.tar.gz: fa1a2114d426eab57a2b463e700a59fa681de9b677310918e7db1f23be4aa767d11c1b46097a012a76fb6fcfb13d0c1886e297bf662f2add185ca11b696a0f19

data/lib/hiccdown.rb

@@ -5,14 +5,15 @@ require 'action_view'
 module Hiccdown
   module ViewHelpers
     def self.included(base)
-      base.prepend(MethodOverrides)
+      base.prepend(ViewHelperOverrides)
+      ActionView::Helpers::RenderingHelper.prepend(RenderingHelperOverrides)
     end
 
     def scope *args, &block
       Hiccdown::scope(*args, &block)
     end
 
-    module MethodOverrides
+    module ViewHelperOverrides
       def self.prepended(base)
         # `capture` is at the root of seemingly all Rails methods tasked with
         # rendering content, including `content_tag` and `tag`, which in turn
@@ -29,6 +30,23 @@ module Hiccdown
         end
       end
     end
+
+    module RenderingHelperOverrides
+      def self.prepended(base)
+        # This teaches the view renderer (which is different from the controller renderer,
+        # h/t https://stackoverflow.com/questions/78801079/rails-custom-renderer-for-turbo-stream?noredirect=1#comment138933498_78801079)
+        # to accept a `:hiccdown` option, thus enabling the rendering of hiccdown in turbo-stream
+        # actions as well:
+        # `turbo_stream.update(..., hiccdown: [:h1, 'hello world'])
+        define_method(:render) do |options = {}, locals = {}, &block|
+          if options.is_a?(Hash) && options.key?(:hiccdown)
+            Hiccdown::to_html(options[:hiccdown]).html_safe
+          else
+            super(options, locals, &block)
+          end
+        end
+      end
+    end
   end
 
   def self.scope *args, &block
@@ -39,35 +57,35 @@ module Hiccdown
     Set.new([:area, :base, :br, :col, :command, :embed, :hr, :img, :input, :keygen, :link, :menuitem, :meta, :param, :source, :track, :wbr])
   end
 
-  def self.process_hash(hash, prefix = nil, escape)
-    hash.flat_map do |key, value|
+  def self.process_attributes(hash, prefix = nil, escape)
+    hash.map do |key, value|
       attribute_key = prefix ? "#{prefix}-#{key}" : key.to_s
 
       if value.is_a?(Hash)
-        process_hash(value, attribute_key, escape)
+        process_attributes(value, attribute_key, escape)
       elsif value.is_a?(Array)
-        value_str = value.map { |v| maybe_escape(v.to_s, escape) }.join(' ')
-        ["#{attribute_key}=\"#{value_str}\""]
+        value_str = value
+          .reject { |v| v.to_s == '' }
+          .map { |v| maybe_escape(v.to_s, escape) }
+          .join(' ')
+
+        %{#{attribute_key}="#{value_str}"}
       else
         value_str = maybe_escape(value.to_s, escape)
-        ["#{attribute_key}=\"#{value_str}\""]
+        %{#{attribute_key}="#{value_str}"}
       end
     end
   end
 
-  def self.hash_to_html_attributes(hash, escape)
-    process_hash(hash, nil, escape).join(' ')
-  end
-
   def self.to_html structure, escape = true
     if structure.is_a? Hash
-      self.hash_to_html_attributes(structure, escape)
+      self.process_attributes(structure, nil, escape).join(' ')
     elsif structure.is_a? Array
       if structure.empty?
         return nil
       end
 
-      if structure.first.is_a?(Array)
+      if structure.first.is_a?(Array) || structure.first.is_a?(String)
         return structure.map { |s| to_html(s, escape) }.join
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiccdown
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Dennis Hackethal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-07-27 00:00:00.000000000 Z
 dependencies: []
 description: Generates an HTML string from a Hiccup structure and improves Rails views.
 email: engineering@dennishackethal.com