rggen-spreadsheet-loader 0.16.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf9a2598faafa52f60ab349dbf8a3f8abd62bb1ce4c4a9bb146c3161194c5a0c
-  data.tar.gz: 4c733349b76ec9c4641cb6a30c5b955a9e8551463d53806011d0af6cb3de0605
+  metadata.gz: e0f3c849dfe3a2e44abfe3dc1014c4a4254fe8be92bdd4b64745fd1778cb0b42
+  data.tar.gz: 690e61fab0e402d9171aa2ee50befbf25111ad44810acf01cd5c9af11fba7e8f
 SHA512:
-  metadata.gz: 7abd9a096f7df1f5497daa44e917c3bc7542a0885034ebffcee415eda8b960b2b81484879cf323d2fac9beb65713d2b41536d309d51090eec7ffc6278dae2a94
-  data.tar.gz: '09b4010e88e75ea6c49c1527e9338f04ba1a0600665ffc2b8116f41fa92efaba1211ea6a2c9260750c471d507e8bea47bc4b832f133f3f21d32ec8153cf269c8'
+  metadata.gz: 23770bfa1f24804808d6c75885f07338831f18833147c165783b8dd1bac3edde07e90f281f1ed2f326fcf71487ff972bb1f14353d08142491660a68997b57676
+  data.tar.gz: e162d610aa891cd2928370e9cb8f9bf6d4057be34f344efc855de1539ecc2b743054c4d00d4209a999747facbe579cf947fc8cdae44f2c36e72dfbd29cf33c40

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2020 Taichi Ishitani
+Copyright (c) 2019-2021 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-2021 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.rb

@@ -13,10 +13,12 @@ require_relative 'spreadsheet_loader/xls_loader'
 
 module RgGen
   module SpreadsheetLoader
-    def self.default_setup(builder)
-      builder.register_loader(:register_map, CSVLoader)
-      builder.register_loader(:register_map, RooLoader)
-      builder.register_loader(:register_map, XLSLoader)
+    extend Core::Plugin
+
+    setup_plugin :'rggen-spreadsheet-loader' do |plugin|
+      plugin.register_loader :register_map, :spreadsheet, CSVLoader
+      plugin.register_loader :register_map, :spreadsheet, RooLoader
+      plugin.register_loader :register_map, :spreadsheet, XLSLoader
     end
   end
 end

data/lib/rggen/spreadsheet_loader/csv_loader.rb

@@ -5,7 +5,7 @@ module RgGen
     class CSVLoader < Core::RegisterMap::Loader
       include SpreadsheetLoader
 
-      support_types [:csv]
+      support_types [:csv, :tsv]
 
       def read_spreadsheet(file, book)
         sheet = read_csv(file)
@@ -17,7 +17,12 @@ module RgGen
 
       def read_csv(file)
         require 'csv'
-        CSV.read(file)
+        CSV.read(file, col_sep: separator(file))
+      end
+
+      def separator(file)
+        ext = File.extname(file)
+        ext.casecmp?('.tsv') && "\t" || ','
       end
     end
   end

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/setup.rb

@@ -1,4 +1,8 @@
 # frozen_string_literal: true
 
 require 'rggen/spreadsheet_loader'
-RgGen.setup :'rggen-spreadsheet-loader', RgGen::SpreadsheetLoader
+
+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

@@ -9,72 +9,72 @@ module RgGen
         Spreadsheet::Book.new(file) { |book| read_spreadsheet(file, book) }
       end
 
-      def format(book, _file)
-        book.sheets.each(&method(:process_sheet))
-      end
-
       private
 
-      def process_sheet(sheet)
-        register_block = parse_register_block(sheet)
-        sheet
-          .rows(register_start_position.row)
-          .reject { |row| row.cells.all?(&:empty_cell?) }
-          .each { |row| process_row(row, register_block) }
+      def format_layer_data(read_data, layer, _file)
+        return if layer == :root
+        collect_layer_data(read_data, layer)
       end
 
-      def parse_register_block(sheet)
-        root.register_block do
-          register_block_valid_values
-            .zip(register_block_cells(sheet))
-            .each { |value_name, cell| value(value_name, cell) }
-        end
+      def collect_layer_data(read_data, layer)
+        values = valid_values(layer)
+        cells = __send__("#{layer}_cells", read_data)
+        values.zip(cells).to_h
       end
 
       def register_block_cells(sheet)
         start_row = register_block_start_position.row
         start_column = register_block_start_position.column
-        Array.new(register_block_valid_values.size) do |i|
+        Array.new(valid_values(:register_block).size) do |i|
           sheet[start_row + i, start_column]
         end
       end
 
-      def process_row(row, register_block)
-        register =
-          if row[register_start_position.column].empty_cell?
-            register_block.children.last
-          else
-            parse_register(row, register_block)
-          end
-        parse_bit_field(row, register)
+      def register_cells(rows)
+        start_column = register_start_position.column
+        size = valid_values(:register).size
+        rows.first.cells(start_column, size)
       end
 
-      def parse_register(row, register_block)
-        register_block.register do
-          register_valid_values
-            .zip(register_cells(row))
-            .each { |value_name, cell| value(value_name, cell) }
-        end
+      def bit_field_cells(row)
+        start_column = bit_field_start_position.column
+        size = valid_values(:bit_field).size
+        row.cells(start_column, size)
       end
 
-      def register_cells(row)
-        start_column = register_start_position.column
-        size = register_valid_values.size
-        row.cells(start_column, size)
+      SUB_LAYERS = {
+        root: :register_block,
+        register_block: :register,
+        register: :bit_field
+      }.freeze
+
+      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) }
       end
 
-      def parse_bit_field(row, register)
-        register.bit_field do
-          bit_field_valid_values
-            .zip(bit_field_cells(row))
-            .each { |value_name, cell| value(value_name, cell) }
-        end
+      def collect_register_block_data(book)
+        book.sheets
       end
 
-      def bit_field_cells(row)
-        start_column = bit_field_start_position.column
-        size = bit_field_valid_values.size
-        row.cells(start_column, size)
+      def collect_register_data(sheet)
+        sheet
+          .rows(register_start_position.row)
+          .reject { |row| row.cells.all?(&:empty_cell?) }
+          .each_with_object([], &method(:collect_register_rows))
+      end
+
+      def collect_register_rows(row, row_sets)
+        register_begin?(row) && (row_sets << [])
+        row_sets.last << row
+      end
+
+      def register_begin?(row)
+        !row[register_start_position.column].empty_cell?
+      end
+
+      def collect_bit_field_data(rows)
+        rows
       end
 
       def register_block_start_position
@@ -83,28 +83,16 @@ module RgGen
 
       def register_start_position
         @register_start_position ||=
-          Position.new(register_block_valid_values.size + 2, 1)
+          Position.new(valid_values(:register_block).size + 2, 1)
       end
 
       def bit_field_start_position
         @bit_field_start_position ||=
-          begin
-            column =
-              register_start_position.column + register_valid_values.size
-            Position.new(0, column)
-          end
-      end
-
-      def register_block_valid_values
-        valid_value_lists[:register_block]
-      end
-
-      def register_valid_values
-        valid_value_lists[:register]
+          Position.new(0, bit_field_start_column)
       end
 
-      def bit_field_valid_values
-        valid_value_lists[:bit_field]
+      def bit_field_start_column
+        register_start_position.column + valid_values(:register).size
       end
     end
   end

data/lib/rggen/spreadsheet_loader/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module SpreadsheetLoader
-    VERSION = '0.16.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.16.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -90,15 +90,15 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
-summary: rggen-spreadsheet-loader-0.16.0
+summary: rggen-spreadsheet-loader-0.20.0
 test_files: []