rsyntaxtree 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef69a566b76dec78e1e804475c604162173582605c852900b5cd5c5cf3f2e5eb
-  data.tar.gz: 3ee903c09bab59e55e1dd81544768482ddd53c3f0eaf6081364f4bb0c446cfed
+  metadata.gz: 38f3abe8841c2097201c6120f900a0d9eb99fb8bea9c6dc8388ac38a8e0df2c7
+  data.tar.gz: d22ebd93a2a2ed135e4afcc21797f4f057a3b5d340fdfd265a7f5490ccc642fb
 SHA512:
-  metadata.gz: f9057ca7c228e28351e95fb5b2573818736a738ed5ae2990db33291b884d1aa0d4e8158949b390b84f5151bf0117850521e0b25d1051fd7f5fe080d4559ecdfb
-  data.tar.gz: dc727f0091f56ced11c29a25739f8ee73fe912fc8673e8c073a4f3fd7a9de37e4344c392f4e7691773c7abcd7c72f71209f991c1d450e9ddd96e230dbebf4461
+  metadata.gz: b3c9dc57831246bdd189e92998ba8325606635669e4e63839509d84db3e21911d0eb928f615b2d2d0f5d9ed6e711c2fed3785d3f1453988deef333a5e513ec48
+  data.tar.gz: eea07050d7df010b52615c475d4681749420c7b16687169c9e5ae3de5fbc6683daf939b9c17795442ed2589ad08dfddd745ad41b6d169f5238f521eaab638d3b

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [1.10.0] - 2026-08
+
+A transitional release ahead of 2.0, which drops JPG/GIF output and the
+RMagick dependency.
+
+### Deprecated
+- JPG and GIF output: the CLI prints a warning to stderr when either is
+  requested, and the documentation marks both as deprecated. JPEG blurs
+  line art and GIF has no use case here — use PNG. Both formats are
+  removed in 2.0.
+
+### Changed
+- The library no longer loads RMagick at require time. SVG, PNG, PDF,
+  TikZ and LSIF work without ImageMagick installed; only a JPG or GIF
+  request needs RMagick, and a request without it reports the missing
+  dependency as a regular input error instead of a bare `LoadError`.
+
+### Fixed
+- `RSTError` mutated the message it was given, so raising one with a plain
+  string literal crashed inside the error class with a `FrozenError`. Every
+  file here carries `frozen_string_literal`, which made the working form the
+  unobvious one.
+
 ## [1.9.0] - 2026-08
 
 ### Added

data/CITATION.cff

@@ -11,8 +11,8 @@ repository-code: "https://github.com/yohasebe/rsyntaxtree"
 # Concept DOI: always resolves to the latest archived version on Zenodo
 doi: "10.5281/zenodo.21916150"
 license: MIT
-version: 1.8.2
-date-released: 2026-08-15
+version: 1.10.0
+date-released: 2026-08-19
 keywords:
   - linguistics
   - syntax tree

data/README.md

@@ -66,7 +66,7 @@ Connect nodes with lines or arrows:
 
 ### Multiple Output Formats
 
-Generate trees in PNG, SVG, PDF, JPG, GIF, or LSIF (JSON) format.
+Generate trees in PNG, SVG, PDF, or LSIF (JSON) format. (JPG and GIF are deprecated and will be removed in 2.0.)
 
 ## Web Interface
 
@@ -167,7 +167,7 @@ Usage:
 | Option | Description | Default |
 |--------|-------------|---------|
 | `-o, --outdir` | Output directory | `./` |
-| `-f, --format` | Output format: png, gif, jpg, pdf, svg, lsif | `png` |
+| `-f, --format` | Output format: png, svg, pdf, lsif, tikz (jpg and gif are deprecated) | `png` |
 | `-l, --leafstyle` | Leaf style: auto, triangle, bar, nothing | `auto` |
 | `-n, --fontstyle` | Font style: sans, serif, cjk, mono | `sans` |
 | `-s, --fontsize` | Font size: 8-26 | `16` |

data/bin/rsyntaxtree

@@ -160,6 +160,10 @@ opts.each do |key, value|
   end
 end
 
+if %w[jpg gif].include?(string_opts[:format])
+  warn "Warning: #{string_opts[:format].upcase} output is deprecated and will be removed in RSyntaxTree 2.0. Use PNG instead."
+end
+
 data = if ARGV[0] && File.exist?(File.expand_path(ARGV[0]))
          File.read ARGV[0]
        elsif ARGV[0]

data/lib/rsyntaxtree/utils.rb

@@ -7,7 +7,6 @@
 # Image utility functions to inspect text font metrics
 # Copyright (c) 2007-2026 Yoichiro Hasebe <yohasebe@gmail.com>
 
-require 'rmagick'
 require 'pango'
 
 # Font family lists shared by the SVG output and the Pango-based text

data/lib/rsyntaxtree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RSyntaxTree
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

data/lib/rsyntaxtree.rb

@@ -53,8 +53,10 @@ DEFAULT_OPTS = {
 
 class RSTError < StandardError
   def initialize(msg = "Error: something unexpected occurred")
-    msg.gsub!(WHITESPACE_BLOCK, "<>")
-    super msg
+    # Non-destructive: every file here carries frozen_string_literal, so
+    # mutating the message in place turned a raise with a plain literal into
+    # a FrozenError from inside the error class itself.
+    super(msg.gsub(WHITESPACE_BLOCK, "<>"))
   end
 end
 
@@ -69,7 +71,6 @@ require_relative 'rsyntaxtree/string_parser'
 
 require 'cgi'
 require 'rsvg2'
-require 'rmagick'
 
 module RSyntaxTree
   class RSGenerator
@@ -243,24 +244,41 @@ module RSyntaxTree
       graph.svg_data
     end
 
+    # JPG and GIF output converts the PNG through RMagick. The require is
+    # lazy: both formats are deprecated and will be removed in 2.0, and the
+    # library must load without RMagick for every other format. A missing
+    # RMagick is reported as an input-level error, not a bare LoadError.
+    def with_rmagick
+      require 'rmagick'
+      yield
+    rescue LoadError
+      raise RSTError, +"Error: JPG/GIF output requires ImageMagick and the rmagick gem, " \
+                      "which is not installed. Use PNG instead — JPG and GIF support " \
+                      "is deprecated and will be removed in 2.0."
+    end
+
     def draw_jpg
-      png_data = draw_png
-      images = Magick::Image.from_blob(png_data)
-      image = images.first
-      image.format = 'JPEG'
-      blob = image.to_blob
-      images.each(&:destroy!)
-      blob
+      with_rmagick do
+        png_data = draw_png
+        images = Magick::Image.from_blob(png_data)
+        image = images.first
+        image.format = 'JPEG'
+        blob = image.to_blob
+        images.each(&:destroy!)
+        blob
+      end
     end
 
     def draw_gif
-      png_data = draw_png
-      images = Magick::Image.from_blob(png_data)
-      image = images.first
-      image.format = 'GIF'
-      blob = image.to_blob
-      images.each(&:destroy!)
-      blob
+      with_rmagick do
+        png_data = draw_png
+        images = Magick::Image.from_blob(png_data)
+        image = images.first
+        image.format = 'GIF'
+        blob = image.to_blob
+        images.each(&:destroy!)
+        blob
+      end
     end
 
     def draw_lsif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Yoichiro Hasebe