html2slim2 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a545d55f7ec6dd7f97e609446fa01d6da140a689d51b6be921b4c15c8b6667f4
-  data.tar.gz: 6e5e6b61b863f62c1a88f97e9ae588f8bc766159fcff347eae98a44157a9892b
+  metadata.gz: c977c64c4721d5124549f9a03ee27cd5c889adcb238f2e91fb74cd0d967d636e
+  data.tar.gz: 7e46a4be4a7aa50210b838248a63165f5d3a5b0e9db3da6e06df580016749894
 SHA512:
-  metadata.gz: 196406fc4f69748e6bea1e0743b3a5171dd90e015d7d13026b8466999d55f0ad37d3d2279801d49df7a4a30f81be7107118b3c76d3f4a2c3690066bc4c2327f3
-  data.tar.gz: d1344a4283b17bfdd8b1dd5a6844e4769b731a63aa5ed3faed6e8c587fb89a92748b5e65a51ba9368f784846f2e7ab2aa52f64cddb6d2f4fa200d24d0e27e526
+  metadata.gz: 5dafebc8d2f963272afee508511c50ffbef82ca550980efd12bd0e97502b6eab1e1dd130788fb1214f76d3bc9350d4e63436489cdf4678e16e7d0d62ae874abd
+  data.tar.gz: 10250ab3f587a3c17ea9014684541b916d15529653aac5276e922f1e93fe221f36e550685cba6f27e878ea5a8dcbe0c3244bd0e812795f6dd9cb3136d869ee5f

data/README.md

@@ -1,6 +1,6 @@
 # HTML2Slim2
 
-![Version](https://img.shields.io/gem/v/html2slim2.svg)
+[![Gem Version](https://badge.fury.io/rb/html2slim2.svg)](https://badge.fury.io/rb/html2slim2)
 
 <!--
 [![Build Status](https://travis-ci.org/slim-template/html2slim.png?branch=master)](https://travis-ci.org/slim-template/html2slim)
@@ -8,7 +8,7 @@
 [![Code climate](https://codeclimate.com/github/slim-template/html2slim.png)](https://codeclimate.com/github/slim-template/html2slim)
 -->
 
-Script for converting HTML and ERB files to [slim](http://slim-lang.com/).
+Script for converting HTML and ERB files to [slim](http://slim-template.github.io/).
 
 ## Usage
 
@@ -42,7 +42,7 @@ This project is released under the MIT license.
 
 ## Maintained repo
 
-[https://github.com/sanadan/html2slim](https://github.com/sanadan/html2slim)
+[https://github.com/sanadan/html2slim2](https://github.com/sanadan/html2slim2)
 
 ## OFFICIAL REPO
 

data/bin/erb2slim2

@@ -0,0 +1 @@
+erb2slim

data/bin/html2slim2

@@ -0,0 +1 @@
+html2slim

data/lib/html2slim2/command.rb

@@ -44,7 +44,7 @@ module HTML2Slim2
       end
 
       opts.on_tail('-v', '--version', 'Print version') do
-        puts "#{command_name} #{HTML2Slim::VERSION}"
+        puts "#{command_name} #{HTML2Slim2::VERSION}"
         exit
       end
 

data/lib/html2slim2/converter.rb

@@ -1,8 +1,15 @@
+module HTML2Slim2
+  MULTILINE_ATTR_MARKER = 'html2slim2-multiline'
+end
+
 require_relative 'nokogiri_monkey_patches'
 
 module HTML2Slim2
   class Converter
+    OPENING_TAG_RE = /<([A-Za-z][A-Za-z0-9:-]*)((?:[^>"']|"[^"]*"|'[^']*')*)(\/?)>/m
+
     def initialize(html)
+      html = mark_multiline_opening_tags(html)
       nokogiri = html[..1] == '<!' ? Nokogiri.parse(html) : Nokogiri::HTML.fragment(html)
       @slim = nokogiri.to_slim
     end
@@ -10,6 +17,19 @@ module HTML2Slim2
     def to_s
       @slim
     end
+
+    private
+
+    def mark_multiline_opening_tags(html)
+      html.gsub(OPENING_TAG_RE) do |match|
+        attrs = Regexp.last_match[2]
+        next match unless attrs.include?("\n")
+
+        name = Regexp.last_match[1]
+        slash = Regexp.last_match[3]
+        %(<#{name}#{attrs} #{MULTILINE_ATTR_MARKER}="1"#{slash}>)
+      end
+    end
   end
 
   class HTMLConverter < Converter

data/lib/html2slim2/nokogiri_monkey_patches.rb

@@ -5,7 +5,15 @@ class Nokogiri::XML::Text
     str = escape(content)
     return nil if str.strip.empty?
 
-    ('  ' * lvl) + %(| #{str.gsub(/\s+/, ' ')})
+    # A lone text line with no indentation is content, not HTML formatting space.
+    # "\na\n" → "| a"  (not "|  a ")
+    normalized = if str.match?(/\A\n+\S/) && str.match?(/\S\n+\z/)
+                   str.strip.gsub(/\s+/, ' ')
+                 else
+                   str.gsub(/\s+/, ' ')
+                 end
+
+    ('  ' * lvl) + %(| #{normalized})
   end
 
   private
@@ -39,14 +47,15 @@ class Nokogiri::XML::Element
   BLANK_RE = /\A[[:space:]]*\z/.freeze
 
   def slim(lvl = 0)
-    r = '  ' * lvl
+    indent = '  ' * lvl
 
-    return r + slim_ruby_code(r) if ruby?
+    return indent + slim_ruby_code(indent) if ruby?
 
+    r = indent
     r += name unless skip_tag_name?
     r += slim_id
     r += slim_class
-    r += slim_attributes
+    r += slim_attributes(indent)
     r
   end
 
@@ -54,7 +63,10 @@ class Nokogiri::XML::Element
     if children.any?
       %(#{slim(lvl)}\n#{children.filter_map { |c| c.to_slim(lvl + 1) }.join("\n")})
     else
-      slim(lvl)
+      r = slim(lvl)
+      # Empty multiline tags still end with a newline so sibling spacing
+      # matches tags that only contained ignorable whitespace.
+      r.include?("\n") ? "#{r}\n" : r
     end
   end
 
@@ -80,10 +92,33 @@ class Nokogiri::XML::Element
     has_class? ? ".#{self['class'].to_s.strip.split(/\s+/).join('.')}" : ''
   end
 
-  def slim_attributes
+  def slim_attributes(indent = '')
+    multiline = has_attribute?(HTML2Slim2::MULTILINE_ATTR_MARKER)
+    remove_attribute(HTML2Slim2::MULTILINE_ATTR_MARKER)
     remove_attribute('class')
     remove_attribute('id')
-    has_attributes? ? "[#{attributes_as_html.to_s.strip}]" : ''
+    return '' unless has_attributes?
+
+    if multiline && multiline_attribute_output?
+      slim_multiline_attributes(indent)
+    else
+      "[#{attributes_as_html.to_s.strip}]"
+    end
+  end
+
+  def multiline_attribute_output?
+    attrs = attributes.to_hash
+    attrs.size > 1 || attrs.values.any? { |value| value.to_s.include?("\n") }
+  end
+
+  def slim_multiline_attributes(indent)
+    parts = attributes.map do |attr_name, attr_val|
+      attr_val ? "#{attr_name}=#{html_quote attr_val.to_s}" : attr_name.to_s
+    end
+    return "[#{parts.first}]" if parts.size <= 1
+
+    inner_indent = "#{indent}  "
+    "[\n#{parts.map { |part| "#{inner_indent}#{part}" }.join("\n")}\n#{indent}]"
   end
 
   def has_attributes? # rubocop:disable Naming/PredicatePrefix

data/lib/html2slim2/version.rb

@@ -1,3 +1,3 @@
 module HTML2Slim2
-  VERSION = '0.3.1'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2slim2
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - sanadan
 - Maiz Lulkin
 bindir: bin
 cert_chain: []
-date: 2026-02-09 00:00:00.000000000 Z
+date: 2026-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -31,14 +31,18 @@ email:
 - maiz@lulk.in
 executables:
 - erb2slim
+- erb2slim2
 - html2slim
+- html2slim2
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
 - README.md
 - bin/erb2slim
+- bin/erb2slim2
 - bin/html2slim
+- bin/html2slim2
 - lib/html2slim2.rb
 - lib/html2slim2/command.rb
 - lib/html2slim2/converter.rb
@@ -58,14 +62,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.20
 specification_version: 4
 summary: HTML to Slim converter.
 test_files: []