fontist 3.0.17 → 3.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8aac3407b7b54563dc14319ade845a761256f0ce2d324ed9a7a1da7dfe9613
-  data.tar.gz: 2ec396abab12f551459a0e7455355243c46e0f4359bf2de4f018ebcde46a30e0
+  metadata.gz: 2892a051558c7fca54573398a4d81a65b24365a3a42c2aaedac27f38ed85a70f
+  data.tar.gz: d24c202473b5a65e7c282d99802bf5f443d664ca5bceaa61349a912dea2c00bf
 SHA512:
-  metadata.gz: dd1a4460fc10c117bb6d7fc3dcbced001f83c918c64e70621778575e7edce78544a94fbbbbe5e64f22294e5c0525af723043055feae62f3a21fe299020cdda71
-  data.tar.gz: 33e5d409a00bd73c39e839a9a9acad2f31aa2dde95697f1ad08ebfc4f0d2aa980cfb8cac95524b8fdc310c1e880546dbf09bb15ebd3060d44a71948821f35db9
+  metadata.gz: e8833cb9fc107eaf9b3a3f8d470735d7c269c35a12ecaf69cba222553ec2bd2db20b19e8ee3d9482b0f92127dfbf11ff24808a81e942e471ad52b4e79dc4e032
+  data.tar.gz: d72ce09d1cb402e2c35b16116fec1a562e67fb020fd217ce1289ca9784305d15da7fb55fd0e58b90f290b1217fed442b5e7f7aaa060256067d952248eea2c714

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   SuggestExtensions: false
 
 plugins:

data/Gemfile

@@ -18,6 +18,12 @@ gem "simplecov"
 gem "vcr"
 gem "webmock"
 
+# Optional YAML engine (consumer-side dependency; needs Ruby >= 3.0,
+# which is above fontist's gemspec floor, so it stays out of the
+# gemspec). Activated with FONTIST_YAML=yeptris; off by default
+# pending leptris/yeptris#863 (linux scalar-parity fix).
+gem "yeptris", require: false
+
 # Profiling tools (development only)
 # gem "ruby-prof", "~> 1.7"
 # stackprof uses Unix-specific system calls and doesn't compile on Windows

data/fontist.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = "Please run `fontist update` to fetch formulas."
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/fontist/fontist"

data/lib/fontist/system_index.rb

@@ -559,19 +559,48 @@ stats:)
                                  verbose: verbose, stats: stats,
                                  num_workers: num_cores)
       else
-        # Measured on 600 system fonts: single thread 2.3s, 8 threads
-        # 3.3s (GVL-bound, mutex contention), 8 processes 0.6s. The
-        # silent build path therefore forks instead of threading
-        results = Parallel.map(sorted_paths, in_processes: num_cores) do |path|
-          detect_font_with_cache(path, existing_fonts_by_path[path],
-                                 stats: nil)
+        # Threads, not forked processes: a silent scan runs from inside
+        # long-lived host processes (e.g. metanorma, whose heap reaches
+        # hundreds of MB by the time fonts are looked up). Each fork
+        # inherits that heap, and its RSS is charged to the process group
+        # while it lives, so an 8-process scan transiently multiplies the
+        # host's footprint by up to 9x — measured 3.6GB against a 0.9GB
+        # parent during a metanorma compile (OOMs under cgroup caps).
+        # The ~1s-per-600-fonts scan penalty is bounded and paid only on
+        # cache-miss rebuilds. split_paths_by_reuse keeps cached entries
+        # in the parent: see its comment for the marshal constraint.
+        to_scan, cached_results = split_paths_by_reuse(
+          sorted_paths,
+          existing_fonts_by_path)
+
+        results = Parallel.map(to_scan, in_threads: num_cores) do |path|
+          detect_fonts(path, stats: nil)
         end.flatten.compact
 
-        stats&.total_fonts = results.size
-        results
+        stats&.total_fonts = cached_results.size + results.size
+        cached_results + results
       end
     end
 
+    # The stat-only reuse check runs in the parent: cached entries can
+    # carry backrefs to their SystemIndexFontCollection (whose
+    # paths_loader is a Proc), and worker results are Marshal.dump'ed
+    # back across the fork boundary — crossing it with cached
+    # collections raises "no _dump_data is defined for class Proc".
+    # Workers therefore receive only to-scan paths, and the block
+    # handed to Parallel closes over nothing but its argument.
+    def split_paths_by_reuse(sorted_paths, existing_fonts_by_path)
+      unchanged, to_scan = sorted_paths.partition do |path|
+        cached = existing_fonts_by_path[path]
+        cached&.any? && file_unchanged?(path, cached.first)
+      end
+      cached_results = unchanged.flat_map do |path|
+        existing_fonts_by_path[path].to_a
+      end
+
+      [to_scan, cached_results]
+    end
+
     def process_paths_in_threads(sorted_paths, existing_fonts_by_path,
 verbose:, stats:, num_workers:)
       progress = ScanProgress.new(sorted_paths.size, verbose: verbose) do |count, path|

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.17".freeze
+  VERSION = "3.0.19".freeze
 end

data/lib/fontist/yaml/yeptris_adapter.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Fontist
+  module Yaml
+    # Model YAML parsing through yeptris's native loader. Measured 4x
+    # faster than Psych on formula and index documents (442KB index:
+    # 47ms vs 202ms), with parse results verified identical across the
+    # full formulas corpus. Dumping stays on the standard adapter.
+    class YeptrisAdapter < Lutaml::Yaml::Adapter::StandardAdapter
+      def self.parse(yaml, _options = {})
+        Yeptris::YAML.load(yaml)
+      end
+    end
+  end
+end

data/lib/fontist/yaml.rb

@@ -0,0 +1,5 @@
+module Fontist
+  module Yaml
+    autoload :YeptrisAdapter, "#{__dir__}/yaml/yeptris_adapter"
+  end
+end

data/lib/fontist/yaml_backend.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Fontist
+  # Model YAML engine selection.
+  #
+  # The yeptris engine (native loader, measured 4x faster than Psych on
+  # large documents) activates only when explicitly enabled with
+  # FONTIST_YAML=yeptris. It is off by default because the yeptris
+  # x86_64-linux and Windows builds currently mis-parse some plain
+  # scalars as single-element Arrays (leptris/yeptris#863); flip the
+  # default once that parity fix lands.
+  module YamlBackend
+    ENV_KEY = "FONTIST_YAML"
+    ENABLED_VALUE = "yeptris"
+
+    class << self
+      # Returns the activated adapter class, or nil when the standard
+      # engine stays in place (flag unset, or yeptris unavailable)
+      def activate!
+        return nil unless enabled?
+        return nil unless yeptris_available?
+
+        adapter = Yaml::YeptrisAdapter
+        Lutaml::Model::AdapterResolver.set_adapter_class(:yaml, adapter)
+
+        adapter
+      end
+
+      def enabled?
+        ENV[ENV_KEY] == ENABLED_VALUE
+      end
+
+      def yeptris_available?
+        require "yeptris"
+        true
+      rescue LoadError
+        false
+      end
+    end
+  end
+end

data/lib/fontist.rb

@@ -11,6 +11,8 @@ require_relative "fontist/from_file_cache"
 require_relative "fontist/memoizable"
 require_relative "fontist/path_scanning"
 require_relative "fontist/utils"
+require_relative "fontist/yaml"
+require_relative "fontist/yaml_backend"
 
 module Fontist
   # Core classes
@@ -282,3 +284,5 @@ module Fontist
     true
   end
 end
+
+Fontist::YamlBackend.activate!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.19
 platform: ruby
 authors:
 - Ribose Inc.
@@ -512,6 +512,9 @@ files:
 - lib/fontist/version.rb
 - lib/fontist/windows_fod_metadata.rb
 - lib/fontist/windows_import_source.rb
+- lib/fontist/yaml.rb
+- lib/fontist/yaml/yeptris_adapter.rb
+- lib/fontist/yaml_backend.rb
 - lib/tasks/system_fonts.rake
 - script/capture_system_fonts
 - script/download_system_indexes
@@ -533,7 +536,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="