simple_xlsx_reader 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 979490ce3bd7f0482879fb5fb5465e10ad1b07c1488d0a544950131d9063050a
-  data.tar.gz: 412d0040a586cc5ee4acdd4a2f74dd74f3bf9eb781a35d8a36c12f6caadc566c
+  metadata.gz: 20c74bef372629ffb807d50df274c90682e17d53eed296a1e05fbb99533d4a8e
+  data.tar.gz: 9c4311913e79ad139414a4fe064d89fb246a1d46f30b7736c87f049985801660
 SHA512:
-  metadata.gz: 00c01bc0c2a393eb35e458411dfeab55b8bf30cee2661324cbd97a175baf0ceb31a881b1b2b7bd668a2b475ff008372c1428908340e30769308884355fdd46e8
-  data.tar.gz: 81b1b26806a97c56710cab64aa22212985dea82b308e2fbba6835f4ea7a69b79067268bb13537999594dc5722928f1df235938355a7d4a51b58ae7ed4af1d093
+  metadata.gz: 18db8595a36d4d9bb0f1dfee5da58753b799a6358530dfb9436f9c7b72e8e06bb9101d86d8dc617669c075fced44db8c24fdca6c5a3b2cb6b908cc0cd645eeb1
+  data.tar.gz: 23d4b057060c5f66ad3d57d0d65fa6e127ed4c7faa622ec0d236b58dd439179b41dff041ec2dd955c2ec893d577d9660465d2dcea0fe9a9f3af5e911ac5aa8e7

data/.github/workflows/ruby.yml

@@ -22,15 +22,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
 
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@2b019609e2b0f1ea1a2bc8ca11cb82ab46ada124
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 2.0.1
+
+* Restore ability to parse IO strings (@robbevp)
+* Add Ruby 3.1 and 3.2 to CI (@taichi-ishitani)
+
 ### 2.0.0
 
 * SPEED

data/lib/simple_xlsx_reader/document.rb

@@ -8,14 +8,16 @@ module SimpleXlsxReader
   # Main class for the public API. See the README for usage examples,
   # or read the code, it's pretty friendly.
   class Document
-    attr_reader :file_path
+    attr_reader :string_or_io
 
-    def initialize(file_path)
-      @file_path = file_path
+    def initialize(legacy_file_path = nil, file_path: nil, string_or_io: nil)
+      fail(ArgumentError, 'either file_path or string_or_io must be provided') if legacy_file_path.nil? && file_path.nil? && string_or_io.nil?
+  
+      @string_or_io = string_or_io || File.new(legacy_file_path || file_path)
     end
 
     def sheets
-      @sheets ||= Loader.new(file_path).init_sheets
+      @sheets ||= Loader.new(string_or_io).init_sheets
     end
 
     # Expensive because it slurps all the sheets into memory,

data/lib/simple_xlsx_reader/loader.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 module SimpleXlsxReader
-  class Loader < Struct.new(:file_path)
+  class Loader < Struct.new(:string_or_io)
     attr_accessor :shared_strings, :sheet_parsers, :sheet_toc, :style_types, :base_date
 
     def init_sheets
       ZipReader.new(
-        file_path: file_path,
+        string_or_io: string_or_io,
         loader: self
       ).read
 
@@ -19,12 +19,12 @@ module SimpleXlsxReader
       end
     end
 
-    ZipReader = Struct.new(:file_path, :loader, keyword_init: true) do
+    ZipReader = Struct.new(:string_or_io, :loader, keyword_init: true) do
       attr_reader :zip
 
       def initialize(*args)
         super
-        @zip = SimpleXlsxReader::Zip.open(file_path)
+        @zip = SimpleXlsxReader::Zip.open_buffer(string_or_io)
       end
 
       def read

data/lib/simple_xlsx_reader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleXlsxReader
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/lib/simple_xlsx_reader.rb

@@ -42,8 +42,11 @@ module SimpleXlsxReader
     end
 
     def open(file_path)
-      Document.new(file_path).tap(&:sheets)
+      Document.new(file_path: file_path).tap(&:sheets)
+    end
+    
+    def parse(string_or_io)
+      Document.new(string_or_io: string_or_io).tap(&:sheets)
     end
-    alias parse open
   end
 end

data/test/simple_xlsx_reader_test.rb

@@ -18,6 +18,7 @@ describe SimpleXlsxReader do
 
   let(:sesame_street_blog_file_path) { File.join(File.dirname(__FILE__), 'sesame_street_blog.xlsx') }
   let(:sesame_street_blog_io) { File.new(sesame_street_blog_file_path) }
+  let(:sesame_street_blog_string) { IO.read(sesame_street_blog_file_path) }
 
   let(:expected_result) do
     {
@@ -54,6 +55,14 @@ describe SimpleXlsxReader do
       end
     end
 
+    describe 'load from string' do
+      let(:subject) { SimpleXlsxReader.parse(sesame_street_blog_io) }
+
+      it 'reads an xlsx string into a hash of {[sheet name] => [data]}' do
+        _(subject.to_hash).must_equal(expected_result)
+      end
+    end
+
     it 'outputs strings in UTF-8 encoding' do
       document = SimpleXlsxReader.parse(sesame_street_blog_io)
       _(document.sheets[0].rows.to_a.flatten.map(&:encoding).uniq)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_xlsx_reader
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Woody Peterson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri