fontist 3.0.23 → 3.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437b60367c3601897b3f22af4c3e00a2ffec30d74120df9fff64ad76291b7624
-  data.tar.gz: 49206f8ffe89f3110c8d97513b4b263d6cfc8c47566bf39283464a46b34b94cd
+  metadata.gz: 7e161f1ace760cebffefd73f61835fef3abb2875972836c3ad7e82324a465d11
+  data.tar.gz: 85f425e3a050b0e9674e32b413d750bde0d40e4e34f3c261c6138dadc571e0a5
 SHA512:
-  metadata.gz: b95402fae1199140efe5a00a54ce59207bd15268ee28803a3e830942d812ba3d0d8bedddf800a7ebcea6c736666d8f183f68b1df98a74714137da2ebd1fcae86
-  data.tar.gz: 42d80c546ae290865441aa1ebaf9ac04278ee99dfaad92863dd61b92fb3594511434957d950fbb6551344708ec06da5cf3812fe06e3009c0a36a92cb473c6cef
+  metadata.gz: 282670c9e6c9ebc53dedbaa927e80259a489f44bc33392d388c977ad909209b721b354b7922a2190f0e7554221a63ca3c15a234a55b100e27bdce92cca1e496e
+  data.tar.gz: 46ca6895943eefe3a7dce37a6e4cf08241530b6dfacc9fef5233f259ea091ab9d94aac2d4bdd903cc468948d3783a6ceff66219fd04f3514576f88a4a62048ef

data/lib/fontist/font_path.rb

@@ -14,7 +14,7 @@ module Fontist
 
     def formulas
       @formulas ||= if fontist_font?
-                      Indexes::FilenameIndex.from_file.load_index_formulas(File.basename(@path)).flat_map(&:name)
+                      Indexes::FilenameIndex.lookup_index.load_index_formulas(File.basename(@path)).flat_map(&:name)
                     else
                       []
                     end

data/lib/fontist/formula.rb

@@ -122,15 +122,15 @@ module Fontist
       end
 
       def find(font_name)
-        Indexes::FontIndex.from_file.load_formulas(font_name).first
+        Indexes::FontIndex.lookup_index.load_formulas(font_name).first
       end
 
       def find_many(font_name)
-        Indexes::FontIndex.from_file.load_formulas(font_name)
+        Indexes::FontIndex.lookup_index.load_formulas(font_name)
       end
 
       def find_fonts(font_name)
-        formulas = Indexes::FontIndex.from_file.load_formulas(font_name)
+        formulas = Indexes::FontIndex.lookup_index.load_formulas(font_name)
 
         formulas.map do |formula|
           formula.all_fonts.select do |f|
@@ -140,7 +140,7 @@ module Fontist
       end
 
       def find_styles(font_name, style_name)
-        formulas = Indexes::FontIndex.from_file.load_formulas(font_name)
+        formulas = Indexes::FontIndex.lookup_index.load_formulas(font_name)
 
         formulas.map do |formula|
           formula.all_fonts.map do |f|
@@ -173,7 +173,7 @@ module Fontist
       end
 
       def find_by_font_file(font_file)
-        key = Indexes::FilenameIndex.from_file
+        key = Indexes::FilenameIndex.lookup_index
           .load_index_formulas(File.basename(font_file))
           .flat_map(&:name)
           .first

data/lib/fontist/indexes/base_font_collection_index.rb

@@ -122,6 +122,7 @@ module Fontist
         return if collection.fonts.nil?
 
         collection.fonts.delete_if { |f| f.path == path }
+        collection.invalidate_lookups!
         collection.to_file(index_path)
       end
 

data/lib/fontist/indexes/font_index.rb

@@ -8,6 +8,14 @@ module Fontist
           DefaultFamilyFontIndex.from_file
         end
       end
+
+      def self.lookup_index
+        if Fontist.preferred_family?
+          PreferredFamilyFontIndex.lookup_index
+        else
+          DefaultFamilyFontIndex.lookup_index
+        end
+      end
     end
   end
 end

data/lib/fontist/indexes/index_mixin.rb

@@ -1,5 +1,9 @@
+require "json"
+
 module Fontist
   module Indexes
+    autoload :LookupIndex, "#{__dir__}/lookup_index"
+
     # IndexMixin provides common functionality for font index classes.
     #
     # == Performance Optimization (Tech Debt)
@@ -72,9 +76,38 @@ module Fontist
           # 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
+          # Delete the index file and its lookup sidecar to force a
+          # rebuild on next access. This is important for tests to
+          # ensure clean state
           FileUtils.rm_f(path)
+          FileUtils.rm_f("#{path}.json")
+        end
+
+        # Read-only lookups over the sidecar JSON beside the index
+        # file, which skips binding every entry into model objects. The
+        # sidecar is (re)written whenever the index file is written,
+        # and regenerated here when it is missing or stale.
+        def lookup_index
+          entries_hash = sidecar_entries || rebuild_sidecar_entries
+          normalizer = new.method(:normalize_key)
+          LookupIndex.new(entries_hash, normalizer: normalizer)
+        end
+
+        def sidecar_entries
+          sidecar_path = "#{path}.json"
+          return unless File.exist?(sidecar_path)
+          return if File.exist?(path) &&
+            File.mtime(sidecar_path) < File.mtime(path)
+
+          JSON.parse(File.read(sidecar_path))["entries"]
+        rescue JSON::ParserError, TypeError
+          nil
+        end
+
+        def rebuild_sidecar_entries
+          entries_hash = from_file(path).entries_hash
+          File.write("#{path}.json", JSON.dump("entries" => entries_hash))
+          entries_hash
         end
       end
 
@@ -158,6 +191,19 @@ module Fontist
 
         FileUtils.mkdir_p(File.dirname(file_path))
         File.write(file_path, to_yaml)
+        write_lookup_sidecar(file_path)
+      end
+
+      def write_lookup_sidecar(file_path)
+        File.write("#{file_path}.json",
+                   JSON.dump("entries" => entries_hash))
+      end
+
+      # key -> formula paths, in the sidecar's JSON-friendly shape
+      def entries_hash
+        Array(entries).to_h do |entry|
+          [normalize_key(entry.key), entry.formula_path]
+        end
       end
 
       private
@@ -209,15 +255,29 @@ module Fontist
       def create_and_add_entry(key, paths)
         entry = FormulaKeyToPath.new(key: key, formula_path: paths)
         entries << entry
+        @entries_lookup_id = nil
         @index_build_cache[key] = entry if @index_build_cache
       end
 
+      # O(1) key lookup over the entries; rebuilt whenever the entries
+      # array identity changes (rebuilds parse fresh instances, and
+      # in-place additions drop the cached hash)
+      def entries_lookup
+        entries_id = Array(entries).object_id
+        if @entries_lookup_id != entries_id
+          @entries_lookup_id = entries_id
+          @entries_lookup = Array(entries)
+            .group_by { |entry| normalize_key(entry.key) }
+        end
+        @entries_lookup
+      end
+
       def index_formula(key)
         Array(entries).detect { |f| normalize_key(f.key) == normalize_key(key) }
       end
 
       def index_formulas(key)
-        Array(entries).select { |f| normalize_key(f.key) == normalize_key(key) }
+        entries_lookup[normalize_key(key)] || []
       end
 
       def relative_formula_path(path)

data/lib/fontist/indexes/lookup_index.rb

@@ -0,0 +1,34 @@
+module Fontist
+  module Indexes
+    # Read-only lookups over the JSON sidecar written beside an index
+    # file. Binding every index entry into model objects dominates the
+    # cost of loading an index; the sidecar holds the key-to-path map
+    # as plain data, and FormulaKeyToPath entries are materialized only
+    # for the requested key.
+    class LookupIndex
+      def initialize(entries_hash, normalizer:)
+        @entries_hash = entries_hash
+        @normalizer = normalizer
+      end
+
+      def load_index_formulas(key)
+        [
+          FormulaKeyToPath.new(
+            key: key,
+            formula_path: paths_for(@normalizer.call(key)),
+          ),
+        ]
+      end
+
+      def load_formulas(key)
+        load_index_formulas(key).flat_map(&:to_full)
+      end
+
+      private
+
+      def paths_for(normalized_key)
+        @entries_hash[normalized_key] || []
+      end
+    end
+  end
+end

data/lib/fontist/system_index.rb

@@ -209,15 +209,13 @@ module Fontist
 
       return nil if current_fonts.nil? || current_fonts.empty?
 
-      if style.nil?
-        found_fonts = current_fonts.select do |file|
-          file.family_name&.casecmp?(font)
-        end
-      else
-        found_fonts = current_fonts.select do |file|
-          file.family_name&.casecmp?(font) && file.type&.casecmp?(style)
+      bucket = family_lookup(current_fonts)[font.to_s.downcase] || []
+      found_fonts =
+        if style.nil?
+          bucket
+        else
+          bucket.select { |file| file.type&.casecmp?(style) }
         end
-      end
 
       # Apply format filtering if specified
       if format_spec&.has_constraints? && found_fonts
@@ -229,6 +227,25 @@ module Fontist
       found_fonts.empty? ? nil : found_fonts
     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)
+    def invalidate_lookups!
+      @family_lookup_fonts_id = nil
+    end
+
+    # O(1) family-name lookup over the indexed fonts; rebuilt whenever
+    # the fonts array identity changes
+    def family_lookup(current_fonts)
+      fonts_id = Array(current_fonts).object_id
+      if @family_lookup_fonts_id != fonts_id
+        @family_lookup_fonts_id = fonts_id
+        @family_lookup = Array(current_fonts)
+          .group_by { |file| file.family_name&.downcase }
+      end
+      @family_lookup
+    end
+
     def index
       if @read_only_mode && !fonts.nil?
         return fonts

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.23".freeze
+  VERSION = "3.0.25".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.23
+  version: 3.0.25
 platform: ruby
 authors:
 - Ribose Inc.
@@ -452,6 +452,7 @@ files:
 - lib/fontist/indexes/incremental_index_updater.rb
 - lib/fontist/indexes/incremental_scanner.rb
 - lib/fontist/indexes/index_mixin.rb
+- lib/fontist/indexes/lookup_index.rb
 - lib/fontist/indexes/preferred_family_font_index.rb
 - lib/fontist/indexes/system_index.rb
 - lib/fontist/indexes/user_index.rb