safe_image 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29ce0a1f4932ad1cf1dd7e47c6ae9b29009a7d2d63d54e350ec62feb1dc09e22
-  data.tar.gz: 2bd28448920dc859ddb8e5a0703d51163aee702807184971b8bcea594fd36fec
+  metadata.gz: befa424ca6c37f5008b16030433887ea82049fc5a814b562b354842b1b4654ba
+  data.tar.gz: ea6932183795638094040dbe2dae77a8a4ab698193aa0dd720f5b805091d0cfb
 SHA512:
-  metadata.gz: c756eb00ec11291985e5b9f6f573abf19399c0592e1e7d390e9239e29d359893432f55a86283441d22e22bd6a3b0d0f98b3886735d73737c809937320220b0ca
-  data.tar.gz: 2b7b4e9d309a6184a9881010eb058990eb4b86b293ca717c26f12d89cc9310fa8dc03a8bb9dcbeb6071840529a86f0d68726cda8715602d46ab1bc7bb80f8aae
+  metadata.gz: f3f74766cfe5c514976dee2f62f76c60bdec7799ba6602c88dfdba189046c7cce32b844f5ff529677ecf3daed8d5780a617900a3959f83e6e1242505133715a1
+  data.tar.gz: 624d2deff70c1c908719069775d3bd7a7103eaf77e6b57a3020d014f06676300cba97cff43ce57354ec05b432f647054276d8a2367170365fe91fe700ec0a8b8

data/CHANGELOG.md

@@ -5,6 +5,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.1 - 2026-06-23]
+
+### Added
+
+- Added macOS CI coverage for the full test suite against Homebrew-provided
+  dependencies, including libvips, ImageMagick, jpegoptim, jpeg-turbo,
+  pngquant, and oxipng.
+
+### Fixed
+
+- Made the bundled `safe_image_vips_helper` build optional at gem install time.
+  Installing Safe Image no longer fails on systems without libvips development
+  files or when the helper cannot be compiled; instead, install completes without
+  the helper and `SafeImage.configure!(backend: :vips)` continues to fail closed
+  with `VipsUnavailableError`.
+- Clean up stale or partially-built `safe_image_vips_helper` binaries when the
+  optional helper build is skipped, avoiding accidental use of an old helper.
+- Look for trusted external tools in Homebrew's Apple Silicon paths so the
+  ImageMagick and JPEG optimizer backends work on macOS CI and typical Homebrew
+  installs.
+- Use real temporary-directory paths for remote-download tempfiles and tests so
+  macOS' `/var` symlink does not trip Safe Image's symlink-component checks.
+- Use the bundled DejaVu font for ImageMagick letter-avatar rendering so the
+  default font does not depend on host fontconfig availability.
+- Escape custom `PKG_CONFIG` paths in the generated helper Makefile so install
+  works when the path contains shell- or Makefile-significant characters.
+
 ## [0.5.0 - 2026-06-22]
 
 ### Changed

data/ext/safe_image_vips_helper/extconf.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require "mkmf"
 require "rbconfig"
-
-pkg_config("vips") or abort "libvips development files are required (pkg-config vips failed)"
-
-pkg_cflags = `pkg-config --cflags vips`.strip
-pkg_libs = `pkg-config --libs vips`.strip
-cflags = [ENV["CFLAGS"] || RbConfig::CONFIG["CFLAGS"], RbConfig::CONFIG["CPPFLAGS"], pkg_cflags].compact.join(" ")
-ldflags = [ENV["LDFLAGS"] || RbConfig::CONFIG["LDFLAGS"]].compact.join(" ")
+require "shellwords"
 
 helper = "safe_image_vips_helper"
 source = "safe_image_vips_helper.c"
 lib_dir = File.expand_path("../../lib/safe_image", __dir__)
+installed_helper = File.join(lib_dir, helper)
+
+cflags =
+  [ENV["CFLAGS"] || RbConfig::CONFIG["CFLAGS"], RbConfig::CONFIG["CPPFLAGS"], "$(VIPS_CFLAGS)"].compact.join(" ")
+ldflags = [ENV["LDFLAGS"] || RbConfig::CONFIG["LDFLAGS"]].compact.join(" ")
+pkg_config = ENV.fetch("PKG_CONFIG", "pkg-config")
+make_pkg_config = pkg_config.shellescape.gsub("$", "$$")
 
 File.write(
   "Makefile",
@@ -21,18 +21,36 @@ File.write(
     CC = #{RbConfig::CONFIG.fetch("CC")}
     CFLAGS = #{cflags}
     LDFLAGS = #{ldflags}
-    LIBS = #{pkg_libs} -lm
+    PKG_CONFIG = #{make_pkg_config}
+    VIPS_CFLAGS = $(shell $(PKG_CONFIG) --cflags vips 2>/dev/null)
+    VIPS_LIBS = $(shell $(PKG_CONFIG) --libs vips 2>/dev/null)
+    LIBS = $(VIPS_LIBS) -lm
     INSTALL = #{RbConfig::CONFIG.fetch("INSTALL", "install")}
 
+    .PHONY: all install clean distclean
+
     all: #{helper}
 
     #{helper}: #{source}
-    	$(CC) $(CFLAGS) -o #{helper} #{source} $(LDFLAGS) $(LIBS)
-
-    install: #{helper}
-    	mkdir -p #{lib_dir}
-    	cp #{helper} #{File.join(lib_dir, helper)}
-    	chmod 0755 #{File.join(lib_dir, helper)}
+    	rm -f #{helper}
+    	if $(PKG_CONFIG) --exists vips >/dev/null 2>&1; then \
+    		$(CC) $(CFLAGS) -o #{helper} #{source} $(LDFLAGS) $(LIBS) || { \
+    			echo "safe_image: warning: failed to compile optional libvips helper; install will continue without vips backend support" >&2; \
+    			rm -f #{helper}; \
+    		}; \
+    	else \
+    		echo "safe_image: warning: pkg-config could not find libvips; install will continue without vips backend support" >&2; \
+    	fi
+
+    install: all
+    	mkdir -p #{lib_dir.shellescape}
+    	if [ -x #{helper} ]; then \
+    		cp #{helper} #{installed_helper.shellescape}; \
+    		chmod 0755 #{installed_helper.shellescape}; \
+    	else \
+    		rm -f #{installed_helper.shellescape}; \
+    		echo "safe_image: warning: optional libvips helper was not installed; configure!(backend: :vips) will raise" >&2; \
+    	fi
 
     clean:
     	rm -f #{helper} *.o

data/lib/safe_image/ico.rb

@@ -59,7 +59,7 @@ module SafeImage
           # reaches a decoder.
           validate_pixels!(*entry_dimensions(data, entry), max_pixels)
           payload = data.byteslice(entry.offset, entry.size)
-          Tempfile.create(%w[safe-image-ico .png]) do |tmp|
+          Tempfile.create(%w[safe-image-ico .png], SafeImage.real_tmpdir) do |tmp|
             tmp.binmode
             tmp.write(payload)
             tmp.close

data/lib/safe_image/image_magick_backend.rb

@@ -28,6 +28,7 @@ module SafeImage
     ].freeze
 
     ALLOWED_FONTS = %w[NimbusSans-Regular DejaVu-Sans Liberation-Sans Arial Helvetica Adwaita-Sans].freeze
+    BUNDLED_DEJAVU = File.expand_path("fonts/DejaVuSans.ttf", __dir__)
 
     def probe(path, timeout: Runner::DEFAULT_TIMEOUT, max_pixels: nil)
       raise UnsupportedFormatError, "ImageMagick identify not available" unless Runner.available?("identify")
@@ -261,6 +262,7 @@ module SafeImage
       if ALLOWED_FONTS.none? { |candidate| candidate == font_name }
         raise ArgumentError, "unsupported font: #{font_name.inspect}"
       end
+      font_arg = imagemagick_font(font_name)
 
       argv = [
         command,
@@ -273,7 +275,7 @@ module SafeImage
         "-fill",
         "#FFFFFFCC",
         "-font",
-        font_name,
+        font_arg,
         "-gravity",
         "Center",
         "-annotate",
@@ -283,7 +285,17 @@ module SafeImage
         "8",
         output_arg
       ]
-      run_image_command(argv, output, "generated", "png", timeout)
+      run_image_command(argv, output, "generated", "png", timeout, read: font_read_paths(font_arg))
+    end
+
+    def imagemagick_font(font_name)
+      return BUNDLED_DEJAVU if font_name == "DejaVu-Sans" && File.file?(BUNDLED_DEJAVU)
+
+      font_name
+    end
+
+    def font_read_paths(font_arg)
+      font_arg.include?(File::SEPARATOR) ? [font_arg] : []
     end
 
     def fix_orientation(input:, output:, timeout: Runner::DEFAULT_TIMEOUT)

data/lib/safe_image/metadata_operations.rb

@@ -128,7 +128,7 @@ module SafeImage
     private
 
     def vips_ico_dominant_color(path, max_pixels:)
-      Tempfile.create(%w[safe-image-ico .png]) do |tmp|
+      Tempfile.create(%w[safe-image-ico .png], SafeImage.real_tmpdir) do |tmp|
         tmp.close
         Ico.convert_to_png(path, tmp.path, max_pixels: max_pixels)
         VipsBackend.dominant_color(tmp.path, max_pixels: max_pixels)

data/lib/safe_image/native.rb

@@ -121,7 +121,7 @@ module SafeImage
         raise LimitError, "rgba buffer dimensions exceed 4096x4096" if width > 4096 || height > 4096
         raise ArgumentError, "rgba buffer must be width*height*4 bytes" if bytes.bytesize != width * height * 4
 
-        Tempfile.create(%w[safe-image-rgba .rgba], binmode: true) do |raw|
+        Tempfile.create(%w[safe-image-rgba .rgba], SafeImage.real_tmpdir, binmode: true) do |raw|
           raw.write(bytes)
           raw.close
           NativeHelper.png_from_rgba(raw.path, width, height, String(output))

data/lib/safe_image/remote.rb

@@ -149,7 +149,7 @@ module SafeImage
       uri = parse_uri(url)
       started_at = monotonic_time
 
-      Tempfile.create(%w[safe-image-remote .bin], binmode: true) do |file|
+      Tempfile.create(%w[safe-image-remote .bin], SafeImage.real_tmpdir, binmode: true) do |file|
         response =
           request(
             uri,
@@ -313,7 +313,7 @@ module SafeImage
       uri = parse_uri(url)
       started_at = monotonic_time
 
-      Tempfile.create(%w[safe-image-remote .bin], binmode: true) do |file|
+      Tempfile.create(%w[safe-image-remote .bin], SafeImage.real_tmpdir, binmode: true) do |file|
         original_path = file.path
         path = original_path
         ext = nil

data/lib/safe_image/runner.rb

@@ -37,7 +37,11 @@ module SafeImage
     # Give well-behaved tools a short flush window after TERM before KILL keeps
     # the timeout hard without leaking process groups.
     TERMINATE_GRACE_SECONDS = 0.2
-    TRUSTED_PATH = "/usr/bin:/bin:/usr/local/bin".freeze
+    # Homebrew on Apple Silicon installs some trusted tools outside /usr/local/bin;
+    # jpeg-turbo is keg-only, so jpegtran lives under its opt prefix.
+    TRUSTED_PATH = %w[/usr/bin /bin /usr/local/bin /opt/homebrew/bin /opt/homebrew/opt/jpeg-turbo/bin].join(
+      File::PATH_SEPARATOR
+    ).freeze
     ALLOWED_ENV_KEYS = %w[LANG LC_ALL LC_CTYPE TZ].freeze
     IMAGEMAGICK_POLICY_PATH = File.expand_path("imagemagick_policy", __dir__)
     IMAGEMAGICK_POLICY_FILE = File.join(IMAGEMAGICK_POLICY_PATH, "policy.xml").freeze

data/lib/safe_image/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SafeImage
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/safe_image.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "tmpdir"
 require_relative "safe_image/version"
 
 module SafeImage
@@ -47,6 +48,10 @@ module SafeImage
   # it in with a single assignment, so readers never observe a half-applied
   # config.
   Config = Data.define(:backend, :landlock, :max_pixels)
+
+  def self.real_tmpdir
+    @real_tmpdir ||= File.realpath(Dir.tmpdir)
+  end
 end
 
 require_relative "safe_image/native"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safe_image
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Sam Saffron