fontisan 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ee842928fa05a0dceee00f233fe76f0f392083087807e8d85dc2ab3840b17e4
-  data.tar.gz: fd136b7b46e1cf21b3bcd9a968fb13cf9abe59bff4b6c73b798db8bee40d7a02
+  metadata.gz: 39c9d53cc2e783d606e838535f0fe703a74718bd36b1864a7a5070ae0a4e46f2
+  data.tar.gz: a84826024c22f54279c657ac22c66f9d7f6030f4d46158a16d7801559783b521
 SHA512:
-  metadata.gz: b0d3626427babba6144519e649ac113673a42d89ff1fde9b2c854d7ec72e8ef3aa4434cb98cc59c6243c0b428607c6ad30b746955afbec9452f2b06fbb31ba54
-  data.tar.gz: 3d871f07e2591a82081cf1c5f7582d3e731f1d1cf1fc0e416ff0c9216de417046220bd6afd8d482c6c096a2c96639004e567cec74c3ef8b9eac2c9815d2c5738
+  metadata.gz: fbb949d64435949177b73be36751fdd3e0a89cfcbfdd3032f2307b825f10148cac330db52807aa2df1558393b55390096266a100e30ca83244b962a6f3e7d5c7
+  data.tar.gz: c6c0b91fd3d690d126720b135d99b8cd87b706066e38b84b9b2ce44069c8811d710cc271a7df48c8c8e20dc57c1702798347442872708c756df0323f838b63fe

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-01-05 11:02:40 UTC using RuboCop version 1.81.7.
+# on 2026-01-06 02:07:50 UTC using RuboCop version 1.81.7.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -51,7 +51,7 @@ Layout/ExtraSpacing:
     - 'spec/integration/color_emoji_fonts_spec.rb'
     - 'spec/integration/dfont_pack_spec.rb'
 
-# Offense count: 1309
+# Offense count: 1313
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -64,13 +64,14 @@ Layout/LineLength:
 # SupportedStyles: final_newline, final_blank_line
 Layout/TrailingEmptyLines:
   Exclude:
-    - 'spec/integration/dfont_pack_spec.rb'
+    - 'lib/fontisan/collection/shared_logic.rb'
 
-# Offense count: 18
+# Offense count: 19
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
+    - 'check_dfont.rb'
     - 'spec/fontisan/converters/woff2_encoder_integration_spec.rb'
 
 # Offense count: 27
@@ -175,12 +176,12 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 5
 
-# Offense count: 234
+# Offense count: 233
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 706
+# Offense count: 707
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 135
@@ -266,7 +267,7 @@ RSpec/DescribeMethod:
     - 'spec/fontisan/collection/variable_font_builder_spec.rb'
     - 'spec/fontisan/converters/woff2_encoder_integration_spec.rb'
 
-# Offense count: 1284
+# Offense count: 1280
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 66
@@ -340,11 +341,11 @@ RSpec/MultipleDescribes:
     - 'spec/fontisan/utils/thread_pool_spec.rb'
     - 'spec/fontisan/variation/cache_spec.rb'
 
-# Offense count: 1688
+# Offense count: 1697
 RSpec/MultipleExpectations:
-  Max: 22
+  Max: 19
 
-# Offense count: 148
+# Offense count: 149
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 13
@@ -598,12 +599,13 @@ Style/StringConcatenation:
   Exclude:
     - 'spec/fontisan/tables/cbdt_spec.rb'
 
-# Offense count: 53
+# Offense count: 56
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
+    - 'check_dfont.rb'
     - 'lib/fontisan/commands/convert_command.rb'
     - 'lib/fontisan/converters/collection_converter.rb'
     - 'lib/fontisan/validators/font_book_validator.rb'

data/README.adoc

@@ -184,7 +184,7 @@ Family:                   Noto Serif CJK JP ExtraLight
 ====
 [source,shell]
 ----
-$ fontisan info spec/fixtures/fonts/MonaSans/mona-sans-2.0.8/googlefonts/variable/MonaSans[wdth,wght].ttf --brief
+$ fontisan info spec/fixtures/fonts/MonaSans/variable/MonaSans[wdth,wght].ttf --brief
 
 Font type:                TrueType (Variable)
 Family:                   Mona Sans ExtraLight
@@ -1241,7 +1241,7 @@ validator = Fontisan::Validators::OpenTypeValidator.new
 report = validator.validate(font)
 
 # Check individual results
-name_check = report.result_of(:name_version)
+name_check = report.result_of(:name_validation)
 puts name_check.passed?
 puts name_check.severity
 ----
@@ -1308,7 +1308,7 @@ font = Fontisan::FontLoader.load('font.ttf')
 validator = MyFontValidator.new
 report = validator.validate(font)
 
-# Check results
+# Check validation results
 puts report.valid?                           # => true/false
 puts report.status                           # => "valid", "valid_with_warnings", "invalid"
 puts report.summary.errors                   # => number of errors
@@ -1576,6 +1576,14 @@ dfont (Apple suitcase)::: Apple proprietary format storing complete Mac font
 suitcase resources in the data fork. Supports any SFNT fonts (TTF, OTF, or
 mixed). Mac OS X specific. File extension: `.dfont`
 
+Fontist returns the appropriate collection type based on the font data:
+
+* Examines font data within collection to determine type (TTC vs OTC)
+* TTC contains fonts with TrueType outlines (glyf table)
+* OTC contains fonts with CFF outlines (CFF table)
+* If ANY font in the collection has CFF outlines, use OpenTypeCollection
+* Only use TrueTypeCollection if ALL fonts have TrueType outlines
+
 
 === Collection compatibility
 
@@ -2076,6 +2084,41 @@ Fontisan can:
 * Importing and generation PNG block ruler layers
 
 
+== Testing
+
+=== General
+
+Fontisan has a comprehensive test suite covering all font operations, formats,
+and features.
+
+=== Running tests
+
+[source,shell]
+----
+# Run full test suite
+bundle exec rspec
+
+# Run with documentation format
+bundle exec rspec --format documentation
+
+# Run specific file
+bundle exec rspec spec/fontisan/tables/maxp_spec.rb
+----
+
+=== Test fixtures
+
+All required font fixtures are automatically downloaded before tests run. The
+test suite uses a centralized fixture configuration system that ensures all
+necessary fonts are available.
+
+[source,shell]
+----
+# Manual fixture management (if needed)
+bundle exec rake fixtures:download  # Download all test fonts
+bundle exec rake fixtures:clean     # Remove downloaded fonts
+----
+
+
 == Copyright and license
 
 Copyright https://www.ribose.com[Ribose].

data/lib/fontisan/base_collection.rb

@@ -2,6 +2,7 @@
 
 require "bindata"
 require_relative "constants"
+require_relative "collection/shared_logic"
 
 module Fontisan
   # Abstract base class for font collections (TTC/OTC)
@@ -29,6 +30,8 @@ module Fontisan
   #     end
   #   end
   class BaseCollection < BinData::Record
+    include Collection::SharedLogic
+
     endian :big
 
     string :tag, length: 4, assert: "ttcf"
@@ -251,8 +254,6 @@ module Fontisan
     # @param io [IO] Open file handle
     # @return [TableSharingInfo] Sharing statistics
     def calculate_table_sharing(io)
-      require_relative "models/table_sharing_info"
-
       font_class = self.class.font_class
 
       # Extract all fonts
@@ -260,37 +261,8 @@ module Fontisan
         font_class.from_collection(io, offset)
       end
 
-      # Build table hash map (checksum -> size)
-      table_map = {}
-      total_table_size = 0
-
-      fonts.each do |font|
-        font.tables.each do |entry|
-          key = entry.checksum
-          size = entry.table_length
-          table_map[key] ||= size
-          total_table_size += size
-        end
-      end
-
-      # Count unique vs shared
-      unique_tables = table_map.size
-      total_tables = fonts.sum { |f| f.tables.length }
-      shared_tables = total_tables - unique_tables
-
-      # Calculate space saved
-      unique_size = table_map.values.sum
-      space_saved = total_table_size - unique_size
-
-      # Calculate sharing percentage
-      sharing_pct = total_tables.positive? ? (shared_tables.to_f / total_tables * 100).round(2) : 0.0
-
-      Models::TableSharingInfo.new(
-        shared_tables: shared_tables,
-        unique_tables: unique_tables,
-        sharing_percentage: sharing_pct,
-        space_saved_bytes: space_saved,
-      )
+      # Use shared logic for calculation
+      calculate_table_sharing_for_fonts(fonts)
     end
   end
 end

data/lib/fontisan/collection/shared_logic.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Fontisan
+  module Collection
+    # Shared logic for font collection classes
+    #
+    # This module provides common functionality for all collection types
+    # (TTC, OTC, dfont) to maintain DRY principles.
+    module SharedLogic
+      # Calculate table sharing statistics
+      #
+      # Analyzes which tables are shared between fonts and calculates
+      # space savings from deduplication.
+      #
+      # @param fonts [Array<TrueTypeFont, OpenTypeFont>] Array of fonts
+      # @return [Models::TableSharingInfo] Sharing statistics
+      def calculate_table_sharing_for_fonts(fonts)
+        require_relative "../models/table_sharing_info"
+
+        # Build table hash map (checksum -> size)
+        table_map = {}
+        total_table_size = 0
+
+        fonts.each do |font|
+          font.tables.each do |entry|
+            key = entry.checksum
+            size = entry.table_length
+            table_map[key] ||= size
+            total_table_size += size
+          end
+        end
+
+        # Count unique vs shared
+        unique_tables = table_map.size
+        total_tables = fonts.sum { |f| f.tables.length }
+        shared_tables = total_tables - unique_tables
+
+        # Calculate space saved
+        unique_size = table_map.values.sum
+        space_saved = total_table_size - unique_size
+
+        # Calculate sharing percentage
+        sharing_pct = total_tables.positive? ? (shared_tables.to_f / total_tables * 100).round(2) : 0.0
+
+        Models::TableSharingInfo.new(
+          shared_tables: shared_tables,
+          unique_tables: unique_tables,
+          sharing_percentage: sharing_pct,
+          space_saved_bytes: space_saved,
+        )
+      end
+    end
+  end
+end

data/lib/fontisan/dfont_collection.rb

@@ -2,6 +2,7 @@
 
 require_relative "parsers/dfont_parser"
 require_relative "error"
+require_relative "collection/shared_logic"
 
 module Fontisan
   # DfontCollection represents an Apple dfont suitcase containing multiple fonts
@@ -23,6 +24,8 @@ module Fontisan
   #     fonts.each { |font| puts font.class.name }
   #   end
   class DfontCollection
+    include Collection::SharedLogic
+
     # Path to dfont file
     # @return [String]
     attr_reader :path
@@ -32,6 +35,22 @@ module Fontisan
     attr_reader :num_fonts
     alias font_count num_fonts
 
+    # Get font offsets (indices for dfont)
+    #
+    # dfont doesn't use byte offsets like TTC/OTC, so we return indices
+    #
+    # @return [Array<Integer>] Array of font indices
+    def font_offsets
+      (0...@num_fonts).to_a
+    end
+
+    # Get the collection format identifier
+    #
+    # @return [String] "dfont" for dfont collection
+    def self.collection_format
+      "dfont"
+    end
+
     # Load dfont collection from file
     #
     # @param path [String] Path to dfont file
@@ -65,6 +84,15 @@ module Fontisan
       File.exist?(@path) && @num_fonts.positive?
     end
 
+    # Get the collection version as a string
+    #
+    # dfont files don't have version numbers like TTC/OTC
+    #
+    # @return [String] Version string (always "N/A" for dfont)
+    def version_string
+      "N/A"
+    end
+
     # Extract all fonts from dfont
     #
     # @param io [IO] Open file handle
@@ -181,5 +209,61 @@ module Fontisan
 
       font
     end
+
+    # Get comprehensive collection metadata
+    #
+    # Returns a CollectionInfo model with header information and
+    # table sharing statistics for the dfont collection.
+    # This is the API method used by the `info` command for collections.
+    #
+    # @param io [IO] Open file handle to read fonts from
+    # @param path [String] Collection file path (for file size)
+    # @return [Models::CollectionInfo] Collection metadata
+    #
+    # @example Get collection info
+    #   File.open("family.dfont", "rb") do |io|
+    #     collection = DfontCollection.from_file("family.dfont")
+    #     info = collection.collection_info(io, "family.dfont")
+    #     puts "Format: #{info.collection_format}"
+    #   end
+    def collection_info(io, path)
+      require_relative "models/collection_info"
+      require_relative "models/table_sharing_info"
+
+      # Calculate table sharing statistics
+      table_sharing = calculate_table_sharing(io)
+
+      # Get file size
+      file_size = path ? File.size(path) : 0
+
+      Models::CollectionInfo.new(
+        collection_path: path,
+        collection_format: self.class.collection_format,
+        ttc_tag: "dfnt", # dfont doesn't use ttcf tag
+        major_version: 0, # dfont doesn't have version
+        minor_version: 0,
+        num_fonts: @num_fonts,
+        font_offsets: font_offsets,
+        file_size_bytes: file_size,
+        table_sharing: table_sharing,
+      )
+    end
+
+    private
+
+    # Calculate table sharing statistics
+    #
+    # Analyzes which tables are shared between fonts and calculates
+    # space savings from deduplication.
+    #
+    # @param io [IO] Open file handle
+    # @return [Models::TableSharingInfo] Sharing statistics
+    def calculate_table_sharing(io)
+      # Extract all fonts
+      fonts = extract_fonts(io)
+
+      # Use shared logic for calculation
+      calculate_table_sharing_for_fonts(fonts)
+    end
   end
 end

data/lib/fontisan/font_loader.rb

@@ -99,11 +99,10 @@ module Fontisan
         # Check for TTC/OTC signature
         return true if signature == Constants::TTC_TAG
 
-        # Check for multi-font dfont (suitcase) - only if it's actually a dfont
+        # Check for dfont - dfont is a collection format even if it contains only one font
         if signature == Constants::DFONT_RESOURCE_HEADER
           require_relative "parsers/dfont_parser"
-          # Verify it's a valid dfont and has multiple fonts
-          return Parsers::DfontParser.dfont?(io) && Parsers::DfontParser.sfnt_count(io) > 1
+          return Parsers::DfontParser.dfont?(io)
         end
 
         false

data/lib/fontisan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fontisan
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontisan
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-05 00:00:00.000000000 Z
+date: 2026-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -129,6 +129,7 @@ files:
 - lib/fontisan/collection/builder.rb
 - lib/fontisan/collection/dfont_builder.rb
 - lib/fontisan/collection/offset_calculator.rb
+- lib/fontisan/collection/shared_logic.rb
 - lib/fontisan/collection/table_analyzer.rb
 - lib/fontisan/collection/table_deduplicator.rb
 - lib/fontisan/collection/writer.rb