syntax_tree-haml 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7631572676709bc4c79a2030b99cdd8e084ce038c52c291c27ded3270f799829
-  data.tar.gz: 1ab41e2943d58dd6d6cf242fe4a45e3b257a4963a5cca091241cc154f4c3e73e
+  metadata.gz: b81fe1099e22a95015983cabc44340820430e2b1273d89b8042cd5c0799e9eec
+  data.tar.gz: 81dac915a833b4a8a4fd82e5f14dc1b98b6db5d94733701c57b18cc9d86cd983
 SHA512:
-  metadata.gz: c0acf761755fb73bb9e9bd113cc5d26328ce4f61f1d2f1a67930b2fb62954de0dcdf88696b6a874a8424dce7d2c2e85baa614f704347ee308652276dd5d8d7c4
-  data.tar.gz: e5ef7dcc2a98160a5cd90fc7e4de44cef58aacd086ec1cf9f0fabfad20c9be83829a3a0c7fabb7311f392dba40ea49bcfc2a26fbb7eada822f2c8e8fe1660a92
+  metadata.gz: fd3c147a0e384a3b95196ed051420f8d873c960bc28af8df964b9fa0e5550adcf1072c1f76b4b39675ccdbdc8099fd7fb02ec1e5c6062a028ee4f0317afca19e
+  data.tar.gz: 764aa4c5a07616dd5a6a43f8dde3efa0b61490573ff414b5c271a2ee25b417def1b8586b7ce7bfaa4d51871bb8bd66356e826fc0131b9cabadf0b31e441a5183

data/.github/workflows/main.yml

@@ -4,6 +4,13 @@ on:
 - pull_request_target
 jobs:
   ci:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+        - '2.7'
+        - '3.0'
+        - '3.1'
     name: CI
     runs-on: ubuntu-latest
     env:
@@ -13,7 +20,7 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
-        ruby-version: '3.1'
+        ruby-version: ${{ matrix.ruby }}
     - name: Test
       run: bundle exec rake test
   automerge:

data/CHANGELOG.md

@@ -6,6 +6,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.2.0] - 2022-05-13
+
+### Added
+
+- An optional `maxwidth` second argument to `SyntaxTree::Haml.format`.
+
+## [1.1.0] - 2022-04-22
+
+### Added
+
+- Support for Ruby 2.7 added back.
+
+## [1.0.1] - 2022-03-31
+
+### Changed
+
+- Fix up usage of the `SyntaxTree.register_handler` method.
+
 ## [1.0.0] - 2022-03-31
 
 ### Changed
@@ -18,6 +36,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.0.0...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.2.0...HEAD
+[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
+[1.0.1]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v0.1.0...v1.0.0
 [0.1.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/c1264c...v0.1.0

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    syntax_tree-haml (1.0.0)
+    syntax_tree-haml (1.2.0)
       haml (>= 5.2)
-      syntax_tree (>= 2.0)
+      prettier_print
+      syntax_tree (>= 2.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -13,6 +14,7 @@ GEM
       temple (>= 0.8.0)
       tilt
     minitest (5.15.0)
+    prettier_print (0.1.0)
     rake (13.0.6)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -20,11 +22,15 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    syntax_tree (2.0.0)
+    syntax_tree (2.5.0)
+      prettier_print
     temple (0.8.2)
     tilt (2.0.10)
 
 PLATFORMS
+  ruby
+  x86_64-darwin-19
+  x86_64-darwin-20
   x86_64-darwin-21
   x86_64-linux
 

data/lib/syntax_tree/haml/silent_script.rb

@@ -48,9 +48,14 @@ module SyntaxTree
       def continuation?(child)
         return false if child.type != :silent_script
 
-        [node.value[:keyword], child.value[:keyword]] in
-          ["case", "in" | "when" | "else"] |
-          ["if" | "unless", "elsif" | "else"]
+        case [node.value[:keyword], child.value[:keyword]]
+        in ["case", "in" | "when" | "else"]
+          true
+        in ["if" | "unless", "elsif" | "else"]
+          true
+        else
+          false
+        end
       end
     end
   end

data/lib/syntax_tree/haml/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module Haml
-    VERSION = "1.0.0"
+    VERSION = "1.2.0"
   end
 end

data/lib/syntax_tree/haml.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "haml"
+require "prettier_print"
 require "syntax_tree"
 
 require "syntax_tree/haml/comment"
@@ -47,12 +48,8 @@ module SyntaxTree
       ::Haml::Parser.new({}).call(source)
     end
 
-    def self.format(source)
-      formatter = PP.new([])
-      parse(source).format(formatter)
-
-      formatter.flush
-      formatter.output.join
+    def self.format(source, maxwidth = 80)
+      PrettierPrint.format(+"", maxwidth) { |q| parse(source).format(q) }
     end
 
     def self.read(filepath)
@@ -76,7 +73,6 @@ module SyntaxTree
     end
   end
 
-  # If we're in the context of the CLI, then register our module as a handler
-  # for the .haml file type.
-  CLI.register_handler(".haml", Haml) if const_defined?(:CLI)
+  # Register our module as a handler for the .haml file type.
+  register_handler(".haml", Haml)
 end

data/syntax_tree-haml.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "haml", ">= 5.2"
-  spec.add_dependency "syntax_tree", ">= 2.0"
+  spec.add_dependency "prettier_print"
+  spec.add_dependency "syntax_tree", ">= 2.0.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree-haml
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -24,20 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: prettier_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: syntax_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement