haml2html 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6e804a6e70b2ee7b505963c8fb1919067cf47502fc0598884d0ac6d288a42e5
-  data.tar.gz: 5bcc16b7b359cf436f07b55d15a5bb03d28821adcea468a4e7aebdabbe416126
+  metadata.gz: bcf730acaf73c99940361793046e483d462069800940912362b1b645d7c2bebc
+  data.tar.gz: cd4b1cf2bcbc28e1a80ccc074bc965919d5b3c6d9ec38d2f5398d8bbfd37db2a
 SHA512:
-  metadata.gz: 47b3a2683f991ee10b879f3f46f8b4919c4794bd375cd95af16d7818449fbd62325a99863720ffe311c4b0e50db830a889ad6906f397b12772c4d12a10294b8d
-  data.tar.gz: f3836002ec40c1617aa98a24f0443d348d1951233f2472cd652ad5a6417887fff7cd53f237c64c5c96e69a72348846be4660b8210beec09ba318f72f53cc6db1
+  metadata.gz: f6a33a3a82682bca7ad2a5707f5e68c16c468f1d14e9bc7a9d25a3fa3362c8ebf5df756c38a0548dafa144c93aa43e37ab55e286d286b89ff5595f78893bdff1
+  data.tar.gz: 8e08fe063629fa885a1596b4456268706611f0f1807b92b7658138829d04a8fceb777d010389963481b7d539136d99d96696f8658546df44bf309f7db4e7e2b8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.2
+
+- Raise the minimum supported Ruby version to 3.2.
+- Switch diagnostics back to `Data.define`.
+
 ## 0.1.1
 
 - Add support for `:ruby` filters.

data/README.md

@@ -31,26 +31,58 @@ require "haml2html"
 erb = Haml2html::Converter.new("%p= post.title\n", filename: "show.html.haml").render
 ```
 
+## Examples
+
+Haml:
+
+```haml
+= form_with model: post do |form|
+  = form.text_field :title
+```
+
+ERB:
+
+```erb
+<%= form_with model: post do |form| %>
+  <%= form.text_field :title %>
+<% end %>
+```
+
+Haml:
+
+```haml
+:ruby
+  if published
+    status = "Published"
+  else
+    status = "Draft"
+  end
+%p= status
+```
+
+ERB:
+
+```erb
+<%
+if published
+  status = "Published"
+else
+  status = "Draft"
+end
+%>
+<p><%= status %></p>
+```
+
 ## Supported
 
 - Haml tags, nesting, static attributes, text, interpolation.
 - Ruby output and control flow: `=`, `!=`, `- if`, `- each do`, and similar blocks.
 - Public comments and silent comments.
-- `:plain`, `:escaped`, `:javascript`, `:css`, and `:erb` filters.
-- Dynamic Haml attributes and object references through `Haml::AttributeBuilder`.
-
-Generated ERB may call `Haml::AttributeBuilder` for dynamic attributes and object references. Keep `haml` available at runtime until those converted templates are simplified.
+- `:plain`, `:escaped`, `:javascript`, `:css`, `:erb`, and `:ruby` filters.
+- Dynamic Haml attributes through Rails `tag.attributes`.
 
 ## Limitations
 
 This is a migration tool, not a full source-preserving formatter. Output whitespace and quote style may differ from Haml output, while rendered HTML should remain equivalent for supported constructs. Unsupported filters or nodes fail with diagnostics instead of emitting known-wrong ERB.
 
-Batch directory conversion is planned after the single-file converter is stable.
-
-## Publishing Checklist
-
-1. Verify gemspec URLs match the final repository URL.
-2. Run `rake test`.
-3. Run `gem build haml2html.gemspec --strict`.
-4. Inspect package contents with `gem spec haml2html-0.1.0.gem files`.
-5. Publish with RubyGems MFA enabled.
+Object references such as `%div[user]` are not converted yet.

data/lib/haml2html/converter.rb

@@ -88,7 +88,7 @@ module Haml2html
       return nil if value[:parse].nil? && blank?(value[:value])
 
       if value[:parse]
-        marker = raw_script_line?(node) ? "<%==" : "<%="
+        marker = raw_script?(node) ? "<%==" : "<%="
         raw = "#{marker} #{value[:value].to_s.strip} %>"
         value[:preserve_script] ? raw : raw
       else
@@ -98,12 +98,13 @@ module Haml2html
 
     def emit_attributes(node)
       value = node.value
-      return runtime_attributes(value) if runtime_attributes?(value)
+      attrs = static_attributes(value)
+      diagnose_object_ref(node, value)
 
-      attrs = value[:attributes].sort.map do |name, attr_value|
-        %( #{name}="#{escape_attr(interpolate_text(attr_value.to_s))}")
-      end
-      attrs.join
+      dynamic = dynamic_attributes_expression(value[:dynamic_attributes])
+      return attrs unless dynamic
+
+      "#{attrs}#{dynamic_attributes(dynamic)}"
     end
 
     def emit_script(node, indent)
@@ -112,7 +113,7 @@ module Haml2html
         return "#{spaces(indent)}#{interpolate_text(unquote_string_literal(code))}\n"
       end
 
-      marker = raw_script_line?(node) ? "<%==" : "<%="
+      marker = raw_script?(node) ? "<%==" : "<%="
       if node.children.any?
         output = +"#{spaces(indent)}#{marker} #{code} %>\n"
         output << emit_children(node.children, indent + 1)
@@ -176,40 +177,24 @@ module Haml2html
       end
     end
 
-    def runtime_attributes?(value)
-      object_ref = value[:object_ref]
-      return true unless object_ref.nil? || object_ref == :nil
-
-      dynamic = value[:dynamic_attributes]
-      return false unless dynamic
-
-      dynamic_literals(dynamic).any?
-    end
-
-    def runtime_attributes(value)
-      args = ["true", '"\\"".freeze', ":html", object_ref_literal(value[:object_ref])]
-      args << value[:attributes].inspect unless value[:attributes].empty?
-      args.concat(dynamic_literals(value[:dynamic_attributes]))
-
-      %(<%== (require "haml"; ::Haml::AttributeBuilder.build(#{args.join(", ")})) %>)
+    def static_attributes(value)
+      value[:attributes].sort.map do |name, attr_value|
+        %( #{name}="#{escape_attr(interpolate_text(attr_value.to_s))}")
+      end.join
     end
 
-    def object_ref_literal(object_ref)
-      return "nil" if object_ref.nil? || object_ref == :nil
-
-      object_ref
+    def dynamic_attributes(dynamic)
+      %(<%== tag.attributes(**#{dynamic}).then { |attrs| attrs.empty? ? "" : " \#{attrs}" } %>)
     end
 
-    def dynamic_literals(dynamic)
-      return [] unless dynamic
-
-      [dynamic.new, stripped_old_dynamic_literal(dynamic.old)].compact
-    end
+    def dynamic_attributes_expression(dynamic)
+      return nil unless dynamic
 
-    def stripped_old_dynamic_literal(old)
-      return nil if old.nil?
+      expressions = [dynamic.new, dynamic.old].compact
+      return nil if expressions.empty?
+      return expressions.first if expressions.one?
 
-      old.dup.sub(/\A{/, "").sub(/}\z/m, "")
+      expressions.reduce("{}") { |merged, expression| "#{merged}.merge(#{expression})" }
     end
 
     def diagnose_object_ref(node, value)
@@ -219,19 +204,6 @@ module Haml2html
       unsupported(node, "object reference", "object references cannot be faithfully converted to inline attrs")
     end
 
-    def diagnose_dynamic_attributes(node, value)
-      dynamic = value[:dynamic_attributes]
-      return unless dynamic
-
-      if dynamic.respond_to?(:new) && dynamic.new
-        unsupported(node, "dynamic attributes", "new-style dynamic attributes are not supported")
-      end
-
-      if dynamic.respond_to?(:old) && dynamic.old
-        unsupported(node, "dynamic attributes", "old-style dynamic attributes are not supported")
-      end
-    end
-
     def closes_with_end?(node)
       keyword = node.value[:keyword].to_s
       return true if %w[if unless case begin for while until].include?(keyword)
@@ -263,9 +235,11 @@ module Haml2html
       diagnostics << Diagnostic.new(filename: @filename, line: node.line, feature: feature.to_s, message: message)
     end
 
-    def raw_script_line?(node)
+    def raw_script?(node)
+      return true if node.type == :tag && node.value[:preserve_script] == false
+
       line = @lines.fetch(node.line.to_i - 1, "")
-      line.lstrip.start_with?("!=") || line.include?("!=")
+      line.lstrip.start_with?("!=")
     end
 
     def blank?(value)

data/lib/haml2html/diagnostic.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Haml2html
-  Diagnostic = Struct.new(:filename, :line, :feature, :message, keyword_init: true) do
+  Diagnostic = Data.define(:filename, :line, :feature, :message) do
     def to_s
       location = [filename, line].compact.join(":")
       location = "haml" if location.empty?

data/lib/haml2html/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml2html
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kyle
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-06 00:00:00.000000000 Z
+date: 2026-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -44,6 +44,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
+- !ruby/object:Gem::Dependency
+  name: herb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -88,13 +102,13 @@ files:
 - lib/haml2html/converter.rb
 - lib/haml2html/diagnostic.rb
 - lib/haml2html/version.rb
-homepage: https://github.com/kyle/haml2html
+homepage: https://github.com/KDunc11/haml2html
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/kyle/haml2html
-  source_code_uri: https://github.com/kyle/haml2html/tree/main
-  changelog_uri: https://github.com/kyle/haml2html/blob/main/CHANGELOG.md
+  homepage_uri: https://github.com/KDunc11/haml2html
+  source_code_uri: https://github.com/KDunc11/haml2html/tree/main
+  changelog_uri: https://github.com/KDunc11/haml2html/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -103,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="