spreadsheet 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c435d58771950e840768f7ba80cb02acdf98c9e2
-  data.tar.gz: d994cab59c7ee93edff3e69b40aaf2f7d3a14f68
+  metadata.gz: 6e24a126670c29d4c9f3b8bcf8adb5d8d84a2acf
+  data.tar.gz: 21a56ac71b43a87259aee264c047b298814bd8d2
 SHA512:
-  metadata.gz: 273c89fd7f4eb201c915072ace62ac7a32db7173c708f8f43d09506aa43d3391501c17c716741778e30857e97cfb1ab387f2cd9780ddb38cf7a13df395e99da3
-  data.tar.gz: b09e354712317e7a17d800ab992c3385e0c466cac0c0eeb3f8ed564966ce684530feca24597f63081be0ac25e13fb5307ffdfc6ba23a30639e06f5f63fa4869b
+  metadata.gz: 83d667da3484477693bb3dc44ff85d8c7332142dc5413e0f5497bb825e690e04731751e86103cb9cb4e5cbb2b3d39a433a90448520fac72f498d405b744433d8
+  data.tar.gz: bc6d0f1778204ad90908e0b243449581482b67bfa446298e14e429fa7478dc5fafe3054656813e54a4c69231abc7f3bf11121f7f3c49bb330ce51bb9352aa1f3

data/History.md

@@ -1,3 +1,10 @@
+### 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

data/README.md

@@ -109,5 +109,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/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/version.rb

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 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: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole