fontist 3.0.14 → 3.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06a9b4c9a5923cb458a0a5312fd4877c4615e6663dbd12dc292bed425c084ac4
-  data.tar.gz: 5032ff75c1ac724280b7529b1c24b7975c092624d6aadd74358255242cb950c9
+  metadata.gz: e34cf04876b1c50b7ada12a6d8c23a1954baaecc499433d25844f2c0df899c97
+  data.tar.gz: 3728d8848dd1eb1d92ef0f7b28d251e1f9ef3a9d5d3ec7592f39607f05d9b3d0
 SHA512:
-  metadata.gz: '093f4d9ea5fcaefd488ebe05b2fa90f9179fe997cf78d54ecf06b36f8cf4d05487dcd557ef6162a61844919b2f80b6bbf7ecf190afcfc7b68426b81cb0989742'
-  data.tar.gz: aa94716daea9eec2786bde7875eb036ed43afe20abc8e78c8aecd03ef65189cc8c79c2a1fb5b1f4e0e30ec628a7ea0f5c66448d5a09aa3018636be8b89f581c0
+  metadata.gz: 415419b02587672d1e4676365a2658f0d126f1860a2b67f22aef5509dcb14268deab6db07847b655151612247b94d029bfb9cea65352b8d80a41b017f6c97b76
+  data.tar.gz: 6cab85a340fb53f66d2ba771de09aa6d13a882a98aeb60ffd806da24207a669b61e8d9e57f59821107f6231f5b1070f18a107fde561289d787a32fb2afd3ca09

data/lib/fontist/formula.rb

@@ -181,9 +181,15 @@ module Fontist
 
         content = File.read(path)
 
-        from_yaml(content).tap do |formula|
-          formula.path = path
-          formula.name = titleize(formula.key_from_path) if formula.name.nil?
+        # Parsing a formula costs ~10-20ms and the same formula is
+        # re-read on every lookup, so the parsed instance is memoized
+        # (mtime-validated) and shared between callers; treat as
+        # read-only
+        formula = Fontist::FromFileCache.memoize(path) { from_yaml(content) }
+
+        formula.tap do |f|
+          f.path = path
+          f.name = titleize(f.key_from_path) if f.name.nil?
         end
       rescue Lutaml::Model::Error, TypeError, ArgumentError,
              Psych::BadAlias, Psych::SyntaxError => e

data/lib/fontist/from_file_cache.rb

@@ -0,0 +1,34 @@
+module Fontist
+  # Thread-safe, mtime-validated memoization for parsed YAML artifacts
+  # (formula index, formula files), which cost hundreds of milliseconds to
+  # parse and are re-read on every font lookup.
+  #
+  # Returned instances are shared between all callers and must be treated
+  # as read-only. Entries re-resolve automatically when the file's mtime
+  # changes (e.g. after `fontist update` rewrites the formulas repo).
+  module FromFileCache
+    def self.memoize(path)
+      mutex.synchronize do
+        mtime = File.mtime(path)
+        entry = cache[path]
+        if entry.nil? || entry[:mtime] != mtime
+          entry = { mtime: mtime, value: yield }
+          cache[path] = entry
+        end
+        entry[:value]
+      end
+    end
+
+    def self.clear
+      mutex.synchronize { cache.clear }
+    end
+
+    def self.mutex
+      @mutex ||= Mutex.new
+    end
+
+    def self.cache
+      @cache ||= {}
+    end
+  end
+end

data/lib/fontist/indexes/base_font_collection_index.rb

@@ -132,6 +132,10 @@ module Fontist
       # @param verbose [Boolean] Show detailed progress information
       # @return [void]
       def rebuild(verbose: false)
+        # A rebuild is an explicit request for a fresh scan, so any
+        # memoized font_paths must be dropped first
+        reset_scan_cache
+
         collection.rebuild(verbose: verbose)
       end
 

data/lib/fontist/indexes/fontist_index.rb

@@ -37,10 +37,17 @@ module Fontist
       # Uses case-insensitive glob patterns that work on all platforms,
       # including Linux where File::FNM_CASEFOLD is ignored
       #
+      # Delegates to the memoized fontist-repo scan on SystemFont; the
+      # memo is invalidated through reset_scan_cache when fonts are
+      # installed or removed mid-process
+      #
       # @return [Array<String>] Array of font file paths
       def font_paths
-        patterns = Fontist::Utils.font_file_patterns(Fontist.fonts_path.join("**").to_s)
-        patterns.flat_map { |pattern| Dir.glob(pattern) }
+        SystemFont.fontist_font_paths
+      end
+
+      def reset_scan_cache
+        SystemFont.reset_fontist_font_paths_cache
       end
     end
   end

data/lib/fontist/indexes/index_mixin.rb

@@ -49,12 +49,13 @@ module Fontist
 
           file_content = File.read(file_path).strip
 
-          if file_content.empty? || file_content == "---"
-            # Return empty collection for empty index files
-            return new
-          end
+          # Return empty collection for empty index files
+          return new if file_content.empty? || file_content == "---"
 
-          from_yaml(file_content)
+          # Parsing the index YAML costs hundreds of milliseconds and
+          # happens on every font lookup, so the parsed instance is
+          # memoized (mtime-validated) and shared between callers
+          Fontist::FromFileCache.memoize(file_path) { from_yaml(file_content) }
         end
 
         def rebuild
@@ -67,6 +68,10 @@ module Fontist
         end
 
         def reset_cache
+          # Drop the memoized parsed instance along with the index file,
+          # to force a fresh parse on next access
+          Fontist::FromFileCache.clear
+
           # Delete the index file to force rebuild on next access
           # This is important for tests to ensure clean state
           FileUtils.rm_f(path)

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.14".freeze
+  VERSION = "3.0.15".freeze
 end

data/lib/fontist.rb

@@ -7,6 +7,7 @@ require "lutaml/model"
 require_relative "fontist/errors"
 require_relative "fontist/version"
 require_relative "fontist/cache"
+require_relative "fontist/from_file_cache"
 require_relative "fontist/memoizable"
 require_relative "fontist/path_scanning"
 require_relative "fontist/utils"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.15
 platform: ruby
 authors:
 - Ribose Inc.
@@ -375,6 +375,7 @@ files:
 - lib/fontist/formula.rb
 - lib/fontist/formula_picker.rb
 - lib/fontist/formula_suggestion.rb
+- lib/fontist/from_file_cache.rb
 - lib/fontist/google_import_source.rb
 - lib/fontist/helpers.rb
 - lib/fontist/import.rb