fontist 3.0.32 → 3.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccd5b693c5cc7ffa551f7a24c4e1366cee390bba84c2cdd2969fda96fdb8798d
-  data.tar.gz: 493d3d3683bf368eaa553602084c8a457ddcb911d3e73be0308423263a176a2a
+  metadata.gz: a1143907bf1a14a160d39b19244cdd714b337424825ad84dba942a8373ca7a60
+  data.tar.gz: 282f707e84083d28b1afdb8fb7c80576b35590e1050693fd1cd2d004eeeb1a0d
 SHA512:
-  metadata.gz: 2d13031416210a2c8996623593c27c93bb963dac09b108c55a6a80833262c664c7e478a8e8eb316f69963e73b77c2295790da77e8bad07289ca24ab1865371be
-  data.tar.gz: f2e34e0d2946338a0a2ab047ab48dbe5e5701899c2ed2731867d3389fcbc1caa0f92107ba8a8a992db2b74a78920f4b8105f8191d5636e1ec4b2a88952e80bc5
+  metadata.gz: 870132c48632ccf2315fbdea22a61e1b6952f79cb43aaf769c7daeea7c82f5aab15fc194e26a0694b2f82636168b5710e2a1ed900c9b23759634b589ccefe410
+  data.tar.gz: db7f2844943dbf51fd87954ec6e8356a96528b47ea4d74c662af94b090e1c469f9cd1fee62c075252038d0fd5e799bc4aff84f39ac88e926a4a2ebfe1abb3d23

data/.github/workflows/rake-metanorma.yaml

@@ -43,9 +43,19 @@ jobs:
         with:
           path: "fontist"
 
-      # Append rather than overwrite: metanorma's own Gemfile.devel carries
-      # the taste-stack gems its compile specs need (metanorma/issues/630)
-      - run: 'echo ''gem "fontist", path: "./fontist"'' >> Gemfile.devel'
+      # Point any existing fontist line at this checkout, appending only
+      # when the host Gemfile declares none (metanorma/issues/630 keeps
+      # the taste-stack gems it carries; since metanorma#652 its
+      # Gemfile.devel also pins fontist, which a blind append would
+      # duplicate into a version-conflict error).
+      - run: |
+          if grep -q '^gem "fontist"' Gemfile.devel Gemfile 2>/dev/null; then
+            sed -i.bak 's/^gem "fontist".*/gem "fontist", path: ".\/fontist"/' Gemfile.devel Gemfile 2>/dev/null || true
+            rm -f Gemfile.devel.bak Gemfile.bak
+          else
+            echo 'gem "fontist", path: "./fontist"' >> Gemfile.devel
+          fi
+        shell: bash
 
       - uses: ruby/setup-ruby@v1
         with:

data/lib/fontist/import/helpers/hash_helper.rb

@@ -3,8 +3,28 @@ module Fontist
     module Helpers
       module HashHelper
         class << self
+          # Converts a formula hash to string-keyed plain data. Values
+          # that are lutaml-model models join the document through their
+          # own to_hash serializer (the json gem used to call to_json on
+          # them implicitly during traversal; Yeptris::JSON does not).
           def stringify_keys(hash)
-            Fontist::JSON.parse(Fontist::JSON.dump(hash))
+            deep_stringify(hash)
+          end
+
+          private
+
+          def deep_stringify(value)
+            case value
+            when Hash then value.to_h { |k, v| [k.to_s, deep_stringify(v)] }
+            when Array then value.map { |v| deep_stringify(v) }
+            else deep_stringify_model(value)
+            end
+          end
+
+          def deep_stringify_model(value)
+            return value unless value.respond_to?(:to_hash)
+
+            deep_stringify(value.to_hash)
           end
         end
       end

data/lib/fontist/repo.rb

@@ -115,16 +115,19 @@ module Fontist
         end
       end
 
-      def update(name)
+      def update(name, rebuild: true)
         path = repo_path(name)
         unless Dir.exist?(path)
           raise(Errors::RepoNotFoundError, "No such repo '#{name}'.")
         end
 
         git = Git.open(path)
+        before = git.rev_parse("HEAD")
         git.pull("origin", git.current_branch)
+        changed = git.rev_parse("HEAD") != before
 
-        rebuild_index_if_needed
+        rebuild_index_if_needed if rebuild && changed
+        changed
       rescue StandardError => e
         # Catch all git-related errors
         if e.class.name.include?("Git") || e.message.match?(/git|pull|repository/i)

data/lib/fontist/system_index.rb

@@ -148,10 +148,12 @@ module Fontist
   class SystemIndexMetadata < Lutaml::Model::Serializable
     attribute :last_scan_time, :integer, default: -> { 0 }
     attribute :directory_mtimes, :string, collection: true, default: -> { [] }
+    attribute :format_version, :integer, default: -> { 0 }
 
     key_value do
       map "last_scan_time", to: :last_scan_time
       map "directory_mtimes", to: :directory_mtimes
+      map "format_version", to: :format_version
     end
 
     def self.load(path)
@@ -173,9 +175,12 @@ module Fontist
     instances :fonts, SystemIndexFont
     attr_accessor :path, :paths_loader
 
-    # Metadata for smart change detection
+    # Metadata for smart change detection. The format generation lives
+    # only in the companion metadata file (see restore_metadata); it is
+    # never serialized into the entry list itself.
     attribute :last_scan_time, :integer, default: -> { 0 }
     attribute :directory_mtimes, :string, collection: true, default: -> { [] }
+    attribute :format_version, :integer, default: -> { 0 }
 
     key_value do
       # A bare entry list: the scan metadata lives in a companion
@@ -188,6 +193,13 @@ module Fontist
     # Don't rebuild index more frequently than this (in seconds)
     INDEX_REBUILD_THRESHOLD = 30 * 60 # 30 minutes
 
+    # Index entry shape generation. v1 stored one entry per font file;
+    # v2 stores one entry per named instance of variable fonts (the
+    # FiraCode[wght].ttf class of files). Bump when the entry shape
+    # changes again: persisted indexes carrying an older generation
+    # cannot answer the current lookups and force a rebuild.
+    INDEX_FORMAT_VERSION = 2
+
     def metadata_path
       "#{@path}.metadata.yml"
     end
@@ -197,19 +209,32 @@ module Fontist
 
       SystemIndexMetadata
         .new(last_scan_time: last_scan_time,
-             directory_mtimes: directory_mtimes)
+             directory_mtimes: directory_mtimes,
+             format_version: INDEX_FORMAT_VERSION)
         .save(metadata_path)
     end
 
     def restore_metadata
       return unless @path
-      return unless last_scan_time.to_i.zero?
 
       meta = SystemIndexMetadata.load(metadata_path)
-      return unless meta.last_scan_time.to_i.positive?
-
       self.last_scan_time = meta.last_scan_time
       self.directory_mtimes = meta.directory_mtimes
+      self.format_version = meta.format_version
+    end
+
+    # Whether the persisted index predates the current entry shape. A
+    # v1 index answers every lookup of a variable font's non-default
+    # families with "missing" (the file registered only under its
+    # default instance), and the directory-mtime fast paths would keep
+    # trusting it forever, so the generation mismatch itself is the
+    # staleness signal. A collection with no companion metadata file is
+    # fresh or in-process memory, not a persisted v1 volume: treating
+    # it as stale would discard every cached entry on the next rebuild.
+    def stale_format?
+      return false unless @path && File.exist?(metadata_path.to_s)
+
+      format_version.to_i != INDEX_FORMAT_VERSION
     end
 
     def set_path(path)
@@ -263,6 +288,7 @@ module Fontist
     end
 
     def find(font, style, format_spec: nil)
+      rebuild_if_stale_format!
       current_fonts = index
 
       return nil if current_fonts.nil? || current_fonts.empty?
@@ -285,6 +311,35 @@ module Fontist
       found_fonts.empty? ? nil : found_fonts
     end
 
+    # Rebuild once per process when the persisted index predates
+    # INDEX_FORMAT_VERSION. Runs even under read_only_mode: a stale
+    # generation answers every lookup of a variable font's non-default
+    # families with "missing", which is worse than a one-off rebuild.
+    # Only a VALID, non-empty persisted index heals: a fresh environment
+    # (no file yet) and a corrupt file (the corruption path explains the
+    # removal fix) take their normal routes.
+    def rebuild_if_stale_format!
+      return if @format_check_done
+
+      @format_check_done = true
+      return unless @path && File.exist?(@path.to_s)
+      return if fonts.nil? || fonts.empty?
+
+      # A corrupt index keeps its documented contract: the corruption
+      # error with the removal hint, not a silent heal.
+      check_index
+
+      restore_metadata
+      return unless stale_format?
+
+      Fontist.ui.warn(
+        "Font index format changed (v#{format_version.to_i} -> " \
+        "v#{INDEX_FORMAT_VERSION}); rebuilding once.",
+      )
+      build(forced: true)
+      mark_verified!
+    end
+
     # Drops the cached family lookup; called when fonts are removed in
     # place (a rebuild replaces the fonts array, which re-keys the
     # lookup by itself)
@@ -573,7 +628,12 @@ module Fontist
     end
 
     def detect_paths(paths, verbose: false, stats: nil)
-      existing_fonts_by_path = fonts&.group_by(&:path) || {}
+      # A generation change invalidates every cached parse in one sweep:
+      # v1 entries (one per file) cannot be reused to build v2 lookups
+      # (one per named instance), and the per-file cache fast path would
+      # otherwise keep serving the stale entry for every unchanged file.
+      existing_fonts_by_path =
+        stale_format? ? {} : (fonts&.group_by(&:path) || {})
 
       # Initialize stats if not provided
       stats ||= IndexStats.new if verbose

data/lib/fontist/update.rb

@@ -9,23 +9,35 @@ module Fontist
     end
 
     def call
-      update_main_repo
-      update_private_repos
+      main_changed = update_main_repo
+      private_changed = update_private_repos
     ensure
-      rebuild_index
+      # The index is a projection of the corpus: a pull that brought no
+      # changes leaves it valid, and a failed pull leaves the corpus
+      # untouched. Rebuilding costs a full pass over every formula, so
+      # it only runs when some repo actually moved — or when no index
+      # exists yet (a fresh clone never had one; lookups self-heal by
+      # rebuilding on demand, but an explicit update should leave one
+      # behind).
+      rebuild_index if main_changed || private_changed || index_missing?
     end
 
     private
 
+    def index_missing?
+      !File.exist?(Fontist.formula_filename_index_path)
+    end
+
     def update_main_repo
       dir = File.dirname(Fontist.formulas_repo_path)
       FileUtils.mkdir_p(dir)
 
       unless Dir.exist?(Fontist.formulas_repo_path)
-        return Git.clone(Fontist.formulas_repo_url,
-                         Fontist.formulas_repo_path,
-                         branch: @branch,
-                         depth: 1)
+        Git.clone(Fontist.formulas_repo_url,
+                  Fontist.formulas_repo_path,
+                  branch: @branch,
+                  depth: 1)
+        return true
       end
 
       git = if Dir.exist?(Fontist.formulas_repo_path.join(".git"))
@@ -36,21 +48,34 @@ module Fontist
               end
             end
 
-      return git.pull("origin", @branch) if git.current_branch == @branch
+      if git.current_branch != @branch
+        git.config_set("remote.origin.fetch",
+                       "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
+        git.fetch
+        git.checkout(@branch)
+        git.pull("origin", @branch)
+        return true
+      end
 
-      git.config_set("remote.origin.fetch",
-                     "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
-      git.fetch
-      git.checkout(@branch)
+      # A freshly init-ed repo has no commits yet; nil before the first
+      # pull means "changed", since the pull then creates the corpus
+      before = head_sha(git)
       git.pull("origin", @branch)
+      head_sha(git) != before
     end
 
     def update_private_repos
-      Repo.list.each do |name|
-        Repo.update(name)
+      Repo.list.reduce(false) do |changed, name|
+        Repo.update(name, rebuild: false) || changed
       end
     end
 
+    def head_sha(git)
+      git.rev_parse("HEAD")
+    rescue Git::FailedError, Git::GitError
+      nil
+    end
+
     def rebuild_index
       Index.rebuild
     end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.32".freeze
+  VERSION = "3.0.34".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.32
+  version: 3.0.34
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-11-04 00:00:00.000000000 Z
+date: 2026-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down