data_collector 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b38644344f6bcfa74d68a2281b83c803879334fbd0f281fde4de8f92b180c5ec
-  data.tar.gz: 582650f6f0237f4a45c45ab137b6eac0110117b77a7b917eae448d17285ae999
+  metadata.gz: 67dc86adcebab3a6deba3ca2adf6c41c5925c03fc0dca627b030a39ff889d796
+  data.tar.gz: a4283972b9035c9e48370bcd07f3a375fb5312de584ed757f3572cc4c0b47164
 SHA512:
-  metadata.gz: 550f42750545164f6e7f47347144023be9c1bb58ff661886e1a5ef51c2804fcea8d75b87c65ce29b6a288a3e24bcbfce26f5987c17424cdb1023fda510675b49
-  data.tar.gz: ee0d60db7824fda4688c0c41aed8f8e2884aeb5d9e0b4178c53685a4fcc44e3ef93f848f3b597d6c7b8fdb85a64ffe155f03e9e6bc59fcf54fc109b662a5d892
+  metadata.gz: 65fee9ff5f15c521afc0f8181a67cebe5d7d3668a72e5cf792572745b9f7279565972cfea1568fed08d1173b33686c7fd9038c244afbc37891d25a25b6d3962d
+  data.tar.gz: 5cb4b0144a4993a00af0fc9d9637f9bc1c1fb0b72fd082e30c9f7ffbd319fbd2ad28ce95ae9b0fe54020bcb0e3ec0251380830ff4525d7a80c33966355a1ac0a

data/README.md

@@ -9,7 +9,7 @@ example:
     input.from_uri("file://hello.txt")
 ```
 
-Inputs can be JSON, XML or CSV
+Inputs can be JSON, XML or CSV or XML in a TAR.GZ file
 
  ### output 
 Output is an object you can store data that needs to be written to an output stream.  

data/data_collector.gemspec

@@ -42,9 +42,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "nori", "~> 2.6"
   spec.add_runtime_dependency "http", "~> 4.1"
   spec.add_runtime_dependency "mime-types", "~> 3.2"
-  spec.add_runtime_dependency "minitar", "= 0.8"
+  spec.add_runtime_dependency "minitar", "= 0.9"
   spec.add_runtime_dependency "activesupport", "~> 5.2"
-  spec.add_runtime_dependency "redis", "~> 4.1"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/data_collector/core.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'jsonpath'
+require 'logger'
 
 require_relative 'input'
 require_relative 'output'
@@ -93,6 +94,7 @@ module DataCollector
 
       filtered
     rescue StandardError => e
+      @logger ||= Logger.new(STDOUT)
       @logger.error("#{filter_path} failed: #{e.message}")
       []
     end
@@ -102,6 +104,7 @@ module DataCollector
     end
 
     def log(message)
+      @logger ||= Logger.new(STDOUT)
       @logger.info(message)
     end
 

data/lib/data_collector/output.rb

@@ -64,13 +64,16 @@ module DataCollector
 
     def clear
       @data = {}
-      GC.start(full_mark: true, immediate_sweep: true)
+      #GC.start(full_mark: true, immediate_sweep: true)
+      GC.start
     end
 
 
-    def to_s(erb_file)
+    def to_s(erb_file = nil)
       data = @data
 
+      return data.to_s if erb_file.nil?
+
       def print(data, symbol, to_symbol = nil)
         tag = to_symbol ? to_symbol.to_s : symbol.to_s
 

data/lib/data_collector/rules.rb

@@ -1,5 +1,4 @@
 require 'logger'
-#require_relative 'core'
 
 module DataCollector
   class Rules
@@ -19,7 +18,9 @@ module DataCollector
       end
 
       to_record.each do |element|
-        element = element.delete_if{||}
+        element = element.delete_if do |k, v|
+          v != false && (v.nil? || v.empty?)
+        end
       end
     end
 
@@ -38,13 +39,19 @@ module DataCollector
           to_record << {map_to_key.to_sym => result}
         end
       else
-        to_record << {map_to_key.to_sym => get_value_for(map_to_key, rule['filter'], from_record, rule['options'])}
+        result = get_value_for(map_to_key, rule['filter'], from_record, rule['options'])
+        return if result && result.empty?
+        to_record << {map_to_key.to_sym => result}
       end
     end
 
     def get_value_for(tag_key, filter_path, record, options = {})
       data = nil
       if record
+        if filter_path.is_a?(Array) && !record.is_a?(Array)
+          record = [record]
+        end
+
         data = Core::filter(record, filter_path)
 
         if data && options

data/lib/data_collector/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module DataCollector
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_collector
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement