rggen-spreadsheet-loader 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf9a2598faafa52f60ab349dbf8a3f8abd62bb1ce4c4a9bb146c3161194c5a0c
-  data.tar.gz: 4c733349b76ec9c4641cb6a30c5b955a9e8551463d53806011d0af6cb3de0605
+  metadata.gz: 1a5c038c878bdee2d0369695504d66c0773c5778ca6ba27ad20960c525f0ef32
+  data.tar.gz: 698efcc2c97a0603b7212e35eef134a1526485bd77383bfc27a490f44a21eb87
 SHA512:
-  metadata.gz: 7abd9a096f7df1f5497daa44e917c3bc7542a0885034ebffcee415eda8b960b2b81484879cf323d2fac9beb65713d2b41536d309d51090eec7ffc6278dae2a94
-  data.tar.gz: '09b4010e88e75ea6c49c1527e9338f04ba1a0600665ffc2b8116f41fa92efaba1211ea6a2c9260750c471d507e8bea47bc4b832f133f3f21d32ec8153cf269c8'
+  metadata.gz: 8df01bd76a566ccbbdbcd4e8efab23f20d3f7f64d8908d0cd7bbdcd6c0fe8f4aa1f4ffa1d6cc935d9843f5efaf813275e6af1f9141d188c607a19dc18490c81a
+  data.tar.gz: c806612b266d7a64e432490f96c5c9468e9d3739ae286728402e60822e82ce1b3f5cfcba4ec73d07c05b3e07490ccb49678a73c5fde86295b5f83576e4612f08

data/lib/rggen/spreadsheet_loader.rb

@@ -14,9 +14,9 @@ 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)
+      builder.register_loader(:register_map, :spreadsheet, CSVLoader)
+      builder.register_loader(:register_map, :spreadsheet, RooLoader)
+      builder.register_loader(:register_map, :spreadsheet, XLSLoader)
     end
   end
 end

data/lib/rggen/spreadsheet_loader/setup.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 require 'rggen/spreadsheet_loader'
-RgGen.setup :'rggen-spreadsheet-loader', RgGen::SpreadsheetLoader
+RgGen.setup :'rggen-spreadsheet-loader', 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,65 @@ 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)
+        layer != :root ? collect_layer_data(read_data, layer) : nil
       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([]) do |row, row_sets|
+            row[register_start_position.column].empty_cell? ||
+              (row_sets << [])
+            row_sets.last << row
+          end
+      end
+
+      def collect_bit_field_data(rows)
+        rows
       end
 
       def register_block_start_position
@@ -83,29 +76,17 @@ 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
+              register_start_position.column + valid_values(:register).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]
-      end
-
-      def bit_field_valid_values
-        valid_value_lists[:bit_field]
-      end
     end
   end
 end

data/lib/rggen/spreadsheet_loader/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module SpreadsheetLoader
-    VERSION = '0.16.0'
+    VERSION = '0.17.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.17.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -100,5 +100,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: rggen-spreadsheet-loader-0.16.0
+summary: rggen-spreadsheet-loader-0.17.0
 test_files: []