fontisan 0.2.6 → 0.2.8

data/lib/fontisan/hints/hint_validator.rb

@@ -40,7 +40,10 @@ module Fontisan
       # @param instructions [String] Binary instruction bytes
       # @return [Hash] Validation result with :valid, :errors, :warnings keys
       def validate_truetype_instructions(instructions)
-        return { valid: true, errors: [], warnings: [] } if instructions.nil? || instructions.empty?
+        if instructions.nil? || instructions.empty?
+          return { valid: true, errors: [],
+                   warnings: [] }
+        end
 
         errors = []
         warnings = []
@@ -114,7 +117,6 @@ module Fontisan
           if stack_depth != 0
             warnings << "Stack not neutral: #{stack_depth} value(s) remaining"
           end
-
         rescue StandardError => e
           errors << "Exception during validation: #{e.message}"
         end
@@ -162,14 +164,14 @@ module Fontisan
         end
 
         # Validate stem widths
-        [:std_hw, :std_vw].each do |key|
+        %i[std_hw std_vw].each do |key|
           if hints[key] && hints[key] <= 0
             errors << "#{key} must be positive: #{hints[key]}"
           end
         end
 
         # Validate stem snaps
-        [:stem_snap_h, :stem_snap_v].each do |key|
+        %i[stem_snap_h stem_snap_v].each do |key|
           if hints[key]
             if hints[key].length > MAX_STEM_SNAP
               errors << "#{key} exceeds maximum (#{MAX_STEM_SNAP}): #{hints[key].length}"
@@ -191,10 +193,8 @@ module Fontisan
         end
 
         # Validate language_group
-        if hints[:language_group]
-          unless [0, 1].include?(hints[:language_group])
-            errors << "language_group must be 0 (Latin) or 1 (CJK): #{hints[:language_group]}"
-          end
+        if hints[:language_group] && ![0, 1].include?(hints[:language_group])
+          errors << "language_group must be 0 (Latin) or 1 (CJK): #{hints[:language_group]}"
         end
 
         {
@@ -212,7 +212,10 @@ module Fontisan
       # @param instructions [String] Binary instruction bytes
       # @return [Hash] Result with :neutral, :stack_depth, :errors keys
       def validate_stack_neutrality(instructions)
-        return { neutral: true, stack_depth: 0, errors: [] } if instructions.nil? || instructions.empty?
+        if instructions.nil? || instructions.empty?
+          return { neutral: true, stack_depth: 0,
+                   errors: [] }
+        end
 
         errors = []
         stack_depth = 0
@@ -257,7 +260,7 @@ module Fontisan
         end
 
         {
-          neutral: stack_depth == 0,
+          neutral: stack_depth.zero?,
           stack_depth: stack_depth,
           errors: errors,
         }

data/lib/fontisan/hints/truetype_instruction_analyzer.rb

@@ -29,7 +29,7 @@ module Fontisan
       RCVT = 0x45     # Read CVT
       WCVTP = 0x44    # Write CVT (in Pixels)
       WCVTF = 0x70    # Write CVT (in FUnits)
-      MDAP = [0x2E, 0x2F].freeze  # Move Direct Absolute Point
+      MDAP = [0x2E, 0x2F].freeze # Move Direct Absolute Point
       SCVTCI = 0x1D   # Set Control Value Table Cut In
       SSWCI = 0x1E    # Set Single Width Cut In
       SSW = 0x1F      # Set Single Width
@@ -106,7 +106,7 @@ module Fontisan
               # Pattern: value cvt_index WCVTP (stack top to bottom)
               if stack.length >= 2
                 value = stack.pop
-                cvt_index = stack.pop
+                stack.pop
                 # Track CVT modifications (useful for understanding setup)
               end
 
@@ -168,7 +168,7 @@ module Fontisan
 
         {
           fpgm_size: size,
-          has_functions: size > 0,
+          has_functions: size.positive?,
           complexity: complexity,
         }
       rescue StandardError
@@ -208,13 +208,19 @@ module Fontisan
         xheight_min = (450 * scale_factor).to_i
         xheight_max = (600 * scale_factor).to_i
         capheight_min = (650 * scale_factor).to_i
-        capheight_max = (1500 * scale_factor).to_i  # Wider range for large UPM
+        capheight_max = (1500 * scale_factor).to_i # Wider range for large UPM
 
         # Group CVT values by typical alignment zones
-        descender_values = cvt.select { |v| v < descender_max && v > descender_min }
-        baseline_values = cvt.select { |v| v >= -baseline_range && v <= baseline_range }
-        xheight_values = cvt.select { |v| v >= xheight_min && v <= xheight_max }
-        capheight_values = cvt.select { |v| v >= capheight_min && v <= capheight_max }
+        descender_values = cvt.select do |v|
+          v < descender_max && v > descender_min
+        end
+        baseline_values = cvt.select do |v|
+          v >= -baseline_range && v <= baseline_range
+        end
+        cvt.select { |v| v >= xheight_min && v <= xheight_max }
+        capheight_values = cvt.select do |v|
+          v >= capheight_min && v <= capheight_max
+        end
 
         # Build blue_values (baseline and top zones)
         blue_values = []
@@ -254,6 +260,7 @@ module Fontisan
       def estimate_complexity(bytes)
         return :simple if bytes.length < 50
         return :moderate if bytes.length < 200
+
         :complex
       end
     end

data/lib/fontisan/hints/truetype_instruction_generator.rb

@@ -65,7 +65,7 @@ module Fontisan
         {
           fpgm: generate_fpgm(ps_params),
           prep: generate_prep(ps_params),
-          cvt: generate_cvt(ps_params)
+          cvt: generate_cvt(ps_params),
         }
       end
 

data/lib/fontisan/models/collection_validation_report.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require_relative "font_report"
+require_relative "validation_report"
+require "lutaml/model"
+
+module Fontisan
+  module Models
+    # CollectionValidationReport aggregates validation results for all fonts
+    # in a TTC/OTC/dfont collection.
+    #
+    # Provides collection-level summary statistics and per-font validation
+    # details with clear formatting.
+    class CollectionValidationReport < Lutaml::Model::Serializable
+      attribute :collection_path, :string
+      attribute :collection_type, :string
+      attribute :num_fonts, :integer
+      attribute :font_reports, FontReport, collection: true,
+                                           initialize_empty: true
+      attribute :valid, :boolean, default: -> { true }
+
+      key_value do
+        map "collection_path", to: :collection_path
+        map "collection_type", to: :collection_type
+        map "num_fonts", to: :num_fonts
+        map "font_reports", to: :font_reports
+        map "valid", to: :valid
+      end
+
+      # Add a font report to the collection
+      #
+      # @param font_report [FontReport] The font report to add
+      # @return [void]
+      def add_font_report(font_report)
+        font_reports << font_report
+        # Mark that we're no longer using the default value
+        value_set_for(:font_reports)
+        # Update overall validity
+        self.valid = valid && font_report.report.valid?
+      end
+
+      # Get overall validation status for the collection
+      #
+      # @return [String] "valid", "invalid", or "valid_with_warnings"
+      def overall_status
+        return "invalid" unless font_reports.all? { |fr| fr.report.valid? }
+        return "valid_with_warnings" if font_reports.any? do |fr|
+          fr.report.has_warnings?
+        end
+
+        "valid"
+      end
+
+      # Generate text summary with collection header and per-font sections
+      #
+      # @return [String] Formatted validation report
+      def text_summary
+        lines = []
+        lines << "Collection: #{collection_path}"
+        lines << "Type: #{collection_type}"
+        lines << "Fonts: #{num_fonts}"
+        lines << ""
+        lines << "Summary:"
+        lines << "  Total Errors: #{total_errors}"
+        lines << "  Total Warnings: #{total_warnings}"
+        lines << "  Total Info: #{total_info}"
+
+        if font_reports.any?
+          lines << ""
+          font_reports.each do |font_report|
+            lines << "=== Font #{font_report.font_index}: #{font_report.font_name} ==="
+            # Indent each line of the font's report
+            font_lines = font_report.report.text_summary.split("\n")
+            lines.concat(font_lines)
+            lines << "" unless font_report == font_reports.last
+          end
+        end
+
+        lines.join("\n")
+      end
+
+      # Calculate total errors across all fonts
+      #
+      # @return [Integer] Total error count
+      def total_errors
+        font_reports.sum { |fr| fr.report.summary.errors }
+      end
+
+      # Calculate total warnings across all fonts
+      #
+      # @return [Integer] Total warning count
+      def total_warnings
+        font_reports.sum { |fr| fr.report.summary.warnings }
+      end
+
+      # Calculate total info messages across all fonts
+      #
+      # @return [Integer] Total info count
+      def total_info
+        font_reports.sum { |fr| fr.report.summary.info }
+      end
+    end
+  end
+end

data/lib/fontisan/models/font_report.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative "validation_report"
+require "lutaml/model"
+
+module Fontisan
+  module Models
+    # FontReport wraps a single font's validation report with collection context
+    #
+    # Used within CollectionValidationReport to associate validation results
+    # with a specific font index and name in the collection.
+    class FontReport < Lutaml::Model::Serializable
+      attribute :font_index, :integer
+      attribute :font_name, :string
+      attribute :report, ValidationReport
+
+      key_value do
+        map "font_index", to: :font_index
+        map "font_name", to: :font_name
+        map "report", to: :report
+      end
+    end
+  end
+end

data/lib/fontisan/models/validation_report.rb

@@ -101,7 +101,9 @@ module Fontisan
       attribute :status, :string
       attribute :use_case, :string
       attribute :checks_performed, :string, collection: true, default: -> { [] }
-      attribute :check_results, CheckResult, collection: true, default: -> { [] }
+      attribute :check_results, CheckResult, collection: true, default: -> {
+        []
+      }
 
       yaml do
         map "font_path", to: :font_path
@@ -340,7 +342,9 @@ module Fontisan
       # @param field_name [String, Symbol] Field name
       # @return [Array<CheckResult>] Array of check results for the field
       def field_issues(table_tag, field_name)
-        check_results.select { |cr| cr.table == table_tag.to_s && cr.field == field_name.to_s }
+        check_results.select do |cr|
+          cr.table == table_tag.to_s && cr.field == field_name.to_s
+        end
       end
 
       # Check filtering methods
@@ -374,6 +378,7 @@ module Fontisan
       # @return [Float] Failure rate (0.0 to 1.0)
       def failure_rate
         return 0.0 if check_results.empty?
+
         failed_checks.length.to_f / check_results.length
       end
 

data/lib/fontisan/open_type_font.rb

@@ -581,10 +581,9 @@ module Fontisan
     # @param path [String] Path to the OTF file
     # @return [void]
     def update_checksum_adjustment_in_file(path)
-      # Use tempfile-based checksum calculation for Windows compatibility
-      # This keeps the tempfile alive until we're done with the checksum
       File.open(path, "r+b") do |io|
-        checksum, _tmpfile = Utilities::ChecksumCalculator.calculate_checksum_from_io_with_tempfile(io)
+        # Calculate checksum directly from IO to avoid Windows Tempfile issues
+        checksum = Utilities::ChecksumCalculator.calculate_checksum_from_io(io)
 
         # Calculate adjustment
         adjustment = Utilities::ChecksumCalculator.calculate_adjustment(checksum)

data/lib/fontisan/optimizers/charstring_rewriter.rb

@@ -151,7 +151,7 @@ module Fontisan
       # @param charstring [String] CharString to search
       # @param pattern [Pattern] pattern to find
       # @return [Array<Integer>] array of start positions
-      def find_pattern_positions(charstring, pattern, glyph_id = nil)
+      def find_pattern_positions(charstring, pattern, _glyph_id = nil)
         positions = []
         offset = 0
 

data/lib/fontisan/optimizers/subroutine_optimizer.rb

@@ -32,7 +32,9 @@ module Fontisan
         selected = []
         # Sort by savings (descending), then by length (descending), then by min glyph ID,
         # then by byte values for complete determinism across platforms
-        remaining = @patterns.sort_by { |p| [-p.savings, -p.length, p.glyphs.min, p.bytes.bytes] }
+        remaining = @patterns.sort_by do |p|
+          [-p.savings, -p.length, p.glyphs.min, p.bytes.bytes]
+        end
 
         remaining.each do |pattern|
           break if selected.length >= @max_subrs
@@ -53,7 +55,9 @@ module Fontisan
       def optimize_ordering(subroutines)
         # Higher frequency = lower ID (shorter encoding)
         # Use same comprehensive sort keys as optimize_selection for consistency
-        subroutines.sort_by { |subr| [-subr.frequency, -subr.length, subr.glyphs.min, subr.bytes.bytes] }
+        subroutines.sort_by do |subr|
+          [-subr.frequency, -subr.length, subr.glyphs.min, subr.bytes.bytes]
+        end
       end
 
       # Check if nesting would be beneficial

data/lib/fontisan/subset/glyph_mapping.rb

@@ -30,6 +30,8 @@ module Fontisan
     #   mapping = Fontisan::Subset::GlyphMapping.new([0, 5, 10])
     #   mapping.old_id(1) # => 5
     class GlyphMapping
+      include Enumerable
+
       # @return [Hash<Integer, Integer>] mapping from old GIDs to new GIDs
       attr_reader :old_to_new
 

data/lib/fontisan/subset/table_subsetter.rb

@@ -152,7 +152,7 @@ module Fontisan
         # Build new hmtx data
         data = String.new(encoding: Encoding::BINARY)
 
-        mapping.each do |old_id, _new_id|
+        mapping.old_ids.each do |old_id|
           metric = table.metric_for(old_id)
           next unless metric
 
@@ -319,7 +319,7 @@ module Fontisan
         current_offset = 0
 
         # Process glyphs in mapping order
-        mapping.each do |old_id, _new_id|
+        mapping.old_ids.each do |old_id|
           @loca_offsets << current_offset
 
           # Get offset and size from original loca

data/lib/fontisan/tables/cblc.rb

@@ -86,9 +86,12 @@ module Fontisan
           size = new
 
           io = StringIO.new(data)
-          size.instance_variable_set(:@index_subtable_array_offset, io.read(4).unpack1("N"))
-          size.instance_variable_set(:@index_tables_size, io.read(4).unpack1("N"))
-          size.instance_variable_set(:@number_of_index_subtables, io.read(4).unpack1("N"))
+          size.instance_variable_set(:@index_subtable_array_offset,
+                                     io.read(4).unpack1("N"))
+          size.instance_variable_set(:@index_tables_size,
+                                     io.read(4).unpack1("N"))
+          size.instance_variable_set(:@number_of_index_subtables,
+                                     io.read(4).unpack1("N"))
           size.instance_variable_set(:@color_ref, io.read(4).unpack1("N"))
 
           # Parse hori and vert metrics (12 bytes each)
@@ -98,7 +101,8 @@ module Fontisan
           size.instance_variable_set(:@vert, SbitLineMetrics.read(vert_data))
 
           # Parse remaining fields
-          size.instance_variable_set(:@start_glyph_index, io.read(2).unpack1("n"))
+          size.instance_variable_set(:@start_glyph_index,
+                                     io.read(2).unpack1("n"))
           size.instance_variable_set(:@end_glyph_index, io.read(2).unpack1("n"))
           size.instance_variable_set(:@ppem_x, io.read(1).unpack1("C"))
           size.instance_variable_set(:@ppem_y, io.read(1).unpack1("C"))

data/lib/fontisan/tables/cff/index.rb

@@ -35,6 +35,8 @@ module Fontisan
       #   puts index[0]  # => first item data
       #   index.each { |item| puts item }
       class Index
+        include Enumerable
+
         # @return [Integer] Number of items in the INDEX
         attr_reader :count
 

data/lib/fontisan/tables/cff.rb

@@ -299,7 +299,8 @@ module Fontisan
         io.seek(absolute_offset)
         Index.new(io, start_offset: absolute_offset)
       rescue StandardError => e
-        raise CorruptedTableError, "Failed to parse Local Subr INDEX: #{e.message}"
+        raise CorruptedTableError,
+              "Failed to parse Local Subr INDEX: #{e.message}"
       end
 
       # Get the CharStrings INDEX for a specific font
@@ -320,7 +321,8 @@ module Fontisan
         io.seek(charstrings_offset)
         CharstringsIndex.new(io, start_offset: charstrings_offset)
       rescue StandardError => e
-        raise CorruptedTableError, "Failed to parse CharStrings INDEX: #{e.message}"
+        raise CorruptedTableError,
+              "Failed to parse CharStrings INDEX: #{e.message}"
       end
 
       # Get a CharString for a specific glyph
@@ -355,7 +357,8 @@ module Fontisan
           local_subr_index,
         )
       rescue StandardError => e
-        raise CorruptedTableError, "Failed to get CharString for glyph #{glyph_index}: #{e.message}"
+        raise CorruptedTableError,
+              "Failed to get CharString for glyph #{glyph_index}: #{e.message}"
       end
 
       # Get the number of glyphs in a font

data/lib/fontisan/tables/cff2/private_dict_blend_handler.rb

@@ -51,7 +51,7 @@ module Fontisan
           # Check if this is blend data
           # Format: base1 delta1_1 ... delta1_N base2 delta2_1 ... delta2_N ...
           # The array must be divisible by (num_axes + 1)
-          return nil unless value.size % (num_axes + 1) == 0
+          return nil unless (value.size % (num_axes + 1)).zero?
 
           num_values = value.size / (num_axes + 1)
           blends = []

data/lib/fontisan/tables/cff2.rb

@@ -121,7 +121,7 @@ module Fontisan
       def charstrings
         return [] unless @charstrings_index
 
-        @charstrings_index.count.times.map do |glyph_id|
+        Array.new(@charstrings_index.count) do |glyph_id|
           charstring_for_glyph(glyph_id)
         end.compact
       end

data/lib/fontisan/tables/cmap.rb

@@ -278,22 +278,20 @@ module Fontisan
         end
       end
 
-      public
-
       # Validation helper: Check if version is valid
       #
       # cmap version should be 0
       #
       # @return [Boolean] True if version is 0
       def valid_version?
-        version == 0
+        version.zero?
       end
 
       # Validation helper: Check if at least one subtable exists
       #
       # @return [Boolean] True if num_tables > 0
       def has_subtables?
-        num_tables && num_tables > 0
+        num_tables&.positive?
       end
 
       # Validation helper: Check if Unicode mapping exists
@@ -357,7 +355,9 @@ module Fontisan
         mappings = unicode_mappings
         return true if mappings.nil? || mappings.empty?
 
-        mappings.values.all? { |glyph_id| glyph_id >= 0 && glyph_id < max_glyph_id }
+        mappings.values.all? do |glyph_id|
+          glyph_id >= 0 && glyph_id < max_glyph_id
+        end
       end
     end
   end

data/lib/fontisan/tables/glyf.rb

@@ -166,7 +166,7 @@ module Fontisan
       # @param head [Head] Head table for context
       # @param num_glyphs [Integer] Total number of glyphs to check
       # @return [Boolean] True if all non-special glyphs have contours
-      def no_empty_glyphs_except_special?(loca, head, num_glyphs)
+      def no_empty_glyphs_except_special?(loca, _head, num_glyphs)
         # Check glyphs 1 through num_glyphs-1 (.notdef at 0 can be empty)
         (1...num_glyphs).all? do |glyph_id|
           size = loca.size_of(glyph_id)
@@ -194,7 +194,7 @@ module Fontisan
 
         (0...num_glyphs).all? do |glyph_id|
           glyph = glyph_for(glyph_id, loca, head)
-          next true if glyph.nil?  # Empty glyphs are OK
+          next true if glyph.nil? # Empty glyphs are OK
 
           # Check if glyph bounds are within font bounds
           glyph.x_min >= font_x_min &&
@@ -218,7 +218,7 @@ module Fontisan
       def instructions_sound?(loca, head, num_glyphs)
         (0...num_glyphs).all? do |glyph_id|
           glyph = glyph_for(glyph_id, loca, head)
-          next true if glyph.nil?  # Empty glyphs are OK
+          next true if glyph.nil? # Empty glyphs are OK
 
           # Simple glyphs have instructions
           if glyph.respond_to?(:instruction_length)
@@ -242,7 +242,7 @@ module Fontisan
       # @return [Boolean] True if contour count is valid
       def valid_contour_count?(glyph_id, loca, head)
         glyph = glyph_for(glyph_id, loca, head)
-        return true if glyph.nil?  # Empty glyphs are OK
+        return true if glyph.nil? # Empty glyphs are OK
 
         # Simple glyphs: contours should be >= 0
         # Compound glyphs: numberOfContours = -1
@@ -265,12 +265,10 @@ module Fontisan
       # @return [Boolean] True if all glyphs can be accessed
       def all_glyphs_accessible?(loca, head, num_glyphs)
         (0...num_glyphs).all? do |glyph_id|
-          begin
-            glyph_for(glyph_id, loca, head)
-            true
-          rescue Fontisan::CorruptedTableError
-            false
-          end
+          glyph_for(glyph_id, loca, head)
+          true
+        rescue Fontisan::CorruptedTableError
+          false
         end
       rescue StandardError
         false

data/lib/fontisan/tables/head.rb

@@ -95,7 +95,7 @@ module Fontisan
       #
       # @return [Boolean] True if version is 1.0
       def valid_version?
-        version_raw == 0x00010000  # Version 1.0
+        version_raw == 0x00010000 # Version 1.0
       end
 
       # Validation helper: Check if units per em is valid
@@ -130,7 +130,7 @@ module Fontisan
       #
       # @return [Boolean] True if format is 0 or 1
       def valid_index_to_loc_format?
-        index_to_loc_format == 0 || index_to_loc_format == 1
+        [0, 1].include?(index_to_loc_format)
       end
 
       # Validation helper: Check if glyph_data_format is valid
@@ -139,7 +139,7 @@ module Fontisan
       #
       # @return [Boolean] True if format is 0
       def valid_glyph_data_format?
-        glyph_data_format == 0
+        glyph_data_format.zero?
       end
 
       # Validate magic number and raise error if invalid

data/lib/fontisan/tables/hhea.rb

@@ -112,7 +112,7 @@ module Fontisan
       #
       # @return [Boolean] True if format is 0
       def valid_metric_data_format?
-        metric_data_format == 0
+        metric_data_format.zero?
       end
 
       # Validation helper: Check if number of h metrics is valid
@@ -130,7 +130,7 @@ module Fontisan
       #
       # @return [Boolean] True if ascent/descent have correct signs
       def valid_ascent_descent?
-        ascent > 0 && descent < 0
+        ascent.positive? && descent.negative?
       end
 
       # Validation helper: Check if line gap is non-negative
@@ -148,7 +148,7 @@ module Fontisan
       #
       # @return [Boolean] True if advance_width_max > 0
       def valid_advance_width_max?
-        advance_width_max && advance_width_max > 0
+        advance_width_max&.positive?
       end
 
       # Validation helper: Check if caret slope is valid
@@ -168,7 +168,7 @@ module Fontisan
       #
       # @return [Boolean] True if x_max_extent > 0
       def valid_x_max_extent?
-        x_max_extent > 0
+        x_max_extent.positive?
       end
 
       # Validate the table and raise error if invalid

data/lib/fontisan/tables/maxp.rb

@@ -179,9 +179,9 @@ module Fontisan
       #
       # @return [Boolean] True if maxZones is valid or not applicable
       def valid_max_zones?
-        return true if version_0_5?  # Not applicable for CFF
+        return true if version_0_5? # Not applicable for CFF
 
-        max_zones && max_zones.between?(1, 2)
+        max_zones&.between?(1, 2)
       end
 
       # Validation helper: Check if all TrueType metrics are present

data/lib/fontisan/tables/name.rb

@@ -203,7 +203,7 @@ module Fontisan
       #
       # @return [Boolean] True if version is 0 or 1
       def valid_version?
-        format == 0 || format == 1
+        [0, 1].include?(format)
       end
 
       # Validation helper: Check if encoding combinations are valid