can read frozen string io

zdavatz · May 23, 2019 · d1262ce · d1262ce
1 parent 0ab10ae
commit d1262ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lib/spreadsheet/excel/reader.rb b/lib/spreadsheet/excel/reader.rb
@@ -1275,11 +1275,7 @@ def set_row_address worksheet, work, pos, len
   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'
-    end
-    ##
+    io.set_encoding('ASCII-8BIT') if io.respond_to?(:set_encoding)
     io.rewind
     @ole = Ole::Storage.open io
     @workbook = Workbook.new io, {}

diff --git a/test/excel/reader.rb b/test/excel/reader.rb
@@ -25,6 +25,17 @@ def test_not_empty_file_error_on_setup
           reader.setup not_empty_io
         end
       end
+
+      def test_not_frozen_stream_error_on_setup
+        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