rggen-spreadsheet-loader 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe272aa5aa9a72883605247ecf1342b1acf3d7d313b4e3e3e7353f8c2a72b03a
-  data.tar.gz: 5f5e3b4164f967a3739359f57e977d0fae76c16f69c020bee8d201c9d8104eef
+  metadata.gz: 7856ba69aba4ae38374fe772d450d1f8b10ac594c34b45aa9a4ffa6abc0e77d2
+  data.tar.gz: 93e1c030d725f6a64c6a43718e504c0bdd9f7ecad311f73b1ddd95be3e849206
 SHA512:
-  metadata.gz: 874bcd8653c2ce94dd185e6e18444e8f987edce54385036e8dfb3e22f68ee5fad38d6b4bce3bf59e2e64bf1291c602973a84990f08c8d1d601e71919349a3c0a
-  data.tar.gz: fc16cd5baeaf19a86d1f0db152508d479147f87b581dff564736feea3f71734f5b78ca67db4252b744c6b3d7287e10ebad2731b7d513611eb03284565df15460
+  metadata.gz: 43af3f850cb9b89add2a5df580f71844ab017b9f27a64d10803934d838258643eb83c6bd6439f5cafbf29d87c8f1a399b3f3d5de301c756fb64cd9ea513f9bf3
+  data.tar.gz: 6ffc06e90fd24cd16672f37ccb7f7210cafb5c89c53aff96606a0b390316c871d96096db472ee61442f4db0abbd90523e27ef0f1caf6c4a1ee34d143d3e82cba

data/LICENSE

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

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rggen-spreadsheet-loader.svg)](https://badge.fury.io/rb/rggen-spreadsheet-loader)
-[![Build Status](https://travis-ci.com/rggen/rggen-spreadsheet-loader.svg?branch=master)](https://travis-ci.com/rggen/rggen-spreadsheet-loader)
+[![CI](https://github.com/rggen/rggen-spreadsheet-loader/workflows/CI/badge.svg)](https://github.com/rggen/rggen-spreadsheet-loader/actions?query=workflow%3ACI)
 [![Maintainability](https://api.codeclimate.com/v1/badges/7a4090f4a7c21d29036c/maintainability)](https://codeclimate.com/github/rggen/rggen-spreadsheet-loader/maintainability)
 [![codecov](https://codecov.io/gh/rggen/rggen-spreadsheet-loader/branch/master/graph/badge.svg)](https://codecov.io/gh/rggen/rggen-spreadsheet-loader)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=rggen_rggen-spreadsheet-loader&metric=alert_status)](https://sonarcloud.io/dashboard?id=rggen_rggen-spreadsheet-loader)
@@ -40,7 +40,7 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 ## Copyright & License
 
-Copyright © 2019 Taichi Ishitani. RgGen::SpreadsheetLoader is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2019-2020 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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'roo'
-require 'roo-xls'
 require_relative 'spreadsheet_loader/version'
 require_relative 'spreadsheet_loader/spreadsheet/position'
 require_relative 'spreadsheet_loader/spreadsheet/cell'
@@ -9,12 +7,16 @@ require_relative 'spreadsheet_loader/spreadsheet/row'
 require_relative 'spreadsheet_loader/spreadsheet/sheet'
 require_relative 'spreadsheet_loader/spreadsheet/book'
 require_relative 'spreadsheet_loader/spreadsheet_loader'
+require_relative 'spreadsheet_loader/csv_loader'
 require_relative 'spreadsheet_loader/roo_loader'
+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)
     end
   end
 end

data/lib/rggen/spreadsheet_loader/csv_loader.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module RgGen
+  module SpreadsheetLoader
+    class CSVLoader < Core::RegisterMap::Loader
+      include SpreadsheetLoader
+
+      support_types [:csv]
+
+      def read_spreadsheet(file, book)
+        sheet = read_csv(file)
+        sheet_name = File.basename(file, '.*')
+        book.add_sheet(sheet_name, sheet)
+      end
+
+      private
+
+      def read_csv(file)
+        require 'csv'
+        CSV.read(file)
+      end
+    end
+  end
+end

data/lib/rggen/spreadsheet_loader/roo_loader.rb

@@ -5,16 +5,24 @@ module RgGen
     class RooLoader < Core::RegisterMap::Loader
       include SpreadsheetLoader
 
-      support_types [:xlsx, :xls, :ods, :csv]
+      support_types [:xlsx, :ods]
 
       def read_spreadsheet(file, book)
-        Roo::Spreadsheet.open(file).each_with_pagename do |pagename, page|
-          page.first_row && book.add_sheet(pagename, collect_cells(page))
+        read_roo(file) do |pagename, page|
+          book.add_sheet(pagename, collect_cells(page))
         end
       end
 
       private
 
+      def read_roo(file)
+        require 'roo'
+        Roo::Spreadsheet.open(file, extension: File.extname(file))
+          .each_with_pagename do |pagename, page|
+            page.first_row && yield(pagename, page)
+          end
+      end
+
       def collect_cells(page)
         (1..page.last_row).map do |row|
           (1..page.last_column).map { |column| page.cell(row, column) }

data/lib/rggen/spreadsheet_loader/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module SpreadsheetLoader
-    VERSION = '0.14.0'
+    VERSION = '0.15.0'
   end
 end

data/lib/rggen/spreadsheet_loader/xls_loader.rb

@@ -0,0 +1,26 @@
+# 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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rggen-spreadsheet-loader
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.0.a
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.0.a
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: roo-xls
+  name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +77,7 @@ files:
 - LICENSE
 - README.md
 - lib/rggen/spreadsheet_loader.rb
+- lib/rggen/spreadsheet_loader/csv_loader.rb
 - lib/rggen/spreadsheet_loader/roo_loader.rb
 - lib/rggen/spreadsheet_loader/setup.rb
 - lib/rggen/spreadsheet_loader/spreadsheet/book.rb
@@ -72,6 +87,7 @@ 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
 homepage: https://github.com/rggen/rggen-spreadsheet-loader
 licenses:
 - MIT
@@ -88,15 +104,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: rggen-spreadsheet-loader-0.14.0
+summary: rggen-spreadsheet-loader-0.15.0
 test_files: []