fontist 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 473f97386abfc5612b2386ef09c7166f57577346e1fa1576f10b89cde776a82a
-  data.tar.gz: 496fe338410ab4a2fca8d03f51de0030ed831e365e3dd310f9a26f92bb441d16
+  metadata.gz: 83651351d9e3e1b81441f082b60ca4d9583a643e69dc0ce33e313ab2be4063be
+  data.tar.gz: c45afceafa8580fec964069c14aa4f0e7326ed9c9b4cee922425146763785cbc
 SHA512:
-  metadata.gz: 3df014b751d95d4e5c9b1ca536e51b8209a0edc85d35fa5e5f277016ef8b1a4a605b2592057afd74b466537446cd3594ea294f3c820530b393c078ce785e1e86
-  data.tar.gz: cedd3d33a01cd1ceba826848c09ffb40dda37080bd5a1a4aa4db68dfd95a25869b9080ea4b8b1ba82eb01ebfae45602e35439fe6861730cba4ce5f16a9b8913d
+  metadata.gz: bf4d03572d48ac3893f0f46d456fefd77887ceaa314a0cc167964642c54b72f31494fa2cbf8ae7fcbe504dac424b864d02e85522fc8694007768050baba86205
+  data.tar.gz: d5fd1c0d4631af5c6c7f94b22237bf2a11c777ebd7f064ac9af0282cf4ff0158ec822f3625338017900af8a8c8bfeb1276ca00c8c94ffee15dc150862cdd12dc

data/fontist.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "down", "~> 5.0"
   spec.add_dependency "excavate", "~> 1.0", ">= 1.0.3"
-  spec.add_dependency "fontisan", "~> 0.2", ">= 0.2.16"
+  spec.add_dependency "fontisan", "~> 0.2", ">= 0.2.17"
   spec.add_dependency "fuzzy_match", "~> 2.1"
   spec.add_dependency "git", "> 1.0"
   spec.add_dependency "json", "~> 2.0"

data/lib/fontist/collection_file.rb

@@ -43,15 +43,17 @@ module Fontist
             "#{e.category}: #{e.message}"
           end.join("; ")
           # rubocop:disable Layout/LineLength
-          raise Errors::FontFileError,
+          raise Errors::FontIndexabilityValidationError,
                 "Font collection failed indexability validation (first font): #{error_messages}"
           # rubocop:enable Layout/LineLength
         end
 
         collection
+      rescue Errors::FontIndexabilityValidationError
+        raise
       rescue StandardError => e
         raise Errors::FontFileError,
-              "Font collection could not be loaded: #{e.inspect}."
+              "Font collection could not be loaded: #{e.message}"
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 

data/lib/fontist/errors.rb

@@ -20,6 +20,12 @@ module Fontist
 
     class FontFileError < GeneralError; end
 
+    # Raised when a font is structurally readable but fails the indexability
+    # profile (missing required tables, incomplete name records, etc.).
+    # Distinct from FontFileError so callers can tell "we don't recognise this
+    # file" apart from "this file is a font but unusable as an index entry".
+    class FontIndexabilityValidationError < FontFileError; end
+
     class FontExtractError < GeneralError; end
 
     class FontistVersionError < GeneralError; end

data/lib/fontist/font_file.rb

@@ -150,26 +150,9 @@ module Fontist
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
-      # rubocop:disable Metrics/MethodLength
       def detect_font_format(path)
-        # Open file and check SFNT version to determine actual format
-        File.open(path, "rb") do |io|
-          signature = io.read(4)
-          io.rewind
-
-          case signature
-          when "\x00\x01\x00\x00", "true"
-            "ttf"
-          when "OTTO"
-            "otf"
-          when "wOFF"
-            "woff"
-          when "wOF2"
-            "woff2"
-          else
-            "unknown"
-          end
-        end
+        format = Fontisan::FontLoader.detect_format(path)
+        format ? format.to_s : "unknown"
       rescue StandardError
         "unknown"
       end

data/lib/fontist/manifest.rb

@@ -215,10 +215,9 @@ location: nil)
           installed_any = true
         end
       end
-      # Only reset fontist index (not system index) if we actually installed fonts
       if installed_any
-        # Reset only the fontist font cache, not system fonts
         Fontist::SystemFont.reset_fontist_font_paths_cache
+        Fontist::SystemFont.reset_find_styles_cache
       end
       to_response
     end

data/lib/fontist/system_index.rb

@@ -1,4 +1,5 @@
 require "paint"
+require "fontisan"
 
 module Fontist
   # Statistics tracking for index building (thread-safe)
@@ -630,15 +631,12 @@ spinner_index = nil)
       return if excluded?(path)
 
       gather_fonts(path)
+    rescue Errors::FontIndexabilityValidationError => e
+      stats&.record_validation_failure
+      print_validation_error(e, path)
     rescue Errors::FontFileError => e
-      # Check if this is a validation failure
-      if e.message.include?("indexability validation")
-        stats&.record_validation_failure
-        print_validation_error(e, path)
-      else
-        stats&.record_error
-        print_recognition_error(e, path)
-      end
+      stats&.record_error
+      print_recognition_error(e, path)
     end
 
     def excluded?(path)
@@ -649,15 +647,24 @@ spinner_index = nil)
       @excluded_fonts ||= YAML.load_file(Fontist.excluded_fonts_path)
     end
 
+    # Dispatch a file to the file-font or collection parser based on its actual
+    # magic bytes, not its extension. Some vendors ship files with misleading
+    # extensions (notably macOS ships a single OpenType-CFF font as
+    # `SauberScript.ttc` inside its private FontServices framework). Trusting
+    # the extension causes such files to be routed through the collection
+    # parser, which correctly rejects them, producing spurious "not recognized"
+    # warnings.
     def gather_fonts(path)
-      case File.extname(path).gsub(/^\./, "").downcase
-      when "ttf", "otf", "woff", "woff2"
-        detect_file_font(path)
-      when "ttc", "otc"
+      case Fontisan::FontLoader.detect_format(path)
+      when :ttc, :otc
         detect_collection_fonts(path)
+      when :ttf, :otf, :woff, :woff2
+        detect_file_font(path)
       else
         print_recognition_error(Errors::UnknownFontTypeError.new(path), path)
       end
+    rescue Errno::ENOENT, Errno::EACCES, IOError => e
+      print_recognition_error(Errors::FontFileError.new(e.message), path)
     end
 
     def print_validation_error(exception, path)

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.7".freeze
+  VERSION = "3.0.8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-20 00:00:00.000000000 Z
+date: 2026-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -53,7 +53,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.16
+        version: 0.2.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.16
+        version: 0.2.17
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement