fluent-plugin-record-modifier 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbb0e44223c741d2f1c7bed9f61ed7e174c40428
-  data.tar.gz: bc472ac107bef79ce85e9dd561dc8aca9370a78e
+  metadata.gz: 438ccea5164c0e705dff68f7482312e20b1c84a3
+  data.tar.gz: 9a2b5a6893a56928e71cddd0bab98eb8f015b833
 SHA512:
-  metadata.gz: a94230f5226d68bbb72b7456bb7aa12ce2e7654fe93ca133db4bdd1a464588449ff30d16e94f23cc8b6f268cf883f90587354d768bec9eea90307fea43f96ee1
-  data.tar.gz: a8112001bd72021279339f9cfa60dd2f8872d0eb484768ce2da65de4b7892420f9c46cf3a44055d18864cd51f9706c2b96ab8158cc4418fa97400c452634f3be
+  metadata.gz: 88dfb45817738a35242e9eb08ca66511d80056a4744513222654251b762fe901c86b63e7bc5780d83e8d1370f74c375d109ca4dc7c6c6d1cad27a102ae310b71
+  data.tar.gz: 12069d1234c29caa145f8f32943c842b029b462e747a4c2c18df28d31d28df7cc66948587f32878a80560ab56e7ff9cc03ebf288dfe55231fd8a08766a254903

data/.travis.yml

@@ -1,25 +1,25 @@
 language: ruby
 
 rvm:
-  - 2.0.0
   - 2.1
   - 2.2.5
   - 2.3.1
+  - 2.4.2
   - ruby-head
-  - rbx
 
 branches:
   only:
     - master
+    - v0.12
 
 gemfile:
   - Gemfile
 
+sudo: false
+
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx
-    - rvm: 2.0.0
 
 before_install: gem update bundler
 script: bundle exec rake test

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.6.1 - 2017/12/12
+
+  * Drop fluentd v0.10 support
+  * Add frozen object support
+    https://github.com/repeatedly/fluent-plugin-record-modifier/pull/26
+
 Release 0.6.0 - 2017/06/06
 
   * Drop fluentd v0.10 support

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
+gem 'fluentd', '~> 0.12.0'
+
 gemspec

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/fluent/plugin/filter_record_modifier.rb

@@ -116,7 +116,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
@@ -127,7 +133,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_as_array.map(&:last)
   end
+
+  sub_test_case 'frozen check' do
+    def test_set_char_encoding
+      d = create_driver %[
+        char_encoding utf-8
+      ]
+
+      d.run do
+        d.emit("k" => 'v'.force_encoding('BINARY').freeze)
+        d.emit("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_as_array.map { |e| e.last }
+    end
+
+    def test_convert_char_encoding
+      d = create_driver %[
+        char_encoding utf-8:cp932
+      ]
+
+      d.run do
+        d.emit("k" => 'v'.force_encoding('utf-8').freeze)
+        d.emit("k" => {"l" => 'v'.force_encoding('utf-8').freeze})
+      end
+
+      assert_equal [
+        {"k" => 'v'.force_encoding('cp932')},
+        {"k" => {"l" => 'v'.force_encoding('cp932')}},
+      ], d.filtered_as_array.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: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       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