rggen-spreadsheet-loader 0.15.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b1603acefd8a9ca6048b41152da67046cd9107378cadef93918f53957ea5306
-  data.tar.gz: 7789dca828cfb3ba59aee1b009fd774799994aade28b70d391ef942c7027c088
+  metadata.gz: bb30337ed0f7670b7a30412298d500efc2c43a68b23c62cb24710cbd177d6712
+  data.tar.gz: 120d91e46af469f9843844afcfdf1d2ec736bada9d57b5405db9ae16bd52aa49
 SHA512:
-  metadata.gz: 7e83ece7dd05d0d827c3070a85255af2cf873a4c841b801599ad1a21d00d22d14ca72cce0b5fafb60e86d7aa8898ddf9add2dbd062a483c9e2755b65ac98f472
-  data.tar.gz: d3aa50a6640fa53dad732f00f9ed56663f25cd378155e768bc137fc20094906e7f778e802ce26d9062fca8776d9c5f5a8f4d08fa77304323f6d3d9aaf38be803
+  metadata.gz: baaede9d7b9dcdcbe08c7671a17da7ae8847cab6d6f5ab9f0c1154419bd321256a7951414f70e0aa5f9b56d6ef452ecd87027ddcf39ecc9f4f16537d6a9300ed
+  data.tar.gz: b2bf6f9e744ba823cdcbc77b776f59805c9df88ebd107fa9e18830d5baf0396743989da7e7576fb29f2d3fa1be2d1c240abbd114018f86d3c8bf7bbc55616a51

data/lib/rggen/spreadsheet_loader.rb

@@ -13,10 +13,12 @@ require_relative 'spreadsheet_loader/xls_loader'
 
 module RgGen
   module SpreadsheetLoader
+    PLUGIN_NAME = :'rggen-spreadsheet-loader'
+
     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/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/setup.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 require 'rggen/spreadsheet_loader'
-RgGen.setup :'rggen-spreadsheet-loader', RgGen::SpreadsheetLoader
+RgGen.setup 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,70 @@ 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)
-        register_map.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 +81,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[1]
-      end
-
-      def register_valid_values
-        valid_value_lists[2]
+          Position.new(0, bit_field_start_column)
       end
 
-      def bit_field_valid_values
-        valid_value_lists[3]
+      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.15.1'
+    VERSION = '0.18.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-spreadsheet-loader
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-10-31 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.15.1
+summary: rggen-spreadsheet-loader-0.18.2
 test_files: []