fontisan 0.4.40 → 0.4.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10da865d8186bf46cfb6da26e33acf83b80c33d2b5db8e48c0bdc40a465af88e
-  data.tar.gz: ff6df0582ee61c69392124598668cc90252bfe42a241cf6eb318133368b44630
+  metadata.gz: 5e075a18affb55f4954ab88944fb9922030ab5217af23ef495ecd18c7ac23eef
+  data.tar.gz: aff041d7ffe7357787f5d8069d529f20f0c2da4c225e5443cf29b301f3865bca
 SHA512:
-  metadata.gz: d0aba9186efca7050ed91ea9d2d2e70ef6a2c01497f651ba613f27a73cbf913fbf9f0e706c9ef655b15c7939ea1cbdc3ce374c9f3cc803b5549f66fa82492150
-  data.tar.gz: 7c91649aeb22d0d2327a928c54cd3c5aa9c3bc9ca320dfd2bf10ae2e0af876455993872df62ab47678a1768610036a86c1af8423f4eea780298c3d9c4341f535
+  metadata.gz: '0394bc7418ee0afc90b4eb5a72fd37af06b5f2ad8ab2067a4d9a0900005238ada53eb42bcb3aed2a9919888af70c73f2b334158e733b754412f55b2b8dc7eaad'
+  data.tar.gz: a921adde2bf87574c9069a86d253973f5ee232ce56d106426b1691cf6c97b6919c697235659f2f44fa6475a17fd72ee226c8b8140ada6933b38576008ab39b50

data/TODO.bug-fixes/06-instance-woff2-output.md

@@ -0,0 +1,24 @@
+# 06 — Variable font instance WOFF2 output
+
+## Priority
+P1
+
+## Problem
+`Variation::InstanceWriter` raises `Fontisan::Error` for WOFF2 output
+instead of writing the file. Variable font instances can be written
+to TTF, OTF, and WOFF but not WOFF2.
+
+## Goal
+Wire the existing WOFF2 encoder into the instance writer so
+`write(format: :woff2)` produces a valid WOFF2 file.
+
+## Approach
+The instance writer already calls `write_sfnt` for TTF/OTF and
+`write_woff` for WOFF. Add a `write_woff2` method that:
+1. Writes the SFNT tables to a temp TTF
+2. Loads the temp TTF
+3. Encodes to WOFF2 via `Converters::FormatConverter`
+
+## Acceptance criteria
+- `instance_writer.write(format: :woff2)` produces a valid WOFF2 file
+- The WOFF2 file decodes back to the correct instance tables

data/TODO.bug-fixes/07-encapsulation-violations.md

@@ -0,0 +1,38 @@
+# 07 — Encapsulation violations (instance_variable_get/set, send to private)
+
+## Priority
+P0
+
+## Problem
+The codebase has 14+ `instance_variable_get` calls, 4 `instance_variable_set`
+calls, and 3 `send` calls to methods that should be accessed through public
+APIs. These break encapsulation and make the code fragile to refactoring.
+
+## Specific violations
+
+### instance_variable_get (should use public accessors)
+- `cff2.rb:343-344` — reads `@data_size`, `@off_size` from Cff2::Index
+- `cff/table_builder.rb:102` — reads `@start_offset` from Cff::Index
+- `dump_table_command.rb:35` — reads `@table_data` from font (public reader exists!)
+- `truetype_hint_extractor.rb:188,205,222` — reads `@table_data` from font
+- `validator.rb:439` — reads `@filename` from font
+- `converter.rb:83` — reads `@parsed` from charstring
+
+### instance_variable_set (should use constructors or public setters)
+- `instance_writer.rb:233` — sets `@table_data` on temp font
+- `outline_converter.rb:425` — sets `@table_data` on temp font
+- `base_record.rb:41` — sets `@raw_data` on BaseRecord
+- `glyf.rb:56` — sets `@glyphs_cache` on BinData record
+
+### send to potentially private methods
+- `exporter.rb:191` — `send(:encode_binary, ...)`
+
+## Approach
+1. Add missing public readers where they don't exist (Index#data_size, etc.)
+2. Replace all instance_variable_get/set with public method calls
+3. Replace send with direct method calls or public dispatch
+
+## Acceptance criteria
+- 0 `instance_variable_get` in lib/fontisan/
+- 0 `instance_variable_set` in lib/fontisan/
+- 0 `send` to private methods in lib/fontisan/

data/TODO.bug-fixes/08-respond-to-violations.md

@@ -0,0 +1,25 @@
+# 08 — respond_to? duck typing violations
+
+## Priority
+P1
+
+## Problem
+10 `respond_to?` calls use duck typing where proper type checks or
+architecture redesigns would be more correct and safer.
+
+## Specific violations
+- `woff2_font.rb:188,198` — `respond_to?(:table_data)` on underlying font
+- `outline_extractor.rb:44` — `respond_to?(:table)` on font
+- `outline_extractor.rb:133` — `respond_to?(:empty?)` on glyph
+- `woff_font.rb:362` — `respond_to?(:length)` on table_entries
+- `sfnt_font.rb:358` — `respond_to?(:length)` on tables array
+- `glyph_accessor.rb:58,356,359,387` — multiple respond_to? on glyph/font
+
+## Approach
+- Replace `respond_to?(:table)` with `is_a?(SfntFont)` type checks
+- Replace `respond_to?(:table_data)` with proper type checks
+- For BinData records that always have `.length`, remove the check entirely
+- For glyph compound check, use `is_a?` on the glyf record type
+
+## Acceptance criteria
+- 0 `respond_to?` in lib/fontisan/ (excluding spec/)

data/TODO.bug-fixes/README.md

@@ -6,12 +6,17 @@ Each file is `NN-short-name.md` where `NN` is the priority order.
 ## Priorities
 
 ### P0 — Correctness bugs (wrong data for specific font types)
-- [01 — CFF Expert charset placeholder](01-cff-expert-charsets.md)
-- [02 — CFF2 subroutine call stubs](02-cff2-subroutine-stubs.md)
+- [x] ~~[01 — CFF Expert charset placeholder](01-cff-expert-charsets.md)~~ ✓ Done (v0.4.40)
+- [x] ~~[02 — CFF2 subroutine call stubs](02-cff2-subroutine-stubs.md)~~ ✓ Done (v0.4.40)
 
 ### P1 — Feature gaps (non-functional code paths)
-- [03 — Variation subsetter placeholders](03-variation-subsetter-placeholders.md)
-- [04 — UFO image compile round-trip](04-ufo-image-compile-roundtrip.md)
+- [x] ~~[03 — Variation subsetter placeholders](03-variation-subsetter-placeholders.md)~~ ✓ Done (v0.4.40)
+- [x] ~~[04 — UFO image compile round-trip](04-ufo-image-compile-roundtrip.md)~~ ✓ Done (v0.4.40)
+- [x] ~~[06 — Variable font instance WOFF2 output](06-instance-woff2-output.md)~~ ✓ Done (v0.4.41)
 
 ### P2 — Documentation cleanup
-- [05 — Stale CFF comment](05-stale-cff-comment.md)
+- [x] ~~[05 — Stale CFF comment](05-stale-cff-comment.md)~~ ✓ Done (v0.4.40)
+
+### P3 — Code quality violations
+- [07 — Encapsulation violations (instance_variable_get/set, send to private)](07-encapsulation-violations.md)
+- [08 — respond_to? duck typing violations](08-respond-to-violations.md)

data/lib/fontisan/binary/base_record.rb

@@ -38,7 +38,7 @@ module Fontisan
           instance = super(io)
         end
 
-        instance.instance_variable_set(:@raw_data, data)
+        instance.raw_data = data
         instance
       end
 
@@ -49,6 +49,9 @@ module Fontisan
         @raw_data || to_binary_s
       end
 
+      # Set the raw binary data read from the source.
+      attr_writer :raw_data
+
       # Check if the record is valid
       #
       # @return [Boolean] True if valid, false otherwise

data/lib/fontisan/commands/dump_table_command.rb

@@ -32,7 +32,7 @@ module Fontisan
         end
 
         # Get raw table data
-        table_data = @font.instance_variable_get(:@table_data)
+        table_data = @font.table_data
         raw_data = table_data[@table_tag]
 
         unless raw_data

data/lib/fontisan/converters/outline_converter.rb

@@ -422,7 +422,7 @@ module Fontisan
         else
           # Create temporary font with instance tables
           temp_font = font.class.new
-          temp_font.instance_variable_set(:@table_data, instance_tables)
+          temp_font.table_data = instance_tables
 
           # Convert outline format
           case [source_format, target_format]

data/lib/fontisan/export/exporter.rb

@@ -188,7 +188,7 @@ module Fontisan
           tag: tag,
           checksum: format_checksum(checksum),
           parsed: false,
-          data: @serializer.send(:encode_binary, binary_data),
+          data: @serializer.encode_binary(binary_data),
           fields: { error: error.message }.to_json,
         )
       end

data/lib/fontisan/export/table_serializer.rb

@@ -226,6 +226,8 @@ module Fontisan
         }
       end
 
+      public
+
       # Encode binary data based on format
       #
       # @param data [String] Binary data

data/lib/fontisan/hints/truetype_hint_extractor.rb

@@ -185,7 +185,7 @@ module Fontisan
       def extract_font_program(font)
         return "" unless font.has_table?("fpgm")
 
-        font_program_data = font.instance_variable_get(:@table_data)["fpgm"]
+        font_program_data = font.table_data&.[]("fpgm")
         return "" unless font_program_data
 
         # Return as binary string
@@ -202,7 +202,7 @@ module Fontisan
       def extract_control_value_program(font)
         return "" unless font.has_table?("prep")
 
-        prep_data = font.instance_variable_get(:@table_data)["prep"]
+        prep_data = font.table_data&.[]("prep")
         return "" unless prep_data
 
         # Return as binary string
@@ -219,7 +219,7 @@ module Fontisan
       def extract_control_values(font)
         return [] unless font.has_table?("cvt ")
 
-        cvt_data = font.instance_variable_get(:@table_data)["cvt "]
+        cvt_data = font.table_data&.[]("cvt ")
         return [] unless cvt_data
 
         # CVT table is an array of 16-bit signed integers (FWord values)

data/lib/fontisan/sfnt_font.rb

@@ -624,7 +624,7 @@ module Fontisan
     # @param tag [String] The tag to normalize
     # @return [String] UTF-8 encoded tag
     def normalize_tag(tag)
-      @tag_encoding_cache[tag] ||= tag.dup.force_encoding("UTF-8")
+      (@tag_encoding_cache ||= {})[tag] ||= tag.dup.force_encoding("UTF-8")
     end
 
     # Load a single table's data on demand

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

@@ -48,6 +48,9 @@ module Fontisan
         # @return [String] Binary string containing all data
         attr_reader :data
 
+        # @return [Integer] Byte offset where this INDEX starts in the source data
+        attr_reader :start_offset
+
         # Initialize an INDEX from binary data
         #
         # @param io [IO, StringIO, String] Binary data to parse

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

@@ -99,7 +99,7 @@ module Fontisan
         def extract_index(index)
           return [0].pack("n") if index.nil? || index.count.zero?
 
-          start = index.instance_variable_get(:@start_offset)
+          start = index.start_offset
           io = StringIO.new(@source.raw_data)
           io.seek(start)
 

data/lib/fontisan/tables/cff2.rb

@@ -340,8 +340,8 @@ module Fontisan
 
         # count (2) + offSize (1) + offsets + data
         count = index.count
-        data_size = index.instance_variable_get(:@data_size) || 0
-        off_size = index.instance_variable_get(:@off_size) || 4
+        data_size = index.data&.bytesize || 0
+        off_size = index.off_size || 4
 
         2 + 1 + ((count + 1) * off_size) + data_size
       end

data/lib/fontisan/tables/glyf.rb

@@ -43,7 +43,7 @@ module Fontisan
 
       # Cache for parsed glyphs
       # @return [Hash<Integer, SimpleGlyph|CompoundGlyph>]
-      attr_reader :glyphs_cache
+      attr_accessor :glyphs_cache
 
       # Override read to capture raw data
       #
@@ -53,7 +53,7 @@ module Fontisan
         instance = new
 
         # Initialize cache
-        instance.instance_variable_set(:@glyphs_cache, {})
+        instance.glyphs_cache = {}
 
         # Handle nil or empty data gracefully
         instance.raw_data = if io.nil?

data/lib/fontisan/validators/validator.rb

@@ -431,16 +431,7 @@ module Fontisan
       # @return [ValidationReport] Complete report
       def build_report(font, all_results, _elapsed)
         # Extract font path from font object
-        font_path = if font.respond_to?(:path)
-                      font.path
-                    elsif font.respond_to?(:filename)
-                      font.filename
-                    elsif font.instance_variable_defined?(:@filename)
-                      font.instance_variable_get(:@filename)
-                    else
-                      "unknown"
-                    end
-
+        font_path = "unknown"
         report = Models::ValidationReport.new(
           font_path: font_path,
           valid: true,

data/lib/fontisan/variation/converter.rb

@@ -80,7 +80,7 @@ module Fontisan
         return nil unless charstring
 
         # Parse CharString to extract blend data
-        charstring.parse unless charstring.instance_variable_get(:@parsed)
+        charstring.parse
         blend_data = charstring.blend_data
         return nil if blend_data.nil? || blend_data.empty?
 

data/lib/fontisan/variation/instance_writer.rb

@@ -105,8 +105,7 @@ module Fontisan
         when :woff
           write_woff(output_tables, output_path, source_format)
         when :woff2
-          raise Fontisan::Error,
-                "WOFF2 output not yet implemented (planned for Phase 6)"
+          write_woff2(output_tables, output_path, source_format)
         end
       end
 
@@ -231,7 +230,7 @@ module Fontisan
         font = font_class.new
 
         # Set table data
-        font.instance_variable_set(:@table_data, tables)
+        font.table_data = tables
 
         # Define required methods
         font.define_singleton_method(:table_data) { tables }
@@ -324,6 +323,29 @@ module Fontisan
               "Failed to write WOFF output: #{e.message}"
       end
 
+      # Write WOFF2 format
+      #
+      # @param tables [Hash<String, String>] Output tables
+      # @param output_path [String] Output file path
+      # @param source_format [Symbol] Source format (for flavor detection)
+      # @return [Integer] Number of bytes written
+      def write_woff2(tables, output_path, source_format)
+        require "tmpdir"
+        sfnt_version = sfnt_version_for_format(source_format)
+
+        Dir.mktmpdir("fontisan-woff2-") do |dir|
+          temp_ttf = File.join(dir, "instance.ttf")
+          FontWriter.write_to_file(tables, temp_ttf, sfnt_version: sfnt_version)
+
+          font = FontLoader.load(temp_ttf)
+          woff2_data = Converters::Woff2Encoder.new.convert(font)
+          File.binwrite(output_path, woff2_data)
+        end
+      rescue StandardError => e
+        raise Fontisan::Error,
+              "Failed to write WOFF2 output: #{e.message}"
+      end
+
       # Get SFNT version for output format
       #
       # @param format [Symbol] Output format

data/lib/fontisan/variation/validator.rb

@@ -290,13 +290,16 @@ module Fontisan
             next unless reg_axis
 
             # Check coordinates are in valid range [-1, 1]
-            %i[start_coord peak_coord end_coord].each do |coord_method|
-              next unless reg_axis.respond_to?(coord_method)
-
-              coord = reg_axis.send(coord_method)
-              if coord < -1.0 || coord > 1.0
-                @warnings << "#{table_tag} region #{idx} axis #{axis_idx} #{coord_method} out of range: #{coord}"
-              end
+            coords = {
+              start_coord: reg_axis.start_coord,
+              peak_coord: reg_axis.peak_coord,
+              end_coord: reg_axis.end_coord,
+            }
+            coords.each do |name, coord|
+              next unless coord
+              next unless coord < -1.0 || coord > 1.0
+
+              @warnings << "#{table_tag} region #{idx} axis #{axis_idx} #{name} out of range: #{coord}"
             end
           end
         end

data/lib/fontisan/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontisan
 version: !ruby/object:Gem::Version
-  version: 0.4.40
+  version: 0.4.42
 platform: ruby
 authors:
 - Ribose Inc.
@@ -138,6 +138,9 @@ files:
 - TODO.bug-fixes/03-variation-subsetter-placeholders.md
 - TODO.bug-fixes/04-ufo-image-compile-roundtrip.md
 - TODO.bug-fixes/05-stale-cff-comment.md
+- TODO.bug-fixes/06-instance-woff2-output.md
+- TODO.bug-fixes/07-encapsulation-violations.md
+- TODO.bug-fixes/08-respond-to-violations.md
 - TODO.bug-fixes/README.md
 - TODO.improvements/01-cbdt-cblc-gid-stable-propagation.md
 - TODO.improvements/02-collection-outline-priority.md