rggen-spreadsheet-loader 0.18.0 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3074fea36ab23767182a60bb5c9d1af90f8a2cd17435cd987a86c429671e67ae
-  data.tar.gz: ae2e1998d57db665cca20101723ee8ddffb3a15989c5d3ded0bd525fa85ec7dd
+  metadata.gz: bb30337ed0f7670b7a30412298d500efc2c43a68b23c62cb24710cbd177d6712
+  data.tar.gz: 120d91e46af469f9843844afcfdf1d2ec736bada9d57b5405db9ae16bd52aa49
 SHA512:
-  metadata.gz: a75fdae70158612c94788bbb5a857bfe589359247c17d47c1a96f97dc12acf6de74392b6eb46703e1ecc5c26eb795ca30e9a126f9123375de02c95aa1c31dfa0
-  data.tar.gz: 3a4d916d2311ad2b84d23c8bad5344effd12df0e2c91da9c5c78835d9ee564be6ffdee1969c056b7efadefc33f2dd1aee9724edf774e15d1c9bc18a5df77d76a
+  metadata.gz: baaede9d7b9dcdcbe08c7671a17da7ae8847cab6d6f5ab9f0c1154419bd321256a7951414f70e0aa5f9b56d6ef452ecd87027ddcf39ecc9f4f16537d6a9300ed
+  data.tar.gz: b2bf6f9e744ba823cdcbc77b776f59805c9df88ebd107fa9e18830d5baf0396743989da7e7576fb29f2d3fa1be2d1c240abbd114018f86d3c8bf7bbc55616a51

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

@@ -59,11 +59,16 @@ module RgGen
       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
+          .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)
@@ -81,11 +86,11 @@ module RgGen
 
       def bit_field_start_position
         @bit_field_start_position ||=
-          begin
-            column =
-              register_start_position.column + valid_values(:register).size
-            Position.new(0, column)
-          end
+          Position.new(0, bit_field_start_column)
+      end
+
+      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.18.0'
+    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.18.0
+  version: 0.18.2
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-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.18.0
+summary: rggen-spreadsheet-loader-0.18.2
 test_files: []