rggen-spreadsheet-loader 0.18.2 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb30337ed0f7670b7a30412298d500efc2c43a68b23c62cb24710cbd177d6712
-  data.tar.gz: 120d91e46af469f9843844afcfdf1d2ec736bada9d57b5405db9ae16bd52aa49
+  metadata.gz: 1ecef914a6486bf3e24f727a5245c6d80f484cd71801549c13bd53133d61146d
+  data.tar.gz: 42692af472b677c5c2b352ade9e991e3531d5ea2c174e83493decc33f9a105b2
 SHA512:
-  metadata.gz: baaede9d7b9dcdcbe08c7671a17da7ae8847cab6d6f5ab9f0c1154419bd321256a7951414f70e0aa5f9b56d6ef452ecd87027ddcf39ecc9f4f16537d6a9300ed
-  data.tar.gz: b2bf6f9e744ba823cdcbc77b776f59805c9df88ebd107fa9e18830d5baf0396743989da7e7576fb29f2d3fa1be2d1c240abbd114018f86d3c8bf7bbc55616a51
+  metadata.gz: 54cb03880736f943c2be367d6b6fe2537a1bbcb67b8e19dca400e77221edc4aae9facfc9b79b3d67391d831599a96bbcd2aa61b011e79548e50b335073c6a02d
+  data.tar.gz: 6744d166b12b23d1a96c439dbe4028255c590c0290b0576c8fe630a01342c33d16ab5a90ab8600637b1f5f627d09893861bbf04ba2fadc71a70985c1b82df4f4

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2020 Taichi Ishitani
+Copyright (c) 2019-2022 Taichi Ishitani
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -40,7 +40,7 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 ## Copyright & License
 
-Copyright © 2019-2020 Taichi Ishitani. RgGen::SpreadsheetLoader is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2019-2022 Taichi Ishitani. RgGen::SpreadsheetLoader is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
 
 ## Code of Conduct
 

data/lib/rggen/spreadsheet_loader/ods_loader.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module RgGen
+  module SpreadsheetLoader
+    class ODSLoader < Core::RegisterMap::Loader
+      include SpreadsheetLoader
+
+      support_types [:ods]
+
+      def read_spreadsheet(file, book)
+        require 'spreadbase'
+        SpreadBase::Document.new(file)
+          .tables.each { |table| process_table(table, book) }
+      end
+
+      private
+
+      def process_table(table, book)
+        rows = table.data
+        rows.size.positive? && book.add_sheet(table.name, rows)
+      end
+    end
+  end
+end

data/lib/rggen/spreadsheet_loader/setup.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require 'rggen/spreadsheet_loader'
-RgGen.setup RgGen::SpreadsheetLoader do |builder|
+
+RgGen.register_plugin RgGen::SpreadsheetLoader do |builder|
   builder.ignore_value :register_map, :spreadsheet, :register_block, :comment
   builder.ignore_value :register_map, :spreadsheet, :register, :comment
 end

data/lib/rggen/spreadsheet_loader/spreadsheet_loader.rb

@@ -12,7 +12,8 @@ module RgGen
       private
 
       def format_layer_data(read_data, layer, _file)
-        layer != :root ? collect_layer_data(read_data, layer) : nil
+        return if layer == :root
+        collect_layer_data(read_data, layer)
       end
 
       def collect_layer_data(read_data, layer)
@@ -49,7 +50,8 @@ module RgGen
 
       def format_sub_layer_data(read_data, layer, _file)
         sub_layer = SUB_LAYERS[layer]
-        sub_layer && { sub_layer => __send__("collect_#{sub_layer}_data", read_data) }
+        sub_layer &&
+          [sub_layer].product(__send__("collect_#{sub_layer}_data", read_data))
       end
 
       def collect_register_block_data(book)
@@ -57,7 +59,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.18.2'
+    VERSION = '0.21.0'
   end
 end

data/lib/rggen/spreadsheet_loader/xlsx_loader.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module RgGen
+  module SpreadsheetLoader
+    class XLSXLoader < Core::RegisterMap::Loader
+      include SpreadsheetLoader
+
+      support_types [:xlsx]
+
+      def read_spreadsheet(file, book)
+        require 'simple_xlsx_reader'
+        SimpleXlsxReader.open(file)
+          .sheets.each { |sheet| process_sheet(sheet, book) }
+      end
+
+      private
+
+      def process_sheet(sheet, book)
+        sheet.rows.size.positive? &&
+          book.add_sheet(sheet.name, sheet.rows)
+      end
+    end
+  end
+end

data/lib/rggen/spreadsheet_loader.rb

@@ -8,17 +8,18 @@ require_relative 'spreadsheet_loader/spreadsheet/sheet'
 require_relative 'spreadsheet_loader/spreadsheet/book'
 require_relative 'spreadsheet_loader/spreadsheet_loader'
 require_relative 'spreadsheet_loader/csv_loader'
-require_relative 'spreadsheet_loader/roo_loader'
+require_relative 'spreadsheet_loader/ods_loader'
 require_relative 'spreadsheet_loader/xls_loader'
+require_relative 'spreadsheet_loader/xlsx_loader'
 
 module RgGen
   module SpreadsheetLoader
-    PLUGIN_NAME = :'rggen-spreadsheet-loader'
+    extend Core::Plugin
 
-    def self.default_setup(builder)
-      builder.register_loader(:register_map, :spreadsheet, CSVLoader)
-      builder.register_loader(:register_map, :spreadsheet, RooLoader)
-      builder.register_loader(:register_map, :spreadsheet, XLSLoader)
+    setup_plugin :'rggen-spreadsheet-loader' do |plugin|
+      [CSVLoader, ODSLoader, XLSLoader, XLSXLoader].each do |loader|
+        plugin.register_loader :register_map, :spreadsheet, loader
+      end
     end
   end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rggen-spreadsheet-loader
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: roo
+  name: simple_xlsx_reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: spreadbase
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +78,7 @@ files:
 - README.md
 - lib/rggen/spreadsheet_loader.rb
 - lib/rggen/spreadsheet_loader/csv_loader.rb
-- lib/rggen/spreadsheet_loader/roo_loader.rb
+- lib/rggen/spreadsheet_loader/ods_loader.rb
 - lib/rggen/spreadsheet_loader/setup.rb
 - lib/rggen/spreadsheet_loader/spreadsheet/book.rb
 - lib/rggen/spreadsheet_loader/spreadsheet/cell.rb
@@ -74,12 +88,14 @@ files:
 - lib/rggen/spreadsheet_loader/spreadsheet_loader.rb
 - lib/rggen/spreadsheet_loader/version.rb
 - lib/rggen/spreadsheet_loader/xls_loader.rb
+- lib/rggen/spreadsheet_loader/xlsx_loader.rb
 homepage: https://github.com/rggen/rggen-spreadsheet-loader
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rggen/rggen-spreadsheet-loader/issues
   mailing_list_uri: https://groups.google.com/d/forum/rggen
+  rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/rggen/rggen-spreadsheet-loader
   wiki_uri: https://github.com/rggen/rggen/wiki
 post_install_message: 
@@ -90,15 +106,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
-summary: rggen-spreadsheet-loader-0.18.2
+summary: rggen-spreadsheet-loader-0.21.0
 test_files: []

data/lib/rggen/spreadsheet_loader/roo_loader.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module RgGen
-  module SpreadsheetLoader
-    class RooLoader < Core::RegisterMap::Loader
-      include SpreadsheetLoader
-
-      support_types [:xlsx, :ods]
-
-      def read_spreadsheet(file, book)
-        read_roo(file) do |pagename, page|
-          book.add_sheet(pagename, collect_cells(page))
-        end
-      end
-
-      private
-
-      def read_roo(file)
-        require 'roo'
-        Roo::Spreadsheet.open(file, extension: File.extname(file))
-          .each_with_pagename do |pagename, page|
-            page.first_row && yield(pagename, page)
-          end
-      end
-
-      def collect_cells(page)
-        (1..page.last_row).map do |row|
-          (1..page.last_column).map { |column| page.cell(row, column) }
-        end
-      end
-    end
-  end
-end