fontist 1.9.3 → 1.11.2

data/lib/fontist/indexes/preferred_family_font_index.rb

@@ -0,0 +1,24 @@
+require_relative "base_index"
+
+module Fontist
+  module Indexes
+    class PreferredFamilyFontIndex < BaseIndex
+      def self.path
+        Fontist.formula_preferred_family_index_path
+      end
+
+      def add_formula(formula)
+        formula.fonts.each do |font|
+          font.styles.each do |style|
+            font_name = style.preferred_family_name || font.name
+            add_index_formula(font_name, formula.to_index_formula)
+          end
+        end
+      end
+
+      def normalize_key(key)
+        key.downcase
+      end
+    end
+  end
+end

data/lib/fontist/system_font.rb

@@ -1,12 +1,10 @@
 require_relative "system_index"
-require_relative "formula_paths"
 
 module Fontist
   class SystemFont
-    def initialize(font:, style: nil, sources: nil)
+    def initialize(font:, style: nil)
       @font = font
       @style = style
-      @user_sources = sources || []
     end
 
     def self.font_paths
@@ -36,8 +34,8 @@ module Fontist
       Dir.glob(Fontist.fonts_path.join("**"))
     end
 
-    def self.find(font, sources: [])
-      new(font: font, sources: sources).find
+    def self.find(font)
+      new(font: font).find
     end
 
     def self.find_styles(font, style)
@@ -52,23 +50,15 @@ module Fontist
     end
 
     def find_styles
-      find_by_index || find_by_formulas
+      find_by_index
     end
 
     private
 
-    attr_reader :font, :style, :user_sources
+    attr_reader :font, :style
 
     def find_by_index
-      SystemIndex.new(all_paths).find(font, style)
-    end
-
-    def find_by_formulas
-      FormulaPaths.new(all_paths).find(font, style)
-    end
-
-    def all_paths
-      @all_paths ||= Dir.glob(user_sources) + self.class.font_paths
+      SystemIndex.system_index.find(font, style)
     end
   end
 end

data/lib/fontist/system_index.rb

@@ -4,22 +4,73 @@ module Fontist
   class SystemIndex
     include Utils::Locking
 
+    class DefaultFamily
+      def family_name(name)
+        name.font_family
+      end
+
+      def type(name)
+        name.font_subfamily
+      end
+    end
+
+    class PreferredFamily
+      def family_name(name)
+        return name.font_family if name.preferred_family.empty?
+
+        name.preferred_family
+      end
+
+      def type(name)
+        return name.font_subfamily if name.preferred_subfamily.empty?
+
+        name.preferred_subfamily
+      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
+
     attr_reader :font_paths
 
-    def self.find(font, style)
-      new(SystemFont.font_paths).find(font, style)
+    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
     end
 
-    def self.rebuild
-      new(SystemFont.font_paths).rebuild
+    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
     end
 
-    def initialize(font_paths)
+    def initialize(index_path, font_paths, family)
+      @index_path = index_path
       @font_paths = font_paths
+      @family = family
     end
 
     def find(font, style)
-      fonts = system_index.select do |file|
+      fonts = index.select do |file|
         file[:family_name].casecmp?(font) &&
           (style.nil? || file[:type].casecmp?(style))
       end
@@ -28,27 +79,27 @@ module Fontist
     end
 
     def rebuild
-      build_system_index
+      build_index
     end
 
     private
 
-    def system_index
-      @system_index ||= build_system_index
+    def index
+      @index ||= build_index
     end
 
-    def build_system_index
+    def build_index
       lock(lock_path) do
-        do_build_system_index
+        do_build_index
       end
     end
 
     def lock_path
-      Fontist.system_index_path.to_s + ".lock"
+      "#{@index_path}.lock"
     end
 
-    def do_build_system_index
-      previous_index = load_system_index
+    def do_build_index
+      previous_index = load_index
       updated_index = detect_paths(font_paths, previous_index)
       updated_index.tap do |index|
         save_index(index) if changed?(updated_index, previous_index)
@@ -59,21 +110,23 @@ module Fontist
       this.map { |x| x[:path] }.uniq.sort != other.map { |x| x[:path] }.uniq.sort
     end
 
-    def load_system_index
-      index = File.exist?(Fontist.system_index_path) ? YAML.load_file(Fontist.system_index_path) : []
+    def load_index
+      index = File.exist?(@index_path) ? YAML.load_file(@index_path) : []
+      check_index(index)
+      index
+    end
 
+    def check_index(index)
       index.each do |item|
         missing_keys = %i[path full_name family_name type] - item.keys
         unless missing_keys.empty?
           raise(Errors::FontIndexCorrupted, <<~MSG.chomp)
             Font index is corrupted.
             Item #{item.inspect} misses required attributes: #{missing_keys.join(', ')}.
-            You can remove the index file (#{Fontist.system_index_path}) and try again.
+            You can remove the index file (#{@index_path}) and try again.
           MSG
         end
       end
-
-      index
     end
 
     def detect_paths(paths, index)
@@ -95,14 +148,18 @@ module Fontist
       else
         raise Errors::UnknownFontTypeError.new(path)
       end
+    rescue StandardError
+      Fontist.ui.error($!.message)
+      Fontist.ui.error(
+        "Warning: File at #{path} not recognized as a font file.",
+      )
     end
 
     def detect_file_font(path)
-      file = TTFunk::File.open(path)
+      content = File.read(path, mode: "rb")
+      file = TTFunk::File.new(content)
+
       parse_font(file, path)
-    rescue StandardError
-      warn $!.message
-      warn "Warning: File at #{path} not recognized as a font file."
     end
 
     def detect_collection_fonts(path)
@@ -118,20 +175,42 @@ module Fontist
 
       {
         path: path,
-        full_name: parse_text(x.font_name.first),
-        family_name: parse_text(x.preferred_family.first || x.font_family.first),
-        type: parse_text(x.preferred_subfamily.first || x.font_subfamily.first),
+        full_name: english_name(x.font_name),
+        family_name: english_name(@family.family_name(x)),
+        type: english_name(@family.type(x)),
       }
     end
 
-    def parse_text(text)
+    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 save_index(index)
-      dir = File.dirname(Fontist.system_index_path)
+      dir = File.dirname(@index_path)
       FileUtils.mkdir_p(dir) unless File.exist?(dir)
-      File.write(Fontist.system_index_path, YAML.dump(index))
+      File.write(@index_path, YAML.dump(index))
     end
   end
 end

data/lib/fontist/update.rb

@@ -1,9 +1,9 @@
 module Fontist
   class Update
-    BRANCH = "master".freeze
+    VERSION = "v2".freeze
 
     def self.call
-      new(BRANCH).call
+      new(VERSION).call
     end
 
     def initialize(branch = "main")

data/lib/fontist/utils/downloader.rb

@@ -24,12 +24,7 @@ module Fontist
           download_file
         end
 
-        if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
-          raise(Fontist::Errors::TamperedFileError.new(
-            "The downloaded file from #{@file} doesn't " \
-            "match with the expected sha256 checksum!"
-          ))
-        end
+        raise_if_tampered(file)
 
         file
       end
@@ -38,6 +33,19 @@ module Fontist
 
       attr_reader :file, :sha, :file_size
 
+      def raise_if_tampered(file)
+        file_checksum = Digest::SHA256.file(file).to_s
+        if !sha.empty? && !sha.include?(file_checksum)
+          raise(
+            Fontist::Errors::TamperedFileError.new(
+              "The downloaded file from #{@file} doesn't " \
+              "match with the expected sha256 checksum (#{file_checksum})!\n" \
+              "Beginning of content: #{File.read(file, 3000)}",
+            ),
+          )
+        end
+      end
+
       def byte_to_megabyte
         @byte_to_megabyte ||= 1024 * 1024
       end

data/lib/fontist/version.rb

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

data/lib/fontist.rb

@@ -11,7 +11,6 @@ require "fontist/repo"
 require "fontist/font"
 require "fontist/formula"
 require "fontist/system_font"
-require "fontist/fontist_font"
 require "fontist/manifest"
 require "fontist/helpers"
 
@@ -41,7 +40,11 @@ module Fontist
   end
 
   def self.formulas_repo_path
-    Fontist.fontist_path.join("formulas")
+    Fontist.fontist_version_path.join("formulas")
+  end
+
+  def self.fontist_version_path
+    Fontist.fontist_path.join("versions", Update::VERSION)
   end
 
   def self.formulas_repo_url
@@ -49,7 +52,11 @@ module Fontist
   end
 
   def self.formulas_path
-    Fontist.formulas_repo_path.join("Formulas")
+    @formulas_path || Fontist.formulas_repo_path.join("Formulas")
+  end
+
+  def self.formulas_path=(path)
+    @formulas_path = path
   end
 
   def self.private_formulas_path
@@ -65,27 +72,50 @@ module Fontist
   end
 
   def self.system_index_path
-    Fontist.fontist_path.join("system_index.yml")
+    Fontist.fontist_path.join("system_index.default_family.yml")
+  end
+
+  def self.system_preferred_family_index_path
+    Fontist.fontist_path.join("system_index.preferred_family.yml")
+  end
+
+  def self.fontist_index_path
+    Fontist.fontist_path.join("fontist_index.default_family.yml")
+  end
+
+  def self.fontist_preferred_family_index_path
+    Fontist.fontist_path.join("fontist_index.preferred_family.yml")
   end
 
   def self.formula_index_path
-    @formula_index_path || Fontist.formula_index_dir.join("formula_index.yml")
+    Fontist.formula_index_dir.join("formula_index.default_family.yml")
   end
 
-  def self.formula_index_path=(path)
-    @formula_index_path = path
+  def self.formula_preferred_family_index_path
+    Fontist.formula_index_dir.join("formula_index.preferred_family.yml")
   end
 
   def self.formula_filename_index_path
-    @formula_filename_index_path ||
-      Fontist.formula_index_dir.join("filename_index.yml")
+    Fontist.formula_index_dir.join("filename_index.yml")
   end
 
-  def self.formula_filename_index_path=(path)
-    @formula_filename_index_path = path
+  def self.formula_index_dir
+    Fontist.fontist_version_path
   end
 
-  def self.formula_index_dir
-    Fontist.fontist_path
+  def self.preferred_family?
+    !!@preferred_family
+  end
+
+  def self.preferred_family=(bool)
+    @preferred_family = bool
+  end
+
+  def self.debug?
+    @debug || false
+  end
+
+  def self.debug=(bool)
+    @debug = bool
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.11.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -25,69 +25,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: extract_ttc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: ttfunk
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: excavate
+  name: ttfunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: extract_ttc
+  name: excavate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -221,19 +221,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-protocol-buffers
+  name: socksify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: Install openly-licensed fonts on Windows, Linux and Mac!
 email:
 - open.source@ribose.com
@@ -242,7 +242,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/check_google.yml"
 - ".github/workflows/metanorma.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/rspec.yml"
@@ -252,7 +251,7 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
-- README.md
+- README.adoc
 - Rakefile
 - exe/fontist
 - fontist.gemspec
@@ -262,9 +261,8 @@ files:
 - lib/fontist/font.rb
 - lib/fontist/font_installer.rb
 - lib/fontist/font_path.rb
-- lib/fontist/fontist_font.rb
 - lib/fontist/formula.rb
-- lib/fontist/formula_paths.rb
+- lib/fontist/google_cli.rb
 - lib/fontist/helpers.rb
 - lib/fontist/import.rb
 - lib/fontist/import/convert_formulas.rb
@@ -275,9 +273,6 @@ files:
 - lib/fontist/import/formula_builder.rb
 - lib/fontist/import/formula_serializer.rb
 - lib/fontist/import/google.rb
-- lib/fontist/import/google/fonts_public.md
-- lib/fontist/import/google/fonts_public.pb.rb
-- lib/fontist/import/google/fonts_public.proto
 - lib/fontist/import/google/new_fonts_fetcher.rb
 - lib/fontist/import/google/skiplist.yml
 - lib/fontist/import/google_check.rb
@@ -296,9 +291,11 @@ files:
 - lib/fontist/import/text_helper.rb
 - lib/fontist/index.rb
 - lib/fontist/indexes/base_index.rb
+- lib/fontist/indexes/default_family_font_index.rb
 - lib/fontist/indexes/filename_index.rb
 - lib/fontist/indexes/font_index.rb
 - lib/fontist/indexes/index_formula.rb
+- lib/fontist/indexes/preferred_family_font_index.rb
 - lib/fontist/manifest.rb
 - lib/fontist/manifest/install.rb
 - lib/fontist/manifest/locations.rb