haml2html 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcf730acaf73c99940361793046e483d462069800940912362b1b645d7c2bebc
-  data.tar.gz: cd4b1cf2bcbc28e1a80ccc074bc965919d5b3c6d9ec38d2f5398d8bbfd37db2a
+  metadata.gz: 54fab4cd9a6853ba2f3bb3568c17a18f1667b7507a2de432966bea62e6a218e1
+  data.tar.gz: 11e567f5d534e34e2f1a88029f94e20847d13953cdd995e169a65246aaba8ed9
 SHA512:
-  metadata.gz: f6a33a3a82682bca7ad2a5707f5e68c16c468f1d14e9bc7a9d25a3fa3362c8ebf5df756c38a0548dafa144c93aa43e37ab55e286d286b89ff5595f78893bdff1
-  data.tar.gz: 8e08fe063629fa885a1596b4456268706611f0f1807b92b7658138829d04a8fceb777d010389963481b7d539136d99d96696f8658546df44bf309f7db4e7e2b8
+  metadata.gz: e5506405f5757513488fd1771d86adbee964c08d89d5f42f54e1236e6a2e32f1d871ca29c9ee7db83687629325d241416b222e279253f1a464b603ef4c0425af
+  data.tar.gz: bed4c344c88cf6cbd41d89f59398c15ea724a63afb2b91c852f1a1d3402d676dda2be37d6a85414173437fad54064dd4642591e1547d2d38403ba1e38abdb976

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.3
+
+- Fix generated ERB for Haml attributes with mixed static and dynamic classes.
+
 ## 0.1.2
 
 - Raise the minimum supported Ruby version to 3.2.

data/lib/haml2html/converter.rb

@@ -2,6 +2,7 @@
 
 require "cgi"
 require "haml"
+require "ripper"
 
 require_relative "diagnostic"
 
@@ -79,6 +80,7 @@ module Haml2html
       if node.children.empty? && !blank?(inline)
         return "#{open}#{inline}#{close}\n"
       end
+      return "#{open}#{close}\n" if node.children.empty?
 
       "#{open}\n#{emit_children(node.children, indent + 1)}#{spaces(indent)}#{close}\n"
     end
@@ -98,13 +100,18 @@ module Haml2html
 
     def emit_attributes(node)
       value = node.value
-      attrs = static_attributes(value)
+      attrs = value[:attributes].dup
       diagnose_object_ref(node, value)
 
       dynamic = dynamic_attributes_expression(value[:dynamic_attributes])
-      return attrs unless dynamic
+      return static_attributes(attrs) unless dynamic
 
-      "#{attrs}#{dynamic_attributes(dynamic)}"
+      if (simple_attrs = simple_dynamic_attributes(dynamic))
+        dynamic_class = simple_attrs.delete("class")
+        return "#{static_attributes(attrs, dynamic_class: dynamic_class)}#{simple_attrs.map { |name, attr_value| dynamic_attribute(name, attr_value) }.join}"
+      end
+
+      "#{static_attributes(attrs)}#{dynamic_attributes(dynamic)}"
     end
 
     def emit_script(node, indent)
@@ -177,14 +184,61 @@ module Haml2html
       end
     end
 
-    def static_attributes(value)
-      value[:attributes].sort.map do |name, attr_value|
-        %( #{name}="#{escape_attr(interpolate_text(attr_value.to_s))}")
+    def static_attributes(attrs, dynamic_class: nil)
+      emitted_attrs = attrs.dup
+      emitted_attrs["class"] = "" if dynamic_class && !emitted_attrs.key?("class")
+
+      emitted_attrs.sort.map do |name, attr_value|
+        value = escape_attr(interpolate_text(attr_value.to_s))
+        value = value.empty? ? dynamic_class : "#{value} #{dynamic_class}" if name == "class" && dynamic_class
+        %( #{name}="#{value}")
       end.join
     end
 
     def dynamic_attributes(dynamic)
-      %(<%== tag.attributes(**#{dynamic}).then { |attrs| attrs.empty? ? "" : " \#{attrs}" } %>)
+      %(<%== (_haml2html_attrs = tag.attributes(**#{dynamic})).empty? ? "" : " \#{_haml2html_attrs}" %>)
+    end
+
+    def dynamic_attribute(name, value)
+      %( #{name}="#{value}")
+    end
+
+    def simple_dynamic_attributes(dynamic)
+      program = Ripper.sexp(dynamic)
+      hash = program&.dig(1, 0)
+      return nil unless hash&.first == :hash
+
+      associations = hash.dig(1, 1)
+      return nil unless associations.is_a?(Array)
+
+      associations.each_with_object({}) do |association, attrs|
+        return nil unless association&.first == :assoc_new
+
+        label = association[1]
+        return nil unless label&.first == :@label
+
+        value = simple_dynamic_attribute_value(association[2])
+        return nil unless value
+
+        attrs[label[1].delete_suffix(":")] = value
+      end
+    end
+
+    def simple_dynamic_attribute_value(node)
+      case node&.first
+      when :string_literal
+        escape_attr(string_literal_content(node))
+      when :vcall
+        ident = node.dig(1, 1)
+        return nil unless ident
+
+        "<%= #{ident} %>"
+      end
+    end
+
+    def string_literal_content(node)
+      content = node.dig(1, 1, 1)
+      content.to_s
     end
 
     def dynamic_attributes_expression(dynamic)

data/lib/haml2html/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Haml2html
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml2html
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kyle
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-07 00:00:00.000000000 Z
+date: 2026-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml