spreadsheet 1.3.3 → 1.3.5

data/lib/spreadsheet/excel/worksheet.rb

@@ -1,115 +1,134 @@
-require 'spreadsheet/excel/offset'
-require 'spreadsheet/excel/row'
-require 'spreadsheet/worksheet'
+require "spreadsheet/excel/offset"
+require "spreadsheet/excel/row"
+require "spreadsheet/worksheet"
 
 module Spreadsheet
   module Excel
-##
-# Excel-specific Worksheet methods. These are mostly pertinent to the Excel
-# reader, and to recording changes to the Worksheet. You should have no reason
-# to use any of these.
-class Worksheet < Spreadsheet::Worksheet
-  include Spreadsheet::Excel::Offset
-  offset :dimensions
-  attr_reader :offset, :ole, :links, :guts, :notes
-  def initialize opts = {}
-    @row_addresses = nil
-    super
-    @offset, @ole, @reader = opts[:offset], opts[:ole], opts[:reader]
-    @dimensions = nil
-    @links = {}
-    @guts = {}
-    @notes = {}
-  end
-  def add_link row, column, link
-    @links.store [row, column], link
-  end
-  def add_note row, column, note
-    @notes.store [row, column], note
-  end
-  def column idx
-    ensure_rows_read
-    super
-  end
-  def date_base
-    @workbook.date_base
-  end
-  def margins
-    ensure_rows_read
-    super
-  end
-  def pagesetup
-    ensure_rows_read
-    super
-  end
-  def each *args
-    ensure_rows_read
-    super
-  end
-  def ensure_rows_read
-    return if @row_addresses
-    @dimensions = nil
-    @row_addresses = []
-    @reader.read_worksheet self, @offset if @reader
-  end
-  def row idx
-    @rows[idx] or begin
-      ensure_rows_read
-      if addr = @row_addresses[idx]
-        row = @reader.read_row self, addr
-        [:default_format, :height, :outline_level, :hidden, ].each do |key|
-          row.send "unupdated_#{key}=", addr[key]
+    ##
+    # Excel-specific Worksheet methods. These are mostly pertinent to the Excel
+    # reader, and to recording changes to the Worksheet. You should have no reason
+    # to use any of these.
+    class Worksheet < Spreadsheet::Worksheet
+      include Spreadsheet::Excel::Offset
+
+      offset :dimensions
+      attr_reader :offset, :ole, :links, :guts, :notes, :row_addresses
+      def initialize opts = {}
+        @row_addresses = nil
+        super
+        @offset, @ole, @reader = opts[:offset], opts[:ole], opts[:reader]
+        @dimensions = nil
+        @links = {}
+        @guts = {}
+        @notes = {}
+      end
+
+      def add_link row, column, link
+        @links.store [row, column], link
+      end
+
+      def add_note row, column, note
+        @notes.store [row, column], note
+      end
+
+      def column idx
+        ensure_rows_read
+        super
+      end
+
+      def date_base
+        @workbook.date_base
+      end
+
+      def margins
+        ensure_rows_read
+        super
+      end
+
+      def pagesetup
+        ensure_rows_read
+        super
+      end
+
+      def each *args
+        ensure_rows_read
+        super
+      end
+
+      def ensure_rows_read
+        return if @row_addresses
+        @dimensions = nil
+        @row_addresses = []
+        @reader&.read_worksheet self, @offset
+      end
+
+      def row idx
+        @rows[idx] or begin
+          ensure_rows_read
+          if (addr = @row_addresses[idx])
+            row = @reader.read_row self, addr
+            [:default_format, :height, :outline_level, :hidden].each do |key|
+              row.send :"unupdated_#{key}=", addr[key]
+            end
+            row.worksheet = self
+            row
+          else
+            Row.new self, idx
+          end
         end
-        row.worksheet = self
-        row
-      else
-        Row.new self, idx
+      end
+
+      def rows
+        to_a
+      end
+
+      def row_updated idx, row
+        res = super
+        @workbook.changes.store self, true
+        @workbook.changes.store :boundsheets, true
+        @changes.store idx, true
+        @changes.store :dimensions, true
+        res
+      end
+
+      def set_row_address idx, opts
+        @offsets.store idx, opts[:row_block]
+        @row_addresses[idx] = opts
+      end
+
+      def shared_string idx
+        @workbook.shared_string idx
+      end
+
+      private
+
+      ## premature optimization?
+      def have_set_dimensions value, pos, len
+        if @row_addresses.size < row_count
+          @row_addresses.concat Array.new(row_count - @row_addresses.size)
+        end
+      end
+
+      def recalculate_dimensions
+        ensure_rows_read
+        shorten @rows
+        @dimensions = []
+        @dimensions[0] = [index_of_first(@rows),
+          index_of_first(@row_addresses)].compact.min || 0
+        @dimensions[1] = [@rows.size, @row_addresses.size].compact.max || 0
+        compact = @rows.compact
+        first_rows = compact.collect { |row| row.first_used }.compact.min
+        first_addrs = @row_addresses.compact.collect do |addr|
+          addr[:first_used]
+        end.compact.min
+        @dimensions[2] = [first_rows, first_addrs].compact.min || 0
+        last_rows = compact.collect { |row| row.first_unused }.max
+        last_addrs = @row_addresses.compact.collect do |addr|
+          addr[:first_unused]
+        end.compact.max
+        @dimensions[3] = [last_rows, last_addrs].compact.max || 0
+        @dimensions
       end
     end
   end
-  def rows
-    self.to_a
-  end
-  def row_updated idx, row
-    res = super
-    @workbook.changes.store self, true
-    @workbook.changes.store :boundsheets, true
-    @changes.store idx, true
-    @changes.store :dimensions, true
-    res
-  end
-  def set_row_address idx, opts
-    @offsets.store idx, opts[:row_block]
-    @row_addresses[idx] = opts
-  end
-  def shared_string idx
-    @workbook.shared_string idx
-  end
-  private
-  ## premature optimization?
-  def have_set_dimensions value, pos, len
-    if @row_addresses.size < row_count
-      @row_addresses.concat Array.new(row_count - @row_addresses.size)
-    end
-  end
-  def recalculate_dimensions
-    ensure_rows_read
-    shorten @rows
-    @dimensions = []
-    @dimensions[0] = [ index_of_first(@rows),
-                       index_of_first(@row_addresses) ].compact.min || 0
-    @dimensions[1] = [ @rows.size, @row_addresses.size ].compact.max || 0
-    compact = @rows.compact
-    first_rows = compact.collect do |row| row.first_used end.compact.min
-    first_addrs = @row_addresses.compact.collect do |addr|
-      addr[:first_used] end.compact.min
-    @dimensions[2] = [ first_rows, first_addrs ].compact.min || 0
-    last_rows = compact.collect do |row| row.first_unused end.max
-    last_addrs = @row_addresses.compact.collect do |addr|
-      addr[:first_unused] end.compact.max
-    @dimensions[3] = [last_rows, last_addrs].compact.max || 0
-    @dimensions
-  end
-end
-  end
 end

data/lib/spreadsheet/excel/writer/biff8.rb

@@ -1,53 +1,55 @@
-require 'spreadsheet/encodings'
+require "spreadsheet/encodings"
 
 module Spreadsheet
   module Excel
     module Writer
-##
-# This Module collects writer methods such as unicode_string that are specific
-# to Biff8. This Module is likely to be expanded as Support for older Versions
-# of Excel grows and methods get moved here for disambiguation.
-module Biff8
-  include Spreadsheet::Encodings
-  ##
-  # Check whether the string _data_ can be compressed (i.e. every second byte
-  # is a Null-byte) and perform compression.
-  # Returns the data and compression_status (0/1)
-  def compress_unicode_string data
-    compressed = internal('')
-    expect_null = false
-    data.each_byte do |byte|
-      if expect_null
-        if byte != 0
-          return [data, 1] # 1 => Data consists of wide Chars
+      ##
+      # This Module collects writer methods such as unicode_string that are specific
+      # to Biff8. This Module is likely to be expanded as Support for older Versions
+      # of Excel grows and methods get moved here for disambiguation.
+      module Biff8
+        include Spreadsheet::Encodings
+
+        ##
+        # Check whether the string _data_ can be compressed (i.e. every second byte
+        # is a Null-byte) and perform compression.
+        # Returns the data and compression_status (0/1)
+        def compress_unicode_string data
+          compressed = internal("")
+          expect_null = false
+          data.each_byte do |byte|
+            if expect_null
+              if byte != 0
+                return [data, 1] # 1 => Data consists of wide Chars
+              end
+              expect_null = false
+            else
+              compressed << byte
+              expect_null = true
+            end
+          end
+          [compressed, 0] # 0 => Data consists of compressed Chars
         end
-        expect_null = false
-      else
-        compressed << byte
-        expect_null = true
-      end
-    end
-    [compressed, 0] # 0 => Data consists of compressed Chars
-  end
-  ##
-  # Encode _string_ into a Biff8 Unicode String. Header and body are encoded
-  # separately by #_unicode_string. This method simply combines the two.
-  def unicode_string string, count_length=1
-    header, data, _ = _unicode_string string, count_length
-    header << data
-  end
-  @@bytesize = RUBY_VERSION >= '1.9' ? :bytesize : :size
-  ##
-  # Encode _string_ into a Biff8 Unicode String Header and Body.
-  def _unicode_string string, count_length=1
-    data = internal string
-    size = data.send(@@bytesize) / 2
-    fmt = count_length == 1 ? 'C2' : 'vC'
-    data, wide = compress_unicode_string data
-    opts = wide
-    header = [
-      size, # Length of the string (character count, ln)
-      opts, # Option flags:
+
+        ##
+        # Encode _string_ into a Biff8 Unicode String. Header and body are encoded
+        # separately by #_unicode_string. This method simply combines the two.
+        def unicode_string string, count_length = 1
+          header, data, _ = _unicode_string string, count_length
+          header << data
+        end
+        @@bytesize = (RUBY_VERSION >= "1.9") ? :bytesize : :size
+        ##
+        # Encode _string_ into a Biff8 Unicode String Header and Body.
+        def _unicode_string string, count_length = 1
+          data = internal string
+          size = data.send(@@bytesize) / 2
+          fmt = (count_length == 1) ? "C2" : "vC"
+          data, wide = compress_unicode_string data
+          opts = wide
+          header = [
+            size, # Length of the string (character count, ln)
+            opts # Option flags:
             # Bit  Mask  Contents
             #   0  0x01  Character compression (ccompr):
             #            0 = Compressed (8-bit characters)
@@ -58,18 +60,18 @@ module Biff8
             #   3  0x08  Rich-Text settings (richtext):
             #            0 = Does not contain Rich-Text settings
             #            1 = Contains Rich-Text settings
-      #0x00,# (optional, only if richtext=1) Number of Rich-Text
+            # 0x00,# (optional, only if richtext=1) Number of Rich-Text
             #                                formatting runs (rt)
-      #0x00,# (optional, only if phonetic=1) Size of Asian phonetic
+            # 0x00,# (optional, only if phonetic=1) Size of Asian phonetic
             #                                settings block (in bytes, sz)
-    ].pack fmt
-    data << '' # (optional, only if richtext=1)
-               # List of rt formatting runs (➜ 3.2)
-    data << '' # (optional, only if phonetic=1)
-               # Asian Phonetic Settings Block (➜ 3.4.2)
-    [header, data, wide]
-  end
-end
+          ].pack fmt
+          data << "" # (optional, only if richtext=1)
+          # List of rt formatting runs (➜ 3.2)
+          data << "" # (optional, only if phonetic=1)
+          # Asian Phonetic Settings Block (➜ 3.4.2)
+          [header, data, wide]
+        end
+      end
     end
   end
 end