syntax_tree-haml 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9068b047f884f2383ae24642a130e7382b0dfdf776aa1b2bf2f154ed7ea6041f
-  data.tar.gz: 216ff4b132dc97df75181128256036e85824f123f380bee074ae8c47a0e501ce
+  metadata.gz: 0dfb86a00b3723b124c178e28e4a6af8a604aba895a495324ea151732449bde3
+  data.tar.gz: d597c33107dc7d04b1b52dbe645b2b8b0bf0830e0dc328f83971e95305dab32f
 SHA512:
-  metadata.gz: cc8c88bc84720391bd137c6c09113dc616509f3b3630e096c1ecd0da5f09722e72103fa67c3b4e8c746ab7db9922cc97902220dfdf2e3ffc48dc83434198f3bf
-  data.tar.gz: a737c7723359dd1efd998d8a1a02f71c559994dd5d7b28e2169aac223072af0fe136490b335603cb8864c8c499e97134b58547f58dc34181ed5605533201e622
+  metadata.gz: b6c225f3fcbd9af942f4a6cc00ca8a018a9ebec362b18e987f3b38895164da276ceec928fc02303fcb5055b4a4d787e0224d37cea9402de94f3310171e290c87
+  data.tar.gz: 40ae9ef5f96374fed98f1e00302bfda455e3b279f4f653c733cd806bdc52af37ee4f56bd6464b3a16442dd522a56afc23a8773d07692213d978bad16d68b87ac

data/CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.3.1] - 2022-08-01
+
+### Changed
+
+- Use Syntax Tree to handle properly quoting strings.
+
 ## [1.3.0] - 2022-07-22
 
 ### Added
@@ -48,7 +54,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - 🎉 Initial release! 🎉
 
-[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.2.1...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.3.1...HEAD
+[1.3.1]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.3.0...v1.3.1
+[1.3.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.2.1...v1.3.0
 [1.2.1]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.0.1...v1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    syntax_tree-haml (1.3.0)
+    syntax_tree-haml (1.3.1)
       haml (>= 5.2)
       prettier_print
       syntax_tree (>= 2.0.1)
@@ -22,10 +22,10 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    syntax_tree (3.2.0)
+    syntax_tree (3.2.1)
       prettier_print
     temple (0.8.2)
-    tilt (2.0.10)
+    tilt (2.0.11)
 
 PLATFORMS
   ruby

data/lib/syntax_tree/haml/format.rb

@@ -123,6 +123,8 @@ module SyntaxTree
 
       LiteralHashValue = Struct.new(:value)
 
+      StringHashValue = Struct.new(:value, :quote)
+
       # When formatting a tag, there are a lot of different kinds of things that
       # can be printed out. There's the tag name, the attributes, the content,
       # etc. This object is responsible for housing all of those parts.
@@ -220,19 +222,34 @@ module SyntaxTree
         private
 
         def format_value(q, hash, level = 0)
+          quote = SyntaxTree::Formatter::OPTIONS[:quote]
+
           q.group do
             q.text("{")
             q.indent do
               q.group do
                 q.breakable(level == 0 ? "" : " ")
                 q.seplist(hash, nil, :each_pair) do |key, value|
-                  q.text(Format.hash_key(key))
+                  if key.match?(/^@|[-:]/)
+                    q.text("#{quote}#{Quotes.normalize(key, quote)}#{quote}:")
+                  else
+                    q.text("#{key}:")
+                  end
+
                   q.text(" ")
 
-                  if value.is_a?(Hash)
+                  case value
+                  when Hash
                     format_value(q, value, level + 1)
+                  when LiteralHashValue
+                    q.text(value.value)
+                  when StringLiteral
+                    qq = Formatter.new("")
+                    qq.with_target(q.target) { value.format(qq) }
+                  when String
+                    q.text("#{quote}#{Quotes.normalize(value, quote)}#{quote}")
                   else
-                    q.text(Format.hash_value(value))
+                    q.text(value.to_s)
                   end
                 end
               end
@@ -244,27 +261,6 @@ module SyntaxTree
         end
       end
 
-      def self.hash_key(key)
-        if key.match?(/^@|[-:]/)
-          quote = SyntaxTree::Formatter::OPTIONS[:quote]
-          "#{quote}#{Quotes.normalize(key, quote)}#{quote}:"
-        else
-          "#{key}:"
-        end
-      end
-
-      def self.hash_value(value)
-        case value
-        when LiteralHashValue
-          value.value
-        when String
-          quote = SyntaxTree::Formatter::OPTIONS[:quote]
-          "#{quote}#{Quotes.normalize(value, quote)}#{quote}"
-        else
-          value.to_s
-        end
-      end
-
       # Visit a tag node.
       def visit_tag(node)
         parts = PartList.new(node)
@@ -405,7 +401,7 @@ module SyntaxTree
              ::Haml::AttributeParser.parse(source)
           parsed.to_h { |key, value| [key, parse_attributes(value)] }
         in [:program, [[:string_literal, *], *]]
-          source[1...-1]
+          SyntaxTree.parse(source).statements.body[0]
         else
           LiteralHashValue.new(source)
         end

data/lib/syntax_tree/haml/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module Haml
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree-haml
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml