fontist 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1c609003084e7675dfd55c7488c57b9f216a7e9f6412e2dd707e589bdb5f11e
-  data.tar.gz: ff531fc17364227dc60b47eaa64fe5547bc9c1d30e05c94364109d79d7276b5e
+  metadata.gz: 91726c53a66563f2b0a32417d45d246617b85586cc7c9573b24c5b83533c5444
+  data.tar.gz: de8e1aba5de04fb720c85a6c98e708dcbae944bf439c15f4dc29c3f27e4d0831
 SHA512:
-  metadata.gz: 2bcb373787926878310fa113e4454ac09e203c82708bd2edb3df796ce1e92f7e038a5c54011aade53f7cbc2ac2f20c311e449d5d5304a0235b93bfb0433750de
-  data.tar.gz: 6ad5b3863ed427316065477a3c873264ffa6d543bb86be696396e61d8f727533bc8bb50268ce8818b45bb15da387e6913b88f2c1a9abb7ed4a4944e0a8d57691
+  metadata.gz: d05de7120339d223fc716ad1f99a60c80ec54deb37bbe77692cff0295d3ccc4b7263ae5bc2ed2beae3dc82f18f0684d85b47f01ca4c5730e04ec4cb82357be2c
+  data.tar.gz: 381a74039161a1e9d5ea9b560afbc9c551083c67462002f9c590da83fe69283fd8d0506983554c19d9f0ded9fba33a3b71a5d7db11a82d3689ebd7b885a9cfc2

data/lib/fontist/collection_file.rb

@@ -0,0 +1,46 @@
+require "ttfunk"
+
+module Fontist
+  class CollectionFile
+    include Enumerable
+
+    class << self
+      def from_path(path)
+        io = ::File.new(path, "rb")
+
+        yield new(build_collection(io))
+      ensure
+        io.close
+      end
+
+      private
+
+      def build_collection(io)
+        TTFunk::Collection.new(io)
+      rescue StandardError => e
+        raise Errors::FontFileError,
+              "Font file could not be parsed: #{e.inspect}."
+      end
+    end
+
+    def initialize(ttfunk_collection)
+      @collection = ttfunk_collection
+    end
+
+    def count
+      @collection.count
+    end
+
+    def each
+      count.times do |index|
+        yield self[index]
+      end
+
+      self
+    end
+
+    def [](index)
+      FontFile.from_collection_index(@collection, index)
+    end
+  end
+end

data/lib/fontist/errors.rb

@@ -18,6 +18,8 @@ module Fontist
 
     class FontIndexCorrupted < GeneralError; end
 
+    class FontFileError < GeneralError; end
+
     class FontistVersionError < GeneralError; end
 
     class FontNotFoundError < GeneralError; end

data/lib/fontist/font_file.rb

@@ -0,0 +1,109 @@
+require "ttfunk"
+
+module Fontist
+  class FontFile
+    PLATFORM_MACINTOSH = 1
+    PLATFORM_MICROSOFT = 3
+
+    ENCODING_MAC_ROMAN = 0
+    ENCODING_MS_UNICODE_BMP = 1
+
+    LANGUAGE_MAC_ENGLISH = 0
+    LANGUAGE_MS_ENGLISH_AMERICAN = 0x409
+
+    class << self
+      def from_path(path)
+        content = File.read(path, mode: "rb")
+
+        from_content(content)
+      end
+
+      def from_content(content)
+        new(build_font(content))
+      end
+
+      def from_collection_index(collection, index)
+        new(build_font_from_collection_index(collection, index))
+      end
+
+      private
+
+      def build_font(content)
+        TTFunk::File.new(content)
+      rescue StandardError => e
+        raise_font_file_error(e)
+      end
+
+      def build_font_from_collection_index(collection, index)
+        collection[index]
+      rescue StandardError => e
+        raise_font_file_error(e)
+      end
+
+      def raise_font_file_error(exception)
+        raise Errors::FontFileError,
+              "Font file could not be parsed: #{exception.inspect}."
+      end
+    end
+
+    def initialize(ttfunk_file)
+      @file = ttfunk_file
+    end
+
+    def full_name
+      english_name(main_name.font_name)
+    end
+
+    def family
+      english_name(main_name.font_family)
+    end
+
+    def subfamily
+      english_name(main_name.font_subfamily)
+    end
+
+    def preferred_family
+      return if main_name.preferred_family.empty?
+
+      english_name(main_name.preferred_family)
+    end
+
+    def preferred_subfamily
+      return if main_name.preferred_subfamily.empty?
+
+      english_name(main_name.preferred_subfamily)
+    end
+
+    private
+
+    def main_name
+      @main_name ||= @file.name
+    end
+
+    def english_name(name)
+      visible_characters(find_english(name))
+    end
+
+    def find_english(name)
+      name.find { |x| microsoft_english?(x) } ||
+        name.find { |x| mac_english?(x) } ||
+        name.last
+    end
+
+    def microsoft_english?(string)
+      string.platform_id == PLATFORM_MICROSOFT &&
+        string.encoding_id == ENCODING_MS_UNICODE_BMP &&
+        string.language_id == LANGUAGE_MS_ENGLISH_AMERICAN
+    end
+
+    def mac_english?(string)
+      string.platform_id == PLATFORM_MACINTOSH &&
+        string.encoding_id == ENCODING_MAC_ROMAN &&
+        string.language_id == LANGUAGE_MAC_ENGLISH
+    end
+
+    def visible_characters(text)
+      text.gsub(/[^[:print:]]/, "").to_s
+    end
+  end
+end

data/lib/fontist/system_index.rb

@@ -1,4 +1,5 @@
-require "ttfunk"
+require_relative "font_file"
+require_relative "collection_file"
 
 module Fontist
   class SystemIndex
@@ -6,11 +7,11 @@ module Fontist
 
     class DefaultFamily
       def family_name(name)
-        name.font_family
+        name.family
       end
 
       def type(name)
-        name.font_subfamily
+        name.subfamily
       end
 
       def transform_override_keys(dict)
@@ -20,15 +21,11 @@ module Fontist
 
     class PreferredFamily
       def family_name(name)
-        return name.font_family if name.preferred_family.empty?
-
-        name.preferred_family
+        name.preferred_family || name.family
       end
 
       def type(name)
-        return name.font_subfamily if name.preferred_subfamily.empty?
-
-        name.preferred_subfamily
+        name.preferred_subfamily || name.subfamily
       end
 
       def transform_override_keys(dict)
@@ -37,15 +34,6 @@ module Fontist
       end
     end
 
-    PLATFORM_MACINTOSH = 1
-    PLATFORM_MICROSOFT = 3
-
-    ENCODING_MAC_ROMAN = 0
-    ENCODING_MS_UNICODE_BMP = 1
-
-    LANGUAGE_MAC_ENGLISH = 0
-    LANGUAGE_MS_ENGLISH_AMERICAN = 0x409
-
     ALLOWED_KEYS = %i[path full_name family_name type].freeze
 
     def self.system_index
@@ -174,22 +162,26 @@ module Fontist
       else
         raise Errors::UnknownFontTypeError.new(path)
       end
-    rescue StandardError
+    rescue Errors::FontFileError => e
+      print_recognition_error(e, path)
+    end
+
+    def print_recognition_error(exception, path)
       Fontist.ui.error(<<~MSG.chomp)
-        #{$!.message}
+        #{exception.inspect}
         Warning: File at #{path} not recognized as a font file.
       MSG
+      nil
     end
 
     def detect_file_font(path)
-      content = File.read(path, mode: "rb")
-      file = TTFunk::File.new(content)
+      file = FontFile.from_path(path)
 
       parse_font(file, path)
     end
 
     def detect_collection_fonts(path)
-      TTFunk::Collection.open(path) do |collection|
+      CollectionFile.from_path(path) do |collection|
         collection.map do |file|
           parse_font(file, path)
         end
@@ -197,43 +189,16 @@ module Fontist
     end
 
     def parse_font(file, path)
-      x = file.name
-      family_name = english_name(@family.family_name(x))
+      family_name = @family.family_name(file)
 
       {
         path: path,
-        full_name: english_name(x.font_name),
+        full_name: file.full_name,
         family_name: family_name,
-        type: english_name(@family.type(x)),
+        type: @family.type(file),
       }.merge(override_font_props(path, family_name))
     end
 
-    def english_name(name)
-      visible_characters(find_english(name))
-    end
-
-    def find_english(name)
-      name.find { |x| microsoft_english?(x) } ||
-        name.find { |x| mac_english?(x) } ||
-        name.last
-    end
-
-    def microsoft_english?(string)
-      string.platform_id == PLATFORM_MICROSOFT &&
-        string.encoding_id == ENCODING_MS_UNICODE_BMP &&
-        string.language_id == LANGUAGE_MS_ENGLISH_AMERICAN
-    end
-
-    def mac_english?(string)
-      string.platform_id == PLATFORM_MACINTOSH &&
-        string.encoding_id == ENCODING_MAC_ROMAN &&
-        string.language_id == LANGUAGE_MAC_ENGLISH
-    end
-
-    def visible_characters(text)
-      text.gsub(/[^[:print:]]/, "").to_s
-    end
-
     def override_font_props(path, font_name)
       override = Formula.find_by_font_file(path)
         &.style_override(font_name)&.to_h || {}

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.17.0".freeze
+  VERSION = "1.17.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -305,8 +305,10 @@ files:
 - lib/fontist/cache_cli.rb
 - lib/fontist/cli.rb
 - lib/fontist/cli/class_options.rb
+- lib/fontist/collection_file.rb
 - lib/fontist/errors.rb
 - lib/fontist/font.rb
+- lib/fontist/font_file.rb
 - lib/fontist/font_installer.rb
 - lib/fontist/font_path.rb
 - lib/fontist/fontconfig.rb