fontist 3.0.23 → 3.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437b60367c3601897b3f22af4c3e00a2ffec30d74120df9fff64ad76291b7624
-  data.tar.gz: 49206f8ffe89f3110c8d97513b4b263d6cfc8c47566bf39283464a46b34b94cd
+  metadata.gz: 954fe79bde0fb84cf7b2fcc96b686820a7c2f4fd6ec822abd4067b1c0d8c288e
+  data.tar.gz: ac7eb9f594dd5a9be155e2893c4a07bad197743e107a92f16786b45f47000224
 SHA512:
-  metadata.gz: b95402fae1199140efe5a00a54ce59207bd15268ee28803a3e830942d812ba3d0d8bedddf800a7ebcea6c736666d8f183f68b1df98a74714137da2ebd1fcae86
-  data.tar.gz: 42d80c546ae290865441aa1ebaf9ac04278ee99dfaad92863dd61b92fb3594511434957d950fbb6551344708ec06da5cf3812fe06e3009c0a36a92cb473c6cef
+  metadata.gz: 9616ce9f46708c5acb1dc4643688f8ab0a43eeb5eafc7ee8259e9d5a110e415c738514cc00739d937b41d05d1b64868256419f3303d32159aeb41f462f260207
+  data.tar.gz: ba15c400a1fed88380cd28f8669c7272e6d52cf0dcf4df09f42166cc0b95cf55db36dcf5456bd3704981550308e087b2074f3aaaa9419567e75733ff96099bbf

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/index_mixin.rb

@@ -209,15 +209,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/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.24".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.24
 platform: ruby
 authors:
 - Ribose Inc.