rsyntaxtree 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22d15ae9e17b8312dc6fdc9c37c4fe942e981854eb69589eb4b117acd1d781b
-  data.tar.gz: 983152369ea224f73372c0e7f7754bc5db36e65fab6d20eec235757dde5a44b0
+  metadata.gz: b1d293f1051661467a4b39531bb7868073256fc6a40e60affa4dee8daa45187f
+  data.tar.gz: 79ececb16b1b9394f5027ccec1f4dcba9d4cd541fe8829276eb9c18d5a377c24
 SHA512:
-  metadata.gz: 7d754218424e09ebf23c84471f192f5f3192dd0a94e1b277e3c28bfed2cdcd5ca5e0cb4785fd19f37584811943cd09e0eb9a22595f2b0c321add4d417bda08c3
-  data.tar.gz: 024f6fd854639fee40d7377509b2f36b00cab56c86929c6d2c1b833aab7c0ad77b6a519a5506a679fa315c69c8b1fe7c16bf1665e425ac4747cb6714feb67c2a
+  metadata.gz: cd4e3ceb0efc58a58b87b4273525aa9456e6050c5b7dfe41bcc0b790018240d2e1c1a0f34a42c45f78faf6913441f41a57aef30f60daab8ce7cfc24182a8b3ce
+  data.tar.gz: 76b44cc2c343a43714ab9cfe52c3a04c524fc81296e901796e0b2aa7b8205b73de4b2a88001d269a5fa834a9267e62e3d2a034b2fbde7d7ca471be90d41524ae

data/README.md

@@ -10,6 +10,7 @@ Documentation is currently available in the following languages:
 - [日本語ドキュメント](https://yohasebe.github.io/rsyntaxtree/documentation_ja)
 
 - [Example Gallery](https://yohasebe.github.io/rsyntaxtree/examples)
+
 ## Web Interface
 
 <img src='https://github.com/yohasebe/rsyntaxtree/blob/master/img/rsyntaxtree-web-screenshot.png?raw=true' width='700px'/>
@@ -56,9 +57,27 @@ See [RSyntaxTree Example Gallery](https://yohasebe.github.io/rsyntaxtree/example
 
 ## Installation
 
-`# gem install rsyntaxtree`
+```
+gem install rsyntaxtree
+```
+
+### macOS Installation Notice
+
+**Important for macOS users:** If you are installing the RSyntaxTree gem directly on macOS, you might encounter build errors for some native extensions (specifically for `gobject-introspection`, `cairo-gobject`, and `gio2`). These errors occur due to macOS linker requirements for dynamic symbol resolution. To work around this issue, please run the following commands in your terminal **before** installing RSyntaxTree:
+
+```bash
+gem install gobject-introspection -- --with-ldflags="-Wl,-undefined,dynamic_lookup"
+gem install cairo-gobject -- --with-ldflags="-Wl,-undefined,dynamic_lookup"
+gem install gio2 -- --with-ldflags="-Wl,-undefined,dynamic_lookup"
+```
+
+After executing these commands, you can install RSyntaxTree normally:
+
+```bash
+gem install rsyntaxtree
+```
 
-**NOTE**: Currently, installation of the gem package on macOS is not recommended. Please use the [Docker image](https://hub.docker.com/r/yohasebe/rsyntaxtree) or the [web interface](https://yohasebe.com/rsyntaxtree).
+Alternatively, if you prefer a smoother installation process, consider using the [Docker image](https://hub.docker.com/r/yohasebe/rsyntaxtree) or the [web interface](https://yohasebe.com/rsyntaxtree).
 
 ## Usage
 

data/Rakefile

@@ -9,24 +9,58 @@ require_relative 'lib/rsyntaxtree/utils'
 # task default: "test"
 
 Rake::TestTask.new do |task|
-  task.pattern = "test/*_test.rb"
-  task.warning = false
+    task.pattern = "test/*_test.rb"
+    task.warning = false
 end
 
 desc "Generate SVG and PNG example images locally"
 task :generate do
-  require_relative "dev/generate_examples"
+    require_relative "dev/generate_examples"
 end
 
 desc "Docker image Build"
 task :docker_build do
-  `docker build ./ -t rsyntaxtree_devel`
+    `docker build ./ -t rsyntaxtree_devel`
 end
 
 desc "Generate SVG and PNG example images using Docker image"
 task :docker_generate do
-  docpath = File.expand_path(File.join(__dir__, "docs"))
-  `docker build ./ -t rsyntaxtree_devel`
-  `docker run --rm -v #{docpath}:/rsyntaxtree/hostdocs rsyntaxtree_devel ruby /rsyntaxtree/dev/generate_examples.rb /rsyntaxtree/hostdocs`
-  `cat #{docpath}/generate_examples.log`
+    docpath = File.expand_path(File.join(__dir__, "docs"))
+    `docker build ./ -t rsyntaxtree_devel`
+    `docker run --rm -v #{docpath}:/rsyntaxtree/hostdocs rsyntaxtree_devel ruby /rsyntaxtree/dev/generate_examples.rb /rsyntaxtree/hostdocs`
+    `cat #{docpath}/generate_examples.log`
+end
+
+# Add new task for macOS environment configuration
+
+desc "Configure Bundler build options for macOS"
+task :setup_macos do
+    require "rbconfig"
+    host_os = RbConfig::CONFIG['host_os']
+
+    # Check if the host OS is macOS (Darwin)
+
+    if host_os =~ /darwin/
+        puts "macOS detected. Setting up build options for native extensions..."
+
+        gems_with_options = {
+            "gobject-introspection" => '--with-ldflags=-Wl,-undefined,dynamic_lookup',
+            "cairo-gobject"         => '--with-ldflags=-Wl,-undefined,dynamic_lookup',
+            "gio2"                  => '--with-ldflags=-Wl,-undefined,dynamic_lookup'
+        }
+
+        # Configure each gem with the necessary ldflags option using Bundler config command
+
+        gems_with_options.each do |gem_name, flags|
+            command = "bundle config build.#{gem_name} \"#{flags}\""
+            puts "Executing: #{command}"
+            unless system(command)
+                abort("Failed to execute command: #{command}")
+            end
+        end
+
+        puts "macOS setup complete. Please run 'bundle install' after this."
+    else
+        puts "This setup task is intended for macOS environments. Current OS: #{host_os}"
+    end
 end

data/docs/_examples/016.md

@@ -1,6 +1,6 @@
 ---
 name: "016"
-caption: "Tick-tac-toe"
+caption: "Tic-tac-toe"
 color: "off"
 category: "Miscellaneous"
 polyline: "off"

data/docs/_examples/053.md

@@ -13,29 +13,22 @@ font: "Noto Serif"
 ---
 ```
 [expr
-  [id x
-  
-  ]
+  [id x]
   [suffix
     \[
-    [id 2
-    
-    ]
+    [id 2 ]
     \]
     [suffix
       \[
-      [id 3
-      
-      ]
+      [id 3 ]
       \]
       [suffix
         \[
-        [id 4
-        
-        ]
+        [id 4 ]
         \]
       ]
     ]
   ]
 ]
+  
 ```

data/lib/rsyntaxtree/svg_graph.rb

@@ -7,7 +7,7 @@
 # Parses an element list into an SVG tree.
 # Copyright (c) 2007-2024 Yoichiro Hasebe <yohasebe@gmail.com>
 
-require "tempfile"
+# No tempfile usage in this file
 require_relative 'base_graph'
 require_relative 'utils'
 

data/lib/rsyntaxtree/utils.rb

@@ -53,7 +53,9 @@ module FontMetrics
       gca.interline_spacing = 0
       gca.interword_spacing = 0
     end
-    gc.get_multiline_type_metrics(background, text)
+    metrics = gc.get_multiline_type_metrics(background, text)
+    background.destroy! # Explicitly destroy the image
+    metrics
   end
   module_function :get_metrics
 end

data/lib/rsyntaxtree/version.rb

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

data/lib/rsyntaxtree.rb

@@ -160,11 +160,12 @@ module RSyntaxTree
       context.render_rsvg_handle(rsvg)
       b = StringIO.new
       surface.write_to_png(b)
-      if binary
-        b
-      else
-        b.string
-      end
+      result = binary ? b : b.string
+      # Clean up resources
+      b.close unless binary
+      surface.finish
+      context.destroy
+      result
     rescue Cairo::InvalidSize
       raise RSTError, +"Error: the result syntree is too big"
     end
@@ -178,11 +179,11 @@ module RSyntaxTree
       context = Cairo::Context.new(surface)
       context.render_rsvg_handle(rsvg)
       surface.finish
-      if binary
-        b
-      else
-        b.string
-      end
+      result = binary ? b : b.string
+      # Clean up resources
+      b.close unless binary
+      context.destroy
+      result
     rescue Cairo::InvalidSize
       raise RSTError, +"Error: the result syntree is too big"
     end
@@ -200,10 +201,12 @@ module RSyntaxTree
       image, _data = Magick::Image.from_blob(svg) do |im|
         im.format = 'svg'
       end
-      image.to_blob do |im|
+      blob = image.to_blob do |im|
         im.format = @params[:format].upcase
       end
-      image
+      # Clean up resources
+      image.destroy!
+      blob
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -358,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby