spreadsheet 1.2.0 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 153daf0819e113f6da9726a43b23494e30497ae3
-  data.tar.gz: 811ecec4ac2a63d3c431ed6dc324ff69c9a189ca
+  metadata.gz: c8aa45d407cf5aeadbf8af753a674fdf12dab84c
+  data.tar.gz: 32a18ad8a2d79f9eb5df62f435560502c05bfbb8
 SHA512:
-  metadata.gz: 3bc43a69c6d5817d2132f05a9544546b070e5512c19c002aa7280ab2879a8b3f0297890f9bea890efe6a082b69a59a226313f4df47e4b5e65e7a08fb81ed894b
-  data.tar.gz: 2ea734d18f429276707f0823f2703cda52fcc057d6aa04eea4b065db1f08299c3f2a94fc4fb1b61fde2080d5a63fe479ecf857bc14d47d92fa7b1a1331537c02
+  metadata.gz: 97f97bf780ece2ac6f25906106b1f62c1cb681cb91740620321875de8fcd2489dc97c592a4d143c52f1cd78c6f737e2b12a33fe3d6a0715ecd4f390461ffa713
+  data.tar.gz: ddb5ee3babe8492581be775a760db74dd4f392f75773386c6a204682e051f20b56d004091741653691eba09f7e8433588945b266784747d95b5cfae4f0836180

data/.gitignore

@@ -1,2 +1,3 @@
 tags
 *.swp
+/Gemfile.lock

data/.travis.yml

@@ -1,14 +1,20 @@
 language: ruby
+dist: trusty
 sudo: false
 cache: bundler
 before_install:
-  - gem install bundler -v 1.17.3 --no-document
+  - "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.3.3
-  - 2.2.6
+  - 2.6.3
+  - 2.5.5
+  - 2.4.5
+  - 2.3.8
+  - 2.2.10
   - 2.1.10
   - 2.0.0
   - 1.9.3
@@ -21,6 +27,13 @@ rvm:
   - 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.5
+      env: RUBYOPT='--enable-frozen-string-literal --debug-frozen-string-literal' USE_LATEST_RUBY_OLE=yes
+    - rvm: 2.6.3
+      env: RUBYOPT='--enable-frozen-string-literal --debug-frozen-string-literal' USE_LATEST_RUBY_OLE=yes
   allow_failures:
     - rvm: ruby-head
     - rvm: rbx-19mode
@@ -29,8 +42,5 @@ matrix:
     - rvm: jruby-19mode
     - rvm: jruby-18mode
     - rvm: ree
-notifications:
-  email:
-    recipients:
-      - yasaka@ywesee.com
-      - zdavatz@ywesee.com
+email:
+  false

data/Gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
-gem 'ruby-ole'
+
+gem 'ruby-ole', '>= 1.2.12.2'
 
 if RUBY_VERSION.to_f > 2.0
   gem 'test-unit'

data/Gemfile.lock

@@ -3,11 +3,11 @@ GEM
   specs:
     hoe (3.17.1)
       rake (>= 0.8, < 13.0)
-    minitest (5.8.2)
-    power_assert (0.2.4)
-    rake (10.5.0)
-    ruby-ole (1.2.12.1)
-    test-unit (3.1.5)
+    minitest (5.10.1)
+    power_assert (1.0.1)
+    rake (12.3.0)
+    ruby-ole (1.2.12.2)
+    test-unit (3.2.3)
       power_assert
 
 PLATFORMS
@@ -16,8 +16,8 @@ PLATFORMS
 DEPENDENCIES
   hoe (>= 3.4)
   minitest
-  ruby-ole
+  ruby-ole (>= 1.2.12.2)
   test-unit
 
 BUNDLED WITH
-   1.17.2
+   1.14.6

data/History.md

@@ -1,3 +1,45 @@
+### 1.2.6 22.1.2020
+Author: tetsuya-ogawa <tetsuya.ogawa87@gmail.com>
+Date:   Wed Jan 22 15:18:00 2020 +0900
+
+* add instance method "<<" to Spreadsheet::Worksheet
+
+### 1.2.5 23.10.2019
+Author: Jesús Manuel García Muñoz <jesus@bebanjo.com>
+Date:   Wed Oct 23 20:26:01 2019 +0200
+
+* Fixes unrecognized date format
+
+### 1.2.4 24.05.2019
+Author: Cyril Champier <cyril.champier@doctolib.com>
+Date:   Fri May 24 12:56:52 2019 +0200
+
+* correct ruby version check
+* can read frozen string io
+
+### 1.2.3 12.03.2019
+Author: taichi <taichi730@gmail.com>
+Date:   Tue Mar 12 22:29:12 2019 +0900
+
+* Remove workaround for ruby-ole gem
+
+### 1.2.2 01.03.2019
+Author: taichi <taichi730@gmail.com>
+Date:   Fri Mar 1 13:00:28 2019 +0900
+
+* fixed unit test errors caused by frozen-string-literal
+* removed ruby 2.3.8 with frozen-string-literal from CI regression
+  (It seems that standard libraries for this version does not support the
+  feature enough.)
+* enable '--enable-frozen-string-literal' option on CI test
+
+### 1.2.1 28.02.2019
+Author: taichi <taichi730@gmail.com>
+Date:   Thu Feb 28 10:30:46 2019 +0900
+
+* Merge pull request #231 from taichi-ishitani/separated_version_file  
+* Merge pull request #230 from taichi-ishitani/frozen_string_literal_support
+    
 ### 1.2.0 17.2.2019
 Author: James McLaren <jamesmclaren555@gmail.com>
 * spreadsheet-1.2.0.gem released

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/README.md

@@ -29,9 +29,10 @@ Hannes Wyss. Spreadsheet can read, write and modify Spreadsheet Documents.
 
 ## Notes from Users
 
-Alfred: a@boxbot.org: I think it should be noted in the README file that the library doesn't
-recognize cell formats in Excel created documents, which results in
-Floats returned for any number.
+* [Alfred](mailto:a@boxbot.org): The library doesn't recognize cell formats in Excel
+created documents, which results in Floats returned for any number.
+* [Tom](https://github.com/tom-lord): This library *only* supports XLS format;
+it does **not** support XLSX format.
 
 ## What's new?
 
@@ -50,7 +51,7 @@ Floats returned for any number.
 * Write-Support: BIFF5
 * Remove backward compatibility code
 
-Note: Spreadsheet supports Ruby 1.8.6, 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.1, 2.2.2
+Note: Spreadsheet is tested against all minor ruby versions through: 1.8.7 - 2.6.3
 
 You will get a deprecated warning about iconv when using spreadsheet with Ruby
 1.9.3. So replacing iconv is on the Roadmap as well ;).
@@ -109,5 +110,5 @@ Copyright (c) 2010 ywesee GmbH (mhatakeyama@ywesee.com, zdavatz@ywesee.com)
 ## License
 
 This library is distributed under the GPLv3.
-Please see the [LICENSE] (https://github.com/zdavatz/spreadsheet/blob/master/LICENSE.txt) file.
+Please see the [LICENSE](https://github.com/zdavatz/spreadsheet/blob/master/LICENSE.txt) file.
 

data/lib/spreadsheet.rb

@@ -25,6 +25,7 @@
 #             8006 Zürich
 ###           Switzerland
 
+require 'spreadsheet/version'
 require 'spreadsheet/errors'
 
 require 'spreadsheet/excel/workbook'
@@ -44,10 +45,6 @@ require 'spreadsheet/excel/rgb'
 #  sheet.each do |row| puts row[0] end
 module Spreadsheet
 
-  ##
-  # The version of Spreadsheet you are using.
-  VERSION = '1.2.0'
-
   ##
   # Default client Encoding. Change this value if your application uses a
   # different Encoding:

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
@@ -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/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/writer/workbook.rb

@@ -209,7 +209,7 @@ class Workbook < Spreadsheet::Writer
             oldoffset = positions.min - len
             lastpos = pos + len
             bytechange = 0
-            buffer = StringIO.new ''
+            buffer = StringIO.new ''.dup
             if tuple = workbook.offsets[:sst]
               write_sst_changes workbook, buffer, writer.pos,
                                 sst_total, sst_strings
@@ -396,7 +396,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 +441,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

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

@@ -20,7 +20,7 @@ class Worksheet
   def initialize workbook, worksheet
     @workbook = workbook
     @worksheet = worksheet
-    @io = StringIO.new ''
+    @io = StringIO.new ''.dup
     @biff_version = 0x0600
     @bof = 0x0809
     @build_id = 3515
@@ -642,7 +642,7 @@ and minimal code that generates this warning. Thanks!
   ##
   # Write multiple consecutive cells with RK values (see #write_rk)
   def write_mulrk row, idx, multiples
-    fmt = 'v2'
+    fmt = ['v2']
     data = [
       row.idx, # Index to row
       idx, # Index to first column (fc)
@@ -655,7 +655,7 @@ and minimal code that generates this warning. Thanks!
     end
     # Index to last column (lc)
     data.push idx + multiples.size - 1
-    write_op opcode(:mulrk), data.pack(fmt << 'v')
+    write_op opcode(:mulrk), data.pack((fmt << 'v').join)
   end
   def write_multiples row, idx, multiples
     case multiples.last

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Spreadsheet
+  ##
+  # The version of Spreadsheet you are using.
+  VERSION = '1.2.6'
+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/spreadsheet.gemspec

@@ -1,7 +1,7 @@
 # require File.join(File.dirname(__FILE__), 'lib', 'spreadsheet')
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'spreadsheet'
+require 'spreadsheet/version'
 
 Gem::Specification.new do |spec|
    spec.name        = "spreadsheet"

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

@@ -36,7 +36,7 @@ module Spreadsheet
     end
     def teardown
       Spreadsheet.client_encoding = 'UTF-8'
-      FileUtils.rm_r @var
+      FileUtils.rm_rf @var
     end
     def test_copy__identical__file_paths
       path = File.join @data, 'test_copy.xls'
@@ -506,7 +506,7 @@ module Spreadsheet
       assert_equal 3, sheets.size
       sheet = book.worksheet 0
       assert_instance_of Excel::Worksheet, sheet
-      str = "S\000h\000e\000e\000t\0001\000"
+      str = "S\000h\000e\000e\000t\0001\000".dup
       if RUBY_VERSION >= '1.9'
         str.force_encoding 'UTF-16LE' if str.respond_to?(:force_encoding)
       end
@@ -730,7 +730,7 @@ module Spreadsheet
       book = Spreadsheet::Excel::Workbook.new
       sheet = book.create_worksheet :name => 'My Worksheet'
       sheet[0,0] = 'my cell'
-      data = StringIO.new ''
+      data = StringIO.new ''.dup
       assert_nothing_raised do
         book.write data
       end
@@ -829,7 +829,7 @@ module Spreadsheet
       assert_equal 2, book.worksheets.size
       sheet = book.worksheets.first
       assert_instance_of Spreadsheet::Excel::Worksheet, sheet
-      name = "W\000o\000r\000k\000s\000h\000e\000e\000t\0001\000"
+      name = "W\000o\000r\000k\000s\000h\000e\000e\000t\0001\000".dup
       name.force_encoding 'UTF-16LE' if name.respond_to?(:force_encoding)
       assert_equal name, sheet.name
       assert_not_nil sheet.offset
@@ -926,7 +926,7 @@ module Spreadsheet
       assert_equal 40, sheet1.row(11).height
       assert_instance_of Spreadsheet::Excel::Worksheet, sheet
       sheet = book.worksheets.last
-      name = "m\000y\000 \000n\000a\000m\000e\000"
+      name = "m\000y\000 \000n\000a\000m\000e\000".dup
       name.force_encoding 'UTF-16LE' if name.respond_to?(:force_encoding)
       assert_equal name, sheet.name
       assert_not_nil sheet.offset
@@ -1212,7 +1212,7 @@ module Spreadsheet
       sheet = book.create_worksheet
       (0..200).each { |i| sheet.row(i).push "ëçáéíóú" }
       assert_nothing_raised do
-        book.write StringIO.new("", "w+")
+        book.write StringIO.new("".dup, "w+")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.6
 platform: ruby
 authors:
 - Hannes F. Wyss, Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-17 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
@@ -126,6 +126,7 @@ files:
 - 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