xlsxrb 0.1.11 → 0.1.13

data/lib/xlsxrb/elements/cell.rb

@@ -201,8 +201,12 @@ module Xlsxrb
         end
       end
 
-      # Cache column letters up to Excel's limit (16,384)
-      @column_letters = (0...16_384).map do |index|
+      # Pure calculation: converts a 0-based column index to an Excel letter.
+      #
+      # @param index [Integer] 0-based column index.
+      # @return [String] Excel column letter.
+      #: (Integer index) -> String
+      def self.calculate_column_letter(index)
         result = +""
         i = index
         loop do
@@ -210,8 +214,11 @@ module Xlsxrb
           i = (i / 26) - 1
           break if i.negative?
         end
-        result.freeze
-      end.freeze
+        result
+      end
+
+      # Cache column letters up to Excel's limit (16,384)
+      @column_letters = (0...16_384).map { |index| calculate_column_letter(index).freeze }.freeze
 
       # Converts a 0-based column index to an Excel letter (0 -> "A", 25 -> "Z", 26 -> "AA").
       #
@@ -226,16 +233,16 @@ module Xlsxrb
       def self.column_letter(index)
         raise ArgumentError, "Column index must be a non-negative Integer, got #{index.inspect}" unless index.is_a?(Integer) && index >= 0
 
-        @column_letters[index] || begin
-          result = +""
-          i = index
-          loop do
-            result.prepend(("A".ord + (i % 26)).chr)
-            i = (i / 26) - 1
-            break if i.negative?
-          end
-          result
-        end
+        @column_letters[index] || calculate_column_letter(index)
+      end
+
+      # Pure calculation: converts an uppercase column letter string to a 0-based index.
+      #
+      # @param letter [String] Uppercase column letter string (e.g. "A", "AA").
+      # @return [Integer] 0-based column index.
+      #: (String letter) -> Integer
+      def self.calculate_column_index(letter)
+        letter.bytes.reduce(0) { |acc, b| (acc * 26) + (b - 64) } - 1
       end
 
       # Converts a column letter (e.g. "A", :AA) to a 0-based column index.
@@ -265,7 +272,7 @@ module Xlsxrb
 
         raise ArgumentError, "Invalid column letter: #{letter.inspect}" unless str.match?(/\A[a-zA-Z]+\z/)
 
-        str.upcase.chars.reduce(0) { |acc, c| (acc * 26) + (c.ord - "A".ord + 1) } - 1
+        calculate_column_index(str.upcase)
       end
 
       # Parses an Excel-style reference to [row_index, col_index] (both 0-based).
@@ -299,10 +306,40 @@ module Xlsxrb
         end
         return nil if i.zero? || i == len
 
-        row = bytes.byteslice(i, len - i).to_i - 1
+        row_part = bytes.byteslice(i, len - i)
+        return nil unless row_part.match?(/\A[1-9]\d*\z/)
+
+        row = row_part.to_i - 1
         [row, col - 1]
       end
 
+      # Returns whether the coordinates are within OOXML limits (row: 0..1,048,575, col: 0..16,383).
+      #
+      # @param row_index [Integer] 0-based row index.
+      # @param column_index [Integer] 0-based column index.
+      # @return [Boolean]
+      #: (untyped row_index, untyped column_index) -> bool
+      def self.valid_coordinates?(row_index, column_index)
+        row_index.instance_of?(Integer) && row_index >= 0 && row_index < 1_048_576 &&
+          column_index.instance_of?(Integer) && column_index >= 0 && column_index < 16_384
+      end
+
+      # Returns whether the value type is supported by OOXML specifications.
+      #
+      # @param value [Object]
+      # @return [Boolean]
+      #: (untyped value) -> bool
+      def self.valid_value?(value)
+        case value
+        when nil, String, Numeric, true, false, Date, Time, Formula, RichText, CellError
+          true
+        when Hash
+          value.key?(:formula)
+        else
+          false
+        end
+      end
+
       # Validates cell coordinates and value type against OOXML specifications.
       #
       # @param row_index [Integer]
@@ -311,18 +348,15 @@ module Xlsxrb
       # @return [Array<String>] List of errors.
       #: (untyped row_index, untyped column_index, untyped value) -> Array[String]
       def self.validate(row_index, column_index, value)
-        if row_index.is_a?(Integer) && row_index >= 0 && row_index < 1_048_576 &&
-           column_index.is_a?(Integer) && column_index >= 0 && column_index < 16_384 &&
-           (value.nil? || value.is_a?(String) || value.is_a?(Numeric) || value == true || value == false || value.is_a?(Date) || value.is_a?(Time) || value.is_a?(Formula) || (value.is_a?(Hash) && value.key?(:formula)) || value.is_a?(RichText) || value.is_a?(CellError))
-          return EMPTY_ERRORS
-        end
+        valid_val = valid_value?(value)
+        return EMPTY_ERRORS if valid_coordinates?(row_index, column_index) && valid_val
 
         errs = []
         errs << "row_index must be a non-negative Integer (got #{row_index.inspect})" if !row_index.is_a?(Integer) || row_index.negative?
         errs << "column_index must be a non-negative Integer (got #{column_index.inspect})" if !column_index.is_a?(Integer) || column_index.negative?
         errs << "row_index must be < 1048576 (got #{row_index}, max row is 1048575)" if row_index.is_a?(Integer) && row_index >= 1_048_576
         errs << "column_index must be < 16384 (got #{column_index}, max column is XFD=16383)" if column_index.is_a?(Integer) && column_index >= 16_384
-        errs << "unsupported value type: #{value.class} (#{value.inspect}) — supported types: String, Numeric, true/false, Date, Time, or nil" unless value.nil? || value.is_a?(String) || value.is_a?(Numeric) || value == true || value == false || value.is_a?(Date) || value.is_a?(Time)
+        errs << "unsupported value type: #{value.class} (#{value.inspect}) — supported types: String, Numeric, true/false, Date, Time, Formula, RichText, CellError, or nil" unless valid_val
         errs
       end
     end

data/lib/xlsxrb/elements/column.rb

@@ -11,7 +11,9 @@ module Xlsxrb
     #   col = Elements::Column.new(index: 0, width: 25.0)
     #
     # @api public
-    Column = Data.define(:index, :width, :hidden, :custom_width, :outline_level, :unmapped_data, :errors) do
+    # rubocop:disable Style/DataInheritance -- Required as class syntax for mutant subject matcher
+    class Column < Data.define(:index, :width, :hidden, :custom_width, :outline_level, :unmapped_data, :errors)
+      # rubocop:enable Style/DataInheritance
       # @param index [Integer] 0-based column index.
       # @param width [Float, Integer, nil] Column width in characters.
       # @param hidden [Boolean] Whether the column is hidden.
@@ -36,6 +38,20 @@ module Xlsxrb
         errors.empty?
       end
 
+      # Returns whether the column index is within valid OOXML range (0..16383).
+      #
+      # @param index [Object]
+      # @return [Boolean]
+      #: (untyped index) -> bool
+      def self.valid_index?(index)
+        case index
+        when Integer
+          index >= 0 && index < 16_384
+        else
+          false
+        end
+      end
+
       # Validates column index against OOXML limits.
       #
       # @param index [Integer]
@@ -43,8 +59,16 @@ module Xlsxrb
       #: (untyped index) -> Array[String]
       def self.validate(index)
         errs = []
-        errs << "index must be a non-negative Integer (got #{index.inspect})" if !index.is_a?(Integer) || index.negative?
-        errs << "index must be < 16384 (got #{index}, max column is XFD=16383)" if index.is_a?(Integer) && index >= 16_384
+        case index
+        when Integer
+          if index.negative?
+            errs << "index must be a non-negative Integer (got #{index})"
+          elsif index >= 16_384
+            errs << "index must be < 16384 (got #{index}, max column is XFD=16383)"
+          end
+        else
+          errs << "index must be a non-negative Integer (got #{index.inspect})"
+        end
         errs
       end
     end

data/lib/xlsxrb/elements/row.rb

@@ -13,8 +13,10 @@ module Xlsxrb
     #   row.to_a            # array of cell values
     #
     # @api public
-    Row = Data.define(:index, :cells, :height, :hidden, :custom_height, :outline_level, :unmapped_data, :errors) do
-      include Enumerable
+    # rubocop:disable Style/DataInheritance -- Required as class syntax for mutant subject matcher
+    class Row < Data.define(:index, :cells, :height, :hidden, :custom_height, :outline_level, :unmapped_data, :errors)
+      # rubocop:enable Style/DataInheritance
+      [Enumerable].each { |m| include m }
 
       # @param index [Integer] 0-based row index.
       # @param cells [Array<Elements::Cell>] Cells in this row.
@@ -152,6 +154,20 @@ module Xlsxrb
         result
       end
 
+      # Returns whether the row index is within valid OOXML range (0..1048575).
+      #
+      # @param index [Object]
+      # @return [Boolean]
+      #: (untyped index) -> bool
+      def self.valid_index?(index)
+        case index
+        when Integer
+          index >= 0 && index < 1_048_576
+        else
+          false
+        end
+      end
+
       # Validates row index and cells against OOXML limits.
       #
       # @param index [Integer]
@@ -159,16 +175,19 @@ module Xlsxrb
       # @return [Array<String>] List of errors.
       #: (untyped index, untyped cells) -> Array[String]
       def self.validate(index, cells)
-        return EMPTY_ERRORS if index.is_a?(Integer) && index >= 0 && index < 1_048_576 && cells.is_a?(Array)
-
         errs = []
-        if !index.is_a?(Integer) || index.negative?
+        case index
+        when Integer
+          if index.negative?
+            errs << "index must be a non-negative Integer (got #{index})"
+          elsif index >= 1_048_576
+            errs << "index must be < 1048576 (got #{index}, max row is 1048575)"
+          end
+        else
           errs << "index must be a non-negative Integer (got #{index.inspect})"
-        elsif index >= 1_048_576
-          errs << "index must be < 1048576 (got #{index}, max row is 1048576)"
         end
         errs << "cells must be an Array (got #{cells.class})" unless cells.is_a?(Array)
-        errs
+        errs.empty? ? EMPTY_ERRORS : errs
       end
     end
   end

data/lib/xlsxrb/elements/workbook.rb

@@ -12,15 +12,17 @@ module Xlsxrb
     #   workbook.each { |s| puts s.name }
     #
     # @api public
-    Workbook = Data.define(:sheets, :shared_strings, :styles, :unmapped_data, :errors) do
-      include Enumerable
+    # rubocop:disable Style/DataInheritance -- Required as class syntax for mutant subject matcher
+    class Workbook < Data.define(:sheets, :shared_strings, :styles, :unmapped_data, :errors)
+      # rubocop:enable Style/DataInheritance
+      [Enumerable].each { |m| include m }
 
-      # @param sheets [Array<Elements::Worksheet>] Worksheets in the workbook.
+      # @param sheets [Array<Elements::Worksheet, StreamSheet>] Worksheets in the workbook.
       # @param shared_strings [Array<String>] Shared strings table.
       # @param styles [Hash] Styles definition.
       # @param unmapped_data [Hash] Additional metadata for round-tripping.
       # @param errors [Array<String>, nil] Validation errors.
-      #: (?sheets: Array[Elements::Worksheet], ?shared_strings: Array[String], ?styles: Hash[untyped, untyped], ?unmapped_data: Hash[untyped, untyped], ?errors: Array[String]?) -> void
+      #: (?sheets: Array[Elements::Worksheet | StreamSheet], ?shared_strings: Array[String], ?styles: Hash[untyped, untyped], ?unmapped_data: Hash[untyped, untyped], ?errors: Array[String]?) -> void
       def initialize(sheets: [], shared_strings: [], styles: {}, unmapped_data: {}, errors: nil)
         computed_errors = errors || self.class.validate(sheets)
         super(sheets: sheets.freeze, shared_strings: shared_strings.freeze, styles: styles,
@@ -35,14 +37,14 @@ module Xlsxrb
       #   end
       #
       # @yield [sheet]
-      # @yieldparam sheet [Elements::Worksheet]
+      # @yieldparam sheet [Elements::Worksheet, StreamSheet]
       # @return [Enumerator, void]
-      #: () { (Elements::Worksheet) -> void } -> void
-      #: () -> Enumerator[Elements::Worksheet, void]
+      #: () { (Elements::Worksheet | StreamSheet) -> void } -> void
+      #: () -> Enumerator[Elements::Worksheet | StreamSheet, void]
       def each(&)
         sheets.each(&)
       end
-      alias_method :each_sheet, :each
+      alias each_sheet each
 
       # Returns whether the workbook is valid according to ECMA-376 rules.
       #
@@ -58,10 +60,10 @@ module Xlsxrb
       #   wb.sheet(0)
       #   wb.sheet("Sales")
       #
-      # @param identifier [Integer, String] 0-based index or sheet name.
-      # @return [Elements::Worksheet, nil]
+      # @param identifier [Integer, String, untyped] 0-based index or sheet name.
+      # @return [Elements::Worksheet, StreamSheet, nil]
       # @api public
-      #: (?Integer | String identifier) -> Elements::Worksheet?
+      #: (?Integer | String | untyped identifier) -> (Elements::Worksheet | StreamSheet)?
       def sheet(identifier = 0)
         case identifier
         when Integer
@@ -70,7 +72,7 @@ module Xlsxrb
           sheets.find { |s| s.name == identifier }
         end
       end
-      alias_method :[], :sheet
+      alias [] sheet
 
       # Loads all sheets into memory, returning an Elements::Workbook where every
       # worksheet is a fully-parsed Elements::Worksheet supporting coordinate random access.
@@ -84,9 +86,20 @@ module Xlsxrb
       #: () -> Elements::Workbook
       def load
         loaded_sheets = sheets.map { |s| s.respond_to?(:load) ? s.load : s }
+        close
         with(sheets: loaded_sheets)
       end
-      alias_method :to_workbook, :load
+      alias to_workbook load
+
+      # Closes any streaming resources associated with worksheets.
+      #
+      # @return [void]
+      # @api public
+      #: () -> void
+      def close
+        sheets.each { |s| s.close if s.respond_to?(:close) }
+        nil
+      end
 
       # Returns a new Workbook with the specified sheet updated.
       # Yields the matched worksheet to the block, which must return a new Worksheet.
@@ -102,7 +115,7 @@ module Xlsxrb
       # @yieldreturn [Elements::Worksheet] The modified worksheet.
       # @return [Elements::Workbook] A new Workbook instance.
       # @api public
-      #: (Integer | String identifier) { (Elements::Worksheet) -> Elements::Worksheet } -> Elements::Workbook
+      #: (Integer | String identifier) ?{ (Elements::Worksheet) -> Elements::Worksheet } -> Elements::Workbook
       def update_sheet(identifier)
         raise ArgumentError, "block is required" unless block_given?
 

data/lib/xlsxrb/elements/worksheet.rb

@@ -197,6 +197,22 @@ module Xlsxrb
       end
       alias to_worksheet load
 
+      FORBIDDEN_NAME_CHARS = %r{[\\/?*\[\]]}
+
+      # Returns whether the worksheet name is valid according to OOXML specifications (1..31 chars, no forbidden chars).
+      #
+      # @param name [Object]
+      # @return [Boolean]
+      #: (untyped name) -> bool
+      def self.valid_name?(name)
+        case name
+        when String
+          !name.empty? && name.size <= 31 && !name.match?(FORBIDDEN_NAME_CHARS)
+        else
+          false
+        end
+      end
+
       # Validates worksheet name and rows against OOXML limits.
       #
       # @param name [String]
@@ -209,7 +225,7 @@ module Xlsxrb
           errs << "worksheet name must be a non-empty String (got #{name.inspect})"
         else
           errs << "worksheet name cannot exceed 31 characters (got #{name.size})" if name.size > 31
-          errs << "worksheet name cannot contain \\, /, ?, *, [, or ]" if name.match?(%r{[\\/?*\[\]]})
+          errs << "worksheet name cannot contain \\, /, ?, *, [, or ]" if name.match?(FORBIDDEN_NAME_CHARS)
         end
         errs << "rows must be an Array (got #{rows.class})" unless rows.is_a?(Array)
         if rows.is_a?(Array)

data/lib/xlsxrb/ooxml/cfb.rb

@@ -6,7 +6,7 @@ module Xlsxrb
   module Ooxml
     # Pure-Ruby Compound File Binary (CFB / OLE Structured Storage) implementation for [MS-CFB] / [MS-OFFCRYPTO].
     module Cfb
-      MAGIC = "\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1".b.freeze
+      MAGIC = [0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1].pack("C*").freeze
 
       FREESECT   = 0xFFFFFFFF
       ENDOFCHAIN = 0xFFFFFFFE
@@ -61,9 +61,12 @@ module Xlsxrb
         attr_reader :entries
 
         def self.cfb?(data)
-          return false if data.nil? || data.bytesize < 8
-
-          data[0, 8] == MAGIC
+          case data
+          when String
+            data.start_with?(MAGIC)
+          else
+            false
+          end
         end
 
         def initialize(data)
@@ -372,7 +375,7 @@ module Xlsxrb
             num_minifat_sec = (minifat_bytes.bytesize + sector_size - 1) / sector_size
             num_minifat_sec.times do |s_idx|
               chunk = minifat_bytes[s_idx * sector_size, sector_size] || "".b
-              chunk = chunk.ljust(sector_size, "\xFF".b) if chunk.bytesize < sector_size
+              chunk = chunk.ljust(sector_size, 255.chr(Encoding::BINARY)) if chunk.bytesize < sector_size
               allocated_sectors << chunk
             end
             sector_chains << [first_minifat_sec, num_minifat_sec]
@@ -400,7 +403,7 @@ module Xlsxrb
           fat[dir_sector_id] = ENDOFCHAIN
           fat[fat_sector_id] = FATSECT
 
-          fat_bytes = fat.pack("V*").ljust(sector_size, "\xFF".b)
+          fat_bytes = fat.pack("V*").ljust(sector_size, 255.chr(Encoding::BINARY))
           allocated_sectors << fat_bytes
 
           # Build Header (512 bytes)

data/lib/xlsxrb/ooxml/crypto/agile.rb

@@ -11,11 +11,11 @@ module Xlsxrb
     module Crypto
       # Implements Microsoft Office Agile Encryption specified in [MS-OFFCRYPTO] Section 2.3.4.
       class Agile
-        BLOCK_KEY_VERIFIER_INPUT   = "\xfe\xa7\xd2\x76\x3b\x4b\x9e\x79".b.freeze
-        BLOCK_KEY_VERIFIER_VALUE   = "\xd7\xaa\x0f\x6d\x30\x61\x34\x4e".b.freeze
-        BLOCK_KEY_KEY              = "\x14\x6e\x0b\xe7\xab\xac\xd0\xd6".b.freeze
-        BLOCK_KEY_INTEGRITY_KEY    = "\x5f\xb2\xad\x01\x0c\xb9\xe1\xf6".b.freeze
-        BLOCK_KEY_INTEGRITY_VALUE  = "\xa0\x67\x7f\x02\xb2\x2c\x84\x33".b.freeze
+        BLOCK_KEY_VERIFIER_INPUT   = [0xfe, 0xa7, 0xd2, 0x76, 0x3b, 0x4b, 0x9e, 0x79].pack("C*").freeze
+        BLOCK_KEY_VERIFIER_VALUE   = [0xd7, 0xaa, 0x0f, 0x6d, 0x30, 0x61, 0x34, 0x4e].pack("C*").freeze
+        BLOCK_KEY_KEY              = [0x14, 0x6e, 0x0b, 0xe7, 0xab, 0xac, 0xd0, 0xd6].pack("C*").freeze
+        BLOCK_KEY_INTEGRITY_KEY    = [0x5f, 0xb2, 0xad, 0x01, 0x0c, 0xb9, 0xe1, 0xf6].pack("C*").freeze
+        BLOCK_KEY_INTEGRITY_VALUE  = [0xa0, 0x67, 0x7f, 0x02, 0xb2, 0x2c, 0x84, 0x33].pack("C*").freeze
 
         SEGMENT_SIZE = 4096