spreadsheet 1.2.2 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 791f3a7c891c29fee7506b00457311bc4fcc1fe6
-  data.tar.gz: bbf63401258ae34e9bcc81fc9bfe479d89d48356
+SHA256:
+  metadata.gz: f3838959e9ca05cea64d92732af76a16989f192dee2ae8d6faa78f43f3148858
+  data.tar.gz: 6655bef2181febca0c1f052b557012f8ac08c35e1aa5a69d360e0b006b8231df
 SHA512:
-  metadata.gz: bc5be7f5f24bc8f63388765f5eba89166db17406cad72c72c095537e1f7de9e32c8d22c365017eaba1725661c583eb4369bb2500f77046b35996fdfe372e296e
-  data.tar.gz: 9d254c82d041143d28f5e2447d230439d040836a7bc6e1014934290c93cfda6921de11b030d5e695784c48b1ef4e6c506737214639695962a6bff98d7ce0c0a2
+  metadata.gz: d215eec2e59d1e51a3d895b2dde467b48e3c807fedb871cd08c2f014fda0ddfb13af7629e1cfd4b72a65e56816fd2c635ce9f57ed744c156be11601aaa0fc3dc
+  data.tar.gz: 39963a66c937f064717bdbbe861ac786a2b3a3541409c0852da17f13d63c1c3dc449fc4f9b40bc1e31ca68bedc3a1fe0c43bdba8a32091249eec8d7240ce1140

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,17 @@
+#!/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)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("ruby-ole", "oletool")

data/bin/rake

@@ -0,0 +1,17 @@
+#!/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)
+
+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,17 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# 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.
+#
 
-require 'spreadsheet'
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-source, target = ARGV
+require "rubygems"
+require "bundler/setup"
 
-if source.nil?
-  puts "Usage: #{$0} <source> [<target>]"
-  exit -1
-end
-
-target = target ? File.open(target, 'w') : STDOUT
-
-reader = Spreadsheet::Excel::Reader.new :print_opcodes => target
-reader.setup File.open(source)
-
-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.2'
+  VERSION = '1.2.7'
 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 last_row_index + 1, 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.2
+  version: 1.2.7
 platform: ruby
 authors:
 - Hannes F. Wyss, Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
@@ -16,78 +16,71 @@ 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/bundler
+- bin/oletool
+- bin/rake
+- bin/sow
 - bin/xlsopcodes
-- excelfileformat.pdf
 - lib/parseexcel.rb
 - lib/parseexcel/parseexcel.rb
 - lib/parseexcel/parser.rb
@@ -130,11 +123,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 +137,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 +159,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 +178,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

data/.gitignore

@@ -1,2 +0,0 @@
-tags
-*.swp

data/.travis.yml

@@ -1,51 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-before_install:
-  - "if $(ruby -e 'exit(RUBY_VERSION >= \"2.3.0\")'); then env -u RUBYOPT gem update --system; fi"
-  - "if $(ruby -e 'exit(RUBY_VERSION >= \"2.3.0\")'); then env -u RUBYOPT gem install bundler --no-document; fi"
-  - "if $(ruby -e 'exit(RUBY_VERSION <  \"2.3.0\")'); then gem install bundler -v 1.17.3 --no-document; fi"
-bundler_args: --binstubs
-script: "bundle exec ruby test/suite.rb"
-rvm:
-  - ruby-head
-  - 2.6.1
-  - 2.5.3
-  - 2.4.5
-  - 2.3.8
-  - 2.2.6
-  - 2.1.10
-  - 2.0.0
-  - 1.9.3
-  - 1.9.2
-  - 1.8.7
-  - rbx-19mode
-  - rbx-18mode
-  - jruby-head
-  - jruby-19mode
-  - jruby-18mode
-  - ree
-matrix:
-  include:
-    - rvm: 2.4.5
-      env: RUBYOPT='--enable-frozen-string-literal --debug-frozen-string-literal' USE_LATEST_RUBY_OLE=yes
-    - rvm: 2.5.3
-      env: RUBYOPT='--enable-frozen-string-literal --debug-frozen-string-literal' USE_LATEST_RUBY_OLE=yes
-    - rvm: 2.6.1
-      env: RUBYOPT='--enable-frozen-string-literal --debug-frozen-string-literal' USE_LATEST_RUBY_OLE=yes
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: rbx-19mode
-    - rvm: rbx-18mode
-    - rvm: jruby-head
-    - rvm: jruby-19mode
-    - rvm: jruby-18mode
-    - rvm: ree
-#notifications:
-#  email:
-#    recipients:
-#      - yasaka@ywesee.com
-#      - zdavatz@ywesee.com
-
-email:
-  false # temp