erb-formatter 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a21bdecce12179abd027c94e06f28e708323ef5217e1a45c43302e72c9334d9c
-  data.tar.gz: c4f1dc0e38523170c62a2e4c474140da3b988741a0fe8f983b766738730b63eb
+  metadata.gz: b4d4aa4df0dfb6331993b2586513da76d3c4bb9443f536e5738adf68ef1cbb37
+  data.tar.gz: 0d6a144fd792f2eb78fb6a7112f49e330aae42a6c4b5de0b3b2fe42f6fb513d6
 SHA512:
-  metadata.gz: c1377c919438c3db88d2398d9eef2e259c4fd36e9ad0299e1d5e0892a387389468ea8a7ba083a9575ef5b3814330f08bb549f2fe2e36b61266a58a1b63524b1d
-  data.tar.gz: 9976eaea39da84cfca194851430428224c393bc8cd1e39ebe2b8833b7c57832911b6057415201d00bd00bd5956a5be7d6c197464233b80bc83e92482e0d0db2a
+  metadata.gz: 5db13cddb929dec25486feafd48261068365d4f6847e514ec1c99df903d45bd036e4fa82b54c4de08534af079e8d1dd7c879c282595cb2f539b0e07a44fda135
+  data.tar.gz: 4bacbaecf5078bc4fc43c89cdc183a5883522a23e015a7642fc6b56384bfa34440585a1afb7964e8643db2492d325994eaf6f0d41d2f790a4ddfd81add43e774

data/README.md

@@ -119,6 +119,23 @@ let g:ale_fixers = {
 \}
 ```
 
+### With [Zed](https://zed.dev/) editor
+
+With the gem installed, configure `settings.json` to use the formatter as an external command
+
+```json
+"language_overrides": {
+  "ERB": {
+    "formatter": {
+      "external": {
+        "command": "erb-format",
+        "arguments": ["--stdin", "--print-width", "80"]
+      }
+    }
+  }
+}
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/erb/formatter/version.rb

@@ -3,5 +3,5 @@
 require 'erb'
 
 class ERB::Formatter
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/erb/formatter.rb

@@ -26,9 +26,11 @@ class ERB::Formatter
 
   class Error < StandardError; end
 
+  SPACES = /\s+/m
+
   # https://stackoverflow.com/a/317081
   ATTR_NAME = %r{[^\r\n\t\f\v= '"<>]*[^\r\n\t\f\v= '"<>/]} # not ending with a slash
-  UNQUOTED_VALUE = ATTR_NAME
+  UNQUOTED_VALUE = %r{[^<>'"\s]+}
   UNQUOTED_ATTR = %r{#{ATTR_NAME}=#{UNQUOTED_VALUE}}
   SINGLE_QUOTE_ATTR = %r{(?:#{ATTR_NAME}='[^']*?')}m
   DOUBLE_QUOTE_ATTR = %r{(?:#{ATTR_NAME}="[^"]*?")}m
@@ -136,17 +138,18 @@ class ERB::Formatter
     attrs.scan(ATTR).flatten.each do |attr|
       attr.strip!
       name, value = attr.split('=', 2)
-      if UNQUOTED_ATTR =~ attr
-        attr_html << indented("#{name}=\"#{value}\"")
-        next
-      end
 
       if value.nil?
         attr_html << indented("#{name}")
         next
       end
 
-      value_parts = value[1...-1].strip.split(/\s+/)
+      if /\A#{UNQUOTED_VALUE}\z/o.match?(value)
+        attr_html << indented("#{name}=\"#{value}\"")
+        next
+      end
+
+      value_parts = value[1...-1].strip.split(SPACES)
       value_parts.sort_by!(&@css_class_sorter) if name == 'class' && @css_class_sorter
 
       full_attr = "#{name}=#{value[0]}#{value_parts.join(" ")}#{value[-1]}"
@@ -231,7 +234,7 @@ class ERB::Formatter
 
     return if text.match?(/\A\s*\z/m) # empty
 
-    text = text.gsub(/\s+/m, ' ').strip
+    text = text.gsub(SPACES, ' ').strip
 
     offset = indented("").size
     # Restore full line width if there are less than 40 columns available

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb-formatter
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Elia Schito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: syntax_tree
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Format ERB files with speed and precision.