rggen-spreadsheet-loader 0.25.1 → 0.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846308d8caaad7e74d696d8fff51773dd6fa0a4283628d2a4ab46bda69397005
-  data.tar.gz: 1eafeb29fda650a323165ad6dbc9e1f2e9217b521b08ca4a2337c691536953fe
+  metadata.gz: c5bf64cb074862e23c184ac78876386609d3d490e0d73df93fe51792025ff06e
+  data.tar.gz: 2d040f729f9814615804526850226929826d21990c0e564ffbd23aa8de473045
 SHA512:
-  metadata.gz: 39c4e72865263bc9e55500b3a0f2863551625b8f9d0cb8e0e082c78836ae24dfd5f1cc23954160c918fd69aea962450b025b62386351d7ac898b6a3527cc1d3c
-  data.tar.gz: d2c4f78721fbe0d46ec2ad252e7d2e76d96fedb78e3182b0ce604a4bf3ae6c8546e37adfab44e2698737da3a635799f70fc794267af58d432461e3fad46d9f66
+  metadata.gz: 70135e09a97f971bb5ff38e707f06af2d0bb4f568017070043160cc42357ec6d234e2c72e60c104d0c0dd71c6071533814cb1e3d81213e71d4e2cfdf597be836
+  data.tar.gz: f868400bb4e8e70b264c17c150bd83089cf7d180057f9ec63b0c4f1c73f5b83b00eca14f90ca55f7beb80a8e0c82337825dd91e1e8c4557a4a906b8de37f81c5

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2023 Taichi Ishitani
+Copyright (c) 2019-2024 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

@@ -10,7 +10,7 @@ RgGen::SpreadsheetLoader adds ability to load register map documents written in
 
 Supported spreadsheet formats are listed below:
 
-* MS Excel (xlsx and xls)
+* MS Excel (xlsx)
 * LibreOffice/OpenOffice (ods)
 * CSV
 
@@ -40,7 +40,7 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 ## Copyright & License
 
-Copyright © 2019-2023 Taichi Ishitani. RgGen::SpreadsheetLoader is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2019-2024 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/csv_loader.rb

@@ -16,7 +16,6 @@ module RgGen
       private
 
       def read_csv(file)
-        require 'csv'
         CSV.read(file, col_sep: separator(file))
       end
 

data/lib/rggen/spreadsheet_loader/ods_loader.rb

@@ -8,7 +8,6 @@ module RgGen
       support_types [:ods]
 
       def read_spreadsheet(file, book)
-        require 'spreadbase'
         SpreadBase::Document.new(file)
           .tables.each { |table| process_table(table, book) }
       end

data/lib/rggen/spreadsheet_loader/spreadsheet/position.rb

@@ -3,11 +3,27 @@
 module RgGen
   module SpreadsheetLoader
     module Spreadsheet
-      Position = Struct.new(:file, :sheet, :row, :column) do
+      class Position
+        def initialize(file, sheet, row, column)
+          @file = file
+          @sheet = sheet
+          @row = row
+          @column = column
+        end
+
+        attr_reader :file
+        attr_reader :sheet
+
+        def row
+          @row + 1
+        end
+
+        def column
+          @column.times.inject('A') { |l, _| l.next }
+        end
+
         def to_s
-          to_h
-            .map { |field, value| "#{field}: #{value}" }
-            .join(' ')
+          "file: #{file} sheet: #{sheet} row: #{row} column: #{column}"
         end
       end
     end

data/lib/rggen/spreadsheet_loader/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module SpreadsheetLoader
-    VERSION = '0.25.1'
+    VERSION = '0.25.3'
   end
 end

data/lib/rggen/spreadsheet_loader/xlsx_loader.rb

@@ -8,7 +8,6 @@ module RgGen
       support_types [:xlsx]
 
       def read_spreadsheet(file, book)
-        require 'simple_xlsx_reader'
         SimpleXlsxReader.open(file)
           .sheets.each { |sheet| process_sheet(sheet, book) }
       end

data/lib/rggen/spreadsheet_loader.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+autoload :CSV, 'csv'
+autoload :SimpleXlsxReader, 'simple_xlsx_reader'
+autoload :SpreadBase, 'spreadbase'
+
 require_relative 'spreadsheet_loader/version'
 require_relative 'spreadsheet_loader/spreadsheet/position'
 require_relative 'spreadsheet_loader/spreadsheet/cell'
@@ -9,7 +13,6 @@ require_relative 'spreadsheet_loader/spreadsheet/book'
 require_relative 'spreadsheet_loader/spreadsheet_loader'
 require_relative 'spreadsheet_loader/csv_loader'
 require_relative 'spreadsheet_loader/ods_loader'
-require_relative 'spreadsheet_loader/xls_loader'
 require_relative 'spreadsheet_loader/xlsx_loader'
 
 RgGen.setup_plugin :'rggen-spreadsheet-loader' do |plugin|
@@ -18,7 +21,6 @@ RgGen.setup_plugin :'rggen-spreadsheet-loader' do |plugin|
     entry.register_loaders [
       RgGen::SpreadsheetLoader::CSVLoader,
       RgGen::SpreadsheetLoader::ODSLoader,
-      RgGen::SpreadsheetLoader::XLSLoader,
       RgGen::SpreadsheetLoader::XLSXLoader
     ]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-spreadsheet-loader
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.3
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -44,28 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: spreadsheet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 0.6.0
 description: Spreadsheet loader for RgGen register map.
 email:
 - rggen@googlegroups.com
@@ -86,7 +72,6 @@ files:
 - lib/rggen/spreadsheet_loader/spreadsheet/sheet.rb
 - 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:
@@ -112,8 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.5
 signing_key: 
 specification_version: 4
-summary: rggen-spreadsheet-loader-0.25.1
+summary: rggen-spreadsheet-loader-0.25.3
 test_files: []

data/lib/rggen/spreadsheet_loader/xls_loader.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module RgGen
-  module SpreadsheetLoader
-    class XLSLoader < Core::RegisterMap::Loader
-      include SpreadsheetLoader
-
-      support_types [:xls]
-
-      def read_spreadsheet(file, book)
-        read_xls(file).each do |sheet|
-          book.add_sheet(sheet.name, sheet.rows)
-        end
-      end
-
-      private
-
-      def read_xls(file)
-        require 'spreadsheet'
-        ::Spreadsheet.open(file, 'rb') do |book|
-          book.worksheets.select { |sheet| sheet.row_count.positive? }
-        end
-      end
-    end
-  end
-end