fontist 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13b78039fab8bac4324cc22dc75a21beac4dd1303853ed782cabf1e89b78617c
-  data.tar.gz: d9ddc52af7fce3a9650b227170940c78e757266d27215add37cac136b8710548
+  metadata.gz: 0461da7c09c672b443f4a0bad5443f3bf48294cb3e0aee5ea7082838825519ca
+  data.tar.gz: 0e5931e6617e4484074b7d740fbe9f593dc3a31d9b524859167d90cdfc060498
 SHA512:
-  metadata.gz: 8e88289ff2d6acac6c10599332227163d41ac6fcc7ea2f7acb6d2a4c5e62dec6ab814aecc2e807e08f5de4a3491abf69a88e9648d2ef8829dbd4885dfcd8954c
-  data.tar.gz: 2b67bf621a77b9d9882af25329930e3900c8e852077822dd2582ece1b6528e1fc63ec8c9f7404b89505b8a3d17377e841e476c264e2a7b837dbdab35dfe2c243
+  metadata.gz: c0b30b8bfc0f01507d436dea54d5b122751c852a63d2309a5236a5a5f698c140892e54c2f665dbbce4bf0c6f6276c9a7cd1910f212aa7a27937ceca1b8ba510d
+  data.tar.gz: de92e684e1368ee2a5c10d1789962181316590b87ea5b806d8fd0a959329c54dd0d95723d99334038f75e2865d277b12dbc2c17aeed39b5b57436506273e7be4

data/fontist.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "nokogiri", "~> 1.0"
   spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-benchmark", "~> 0.6"
   spec.add_development_dependency "rubocop", "1.5.2"
   spec.add_development_dependency "rubocop-rails"
   spec.add_development_dependency "rubocop-performance"

data/lib/fontist/import/recursive_extraction.rb

@@ -4,7 +4,7 @@ module Fontist
   module Import
     class RecursiveExtraction
       LICENSE_PATTERN =
-        /(ofl\.txt|ufl\.txt|licenses?\.txt|license|copying)$/i.freeze
+        /(ofl\.txt|ufl\.txt|licenses?\.txt|license(\.md)?|copying)$/i.freeze
 
       def initialize(archive, subarchive: nil, subdir: nil)
         @archive = archive
@@ -70,6 +70,8 @@ module Fontist
 
       def extract_data(archive)
         Excavate::Archive.new(path(archive)).files(recursive_packages: true) do |path|
+          next unless File.file?(path)
+
           match_license(path)
           match_font(path) if font_directory?(path)
         end

data/lib/fontist/system_font.rb

@@ -12,6 +12,10 @@ module Fontist
     end
 
     def self.system_font_paths
+      @system_font_paths ||= load_system_font_paths
+    end
+
+    def self.load_system_font_paths
       config_path = Fontist.system_file_path
       os = Fontist::Utils::System.user_os.to_s
       templates = YAML.load_file(config_path)["system"][os]["paths"]
@@ -20,6 +24,10 @@ module Fontist
       Dir.glob(patterns)
     end
 
+    def self.reset_system_font_paths_cache
+      @system_font_paths = nil
+    end
+
     def self.expand_paths(paths)
       paths.map do |path|
         require "etc"

data/lib/fontist/system_index.rb

@@ -37,35 +37,39 @@ module Fontist
     LANGUAGE_MAC_ENGLISH = 0
     LANGUAGE_MS_ENGLISH_AMERICAN = 0x409
 
-    attr_reader :font_paths
-
     def self.system_index
-      if Fontist.preferred_family?
-        new(Fontist.system_preferred_family_index_path,
-            SystemFont.font_paths,
-            PreferredFamily.new)
-      else
-        new(Fontist.system_index_path,
-            SystemFont.font_paths,
-            DefaultFamily.new)
-      end
+      path = if Fontist.preferred_family?
+               Fontist.system_preferred_family_index_path
+             else
+               Fontist.system_index_path
+             end
+
+      @system_index ||= {}
+      @system_index[Fontist.preferred_family?] ||= {}
+      @system_index[Fontist.preferred_family?][path] ||=
+        new(path, -> { SystemFont.font_paths }, family)
     end
 
     def self.fontist_index
-      if Fontist.preferred_family?
-        new(Fontist.fontist_preferred_family_index_path,
-            SystemFont.fontist_font_paths,
-            PreferredFamily.new)
-      else
-        new(Fontist.fontist_index_path,
-            SystemFont.fontist_font_paths,
-            DefaultFamily.new)
-      end
+      path = if Fontist.preferred_family?
+               Fontist.fontist_preferred_family_index_path
+             else
+               Fontist.fontist_index_path
+             end
+
+      @fontist_index ||= {}
+      @fontist_index[Fontist.preferred_family?] ||= {}
+      @fontist_index[Fontist.preferred_family?][path] ||=
+        new(path, -> { SystemFont.fontist_font_paths }, family)
     end
 
-    def initialize(index_path, font_paths, family)
+    def self.family
+      Fontist.preferred_family? ? PreferredFamily.new : DefaultFamily.new
+    end
+
+    def initialize(index_path, font_paths_fetcher, family)
       @index_path = index_path
-      @font_paths = font_paths
+      @font_paths_fetcher = font_paths_fetcher
       @family = family
     end
 
@@ -85,7 +89,18 @@ module Fontist
     private
 
     def index
-      @index ||= build_index
+      return @index unless index_changed?
+
+      @index = build_index
+    end
+
+    def index_changed?
+      @index.nil? ||
+        @index.map { |x| x[:path] }.uniq.sort != font_paths.sort
+    end
+
+    def font_paths
+      @font_paths_fetcher.call
     end
 
     def build_index

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.11.2".freeze
+  VERSION = "1.11.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-11 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement