fontisan 0.2.6 → 0.2.8

data/lib/fontisan/tables/os2.rb

@@ -177,7 +177,7 @@ module Fontisan
       #
       # @return [Boolean] True if version is 0-5
       def valid_version?
-        version && version.between?(0, 5)
+        version&.between?(0, 5)
       end
 
       # Validation helper: Check if weight class is valid
@@ -186,7 +186,7 @@ module Fontisan
       #
       # @return [Boolean] True if weight class is valid
       def valid_weight_class?
-        us_weight_class && us_weight_class.between?(1, 1000)
+        us_weight_class&.between?(1, 1000)
       end
 
       # Validation helper: Check if width class is valid
@@ -195,7 +195,7 @@ module Fontisan
       #
       # @return [Boolean] True if width class is 1-9
       def valid_width_class?
-        us_width_class && us_width_class.between?(1, 9)
+        us_width_class&.between?(1, 9)
       end
 
       # Validation helper: Check if vendor ID is present
@@ -213,7 +213,7 @@ module Fontisan
       #
       # @return [Boolean] True if typo metrics have correct signs
       def valid_typo_metrics?
-        s_typo_ascender > 0 && s_typo_descender < 0 && s_typo_line_gap >= 0
+        s_typo_ascender.positive? && s_typo_descender.negative? && s_typo_line_gap >= 0
       end
 
       # Validation helper: Check if Win metrics are valid
@@ -222,7 +222,7 @@ module Fontisan
       #
       # @return [Boolean] True if Win ascent and descent are positive
       def valid_win_metrics?
-        us_win_ascent > 0 && us_win_descent > 0
+        us_win_ascent.positive? && us_win_descent.positive?
       end
 
       # Validation helper: Check if Unicode ranges are set
@@ -240,7 +240,7 @@ module Fontisan
       #
       # @return [Boolean] True if PANOSE seems to be set
       def has_panose?
-        panose && panose.any? { |val| val != 0 }
+        panose&.any? { |val| val != 0 }
       end
 
       # Validation helper: Check if embedding permissions are set
@@ -270,9 +270,9 @@ module Fontisan
       #
       # @return [Boolean] True if metrics are present (or not required)
       def has_x_height_cap_height?
-        return true if version < 2  # Not required for v0-1
+        return true if version < 2 # Not required for v0-1
 
-        !sx_height.nil? && !s_cap_height.nil? && sx_height > 0 && s_cap_height > 0
+        !sx_height.nil? && !s_cap_height.nil? && sx_height.positive? && s_cap_height.positive?
       end
 
       # Validation helper: Check if first/last char indices are reasonable

data/lib/fontisan/tables/post.rb

@@ -177,7 +177,7 @@ module Fontisan
       #
       # @return [Boolean] True if is_fixed_pitch is 0 or 1
       def valid_fixed_pitch_flag?
-        is_fixed_pitch == 0 || is_fixed_pitch == 1
+        [0, 1].include?(is_fixed_pitch)
       end
 
       # Validation helper: Check if glyph names are available
@@ -198,7 +198,7 @@ module Fontisan
       def complete_version_2_data?
         return true unless version == 2.0
 
-        !num_glyphs_v2.nil? && num_glyphs_v2 > 0 && !remaining_data.empty?
+        !num_glyphs_v2.nil? && num_glyphs_v2.positive? && !remaining_data.empty?
       end
     end
   end

data/lib/fontisan/tables/sbix.rb

@@ -166,7 +166,8 @@ module Fontisan
           # Sample first few glyphs to detect formats
           strike[:graphic_types]&.each do |type|
             format_name = GRAPHIC_TYPE_NAMES[type]
-            formats << format_name if format_name && !["dupe", "mask"].include?(format_name)
+            formats << format_name if format_name && !["dupe",
+                                                       "mask"].include?(format_name)
           end
         end
         formats.uniq.compact
@@ -312,12 +313,12 @@ module Fontisan
 
           # Check if offsets are valid
           next if glyph_offset >= strike_size || next_glyph_offset > strike_size
-          next if next_glyph_offset <= glyph_offset  # Empty glyph
+          next if next_glyph_offset <= glyph_offset # Empty glyph
 
           # Calculate absolute offset in table
           # glyph_offset is relative to strike start, so add strike_offset
           absolute_offset = strike_offset + glyph_offset
-          next if absolute_offset + 8 > raw_data.length  # Need at least header
+          next if absolute_offset + 8 > raw_data.length # Need at least header
 
           # Read graphic type (skip originOffsetX and originOffsetY = 4 bytes)
           io = StringIO.new(raw_data)
@@ -345,7 +346,7 @@ module Fontisan
         next_offset = strike[:glyph_offsets][glyph_id + 1]
 
         return nil unless offset && next_offset
-        return nil if next_offset <= offset  # Empty glyph
+        return nil if next_offset <= offset # Empty glyph
 
         # Calculate absolute position in table
         absolute_offset = strike[:base_offset] + offset

data/lib/fontisan/true_type_font.rb

@@ -563,10 +563,9 @@ module Fontisan
     # @param path [String] Path to the TTF 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/utilities/checksum_calculator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require "tempfile"
 require_relative "../constants"
 
 module Fontisan
@@ -101,49 +100,6 @@ module Fontisan
 
         sum
       end
-
-      # Calculate checksum from an IO object using a tempfile for Windows compatibility.
-      #
-      # This method creates a temporary file from the IO content to ensure proper
-      # file handle semantics on Windows, where file handles must remain open
-      # for checksum calculation. The tempfile reference is returned alongside
-      # the checksum to prevent premature garbage collection on Windows.
-      #
-      # @param io [IO] the IO object to read from (must be rewindable)
-      # @return [Array<Integer, Tempfile>] array containing [checksum, tempfile]
-      #   The checksum value and the tempfile that must be kept alive until
-      #   the caller is done with the checksum.
-      #
-      # @example
-      #   checksum, tmpfile = ChecksumCalculator.calculate_checksum_from_io_with_tempfile(io)
-      #   # Use checksum...
-      #   # tmpfile will be GC'd when it goes out of scope, which is safe
-      #
-      # @note On Windows, Ruby's Tempfile automatically deletes the temp file when
-      #   the Tempfile object is garbage collected. In multi-threaded environments,
-      #   this can cause PermissionDenied errors if the file is deleted while
-      #   another thread is still using it. By returning the tempfile reference,
-      #   the caller can ensure it remains alive until all operations complete.
-      def self.calculate_checksum_from_io_with_tempfile(io)
-        io.rewind
-
-        # Create a tempfile to handle Windows file locking issues
-        tmpfile = Tempfile.new(["font", ".ttf"])
-        tmpfile.binmode
-
-        # Copy IO content to tempfile
-        IO.copy_stream(io, tmpfile)
-        tmpfile.close
-
-        # Calculate checksum from the tempfile
-        checksum = calculate_file_checksum(tmpfile.path)
-
-        # Return both checksum and tempfile to keep it alive
-        # The caller must keep the tempfile reference until done with checksum
-        [checksum, tmpfile]
-      end
-
-      private_class_method :calculate_checksum_from_io
     end
   end
 end

data/lib/fontisan/validation/collection_validator.rb

@@ -68,7 +68,8 @@ module Fontisan
         issues = []
 
         return ["Font array cannot be empty"] if fonts.nil? || fonts.empty?
-        return ["Invalid format: #{format}"] unless %i[ttc otc dfont].include?(format)
+        return ["Invalid format: #{format}"] unless %i[ttc otc
+                                                       dfont].include?(format)
 
         case format
         when :ttc
@@ -100,7 +101,8 @@ module Fontisan
       # @raise [ArgumentError] if invalid
       def validate_format!(format)
         unless %i[ttc otc dfont].include?(format)
-          raise ArgumentError, "Invalid format: #{format}. Must be :ttc, :otc, or :dfont"
+          raise ArgumentError,
+                "Invalid format: #{format}. Must be :ttc, :otc, or :dfont"
         end
       end
 

data/lib/fontisan/validators/basic_validator.rb

@@ -46,39 +46,29 @@ module Fontisan
         end
 
         # Check 2: Name table version must be valid (0 or 1)
-        check_table :name_version, "name", severity: :error do |table|
-          table.valid_version?
-        end
+        check_table :name_version, "name", severity: :error, &:valid_version?
 
         # Check 3: Family name must be present and non-empty
-        check_table :family_name, "name", severity: :error do |table|
-          table.family_name_present?
-        end
+        check_table :family_name, "name", severity: :error,
+                    &:family_name_present?
 
         # Check 4: PostScript name must be valid (alphanumeric + hyphens)
-        check_table :postscript_name, "name", severity: :error do |table|
-          table.postscript_name_valid?
-        end
+        check_table :postscript_name, "name", severity: :error,
+                    &:postscript_name_valid?
 
         # Check 5: Head table magic number must be correct
-        check_table :head_magic, "head", severity: :error do |table|
-          table.valid_magic?
-        end
+        check_table :head_magic, "head", severity: :error, &:valid_magic?
 
         # Check 6: Units per em must be valid (16-16384)
-        check_table :units_per_em, "head", severity: :error do |table|
-          table.valid_units_per_em?
-        end
+        check_table :units_per_em, "head", severity: :error,
+                    &:valid_units_per_em?
 
         # Check 7: Number of glyphs must be at least 1 (.notdef)
-        check_table :num_glyphs, "maxp", severity: :error do |table|
-          table.valid_num_glyphs?
-        end
+        check_table :num_glyphs, "maxp", severity: :error, &:valid_num_glyphs?
 
         # Check 8: Maxp metrics should be reasonable (not absurd values)
-        check_table :reasonable_metrics, "maxp", severity: :warning do |table|
-          table.reasonable_metrics?
-        end
+        check_table :reasonable_metrics, "maxp", severity: :warning,
+                    &:reasonable_metrics?
       end
     end
   end

data/lib/fontisan/validators/font_book_validator.rb

@@ -36,94 +36,73 @@ module Fontisan
         super
 
         # Check 9: Name table Windows Unicode English encoding
-        check_table :name_windows_encoding, 'name', severity: :error do |table|
+        check_table :name_windows_encoding, "name", severity: :error do |table|
           table.has_valid_platform_combos?([3, 1, 0x0409]) # Windows Unicode English
         end
 
         # Check 10: Name table Mac Roman English encoding
-        check_table :name_mac_encoding, 'name', severity: :warning do |table|
+        check_table :name_mac_encoding, "name", severity: :warning do |table|
           table.has_valid_platform_combos?([1, 0, 0]) # Mac Roman English
         end
 
         # Check 11: OS/2 table version must be valid
-        check_table :os2_version, 'OS/2', severity: :error do |table|
-          table.valid_version?
-        end
+        check_table :os2_version, "OS/2", severity: :error, &:valid_version?
 
         # Check 12: OS/2 weight class must be valid (1-1000)
-        check_table :os2_weight_class, 'OS/2', severity: :error do |table|
-          table.valid_weight_class?
-        end
+        check_table :os2_weight_class, "OS/2", severity: :error,
+                    &:valid_weight_class?
 
         # Check 13: OS/2 width class must be valid (1-9)
-        check_table :os2_width_class, 'OS/2', severity: :error do |table|
-          table.valid_width_class?
-        end
+        check_table :os2_width_class, "OS/2", severity: :error,
+                    &:valid_width_class?
 
         # Check 14: OS/2 vendor ID should be present
-        check_table :os2_vendor_id, 'OS/2', severity: :warning do |table|
-          table.has_vendor_id?
-        end
+        check_table :os2_vendor_id, "OS/2", severity: :warning, &:has_vendor_id?
 
         # Check 15: OS/2 PANOSE classification should be present
-        check_table :os2_panose, 'OS/2', severity: :info do |table|
-          table.has_panose?
-        end
+        check_table :os2_panose, "OS/2", severity: :info, &:has_panose?
 
         # Check 16: OS/2 typographic metrics must be valid
-        check_table :os2_typo_metrics, 'OS/2', severity: :error do |table|
-          table.valid_typo_metrics?
-        end
+        check_table :os2_typo_metrics, "OS/2", severity: :error,
+                    &:valid_typo_metrics?
 
         # Check 17: OS/2 Windows metrics must be valid
-        check_table :os2_win_metrics, 'OS/2', severity: :error do |table|
-          table.valid_win_metrics?
-        end
+        check_table :os2_win_metrics, "OS/2", severity: :error,
+                    &:valid_win_metrics?
 
         # Check 18: OS/2 Unicode ranges should be present
-        check_table :os2_unicode_ranges, 'OS/2', severity: :warning do |table|
-          table.has_unicode_ranges?
-        end
+        check_table :os2_unicode_ranges, "OS/2", severity: :warning,
+                    &:has_unicode_ranges?
 
         # Check 19: Head table bounding box must be valid
-        check_table :head_bounding_box, 'head', severity: :error do |table|
-          table.valid_bounding_box?
-        end
+        check_table :head_bounding_box, "head", severity: :error,
+                    &:valid_bounding_box?
 
         # Check 20: Hhea ascent/descent must be valid
-        check_table :hhea_ascent_descent, 'hhea', severity: :error do |table|
-          table.valid_ascent_descent?
-        end
+        check_table :hhea_ascent_descent, "hhea", severity: :error,
+                    &:valid_ascent_descent?
 
         # Check 21: Hhea line gap should be valid
-        check_table :hhea_line_gap, 'hhea', severity: :warning do |table|
-          table.valid_line_gap?
-        end
+        check_table :hhea_line_gap, "hhea", severity: :warning,
+                    &:valid_line_gap?
 
         # Check 22: Hhea horizontal metrics count must be valid
-        check_table :hhea_metrics_count, 'hhea', severity: :error do |table|
-          table.valid_number_of_h_metrics?
-        end
+        check_table :hhea_metrics_count, "hhea", severity: :error,
+                    &:valid_number_of_h_metrics?
 
         # Check 23: Post table version must be valid
-        check_table :post_version, 'post', severity: :error do |table|
-          table.valid_version?
-        end
+        check_table :post_version, "post", severity: :error, &:valid_version?
 
         # Check 24: Post table italic angle should be valid
-        check_table :post_italic_angle, 'post', severity: :warning do |table|
-          table.valid_italic_angle?
-        end
+        check_table :post_italic_angle, "post", severity: :warning,
+                    &:valid_italic_angle?
 
         # Check 25: Post table underline metrics should be present
-        check_table :post_underline, 'post', severity: :info do |table|
-          table.has_underline_metrics?
-        end
+        check_table :post_underline, "post", severity: :info,
+                    &:has_underline_metrics?
 
         # Check 26: Cmap table must have subtables
-        check_table :cmap_subtables, 'cmap', severity: :error do |table|
-          table.has_subtables?
-        end
+        check_table :cmap_subtables, "cmap", severity: :error, &:has_subtables?
       end
     end
   end

data/lib/fontisan/validators/opentype_validator.rb

@@ -33,45 +33,44 @@ module Fontisan
         super
 
         # Check 27: Maxp TrueType metrics (only for version 1.0)
-        check_table :maxp_truetype_metrics, 'maxp', severity: :warning do |table|
+        check_table :maxp_truetype_metrics, "maxp",
+                    severity: :warning do |table|
           !table.version_1_0? || table.has_truetype_metrics?
         end
 
         # Check 28: Maxp max zones must be valid
-        check_table :maxp_zones, 'maxp', severity: :error do |table|
-          table.valid_max_zones?
-        end
+        check_table :maxp_zones, "maxp", severity: :error, &:valid_max_zones?
 
         # Check 29: Glyf glyphs must be accessible (TrueType fonts only)
         check_glyphs :glyf_accessible, severity: :error do |font|
-          glyf = font.table('glyf')
+          glyf = font.table("glyf")
           next true unless glyf # Skip if CFF font
 
-          loca = font.table('loca')
-          head = font.table('head')
-          maxp = font.table('maxp')
+          loca = font.table("loca")
+          head = font.table("head")
+          maxp = font.table("maxp")
           glyf.all_glyphs_accessible?(loca, head, maxp.num_glyphs)
         end
 
         # Check 30: Glyf glyphs should not be clipped
         check_glyphs :glyf_no_clipping, severity: :warning do |font|
-          glyf = font.table('glyf')
+          glyf = font.table("glyf")
           next true unless glyf
 
-          loca = font.table('loca')
-          head = font.table('head')
-          maxp = font.table('maxp')
+          loca = font.table("loca")
+          head = font.table("head")
+          maxp = font.table("maxp")
           glyf.no_clipped_glyphs?(loca, head, maxp.num_glyphs)
         end
 
         # Check 31: Glyf contour counts must be valid
         check_glyphs :glyf_valid_contours, severity: :error do |font|
-          glyf = font.table('glyf')
+          glyf = font.table("glyf")
           next true unless glyf
 
-          loca = font.table('loca')
-          head = font.table('head')
-          maxp = font.table('maxp')
+          loca = font.table("loca")
+          head = font.table("head")
+          maxp = font.table("maxp")
 
           (0...maxp.num_glyphs).all? do |glyph_id|
             glyf.valid_contour_count?(glyph_id, loca, head)
@@ -79,29 +78,26 @@ module Fontisan
         end
 
         # Check 32: Cmap must have Unicode mapping
-        check_table :cmap_unicode_mapping, 'cmap', severity: :error do |table|
-          table.has_unicode_mapping?
-        end
+        check_table :cmap_unicode_mapping, "cmap", severity: :error,
+                    &:has_unicode_mapping?
 
         # Check 33: Cmap should have BMP coverage
-        check_table :cmap_bmp_coverage, 'cmap', severity: :warning do |table|
-          table.has_bmp_coverage?
-        end
+        check_table :cmap_bmp_coverage, "cmap", severity: :warning,
+                    &:has_bmp_coverage?
 
         # Check 34: Cmap must have format 4 subtable
-        check_table :cmap_format4, 'cmap', severity: :error do |table|
-          table.has_format_4_subtable?
-        end
+        check_table :cmap_format4, "cmap", severity: :error,
+                    &:has_format_4_subtable?
 
         # Check 35: Cmap glyph indices must be valid
         check_structure :cmap_glyph_indices, severity: :error do |font|
-          cmap = font.table('cmap')
-          maxp = font.table('maxp')
+          cmap = font.table("cmap")
+          maxp = font.table("maxp")
           cmap.valid_glyph_indices?(maxp.num_glyphs)
         end
 
         # Check 36: Table checksums (info level - many fonts have mismatches)
-        check_structure :checksum_valid, severity: :info do |font|
+        check_structure :checksum_valid, severity: :info do |_font|
           # Table checksum validation (info level - for reference)
           # Most fonts have checksum mismatches, so we make it info not error
           true # Placeholder - actual checksum validation if desired