data_list_converter 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5acc292029d72d6edf08f6b588b4625bec532d8c9b3be03376c69c732ae4512f
-  data.tar.gz: 61850de2e9b3d1da73ecb42e638d4c473a93442dd12d1012bcec1065ad672bb9
+  metadata.gz: 7ef151bc69ca24bc9d3b73d22d28ba23afa8aa1a7a6ddf312136880d71965e80
+  data.tar.gz: 7d8c795b6d6f910d8abdf31f5979e97ed56c61a45ed6d3df8814133059f10a09
 SHA512:
-  metadata.gz: 355008ec8cf509d617a023779a6ae2824e87c9b4b41d0ff636a1b1f1d2557ab624b9a02a01e15eb9aff731cd755e2e5c63fbb379c9e056455d59fd7836a18021
-  data.tar.gz: 8f1449e216cf16ff1a49198556880039806dd60adbf49c9edbfd638a6240c8c324297d5486dff4ab64f4360a93e8a81f90df933ef304e430fabf08997c764a64
+  metadata.gz: 7c203708cccb88b08401f3dfdc49273fe6d31da24112262677bb26c9e7472b25dc6bb700688de9dea435f05c174bd722c410224eab43ee85812460142db0a5a2
+  data.tar.gz: d4b85c049e047315a9ba2720c27c486ff5fd470c9c1cad40f14748bfd4986a7354b7d49eb65b2895ef1d8d5908f53f4f857679b4b9cc7547dabd772be128132e

data/data_list_converter.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'minitest', '~> 5.7'
   s.add_development_dependency 'spreadsheet', '~> 1.0'
-  s.add_development_dependency 'rubyXL', '~> 3.3'
+  s.add_development_dependency 'rubyXL', '3.3.15'
   s.add_development_dependency 'pry', '~> 0.10.1'
-  s.add_development_dependency 'sqlite3', '~> 1.3'
+  s.add_development_dependency 'sqlite3', "1.3.11"
   s.add_development_dependency 'activerecord', '~> 4.2'
   s.add_development_dependency 'xlsxtream'
   s.add_development_dependency 'creek'

data/lib/data_list_converter/filters/remove_debug.rb

@@ -6,9 +6,14 @@ class DataListConverter
       proc.call do |row|
         unless columns
           columns = row
-          debug_index = columns.index('debug')
+          debug_index = columns.index('debug') || columns.index('Debug')
+        end
+
+        if debug_index != nil
+          block.call(row[0..(debug_index-1)])
+        else
+          block.call(row)
         end
-        block.call(row[0..(debug_index-1)])
       end
     }
   end

data/lib/data_list_converter/helper.rb

@@ -1,12 +1,12 @@
 class DataListConverter
   def self.save_to_file(filename, data, data_format=:item_data, options={})
-    file_format = self.get_file_format(filename)
+    file_format = options.delete(:file_format) || self.get_file_format(filename)
     options[file_format] = {filename: filename}
     DataListConverter.convert(data_format, file_format, data, options)
   end
 
   def self.load_from_file(filename, data_format=:item_data, options={})
-    file_format = self.get_file_format(filename)
+    file_format = options.delete(:file_format) || self.get_file_format(filename)
     options[:filename] = filename
     DataListConverter.convert(file_format, data_format, options)
   end

data/lib/data_list_converter/types/fast_xlsx_file.rb

@@ -1,9 +1,14 @@
 require 'xlsxtream'
 require 'creek'
 
+# usage:
+# require 'data_list_converter/types/fast_xlsx_file'
+# d = [{a: 12.3, b: 'xx'}]
+# DataListConverter.save_to_file("t.xls", d, :item_data, file_format: :fast_xlsx_file)
+
 class DataListConverter
 
-  self.register_converter(:xlsx_file, :table_iterator) do |input, options|
+  self.register_converter(:fast_xlsx_file, :table_iterator) do |input, options|
     lambda { |&block|
       filename = self.parameter(input, :filename, :input)
 
@@ -15,7 +20,7 @@ class DataListConverter
     }
   end
 
-  self.register_converter(:xlsx_file, :multi_sheet_table_iterator) do |input, options|
+  self.register_converter(:fast_xlsx_file, :multi_sheet_table_iterator) do |input, options|
     filename = self.parameter(input, :filename, :input)
 
     creek = Creek::Book.new filename
@@ -29,8 +34,8 @@ class DataListConverter
     end.to_h
   end
 
-  self.register_converter(:table_iterator, :xlsx_file) do |proc, options|
-    filename = self.parameter(options, :filename, :xlsx_file)
+  self.register_converter(:table_iterator, :fast_xlsx_file) do |proc, options|
+    filename = self.parameter(options, :filename, :fast_xlsx_file)
     Xlsxtream::Workbook.open(filename) do |xlsx|
       xlsx.write_worksheet (options[:sheet] || "Sheet1") do |sheet|
         proc.call do |row|
@@ -41,8 +46,8 @@ class DataListConverter
     filename
   end
 
-  self.register_converter(:multi_sheet_table_iterator, :xlsx_file) do |data, options|
-    filename = self.parameter(options, :filename, :xlsx_file)
+  self.register_converter(:multi_sheet_table_iterator, :fast_xlsx_file) do |data, options|
+    filename = self.parameter(options, :filename, :fast_xlsx_file)
     Xlsxtream::Workbook.open(filename) do |xlsx|
       data.each do |name, table_iterator|
         xlsx.write_worksheet(name.to_s) do |sheet|

data/lib/data_list_converter/types/xls_file.rb

@@ -15,11 +15,13 @@ class DataListConverter
   end
 
   self.register_converter(:table_iterator, :xls_file) do |proc, options|
+    type = options[:type]
     book = Spreadsheet::Workbook.new
     sheet = book.create_worksheet(name: (options[:sheet] || "Sheet1"))
+
     i = 0
     proc.call do |row|
-      row = row.map(&:to_s)
+      row = row.map(&:to_s) unless type == :raw
       sheet.row(i).push *row
       i += 1
     end
@@ -29,12 +31,13 @@ class DataListConverter
   end
 
   self.register_converter(:multi_sheet_table_iterator, :xls_file) do |data, options|
+    type = options[:type]
     book = Spreadsheet::Workbook.new
     data.each do |name, table_iterator|
       sheet = book.create_worksheet(name: name.to_s)
       i = 0
       table_iterator.call do |row|
-        row = row.map(&:to_s)
+        row = row.map(&:to_s) unless type == :raw
         sheet.row(i).concat(row)
         i += 1
       end
@@ -49,7 +52,7 @@ class DataListConverter
     book = Spreadsheet.open(filename)
     book.worksheets.map do |sheet|
       iterator = lambda { |&block|
-        sheet.each do |row| 
+        sheet.each do |row|
           block.call(row.to_a)
         end
       }

data/lib/data_list_converter/version.rb

@@ -1,3 +1,3 @@
 class DataListConverter
-  VERSION = "0.5.0".freeze
+  VERSION = "0.6.0".freeze
 end

data/test/helper_test.rb

@@ -1,6 +1,7 @@
 require 'data_list_converter/types/csv_file'
 require 'data_list_converter/types/xls_file'
 require 'data_list_converter/types/xlsx_file'
+require 'data_list_converter/types/fast_xlsx_file'
 require 'data_list_converter/types/marshal'
 
 describe DataListConverter do
@@ -19,7 +20,7 @@ describe DataListConverter do
          :multi_sheet_item_iterator,
          :multi_sheet_table_iterator,
          :marshal_file,
-         :csv_file, :csv_raw, :xls_file, :xlsx_file,
+         :csv_file, :csv_raw, :fast_xlsx_file, :xls_file, :xlsx_file,
          :records, :raw,
         ].sort
       )
@@ -30,7 +31,7 @@ describe DataListConverter do
     specify do
       @c.file_types.must_equal(
         [
-          :csv_file, :xlsx_file, :xls_file, :marshal_file
+          :csv_file, :fast_xlsx_file, :xlsx_file, :xls_file, :marshal_file
         ].sort
       )
     end
@@ -48,17 +49,29 @@ describe DataListConverter do
   describe :load_and_save_to_file do
     specify do
       filename = 'result.csv'
+      data = [{a: '12', b: '3'}, {a: '1', b: '4'}]
+      table_data = [['a', 'b'], ['a1', 'b1']]
+
       begin
-        data = [{a: '12', b: '3'}, {a: '1', b: '4'}]
         @c.save_to_file(filename, data)
         @c.load_from_file(filename).must_equal(data)
 
-        table_data = [['a', 'b'], ['a1', 'b1']]
         @c.save_to_file(filename, table_data, :table_data)
         @c.load_from_file(filename, :table_data).must_equal(table_data)
       ensure
         FileUtils.rm_rf(filename)
       end
+
+      filename = "result.xlsx"
+      begin
+        @c.save_to_file(filename, data, :item_data, file_format: :fast_xlsx_file)
+        @c.load_from_file(filename, :item_data, file_format: :fast_xlsx_file).must_equal(data)
+
+        @c.save_to_file(filename, table_data, :table_data, file_format: :fast_xlsx_file)
+        @c.load_from_file(filename, :table_data, file_format: :fast_xlsx_file).must_equal(table_data)
+      ensure
+        FileUtils.rm_rf(filename)
+      end
     end
   end
 

data/test/types_test.rb

@@ -1,6 +1,7 @@
 require 'data_list_converter/types/csv_file'
 require 'data_list_converter/types/xls_file'
 require 'data_list_converter/types/xlsx_file'
+require 'data_list_converter/types/fast_xlsx_file'
 require 'data_list_converter/types/marshal'
 
 describe DataListConverter do
@@ -79,18 +80,16 @@ describe DataListConverter do
     end
   end
 
-  require 'data_list_converter/types/fast_xlsx_file'
-
-  describe :xlsx_file do
+  describe :fast_xlsx_file do
     specify do
       filename = 'test.xlsx'
       begin
-        @c.convert(:item_data, :xlsx_file, ITEM_DATA, xlsx_file: {filename: filename})
-        @c.convert(:xlsx_file, :item_data, {filename: filename}).must_equal ITEM_DATA
+        @c.convert(:item_data, :fast_xlsx_file, ITEM_DATA, fast_xlsx_file: {filename: filename})
+        @c.convert(:fast_xlsx_file, :item_data, {filename: filename}).must_equal ITEM_DATA
 
-        @c.convert(:multi_sheet_table_data, :xlsx_file, MULTI_SHEET_TABLE_DATA,
-                   xlsx_file: {filename: filename})
-        @c.convert(:xlsx_file, :multi_sheet_table_data,
+        @c.convert(:multi_sheet_table_data, :fast_xlsx_file, MULTI_SHEET_TABLE_DATA,
+                   fast_xlsx_file: {filename: filename})
+        @c.convert(:fast_xlsx_file, :multi_sheet_table_data,
                    {filename: filename},
                   ).must_equal(MULTI_SHEET_TABLE_DATA)
       ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_list_converter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - linjunhalida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,16 +56,16 @@ dependencies:
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.3.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.3.15
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.11
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: convert data between different formats