chupa-text-decomposer-spreadsheet 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e8e9b132dcf0cb81ff510a740da30a867ce44aa0cc7aa3d26ed5c12ec5cf6bf
-  data.tar.gz: cbf5098bb31dfb063e609e63354b068b6929ac17e4c8fcd451424d2640296628
+  metadata.gz: b50a60537eb1f3f662b6f71da4ea8d29a85301d593b9dfbac4da2211c73017d4
+  data.tar.gz: e8ebf3da90b055a6a987409466d02013105fc3e48fb3eb5044a2fe1e81d41807
 SHA512:
-  metadata.gz: 48ba871c9e22532fa8c16b983caee1ebfad186af4ba9db9857ea64efad108b8a73b41dfbcf53d20d196bed0bc7f364613cb1e883d254e6d16d17777d61b7a4d9
-  data.tar.gz: 4867c4e9197d70ac188b55a55bd1bfadb228bab6f366ff4bb5edc35cfb8e81f2f3b497f4b5ec6be88c499d15d40c586176e33b55c95214031577b3e407b55b72
+  metadata.gz: eb709a20b9b5205653507304506b36e86e321def5d7846113822396121a50f32b61739ce88cab30573a8593bca02715e3fee57d2a588ee26e9fc96116c2fd2ea
+  data.tar.gz: '04315366589a40e543c6ef17808c7d902b135924bea0a5ce1b8df0b4bdf2be349a30c23eb30c9bc4391ea0e21abaaabd9982f64507e178bd294b8609776917ae'

data/chupa-text-decomposer-spreadsheet.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "chupa-text-decomposer-spreadsheet"
-  spec.version = "1.0.3"
+  spec.version = "1.0.4"
   spec.author = "Kenji Okimoto"
   spec.email = "okimoto@clear-code.com"
   spec.summary = "ChupaText decomposer for spreadsheet."

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.0.4: 2019-03-01
+
+### Improvements
+
+  * Added error processing for broken file.
+
 ## 1.0.3: 2019-02-25
 
 ### Improvements

data/lib/chupa-text/decomposers/spreadsheet.rb

@@ -5,6 +5,8 @@ require "digest/sha1"
 module ChupaText
   module Decomposers
     class Spreadsheet < Decomposer
+      include Loggable
+
       registry.register("spreadsheet", self)
 
       TARGET_EXTENSIONS = ["ods", "xls", "xlsx", "xlsm", "xml"]
@@ -29,21 +31,47 @@ module ChupaText
       end
 
       def decompose(data)
-        book = Roo::Spreadsheet.open(data.path.to_s)
-        book.sheets.each do |sheet_name|
-          sheet = book.sheet(sheet_name)
-          body = sheet.to_csv
-          text_data = TextData.new(body, source_data: data)
-          text_data["name"] = sheet_name
-          text_data["digest"] = Digest::SHA1.hexdigest(body)
-          text_data["size"] = body.bytesize
-          text_data["first-row"] = sheet.first_row
-          text_data["last-row"] = sheet.last_row
-          text_data["first-column"] = sheet.first_column && sheet.first_column_as_letter
-          text_data["last-column"] = sheet.last_column && sheet.last_column_as_letter
-          yield text_data
+        open_book(data) do |book|
+          book.sheets.each do |sheet_name|
+            sheet = book.sheet(sheet_name)
+            body = sheet.to_csv
+            text_data = TextData.new(body, source_data: data)
+            text_data["name"] = sheet_name
+            text_data["digest"] = Digest::SHA1.hexdigest(body)
+            text_data["size"] = body.bytesize
+            text_data["first-row"] = sheet.first_row
+            text_data["last-row"] = sheet.last_row
+            text_data["first-column"] = sheet.first_column && sheet.first_column_as_letter
+            text_data["last-column"] = sheet.last_column && sheet.last_column_as_letter
+            yield text_data
+          end
+        end
+      end
+
+      private
+      def open_book(data)
+        book = nil
+        begin
+          book = Roo::Spreadsheet.open(data.path.to_s)
+        rescue Ole::Storage::FormatError => format_error
+          error do
+            message = "#{log_tag} Invalid format: "
+            message << "#{format_error.class}: #{format_error.message}\n"
+            message << format_error.backtrace.join("\n")
+            message
+          end
+          return
         end
-        book.close
+
+        begin
+          yield(book)
+        ensure
+          book.close
+        end
+      end
+
+      def log_tag
+        "[decomposer][spreadsheet]"
       end
     end
   end

data/test/fixture/xls/broken.xls

@@ -0,0 +1 @@
+Broken

data/test/helper.rb

@@ -3,4 +3,33 @@ module Helper
     base_dir = File.expand_path(__dir__)
     File.join(base_dir, "fixture", *components)
   end
+
+  class CaptureLogger
+    def initialize(output)
+      @output = output
+    end
+
+    def error(message=nil)
+      @output << [:error, message || yield]
+    end
+  end
+
+  def capture_log
+    original_logger = ChupaText.logger
+    begin
+      output = []
+      ChupaText.logger = CaptureLogger.new(output)
+      yield
+      normalize_log(output)
+    ensure
+      ChupaText.logger = original_logger
+    end
+  end
+
+  def normalize_log(log)
+    log.collect do |level, message|
+      message = message.split("\n", 2)[0]
+      [level, message]
+    end
+  end
 end

data/test/test-spreadsheet.rb

@@ -45,6 +45,20 @@ class TestSpreadsheet < Test::Unit::TestCase
                    decompose("xls/multi-sheets.xls"))
     end
 
+    def test_xls_broken
+      log = capture_log do
+        assert_equal([], decompose("xls/broken.xls"))
+      end
+      assert_equal([
+                     [
+                       :error,
+                       "[decomposer][spreadsheet] Invalid format: " +
+                       "Ole::Storage::FormatError: OLE2 signature is invalid"
+                     ],
+                   ],
+                   log)
+    end
+
     def test_xlsx
       assert_equal([<<-SHEET1, <<-SHEET2, <<-SHEET3],
 "Sheet1 - A1","Sheet1 - B1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text-decomposer-spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Kenji Okimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chupa-text
@@ -108,6 +108,7 @@ files:
 - doc/text/news.md
 - lib/chupa-text/decomposers/spreadsheet.rb
 - test/fixture/ods/multi-sheets.ods
+- test/fixture/xls/broken.xls
 - test/fixture/xls/multi-sheets.xls
 - test/fixture/xlsx/multi-sheets.xlsx
 - test/helper.rb