data_collector 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fb3cc5c42f536a8bdc99421eb6f46972c6c97597f5c0af63e96463f320837ef
-  data.tar.gz: d377133bf042985f6d68b2bb2960d9c4ddae169a39d4602df4a3f4003d6b6434
+  metadata.gz: f8b064bcc0483a98014157586cb18473d240486f3e4c1550b9eeba0cc026af6b
+  data.tar.gz: 503c959ca4d3ac06e65e41f0f721aed795b27871d220d676eeb6bc7b81a169d1
 SHA512:
-  metadata.gz: cd48af243e1615e8cafaf8ed1ab4d9019661e3205286fbd32c9ec4bb3e2faa7e07025a62b378062f10dfc0f1775acb401ad4cb901851cbbaf4cb78a2e7c6474a
-  data.tar.gz: c92eee26040f89ab0b691ba6bf4ad9792222e545e82bb9ebea8b4a4941831615a74d9f389e58d6feccf89ba42c6dd5a02c55bfed996fc670cd1d9600d5023476
+  metadata.gz: 34b2b890765598022e97ee914d6159bd6741ac6d2f711189c81144e880a6590b74183355417d32c3cf39197aad0be914c5d6c6c0089379beac3e14c4bf0b1b01
+  data.tar.gz: 860aa1bab4a0a0c580840f12bf42f77b76598a7433b033211d200647117c91754b49c76540cb52bf58a96184498293c8c0e73659481a7a938277dd53cbd9f7e1

data/lib/data_collector/rules_ng.rb

@@ -10,29 +10,40 @@ module DataCollector
       rules.each do |tag, rule|
         apply_rule(tag, rule, input_data, output_data, options)
       end
+
+      output_data
     end
 
     private
+
     def apply_rule(tag, rule, input_data, output_data, options = {})
-      if rule.is_a?(Array)
+      rule_filter = rule
+      rule_payload = ""
+
+      case rule
+      when Array
         rule.each do |sub_rule|
-           apply_rule(tag, sub_rule, input_data, output_data, options)
+          apply_rule(tag, sub_rule, input_data, output_data, options)
         end
         return output_data
+      when String
+        rule_filter = rule
+        rule_payload = ""
+      else
+        rule_filter = rule.keys.first
+        rule_payload = rule.values.first
       end
 
-      rule_filter = rule.keys.first
-      rule_payload = rule.values.first
       case rule_filter
       when 'text'
         if rule_payload.is_a?(String)
           data = rule_payload
         else
-          data = rule_payload.select{|s| s.is_a?(String)}
-          rule_payload = rule_payload.delete_if{|s| s.is_a?(String)}
-          if rule_payload.size == 1
-            rule_payload = rule_payload.first
-          end
+          data = rule_payload.select { |s| s.is_a?(String) }
+          rule_payload = rule_payload.delete_if { |s| s.is_a?(String) }
+          # if rule_payload.size == 1
+          #   rule_payload = rule_payload.first
+          # end
         end
       when /json_path\:/
         data = json_path_filter(rule_filter.gsub(/^json_path\:/), input_data)
@@ -42,17 +53,22 @@ module DataCollector
 
       data = apply_filtered_data_on_payload(data, rule_payload, options)
 
-      output_data << {tag.to_sym => data}
+      output_data << {tag.to_sym => data} unless data.nil? || (data.is_a?(Array) && data.empty?)
+    rescue StandardError => e
+      puts "error running rule '#{tag}'\n\t#{e.message}"
+      puts e.backtrace.join("\n")
     end
 
     def apply_filtered_data_on_payload(input_data, payload, options = {})
+      return nil if input_data.nil?
       output_data = nil
       case payload.class.name
       when 'Proc'
+        data = input_data.is_a?(Array) ? input_data : [input_data]
         if options && options.empty?
-          output_data = payload.call(input_data)
+          output_data = data.map { |d| payload.call(d) }
         else
-          output_data = payload.call(input_data, options)
+          output_data = data.map { |d| payload.call(d, options) }
         end
       when 'Hash'
         input_data = [input_data] unless input_data.is_a?(Array)
@@ -69,10 +85,12 @@ module DataCollector
           output_data = apply_filtered_data_on_payload(output_data, p, options)
         end
       else
-        output_data = input_data
+        output_data = [input_data]
       end
 
+      output_data = output_data.first if output_data.is_a?(Array) && output_data.size == 1
       output_data.compact! if output_data.is_a?(Array)
+      output_data.flatten! if output_data.is_a?(Array)# || output_data.is_a?(Hash)
       output_data
     end
 

data/lib/data_collector/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_collector
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ETL helper library