spreadsheet 1.1.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d963aae672b717dc7a279a1e14efec5cce64a272
-  data.tar.gz: 18009a3af345b0051e4ad6efe2f85739ec87dda3
+SHA256:
+  metadata.gz: c0291eb7283e45bbe612232b8ee760af808b65440ec47b536236638b6f2ed96c
+  data.tar.gz: 5fe1c14cc4898d924e69a7b4c4d5d1590e5e822f04e9991222631c674399ad45
 SHA512:
-  metadata.gz: e22611671910b290869e586f214b92d00beb40d486b1b830face971f8dc35fdeb60e064fa44c7e0e27393eab5217890fcf595d990597ef1e324be2565048fc93
-  data.tar.gz: 253242666e44ffcc7ef180c542e2f7ee30183db5d00d4277de99e2a2736d519af1a61f4b36404c0a6173ab2883e197c699a96d90cdb02013619691fe07ee81d4
+  metadata.gz: 9d77e1dd7a9b4bce2007d99e3a2a829fb27f51f3739dca76d877a5279999392ffe72206a1be2b6cabc0e2432fa3e4705f3bdf4a2060b9a0e66b4242c719438c2
+  data.tar.gz: f85e21c6b636713a9bcba68d436edbce67e3aab4fa01790be36a1b776e2cb0508fa9bbd4904c9d551258640109dbd574fb671503c6c6d62bd3af848dcbc955fe

data/Manifest.txt

@@ -49,6 +49,7 @@ lib/spreadsheet/link.rb
 lib/spreadsheet/note.rb
 lib/spreadsheet/noteObject.rb
 lib/spreadsheet/row.rb
+lib/spreadsheet/version.rb
 lib/spreadsheet/workbook.rb
 lib/spreadsheet/worksheet.rb
 lib/spreadsheet/writer.rb

data/bin/bundle

@@ -0,0 +1,114 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../../Gemfile", __FILE__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_version
+    @bundler_version ||=
+      env_var_version || cli_arg_version ||
+        lockfile_version
+  end
+
+  def bundler_requirement
+    return "#{Gem::Requirement.default}.a" unless bundler_version
+
+    bundler_gem_version = Gem::Version.new(bundler_version)
+
+    requirement = bundler_gem_version.approximate_recommendation
+
+    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+
+    requirement += ".a" if bundler_gem_version.prerelease?
+
+    requirement
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

data/bin/bundler

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("bundler", "bundler")

data/bin/oletool

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'oletool' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("ruby-ole", "oletool")

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/sow

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'sow' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("hoe", "sow")

data/bin/xlsopcodes

@@ -1,18 +1,29 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require 'spreadsheet'
+#
+# This file was generated by Bundler.
+#
+# The application 'xlsopcodes' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-source, target = ARGV
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-if source.nil?
-  puts "Usage: #{$0} <source> [<target>]"
-  exit -1
-end
+bundle_binstub = File.expand_path("../bundle", __FILE__)
 
-target = target ? File.open(target, 'w') : STDOUT
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
 
-reader = Spreadsheet::Excel::Reader.new :print_opcodes => target
-reader.setup File.open(source)
+require "rubygems"
+require "bundler/setup"
 
-while tuple = reader.get_next_chunk
-end
+load Gem.bin_path("spreadsheet", "xlsopcodes")

data/lib/spreadsheet/excel/internals.rb

@@ -54,7 +54,7 @@ module Internals
     32768 => "MACROMAN",
     32769 => "WINDOWS-1252", #(Latin I) (BIFF2-BIFF3)
   }
-  SEGAPEDOC = CODEPAGES.invert
+  SEGAPEDOC = CODEPAGES.reject { |k, _v| k >= 21010 }.invert
   # color_codes according to http://support.softartisans.com/kbview_1205.aspx
   # synonyms are in comments when reverse lookup
   COLOR_CODES = {

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

@@ -196,7 +196,7 @@ module Biff8
   ##
   # Insert null-characters into a compressed UTF-16 string
   def wide string
-    data = ''
+    data = ''.dup
     string.each_byte do |byte| data << byte.chr << 0.chr end
     data
   end

data/lib/spreadsheet/excel/reader.rb

@@ -56,7 +56,7 @@ class Reader
       ## remove two bits
       integer, = work.unpack 'V'
       integer &= 0xfffffffc
-      value, = ("\0\0\0\0" << [integer].pack('V')).unpack EIGHT_BYTE_DOUBLE
+      value, = ("\0\0\0\0" +  [integer].pack('V')).unpack EIGHT_BYTE_DOUBLE
     else
       ## I can't find a format for unpacking a little endian signed integer.
       #  'V' works for packing, but not for unpacking. But the following works
@@ -125,11 +125,12 @@ class Reader
      #So link the noteObject(text) to the note (with author, position)
      #TODO
      @noteList.each do |i|
-        matching_obj = @noteObjList.select {|j| j.objID == i.objID}
-        if matching_obj.length > 1
+        matching_objs = @noteObjList.select { |j| j.objID == i.objID }
+        if matching_objs.length > 1
            puts "ERROR - more than one matching object ID!"
         end
-        i.text = matching_obj.first.text
+        matching_obj = matching_objs.first
+        i.text = matching_obj.nil? ? '' : matching_obj.text
         worksheet.add_note i.row, i.col, i.text
      end
   end
@@ -398,10 +399,10 @@ class Reader
       end
       formula.value = value
     elsif rtype == 0
-      pos, op, len, work = get_next_chunk
+      pos, op, _len, work = get_next_chunk
       if op == :sharedfmla
         ## TODO: formula-support in 0.8.0
-        pos, op, len, work = get_next_chunk
+        pos, op, _len, work = get_next_chunk
       end
       if op == :string
         formula.value = client read_string(work, 2), @workbook.encoding
@@ -851,6 +852,7 @@ class Reader
     @detected_rows = {}
     @noteObjList = []
     @noteList = []
+    @noteObject = nil
     previous = nil
     while tuple = get_next_chunk
       pos, op, len, work = tuple
@@ -1273,11 +1275,11 @@ class Reader
   end
   def setup io
     ## Reading from StringIO fails without forced encoding
-    if io.respond_to?(:string) && (str = io.string) \
-      && str.respond_to?(:force_encoding)
-      str.force_encoding 'ASCII-8BIT'
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
+      io.set_encoding('ASCII-8BIT')
+    elsif io.respond_to?(:string) && (str = io.string) && str.respond_to?(:force_encoding)
+      str.force_encoding('ASCII-8BIT')
     end
-    ##
     io.rewind
     @ole = Ole::Storage.open io
     @workbook = Workbook.new io, {}

data/lib/spreadsheet/excel/workbook.rb

@@ -28,8 +28,7 @@ class Workbook < Spreadsheet::Workbook
   attr_accessor :bof, :ole
   attr_writer :date_base
   def Workbook.open io, opts = {}
-    @reader = Reader.new opts
-    @reader.read io
+    Reader.new(opts).read(io)    
   end
   def initialize *args
     super

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

@@ -241,81 +241,6 @@ class Worksheet
     end
     write_multiples row, first_idx, multiples if multiples
   end
-  def write_changes reader, endpos, sst_status
-
-    ## FIXME this is not smart solution to update outline_level.
-    #        without this process, outlines in row disappear in MS Excel.       
-    @worksheet.row_count.times do |i|
-      if @worksheet.row(i).outline_level > 0
-        @worksheet.row(i).outline_level = @worksheet.row(i).outline_level
-      end
-    end
-
-    reader.seek @worksheet.offset
-    blocks = row_blocks
-    lastpos = reader.pos
-    offsets = {}
-    row_offsets = []
-    changes = @worksheet.changes
-    @worksheet.offsets.each do |key, pair|
-      if changes.include?(key) \
-        || (sst_status == :complete_update && key.is_a?(Integer))
-        offsets.store pair, key
-      end
-    end
-    ## FIXME it may be smarter to simply write all rowblocks, instead of doing a
-    #        song-and-dance routine for every row...
-    work = offsets.invert
-    work.each do |key, (pos, len)|
-      case key
-      when Integer
-        row_offsets.push [key, [pos, len]]
-      when :dimensions
-        row_offsets.push [-1, [pos, len]]
-      end
-    end
-    row_offsets.sort!
-    row_offsets.reverse!
-    control = changes.size
-    @worksheet.each do |row|
-      key = row.idx
-      if changes.include?(key) && !work.include?(key)
-        row, pair = row_offsets.find do |idx, _| idx <= key end
-        work.store key, pair
-      end
-    end
-    if changes.size > control
-      warn <<-EOS
-Your Worksheet was modified while it was being written. This should not happen.
-Please contact the author (hannes dot wyss at gmail dot com) with a sample file
-and minimal code that generates this warning. Thanks!
-      EOS
-    end
-    work = work.sort_by do |key, (pos, len)|
-      [pos, key.is_a?(Integer) ? key : -1]
-    end
-    work.each do |key, (pos, len)|
-      @io.write reader.read(pos - lastpos) if pos > lastpos
-      if key.is_a?(Integer)
-        if block = blocks.find do |rows| rows.any? do |row| row.idx == key end end
-          write_rowblock block
-          blocks.delete block
-        end
-      else
-        send "write_#{key}"
-      end
-      lastpos = pos + len
-      reader.seek lastpos
-    end
-
-    # Necessary for outline (grouping) and hiding functions 
-    # but these below are not necessary to run
-    # if [Row|Column]#hidden? = false and [Row|Column]#outline_level == 0
-    write_colinfos
-    write_guts
-
-    @io.write reader.read(endpos - lastpos)
-  end
   def write_colinfo bunch
     col = bunch.first
     width = col.width.to_f * 256

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

@@ -164,93 +164,6 @@ class Workbook < Spreadsheet::Writer
     end
   end
   ##
-  # Copy unchanged data verbatim, adjust offsets and write new records for
-  # changed data.
-  def write_changes workbook, io
-    sanitize_worksheets workbook.worksheets
-    collect_formats workbook, :existing_document => true
-    reader = workbook.ole
-    sheet_data = {}
-    sst_status, sst_total, sst_strings = complete_sst_update? workbook
-    sst = {}
-    sst_strings.each_with_index do |str, idx| sst.store str, idx end
-    sheets = worksheets(workbook)
-    positions = []
-    newsheets = []
-    sheets.each do |sheet|
-      @sst[sheet] = sst
-      pos, len = workbook.offsets[sheet.worksheet]
-      if pos
-        positions.push pos
-        sheet.write_changes reader, pos + len, sst_status
-      else
-        newsheets.push sheet
-        sheet.write_from_scratch
-      end
-      sheet_data[sheet.worksheet] = sheet.data
-    end
-    Ole::Storage.open io do |ole|
-      ole.file.open 'Workbook', 'w' do |writer|
-        reader.seek lastpos = 0
-        workbook.offsets.select do |key, pair|
-          workbook.changes.include? key
-        end.sort_by do |key, (pos, _)|
-          pos
-        end.each do |key, (pos, len)|
-          data = reader.read(pos - lastpos)
-          writer.write data
-          case key
-          when Spreadsheet::Worksheet
-            writer.write sheet_data[key]
-          when :boundsheets
-            ## boundsheets are hard to calculate. The offset below is only
-            #  correct if there are no more changes in the workbook globals
-            #  string after this.
-            oldoffset = positions.min - len
-            lastpos = pos + len
-            bytechange = 0
-            buffer = StringIO.new ''
-            if tuple = workbook.offsets[:sst]
-              write_sst_changes workbook, buffer, writer.pos,
-                                sst_total, sst_strings
-              pos, len = tuple
-              if offset = workbook.offsets[:extsst]
-                len += offset[1].to_i
-              end
-              bytechange = buffer.size - len
-              write_boundsheets workbook, writer, oldoffset + bytechange
-              reader.seek lastpos
-              writer.write reader.read(pos - lastpos)
-              buffer.rewind
-              writer.write buffer.read
-            elsif sst.empty? || workbook.biff_version < 8
-              write_boundsheets workbook, writer, oldoffset + bytechange
-            else
-              write_sst workbook, buffer, writer.pos
-              write_boundsheets workbook, writer, oldoffset + buffer.size
-              pos = lastpos
-              len = positions.min - lastpos
-              if len > OPCODE_SIZE
-                reader.seek pos
-                writer.write reader.read(len - OPCODE_SIZE)
-              end
-              buffer.rewind
-              writer.write buffer.read
-              write_eof workbook, writer
-            end
-          else
-            send "write_#{key}", workbook, writer
-          end
-          lastpos = [pos + len, reader.size - 1].min
-          reader.seek lastpos
-        end
-        writer.write reader.read
-        newsheets.each do |sheet|
-          writer.write sheet.data
-        end
-      end
-    end
-  end
   def write_datemode workbook, writer
     mode = @date_base.year == 1899 ? 0x00 : 0x01
     data = [
@@ -396,7 +309,7 @@ class Workbook < Spreadsheet::Writer
     sanitize_worksheets workbook.worksheets
     collect_formats workbook
     sheets = worksheets workbook
-    buffer1 = StringIO.new ''
+    buffer1 = StringIO.new ''.dup
     # ●  BOF Type = workbook globals (➜ 6.8)
     write_bof workbook, buffer1, :globals
     # ○  File Protection Block ➜ 4.19
@@ -441,7 +354,7 @@ class Workbook < Spreadsheet::Writer
     # ○  USESELFS ➜ 5.106
     buffer1.rewind
     # ●● BOUNDSHEET ➜ 5.95
-    buffer2 = StringIO.new ''
+    buffer2 = StringIO.new ''.dup
     # ○  COUNTRY ➜ 5.22
     # ○  Link Table ➜ 4.10.3
     # ○○ NAME ➜ 6.66
@@ -639,8 +552,7 @@ class Workbook < Spreadsheet::Writer
     write_op writer, 0x003d, data.pack('v*')
   end
   ##
-  # The main writer method. Calls #write_from_scratch or #write_changes
-  # depending on the class and state of _workbook_.
+  # The main writer method. Calls #write_from_scratch.
   def write_workbook workbook, io
     unless workbook.is_a?(Excel::Workbook) && workbook.io
       @date_base = Date.new 1899, 12, 31
@@ -650,7 +562,8 @@ class Workbook < Spreadsheet::Writer
       if workbook.changes.empty?
         super
       else
-        write_changes workbook, io
+        @date_base = Date.new 1899, 12, 31
+        write_from_scratch workbook, io
       end
     end
   ensure