rggen-spreadsheet-loader 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a9e3cd2d0e9852524f09edcecf3d62cab2a6b496f4f59571052cb0c7b879aba
-  data.tar.gz: 491fb225fd336ccc3640d1359849fe0383850e1d94b0a70502dbccdec111191d
+  metadata.gz: e0f3c849dfe3a2e44abfe3dc1014c4a4254fe8be92bdd4b64745fd1778cb0b42
+  data.tar.gz: 690e61fab0e402d9171aa2ee50befbf25111ad44810acf01cd5c9af11fba7e8f
 SHA512:
-  metadata.gz: 88dd693a44503622b944dc5ddead75f8c1845ba48ab8dd9c7e1ff2d69096f6e491ae6dbb67ad0f96015e9dcdbc8dfd04761ced92a289cff893f13fbbad04dc91
-  data.tar.gz: e1544ef459e4f3dc3a4ade4e8d5396b66d9be1f4eaac30adaf77e0330c9bd08567ed8ae520712e77c77edd2831aaafb06665ece1f94dc5a7f8cd475df20bfe5a
+  metadata.gz: 23770bfa1f24804808d6c75885f07338831f18833147c165783b8dd1bac3edde07e90f281f1ed2f326fcf71487ff972bb1f14353d08142491660a68997b57676
+  data.tar.gz: e162d610aa891cd2928370e9cb8f9bf6d4057be34f344efc855de1539ecc2b743054c4d00d4209a999747facbe579cf947fc8cdae44f2c36e72dfbd29cf33c40

data/lib/rggen/spreadsheet_loader/roo_loader.rb

@@ -8,19 +8,22 @@ module RgGen
       support_types [:xlsx, :ods]
 
       def read_spreadsheet(file, book)
-        read_roo(file) do |pagename, page|
-          book.add_sheet(pagename, collect_cells(page))
-        end
+        read_roo(file, &page_processor(book))
       end
 
       private
 
-      def read_roo(file)
+      def read_roo(file, &block)
         require 'roo'
         Roo::Spreadsheet.open(file, extension: File.extname(file))
-          .each_with_pagename do |pagename, page|
-            page.first_row && yield(pagename, page)
-          end
+          .each_with_pagename(&block)
+      end
+
+      def page_processor(book)
+        lambda do |pagename_and_page|
+          pagename, page = pagename_and_page
+          page.first_row && book.add_sheet(pagename, collect_cells(page))
+        end
       end
 
       def collect_cells(page)

data/lib/rggen/spreadsheet_loader/spreadsheet_loader.rb

@@ -58,7 +58,8 @@ module RgGen
       end
 
       def collect_register_data(sheet)
-        sheet.rows(register_start_position.row)
+        sheet
+          .rows(register_start_position.row)
           .reject { |row| row.cells.all?(&:empty_cell?) }
           .each_with_object([], &method(:collect_register_rows))
       end

data/lib/rggen/spreadsheet_loader/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module SpreadsheetLoader
-    VERSION = '0.19.0'
+    VERSION = '0.20.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-spreadsheet-loader
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -100,5 +100,5 @@ requirements: []
 rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
-summary: rggen-spreadsheet-loader-0.19.0
+summary: rggen-spreadsheet-loader-0.20.0
 test_files: []