spreadsheet 1.2.3 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c435d58771950e840768f7ba80cb02acdf98c9e2
-  data.tar.gz: d994cab59c7ee93edff3e69b40aaf2f7d3a14f68
+SHA256:
+  metadata.gz: eb16d4af4c562e6c5b65e459811240184635197c457385670cca8921d67e111e
+  data.tar.gz: c38bc6a6c1bc31706307d28f50d66ec163a371eeeeecdcbc3a06c48287668bb9
 SHA512:
-  metadata.gz: 273c89fd7f4eb201c915072ace62ac7a32db7173c708f8f43d09506aa43d3391501c17c716741778e30857e97cfb1ab387f2cd9780ddb38cf7a13df395e99da3
-  data.tar.gz: b09e354712317e7a17d800ab992c3385e0c466cac0c0eeb3f8ed564966ce684530feca24597f63081be0ac25e13fb5307ffdfc6ba23a30639e06f5f63fa4869b
+  metadata.gz: 71450fa0a12bd2ef1667aa106dcbcbc1af8fe54c4e49e0930adf433edcb70a8a38e6e5d4de3c82c912bd3c410cbb03554a1e17cc64c1a803dd0204d96d999989
+  data.tar.gz: a22de68097078aa164d04f80fd6bbd4cdd0f4bb8125a1cf9e250d1884fb9d2147555c183d787d98439d307f8c3fff2a7252a99559ec5d5ac986b2f40a90f5dd5

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.rb

@@ -1,11 +1,5 @@
 require 'spreadsheet'
 
-warn <<-EOS
-[DEPRECATED] By requiring 'spreadsheet/excel' you are loading a Compatibility
-             layer which provides a drop-in replacement for Spreadsheet::Excel
-             versions <= 0.3.5.1. This code will be removed in Spreadsheet
-             version 1.0.0
-EOS
 ##
 # Spreadsheet::Excel Compatibility Layer.
 # Drop-in replacement for Spreadsheet::Excel version <= 0.3.5.1

data/lib/spreadsheet/excel/reader.rb

@@ -1275,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/format.rb

@@ -101,12 +101,12 @@ module Spreadsheet
       @pattern_fg_color = :border
       @pattern_bg_color = :pattern_bg
       @regexes = {
-        :date         => Regexp.new(client("[YMD]", 'UTF-8')),
+        :date         => Regexp.new(client("[YMD]|d{2}|m{3}|y{2}", 'UTF-8')),
         :date_or_time => Regexp.new(client("[hmsYMD]", 'UTF-8')),
         :datetime     => Regexp.new(client("([YMD].*[HS])|([HS].*[YMD])", 'UTF-8')),
         :time         => Regexp.new(client("[hms]", 'UTF-8')),
         :number       => Regexp.new(client("([\#]|0+)", 'UTF-8')),
-        :locale       => Regexp.new(client(/\A\[\$\-\d+\]/.to_s, 'UTF-8')),
+        :locale       => Regexp.new(client(/\A\[\$\-\S+\]/.to_s, 'UTF-8')),
       }
 
       # Temp code to prevent merged formats in non-merged cells.

data/lib/spreadsheet/version.rb

@@ -3,5 +3,5 @@
 module Spreadsheet
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '1.2.3'
+  VERSION = '1.2.8'
 end

data/lib/spreadsheet/workbook.rb

@@ -76,7 +76,7 @@ module Spreadsheet
     # Returns the count of total worksheets present.
     # Takes no arguments. Just returns the length of @worksheets array.
     def sheet_count
-    @worksheets.length
+      @worksheets.length
     end
     ##
     # The Font at _idx_

data/lib/spreadsheet/worksheet.rb

@@ -232,6 +232,9 @@ module Spreadsheet
       updated_from idx
       res
     end
+    def << cells=[]
+      insert_row @rows.size, cells
+    end
     def inspect
       names = instance_variables
       names.delete '@rows'

data/test/excel/reader.rb

@@ -25,6 +25,19 @@ module Spreadsheet
           reader.setup not_empty_io
         end
       end
+
+      def test_not_frozen_stream_error_on_setup
+        return if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
+
+        reader = Spreadsheet::Excel::Reader.new
+        data = File.expand_path File.join('test', 'data')
+        path = File.join data, 'test_empty.xls'
+        content_string = File.read path
+        frozen_io = StringIO.new(content_string.freeze)
+        assert_nothing_thrown do
+          reader.setup(frozen_io)
+        end
+      end
     end
   end
 end

data/test/format.rb

@@ -25,6 +25,8 @@ module Spreadsheet
       assert_equal false, @format.date?
       @format.number_format = "0.00;[RED]\\-0.00"
       assert_equal false, @format.date?
+      @format.number_format = "[$-C0A]dd\\-mmm\\-yy"
+      assert_equal true, @format.date?
     end
     def test_date_or_time?
       assert_equal false, @format.date_or_time?

data/test/suite.rb

@@ -3,6 +3,8 @@
 require 'rubygems'
 require 'bundler'
 require 'find'
+require 'simplecov'
+SimpleCov.start
 
 $VERBOSE = true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.8
 platform: ruby
 authors:
 - Hannes F. Wyss, Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
@@ -16,78 +16,72 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.17'
-description: |-
-  The Spreadsheet Library is designed to read and write Spreadsheet Documents.
-  As of version 0.6.0, only Microsoft Excel compatible spreadsheets are
-  supported. Spreadsheet is a combination/complete rewrite of the
-  Spreadsheet::Excel Library by Daniel J. Berger and the ParseExcel Library by
-  Hannes Wyss. Spreadsheet can read, write and modify Spreadsheet Documents.
-email: zdavatz@ywesee.com
+        version: '0'
+description: As of version 0.6.0, only Microsoft Excel compatible spreadsheets are
+  supported
+email: hannes.wyss@gmail.com, mhatakeyama@ywesee.com, zdavatz@ywesee.com
 executables:
 - xlsopcodes
 extensions: []
-extra_rdoc_files:
-- GUIDE.md
-- History.md
-- LICENSE.txt
-- Manifest.txt
-- README.md
+extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Excel97-2007BinaryFileFormatSpecification.pdf
-- GUIDE.md
-- Gemfile
-- Gemfile.lock
-- History.md
 - LICENSE.txt
 - Manifest.txt
-- README.md
-- Rakefile
+- bin/bundle
+- bin/bundler
+- bin/oletool
+- bin/rake
+- bin/sow
 - bin/xlsopcodes
-- excelfileformat.pdf
 - lib/parseexcel.rb
 - lib/parseexcel/parseexcel.rb
 - lib/parseexcel/parser.rb
@@ -130,11 +124,12 @@ files:
 - lib/spreadsheet/workbook.rb
 - lib/spreadsheet/worksheet.rb
 - lib/spreadsheet/writer.rb
-- spreadsheet.gemspec
 - test/data/test_adding_data_to_existing_file.xls
 - test/data/test_borders.xls
 - test/data/test_changes.xls
 - test/data/test_comment.xls
+- test/data/test_compact_format_date.xls
+- test/data/test_compact_many_rows.xls
 - test/data/test_copy.xls
 - test/data/test_datetime.xls
 - test/data/test_empty.xls
@@ -143,8 +138,10 @@ files:
 - test/data/test_margin.xls
 - test/data/test_merged_and_protected.xls
 - test/data/test_merged_cells.xls
+- test/data/test_missing_format.xls
 - test/data/test_missing_row.xls
 - test/data/test_pagesetup.xls
+- test/data/test_sizes.xls
 - test/data/test_text_drawing.xls
 - test/data/test_version_excel5.xls
 - test/data/test_version_excel95.xls
@@ -163,14 +160,12 @@ files:
 - test/workbook.rb
 - test/workbook_protection.rb
 - test/worksheet.rb
-homepage: https://github.com/zdavatz/spreadsheet
+homepage: https://github.com/zdavatz/spreadsheet/
 licenses:
 - GPL-3.0
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -184,9 +179,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: The Spreadsheet Library is designed to read and write Spreadsheet Documents
-test_files: []
+test_files:
+- test/suite.rb