fontist 2.1.4 → 2.1.5

data/lib/fontist/import/google/data_sources/github.rb

@@ -1,7 +1,4 @@
 require "unibuf"
-require_relative "../metadata_adapter"
-require_relative "../../otf/font_file"
-require_relative "../models/font_family"
 require "pathname"
 
 module Fontist

data/lib/fontist/import/google/data_sources/ttf.rb

@@ -1,5 +1,3 @@
-require_relative "base"
-
 module Fontist
   module Import
     module Google

data/lib/fontist/import/google/data_sources/vf.rb

@@ -1,5 +1,3 @@
-require_relative "base"
-
 module Fontist
   module Import
     module Google

data/lib/fontist/import/google/data_sources/woff2.rb

@@ -1,5 +1,3 @@
-require_relative "base"
-
 module Fontist
   module Import
     module Google

data/lib/fontist/import/google/data_sources.rb

@@ -0,0 +1,13 @@
+module Fontist
+  module Import
+    module Google
+      module DataSources
+        autoload :Base, "#{__dir__}/data_sources/base"
+        autoload :Github, "#{__dir__}/data_sources/github"
+        autoload :Ttf, "#{__dir__}/data_sources/ttf"
+        autoload :Vf, "#{__dir__}/data_sources/vf"
+        autoload :Woff2, "#{__dir__}/data_sources/woff2"
+      end
+    end
+  end
+end

data/lib/fontist/import/google/font_database.rb

@@ -1,12 +1,3 @@
-require_relative "models/font_family"
-require_relative "models/axis"
-require_relative "data_sources/ttf"
-require_relative "data_sources/vf"
-require_relative "data_sources/woff2"
-require_relative "data_sources/github"
-require_relative "../font_metadata_extractor"
-require_relative "../../utils/downloader"
-require_relative "../../google_import_source"
 require "yaml"
 require "fileutils"
 
@@ -404,7 +395,6 @@ github_data: nil, version: 4, source_path: nil)
           path = File.join(output_dir, filename)
 
           # Use HashHelper to convert keys to strings (preserves import_source object)
-          require_relative "../helpers/hash_helper"
           formula_with_string_keys = Helpers::HashHelper.stringify_keys(formula_hash)
 
           File.write(path, YAML.dump(formula_with_string_keys))

data/lib/fontist/import/google/metadata_adapter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "unibuf"
-require_relative "models/metadata"
 
 module Fontist
   module Import

data/lib/fontist/import/google/models/font_family.rb

@@ -1,5 +1,4 @@
 require "lutaml/model"
-require_relative "axis"
 
 module Fontist
   module Import

data/lib/fontist/import/google/models/metadata.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "font_file_metadata"
-require_relative "axis_metadata"
-require_relative "source_metadata"
+require "unibuf"
 
 module Fontist
   module Import
@@ -74,9 +72,6 @@ module Fontist
           # @return [Metadata] parsed metadata object
           # @raise [ParseError] if file cannot be parsed
           def self.from_file(file_path)
-            require "unibuf"
-            require_relative "../metadata_adapter"
-
             unibuf_message = Unibuf.parse_textproto_file(file_path)
             MetadataAdapter.adapt(unibuf_message)
           end
@@ -87,9 +82,6 @@ module Fontist
           # @return [Metadata] parsed metadata object
           # @raise [ParseError] if content cannot be parsed
           def self.from_content(content)
-            require "unibuf"
-            require_relative "../metadata_adapter"
-
             unibuf_message = Unibuf.parse_textproto(content)
             MetadataAdapter.adapt(unibuf_message)
           end

data/lib/fontist/import/google/models/source_metadata.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "file_metadata"
 
 module Fontist
   module Import

data/lib/fontist/import/google/models.rb

@@ -0,0 +1,16 @@
+module Fontist
+  module Import
+    module Google
+      module Models
+        autoload :Axis, "#{__dir__}/models/axis"
+        autoload :AxisMetadata, "#{__dir__}/models/axis_metadata"
+        autoload :FileMetadata, "#{__dir__}/models/file_metadata"
+        autoload :FontFamily, "#{__dir__}/models/font_family"
+        autoload :FontFileMetadata, "#{__dir__}/models/font_file_metadata"
+        autoload :FontVariant, "#{__dir__}/models/font_variant"
+        autoload :Metadata, "#{__dir__}/models/metadata"
+        autoload :SourceMetadata, "#{__dir__}/models/source_metadata"
+      end
+    end
+  end
+end

data/lib/fontist/import/google.rb

@@ -1,6 +1,13 @@
 module Fontist
   module Import
     module Google
+      autoload :Api, "#{__dir__}/google/api"
+      autoload :DataSources, "#{__dir__}/google/data_sources"
+      autoload :FontDatabase, "#{__dir__}/google/font_database"
+      autoload :MetadataAdapter, "#{__dir__}/google/metadata_adapter"
+      autoload :MetadataParser, "#{__dir__}/google/metadata_parser"
+      autoload :Models, "#{__dir__}/google/models"
+
       DEFAULT_MAX_COUNT = 100
 
       def self.metadata_name(path)
@@ -35,5 +42,3 @@ module Fontist
     end
   end
 end
-
-require_relative "google/api"

data/lib/fontist/import/google_fonts_importer.rb

@@ -1,11 +1,6 @@
 require "fileutils"
 require "yaml"
 require "paint"
-require_relative "../import"
-require_relative "../formula"
-require_relative "google/font_database"
-require_relative "google/api"
-require_relative "import_display"
 
 module Fontist
   module Import

data/lib/fontist/import/google_import.rb

@@ -5,10 +5,6 @@
 # @deprecated Use {Fontist::Import::GoogleImporter} instead
 # @see Fontist::Import::GoogleImporter
 
-require_relative "google"
-require_relative "google/api"
-require_relative "google/create_google_formula"
-
 module Fontist
   module Import
     # Legacy Google Fonts import class
@@ -57,10 +53,7 @@ module Fontist
       # @return [Boolean] true if new importer is available and should be used
       def use_new_importer?
         # Check if new importer is available
-        require_relative "google_importer"
-        true
-      rescue LoadError
-        false
+        defined?(Fontist::Import::GoogleImporter)
       end
 
       # Delegates to new GoogleImporter

data/lib/fontist/import/helpers.rb

@@ -0,0 +1,8 @@
+module Fontist
+  module Import
+    module Helpers
+      autoload :HashHelper, "#{__dir__}/helpers/hash_helper"
+      autoload :SystemHelper, "#{__dir__}/helpers/system_helper"
+    end
+  end
+end

data/lib/fontist/import/macos.rb

@@ -1,12 +1,6 @@
 require "plist"
 require "nokogiri"
 require "paint"
-require_relative "create_formula"
-require_relative "recursive_extraction"
-require_relative "../macos/catalog/catalog_manager"
-require_relative "../macos_import_source"
-require_relative "../google_import_source"
-require_relative "../sil_import_source"
 
 module Fontist
   module Import

data/lib/fontist/import/manual_formula_builder.rb

@@ -1,5 +1,3 @@
-require_relative "formula_builder"
-
 module Fontist
   module Import
     class ManualFormulaBuilder < FormulaBuilder

data/lib/fontist/import/models.rb

@@ -0,0 +1,7 @@
+module Fontist
+  module Import
+    module Models
+      autoload :FontMetadata, "#{__dir__}/models/font_metadata"
+    end
+  end
+end

data/lib/fontist/import/otf/font_file.rb

@@ -1,5 +1,3 @@
-require_relative "../font_metadata_extractor"
-
 module Fontist
   module Import
     module Otf

data/lib/fontist/import/otf.rb

@@ -0,0 +1,7 @@
+module Fontist
+  module Import
+    module Otf
+      autoload :FontFile, "#{__dir__}/otf/font_file"
+    end
+  end
+end

data/lib/fontist/import/recursive_extraction.rb

@@ -1,8 +1,3 @@
-require_relative "otf/font_file"
-require_relative "files/collection_file"
-require_relative "files/font_detector"
-require_relative "font_parsing_error_collector"
-
 module Fontist
   module Import
     class RecursiveExtraction

data/lib/fontist/import/sil_import.rb

@@ -1,7 +1,4 @@
 require "nokogiri"
-require "fontist/import/create_formula"
-require_relative "../sil_import_source"
-require_relative "import_display"
 require "paint"
 
 module Fontist

data/lib/fontist/import/upgrade_formulas.rb

@@ -2,7 +2,7 @@ require "fileutils"
 require "yaml"
 require "tmpdir"
 require "find"
-require_relative "../formula"
+require "rubygems/package"
 
 module Fontist
   module Import
@@ -251,9 +251,6 @@ module Fontist
       # @param url [String] the URL to download
       # @return [String, nil] path to downloaded file or nil
       def download_resource(url)
-        # Lazy load downloader to avoid dependency issues
-        require_relative "../utils/downloader" unless defined?(Fontist::Utils::Downloader)
-
         Fontist::Utils::Downloader.download(url)
       rescue StandardError => e
         log "  Warning: Download failed for #{url}: #{e.message}"
@@ -299,9 +296,6 @@ module Fontist
 
         # Try to parse with Otf::FontFile
         begin
-          # Lazy load Otf::FontFile to avoid dependency issues
-          require_relative "otf/font_file" unless defined?(Fontist::Import::Otf::FontFile)
-
           Otf::FontFile.new(path)
           # If it parses, it's likely a font file
           # Guess ttf if we can't determine
@@ -392,7 +386,6 @@ module Fontist
       # @param extract_dir [String] directory to extract to
       # @return [void]
       def extract_tar_gz(archive_path, extract_dir)
-        require "rubygems/package"
         require "zlib"
 
         File.open(archive_path, "rb") do |file|
@@ -410,7 +403,6 @@ module Fontist
       # @param extract_dir [String] directory to extract to
       # @return [void]
       def extract_tar_bz2(archive_path, extract_dir)
-        require "rubygems/package"
         require "bzip2/ffi"
 
         File.open(archive_path, "rb") do |file|
@@ -428,8 +420,6 @@ module Fontist
       # @param extract_dir [String] directory to extract to
       # @return [void]
       def extract_tar(archive_path, extract_dir)
-        require "rubygems/package"
-
         File.open(archive_path, "rb") do |file|
           Gem::Package::TarReader.new(file) do |tar|
             extract_tar_entries(tar, extract_dir)

data/lib/fontist/import.rb

@@ -1,5 +1,28 @@
 module Fontist
   module Import
+    autoload :ConvertFormulas, "#{__dir__}/import/convert_formulas"
+    autoload :CreateFormula, "#{__dir__}/import/create_formula"
+    autoload :Files, "#{__dir__}/import/files"
+    autoload :FontMetadataExtractor, "#{__dir__}/import/font_metadata_extractor"
+    autoload :FontParsingErrorCollector, "#{__dir__}/import/font_parsing_error_collector"
+    autoload :FontStyle, "#{__dir__}/import/font_style"
+    autoload :FormulaBuilder, "#{__dir__}/import/formula_builder"
+    autoload :FormulaSerializer, "#{__dir__}/import/formula_serializer"
+    autoload :Google, "#{__dir__}/import/google"
+    autoload :GoogleFontsImporter, "#{__dir__}/import/google_fonts_importer"
+    autoload :GoogleImport, "#{__dir__}/import/google_import"
+    autoload :Helpers, "#{__dir__}/import/helpers"
+    autoload :ImportDisplay, "#{__dir__}/import/import_display"
+    autoload :Macos, "#{__dir__}/import/macos"
+    autoload :ManualFormulaBuilder, "#{__dir__}/import/manual_formula_builder"
+    autoload :Models, "#{__dir__}/import/models"
+    autoload :Otf, "#{__dir__}/import/otf"
+    autoload :RecursiveExtraction, "#{__dir__}/import/recursive_extraction"
+    autoload :SilImport, "#{__dir__}/import/sil_import"
+    autoload :TemplateHelper, "#{__dir__}/import/template_helper"
+    autoload :TextHelper, "#{__dir__}/import/text_helper"
+    autoload :UpgradeFormulas, "#{__dir__}/import/upgrade_formulas"
+
     class << self
       def name_to_filename(name)
         "#{name.downcase.gsub(' ', '_')}.yml"

data/lib/fontist/import_cli.rb

@@ -1,5 +1,3 @@
-require_relative "import/google"
-
 module Fontist
   class ImportCLI < Thor
     include CLI::ClassOptions
@@ -27,8 +25,6 @@ module Fontist
     def google
       handle_class_options(options)
 
-      require "fontist/import/google_fonts_importer"
-
       # Support both --font-name and --font-family (backward compatibility)
       font_name = options[:font_name] || options[:font_family]
 
@@ -85,7 +81,6 @@ module Fontist
 
     def macos
       handle_class_options(options)
-      require_relative "import/macos"
 
       # Handle deprecated formulas_dir option
       output_dir = if options[:formulas_dir] && !options[:output_path]
@@ -136,8 +131,6 @@ module Fontist
     def sil
       handle_class_options(options)
 
-      require "fontist/import/sil_import"
-
       importer = Fontist::Import::SilImport.new(
         output_path: options[:output_path],
         font_name: options[:font_name],
@@ -180,8 +173,6 @@ module Fontist
     end
 
     def detect_latest_catalog
-      require_relative "macos/catalog/catalog_manager"
-
       catalogs = Fontist::Macos::Catalog::CatalogManager.available_catalogs
 
       if catalogs.empty?

data/lib/fontist/index.rb

@@ -1,8 +1,4 @@
 require "lutaml/model"
-require_relative "indexes/filename_index"
-require_relative "indexes/font_index"
-require_relative "indexes/default_family_font_index"
-require_relative "indexes/preferred_family_font_index"
 
 module Fontist
   class IndexEntry < Lutaml::Model::Serializable

data/lib/fontist/index_cli.rb

@@ -1,6 +1,4 @@
 require "thor"
-require_relative "../fontist"
-require_relative "cli/class_options"
 
 module Fontist
   class IndexCLI < Thor

data/lib/fontist/indexes/base_font_collection_index.rb

@@ -1,5 +1,4 @@
 require "singleton"
-require_relative "../system_index"
 
 module Fontist
   module Indexes

data/lib/fontist/indexes/default_family_font_index.rb

@@ -1,6 +1,4 @@
 require "lutaml/model"
-require_relative "index_mixin"
-require_relative "formula_key_to_path"
 
 module Fontist
   module Indexes

data/lib/fontist/indexes/directory_snapshot.rb

@@ -1,5 +1,3 @@
-require_relative "incremental_scanner"
-
 module Fontist
   module Indexes
     # Value object representing the state of a directory at a point in time

data/lib/fontist/indexes/filename_index.rb

@@ -1,6 +1,4 @@
 require "lutaml/model"
-require_relative "index_mixin"
-require_relative "formula_key_to_path"
 
 module Fontist
   module Indexes

data/lib/fontist/indexes/font_index.rb

@@ -1,6 +1,3 @@
-require_relative "default_family_font_index"
-require_relative "preferred_family_font_index"
-
 module Fontist
   module Indexes
     class FontIndex

data/lib/fontist/indexes/fontist_index.rb

@@ -1,5 +1,3 @@
-require_relative "base_font_collection_index"
-
 module Fontist
   module Indexes
     # Index for fonts installed in the fontist library

data/lib/fontist/indexes/incremental_index_updater.rb

@@ -1,7 +1,3 @@
-require_relative "directory_snapshot"
-require_relative "directory_change"
-require_relative "incremental_scanner"
-
 module Fontist
   module Indexes
     # Service for performing incremental index updates

data/lib/fontist/indexes/preferred_family_font_index.rb

@@ -1,6 +1,4 @@
 require "lutaml/model"
-require_relative "index_mixin"
-require_relative "formula_key_to_path"
 
 module Fontist
   module Indexes

data/lib/fontist/indexes/system_index.rb

@@ -1,5 +1,3 @@
-require_relative "base_font_collection_index"
-
 module Fontist
   module Indexes
     # Index for fonts in system font directories

data/lib/fontist/indexes/user_index.rb

@@ -1,5 +1,3 @@
-require_relative "base_font_collection_index"
-
 module Fontist
   module Indexes
     # Index for fonts installed in the user font directory

data/lib/fontist/indexes.rb

@@ -0,0 +1,18 @@
+module Fontist
+  module Indexes
+    autoload :BaseFontCollectionIndex, "#{__dir__}/indexes/base_font_collection_index"
+    autoload :DefaultFamilyFontIndex, "#{__dir__}/indexes/default_family_font_index"
+    autoload :DirectoryChange, "#{__dir__}/indexes/directory_change"
+    autoload :DirectorySnapshot, "#{__dir__}/indexes/directory_snapshot"
+    autoload :FilenameIndex, "#{__dir__}/indexes/filename_index"
+    autoload :FontIndex, "#{__dir__}/indexes/font_index"
+    autoload :FontistIndex, "#{__dir__}/indexes/fontist_index"
+    autoload :FormulaKeyToPath, "#{__dir__}/indexes/formula_key_to_path"
+    autoload :IncrementalIndexUpdater, "#{__dir__}/indexes/incremental_index_updater"
+    autoload :IncrementalScanner, "#{__dir__}/indexes/incremental_scanner"
+    autoload :IndexMixin, "#{__dir__}/indexes/index_mixin"
+    autoload :PreferredFamilyFontIndex, "#{__dir__}/indexes/preferred_family_font_index"
+    autoload :SystemIndex, "#{__dir__}/indexes/system_index"
+    autoload :UserIndex, "#{__dir__}/indexes/user_index"
+  end
+end

data/lib/fontist/install_location.rb

@@ -1,8 +1,4 @@
 require "pathname"
-require_relative "install_locations/base_location"
-require_relative "install_locations/fontist_location"
-require_relative "install_locations/user_location"
-require_relative "install_locations/system_location"
 
 module Fontist
   # Factory for creating font installation location objects

data/lib/fontist/install_locations/fontist_location.rb

@@ -1,5 +1,3 @@
-require_relative "base_location"
-
 module Fontist
   module InstallLocations
     # Fontist library location (default installation location)

data/lib/fontist/install_locations/system_location.rb

@@ -1,5 +1,3 @@
-require_relative "base_location"
-
 module Fontist
   module InstallLocations
     # System font directory location

data/lib/fontist/install_locations/user_location.rb

@@ -1,5 +1,3 @@
-require_relative "base_location"
-
 module Fontist
   module InstallLocations
     # User font directory location

data/lib/fontist/install_locations.rb

@@ -0,0 +1,8 @@
+module Fontist
+  module InstallLocations
+    autoload :BaseLocation, "#{__dir__}/install_locations/base_location"
+    autoload :FontistLocation, "#{__dir__}/install_locations/fontist_location"
+    autoload :SystemLocation, "#{__dir__}/install_locations/system_location"
+    autoload :UserLocation, "#{__dir__}/install_locations/user_location"
+  end
+end

data/lib/fontist/macos/catalog/asset.rb

@@ -1,5 +1,3 @@
-require_relative "../../macos_import_source"
-
 module Fontist
   module Macos
     module Catalog

data/lib/fontist/macos/catalog/base_parser.rb

@@ -1,5 +1,4 @@
 require "plist"
-require_relative "asset"
 
 module Fontist
   module Macos

data/lib/fontist/macos/catalog/catalog_manager.rb

@@ -1,9 +1,3 @@
-require_relative "font3_parser"
-require_relative "font4_parser"
-require_relative "font5_parser"
-require_relative "font6_parser"
-require_relative "font7_parser"
-require_relative "font8_parser"
 require "open-uri"
 require "uri"
 

data/lib/fontist/macos/catalog/font3_parser.rb

@@ -1,5 +1,3 @@
-require_relative "base_parser"
-
 module Fontist
   module Macos
     module Catalog

data/lib/fontist/macos/catalog/font4_parser.rb

@@ -1,5 +1,3 @@
-require_relative "base_parser"
-
 module Fontist
   module Macos
     module Catalog

data/lib/fontist/macos/catalog/font5_parser.rb

@@ -1,5 +1,3 @@
-require_relative "base_parser"
-
 module Fontist
   module Macos
     module Catalog

data/lib/fontist/macos/catalog/font6_parser.rb

@@ -1,5 +1,3 @@
-require_relative "base_parser"
-
 module Fontist
   module Macos
     module Catalog

data/lib/fontist/macos/catalog/font7_parser.rb

@@ -1,5 +1,3 @@
-require_relative "base_parser"
-
 module Fontist
   module Macos
     module Catalog

data/lib/fontist/macos/catalog/font8_parser.rb

@@ -1,5 +1,3 @@
-require_relative "base_parser"
-
 module Fontist
   module Macos
     module Catalog

data/lib/fontist/macos/catalog.rb

@@ -0,0 +1,15 @@
+module Fontist
+  module Macos
+    module Catalog
+      autoload :Asset, "#{__dir__}/catalog/asset"
+      autoload :BaseParser, "#{__dir__}/catalog/base_parser"
+      autoload :CatalogManager, "#{__dir__}/catalog/catalog_manager"
+      autoload :Font3Parser, "#{__dir__}/catalog/font3_parser"
+      autoload :Font4Parser, "#{__dir__}/catalog/font4_parser"
+      autoload :Font5Parser, "#{__dir__}/catalog/font5_parser"
+      autoload :Font6Parser, "#{__dir__}/catalog/font6_parser"
+      autoload :Font7Parser, "#{__dir__}/catalog/font7_parser"
+      autoload :Font8Parser, "#{__dir__}/catalog/font8_parser"
+    end
+  end
+end

data/lib/fontist/macos.rb

@@ -0,0 +1,5 @@
+module Fontist
+  module Macos
+    autoload :Catalog, "#{__dir__}/macos/catalog"
+  end
+end

data/lib/fontist/macos_import_source.rb

@@ -1,5 +1,3 @@
-require_relative "import_source"
-require_relative "macos_framework_metadata"
 
 module Fontist
   # Import source for macOS supplementary fonts