fluent-plugin-record-modifier 1.0.0.rc1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd31ea6b4191c161f1518dbdfb7cbc57b9840902
-  data.tar.gz: ce1368e0f6b21845deafeb6c72ec60b06d9a2146
+  metadata.gz: 9a15e658406cf52a460a2a6edbb1a1337f71b7b4
+  data.tar.gz: b7993b3cb32177eb7db0aa36fd3eafd7679adb8f
 SHA512:
-  metadata.gz: 00b348bb146840c6e754d974e4400e5dee8444289f3f6bdee1e19b0932f76ece490639e1d0bf2ff0f90e4491b1fc127792b5fadf1130cf08c13e5627b4c30bf6
-  data.tar.gz: 4fcc2ab8f86c7e7e40df240fdbdde4e88c80fb4f2e1dd06ae45b766faac620c381e762946b0cbdb6c3795ead3e3e62b43219325a2f635d4b0bf6510fff3a586f
+  metadata.gz: b482529449bdeff97e0629d896781ac6c8c97f6f26c2f07355e220686ef08bc3e8534f64c98ebfc9c3ca36c8845d98322b81b14032604f8cdb4fcf03ef9d0625
+  data.tar.gz: 7e331024d5c7533a2b6a73cf64bcce452fabcd6279f84202449172be7030aa43cd827e336b20829e9ec6c669c8bbe39e45cbec633bae93ef4a62df77fa856039

data/ChangeLog

@@ -1,7 +1,9 @@
-Release 1.0.0.rc1 - 2016/08/23
+Release 1.0.0 - 2017/12/12
 
   * Use v0.14 API
     https://github.com/repeatedly/fluent-plugin-record-modifier/pull/14
+  * Support frozen object
+    https://github.com/repeatedly/fluent-plugin-record-modifier/pull/26
 
 Release 0.5.0 - 2016/08/23
 

data/README.md

@@ -136,6 +136,20 @@ then you got new record like below:
 {"key1":"hoge", "key2":"foo"}
 ```
 
+### Ruby code trick for complex logic
+
+If you need own complex logic in filter, writing filter plugin is better. But if you don't want to write new plugin, you can use temporal key trick like below:
+
+```
+<filter reform.**>
+  @type record_modifier
+  remove_keys _dummy_
+  <record>
+    _dummy_ ${if record.has_key?('foo'); record['bar'] = 'Hi!'; end; nil}
+  </record>
+</filter>}
+```
+
 ### record_modifier output
 
 In v0.10, you can use `record_modifier` output to emulate filter. `record_modifier` output doesn't support `<record>` way.

data/VERSION

@@ -1 +1 @@
-1.0.0.rc1
+1.0.0

data/lib/fluent/plugin/filter_record_modifier.rb

@@ -113,7 +113,13 @@ DESC
       if value.is_a?(String)
         value.force_encoding(@from_enc)
       elsif value.is_a?(Hash)
-        value.each_pair { |k, v| set_encoding(v) }
+        value.each_pair { |k, v|
+          if v.frozen?
+            value[k] = set_encoding(v.dup)
+          else
+            set_encoding(v)
+          end
+        }
       elsif value.is_a?(Array)
         value.each { |v| set_encoding(v) }
       end
@@ -124,7 +130,13 @@ DESC
         value.force_encoding(@from_enc) if value.encoding == Encoding::BINARY
         value.encode!(@to_enc, @from_enc, :invalid => :replace, :undef => :replace)
       elsif value.is_a?(Hash)
-        value.each_pair { |k, v| convert_encoding(v) }
+        value.each_pair { |k, v|
+          if v.frozen?
+            value[k] = convert_encoding(v.dup)
+          else
+            convert_encoding(v)
+          end
+        }
       elsif value.is_a?(Array)
         value.each { |v| convert_encoding(v) }
       end

data/test/test_filter_record_modifier.rb

@@ -11,7 +11,6 @@ class RecordModifierFilterTest < Test::Unit::TestCase
   end
 
   CONFIG = %q!
-    type record_modifier
     remove_keys hoge
 
     <record>
@@ -57,8 +56,6 @@ class RecordModifierFilterTest < Test::Unit::TestCase
 
   def test_set_char_encoding
     d = create_driver %[
-      type record_modifier
-
       char_encoding utf-8
     ]
 
@@ -77,8 +74,6 @@ class RecordModifierFilterTest < Test::Unit::TestCase
 
   def test_convert_char_encoding
     d = create_driver %[
-      type record_modifier
-
       char_encoding utf-8:cp932
     ]
 
@@ -97,8 +92,6 @@ class RecordModifierFilterTest < Test::Unit::TestCase
 
   def test_remove_one_key
     d = create_driver %[
-      type record_modifier
-
       remove_keys k1
     ]
 
@@ -111,8 +104,6 @@ class RecordModifierFilterTest < Test::Unit::TestCase
 
   def test_remove_multiple_keys
     d = create_driver %[
-      type record_modifier
-
       remove_keys k1, k2, k3
     ]
 
@@ -125,8 +116,6 @@ class RecordModifierFilterTest < Test::Unit::TestCase
 
   def test_remove_non_whitelist_keys
     d = create_driver %[
-      type record_modifier
-
       whitelist_keys k1, k2, k3
     ]
 
@@ -136,4 +125,38 @@ class RecordModifierFilterTest < Test::Unit::TestCase
 
     assert_equal [{"k1" => 'v', "k2" => 'v'}], d.filtered.map(&:last)
   end
+
+  sub_test_case 'frozen check' do
+    def test_set_char_encoding
+      d = create_driver %[
+        char_encoding utf-8
+      ]
+
+      d.run(default_tag: @tag) do
+        d.feed("k" => 'v'.force_encoding('BINARY').freeze)
+        d.feed("k" => {"l" => 'v'.force_encoding('BINARY').freeze})
+      end
+
+      assert_equal [
+        {"k" => 'v'.force_encoding('UTF-8')},
+        {"k" => {"l" => 'v'.force_encoding('UTF-8')}},
+      ], d.filtered.map { |e| e.last }
+    end
+
+    def test_convert_char_encoding
+      d = create_driver %[
+        char_encoding utf-8:cp932
+      ]
+
+      d.run(default_tag: @tag) do
+        d.feed("k" => 'v'.force_encoding('utf-8').freeze)
+        d.feed("k" => {"l" => 'v'.force_encoding('utf-8').freeze})
+      end
+
+      assert_equal [
+        {"k" => 'v'.force_encoding('cp932')},
+        {"k" => {"l" => 'v'.force_encoding('cp932')}},
+      ], d.filtered.map { |e| e.last }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-modifier
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -90,12 +90,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Filter plugin for modifying event record