fluent-plugin-viaq_data_model 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24033376b78bd0a72e22b6ff93d00d634e8dcb30
-  data.tar.gz: cb280696d25324e6ddc66d4091d85951f99abde6
+  metadata.gz: 72e1031bd59c7056bff5416a8877658c4850d7fb
+  data.tar.gz: e9e76b523fca3e2c3eb00800a7e00256adc90db3
 SHA512:
-  metadata.gz: 061b1c5be09ee0e8d1b480ea845368c4e7ce0d87b3455e0a5c486b911352a3dcdc7890b56fe5d433cdb74597b9567dd9270ab59f33c58ef7b0c4f619165f6f02
-  data.tar.gz: 5c7702852bbd5d08813175367d4343f1acc86d4695102b0b48f85a0d7f4ddbf06a8458c4b8cbc3de16452ae8d55065db06d6e5efd6b90258ad1f2995469e8f9a
+  metadata.gz: 9cc93bc210c483b56dd05ce87efd6b9f54dc067c619dbe90d087002f10b01729b3ca21ac7c80024ec07b88aa852609590b1f5b83479287fb0228d2bcc0438801
+  data.tar.gz: 6a398beddcc833b48ba06bec215b70cd415a5b8d661df7d0fa4b7d832e9ecc23f2d558623b9817055956a90874d896e55ed966f3b8a6f1040b47f7e8540084af

data/fluent-plugin-viaq_data_model.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-viaq_data_model"
-  gem.version       = "0.0.3"
+  gem.version       = "0.0.5"
   gem.authors       = ["Rich Megginson"]
   gem.email         = ["rmeggins@redhat.com"]
   gem.description   = %q{Filter plugin to ensure data is in the ViaQ common data model}

data/lib/fluent/plugin/filter_viaq_data_model.rb

@@ -95,7 +95,11 @@ module Fluent
     # recursively delete empty fields and empty lists/hashes from thing
     def delempty(thing)
       if thing.respond_to?(:delete_if)
-        thing.delete_if{|k,v| v.nil? || isempty(delempty(v)) || isempty(v)}
+        if thing.kind_of? Hash
+          thing.delete_if{|k,v| v.nil? || isempty(delempty(v)) || isempty(v)}
+        else # assume single element iterable
+          thing.delete_if{|elem| elem.nil? || isempty(delempty(elem)) || isempty(elem)}
+        end
       end
       thing
     end

data/test/test_filter_viaq_data_model.rb

@@ -192,6 +192,26 @@ class ViaqDataModelFilterTest < Test::Unit::TestCase
       assert_equal(99, rec['h']['i']['m'])
       assert_true(rec['h']['i']['n'])
     end
+    test 'see if fields with a value of numeric 0 are removed or preserved' do
+      msg = {'a'=>{'b'=>{'c'=>{'d'=>{'e'=>'','f'=>{},'g'=>0}}}},'h'=>{'i'=>{'j'=>'','k'=>'l','m'=>0,'n'=>true}}}
+      rec = emit_with_tag('tag', msg)
+      assert_nil(rec['a']['b']['c']['d']['e'])
+      assert_nil(rec['a']['b']['c']['d']['f'])
+      assert_equal(0, rec['a']['b']['c']['d']['g'])
+      assert_equal('l', rec['h']['i']['k'])
+      assert_equal(0, rec['h']['i']['m'])
+      assert_true(rec['h']['i']['n'])
+    end
+    test 'see if fields with array values of numeric values are preserved' do
+      msg = {'a'=>{'b'=>{'c'=>{'d'=>{'e'=>'','f'=>{},'g'=>[99.999]}}}},'h'=>{'i'=>{'j'=>'','k'=>'l','m'=>[88],'n'=>true}}}
+      rec = emit_with_tag('tag', msg)
+      assert_equal([99.999], rec['a']['b']['c']['d']['g'])
+      assert_nil(rec['a']['b']['c']['d']['e'])
+      assert_nil(rec['a']['b']['c']['d']['f'])
+      assert_equal('l', rec['h']['i']['k'])
+      assert_equal([88], rec['h']['i']['m'])
+      assert_true(rec['h']['i']['n'])
+    end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-viaq_data_model
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Rich Megginson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd