data_list_converter 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae357714514bf8851c5d2a0976364842a2a63ef3aa1a0b42a0b0a46d5072aab5
-  data.tar.gz: 016ef3170b9b6919e6d8dbc6a1584157b95d130c4278265dcc5d337bddf3ed65
+  metadata.gz: ed694a5c72e52682133a22004d381f3968c3d28db54cbeba194eda7c793e70a9
+  data.tar.gz: 656daa9eb323ffa7b7bddb8e40df86606889f091f56c47069f39e37c9f434741
 SHA512:
-  metadata.gz: a0f2ef770d00647dfd43595b814eecf5026c2f7d33a1ac3784bbfe14419e233e1e4d866b59c44228a5c60e2e452de5e1aced21993fd207ad23ed2a3807bdfd5c
-  data.tar.gz: 60e7578914900c8f2fda9eccee66293b4087d83db181231bc51381d478a2bf6951c88ce5dba8d5dd3fac456768416122366a9ad26220ad77805adf2cb992362e
+  metadata.gz: ad413ccb9e7f0552a39965c69f7924df825eda9933d9acfb83e20455ea03cdd25f34dd8275187190ca868b34fa490c4025c1024820ebf8627345b7e1d6a8d969
+  data.tar.gz: be36997b5d5b37af61e8c5281038ecb8187650ee3d8c506ea852fec5bba8c324a8434e53fe2e2ba729a86deb667376d331aed6194c9cd05286fd636cdbc48219

data/lib/data_list_converter/base.rb

@@ -45,7 +45,7 @@ class DataListConverter
     def convert(from_type, to_type, from_value, options={})
       methods = []
       add_filter = lambda { |type|
-        filters = (options[type] || {}).delete(:filter)
+        filters = (options[type] || {})[:filter]
         return unless filters
         methods += normalize_filters(type, filters)
       }
@@ -58,6 +58,7 @@ class DataListConverter
         from_type, to_type = route[i], route[i+1]
         method = CONVERTERS[[from_type, to_type]]
         raise "cannot find converter #{from_type} -> #{to_type}" unless method
+        self.log "#{from_type} -> #{to_type} options: #{options[to_type]}"
         methods.push([method, options[to_type] || {}])
         add_filter.call(to_type)
       end

data/lib/data_list_converter/helper.rb

@@ -1,14 +1,14 @@
 class DataListConverter
-  def self.save_to_file(filename, data, data_format=:item_data)
+  def self.save_to_file(filename, data, data_format=:item_data, options={})
     file_format = self.get_file_format(filename)
-    DataListConverter.convert(data_format, file_format, data,
-                              file_format => {filename: 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)
+  def self.load_from_file(filename, data_format=:item_data, options={})
     file_format = self.get_file_format(filename)
-    DataListConverter.convert(file_format, data_format,
-                              {filename: filename})
+    options[:filename] = filename
+    DataListConverter.convert(file_format, data_format, options)
   end
 
   def self.get_file_format(filename)

data/lib/data_list_converter/types/multi_sheet.rb

@@ -19,8 +19,9 @@ class DataListConverter
       :"multi_sheet_#{from_type}",
       :"multi_sheet_#{to_type}",
     ) do |data, options|
+      self.log("multi_sheet #{from_type} -> #{to_type} with options: #{options}")
       data.map do |sheet, from_data|
-        to_data = self.convert(from_type, to_type, from_data)
+        to_data = self.convert(from_type, to_type, from_data, options)
         [sheet, to_data]
       end.to_h
     end

data/lib/data_list_converter/version.rb

@@ -1,3 +1,3 @@
 class DataListConverter
-  VERSION = "0.4.2".freeze
+  VERSION = "0.4.3".freeze
 end

data/test/filters_test.rb

@@ -26,12 +26,30 @@ describe DataListConverter do
       string = StringIO.new
       filter = {count: {size: 4000,
                         out: string,
-                        msg: "%{percent}%"}}
+                        msg: "%{percent}%%"}}
       result = DataListConverter.convert(
         :item_iterator, :table_data, iter,
         item_iterator: {filter: filter})
       string.string.split("\n").must_equal ['total: 10000', '40.0%', '80.0%']
     end
   end
+
+  describe :remove_debug do
+    specify do
+      filter = {remove_debug: true}
+      item_data = [{name: "james", debug: "", a: 12}] * 2
+      result = DataListConverter.convert(
+        :item_data, :table_data, item_data,
+        table_iterator: {filter: filter})
+      result.must_equal [["name"], ["james"], ["james"]]
+
+      # check on multi_sheet
+      item_data = {a: [{name: "james", debug: "", a: 12}] * 2, b: [{name: 'cc', debug: "", b: 3}]*3}
+      result = DataListConverter.convert(
+        :multi_sheet_item_data, :multi_sheet_table_data, item_data,
+        multi_sheet_table_iterator: {table_iterator: {filter: {remove_debug: true}}})
+      result.must_equal(a: [["name"], ["james"], ["james"]], b: [["name"], ["cc"], ["cc"], ["cc"]])
+    end
+  end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_list_converter
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - linjunhalida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -160,8 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: convert data between different formats