fluent-plugin-fluent-plugin-json-size-limit 0.1.24 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e10aae10321603fa97bf64f44a8c5aaece831e988ed7f14be0799b328f13cb
-  data.tar.gz: a29af8031f826c2b4873ba3b976569b2f66fb62d9b2471dc7619f7198ff3204d
+  metadata.gz: fc2d0b868e3e3879068c4c4adb44caf832379ad4d927f09e72f02223cc9efe9b
+  data.tar.gz: cfa85d22a6b21b41ff7541f6040ca22c4ed5fbf20b13f818392928e1f5d5624a
 SHA512:
-  metadata.gz: '0795d0a432657db02bc710c6a6df44c92ed03048a4fc7b84511b3bc78a9b3871f9fdfaa49faa0a99fd2dd2a846a84a0cd7e717a4abbf443ce0265dd69a38510b'
-  data.tar.gz: dcf06ae947ded1e2b08250b4d4c81187e68a8dc6bd218ac76904b798d0dcf54ffec692b3ea6a974a8131e283b3abbc02baf2b4fd6af7b88a1835367ab6a8c869
+  metadata.gz: 18f99e8b8e7841be35f024b481676e7cb0da6b9f045d4ff67479c6cb6325a8ca74452f469f8d3631878c3bf2dbaa179af6dd4ab76392e912656cd44a70c9fc23
+  data.tar.gz: b3eae5c689ed71874327ba01d30803321b19f5848f8977f8e2b57862650adf1504deb263181ad13232ee97dcc6fa1a5c396c5014cb30a0257ddd8865d9b759bc

data/fluent-plugin-fluent-plugin-json-size-limit.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-fluent-plugin-json-size-limit"
-  spec.version = "0.1.24"
+  spec.version = "0.1.27"
   spec.authors = ["Mykola Panin"]
   spec.email   = ["mykola.panin@creatoriq.com"]
 

data/lib/fluent/plugin/filter_jsonsizelimit.rb

@@ -42,28 +42,36 @@ module Fluent
         attempts = 0
         while obj.to_json.bytesize > target_size && attempts < 100
           excess_size = obj.to_json.bytesize - target_size
-          if obj.is_a?(Hash)
-            reduce_hash(obj, excess_size)
-          elsif obj.is_a?(Array)
-            obj.each { |element| reduce_size(element, target_size) }
-          end
+          perform_reduction(obj, excess_size)
           attempts += 1
         end
       end
 
-      def reduce_hash(hash_obj, excess_size)
-        hash_obj.each do |key, value|
-          break if hash_obj.to_json.bytesize <= target_size
-
-          if value.is_a?(String)
-            reduction_amount = (value.length.to_f / hash_obj.to_json.bytesize) * excess_size
-            new_length = [value.length - reduction_amount, 0].max
-            hash_obj[key] = value[0...new_length]
-          elsif value.is_a?(Hash) || value.is_a?(Array)
-            reduce_size(value, target_size)
+      def perform_reduction(obj, excess_size)
+        if obj.is_a?(Hash)
+          obj.each do |key, value|
+            apply_reduction(value, excess_size)
           end
+        elsif obj.is_a?(Array)
+          obj.each { |element| apply_reduction(element, excess_size) }
+        elsif obj.is_a?(String)
+          reduce_string(obj, excess_size)
         end
       end
+
+      def apply_reduction(element, excess_size)
+        if element.is_a?(String)
+          reduce_string(element, excess_size)
+        elsif element.is_a?(Hash) || element.is_a?(Array)
+          reduce_size(element, element.to_json.bytesize - excess_size)
+        end
+      end
+
+      def reduce_string(str, excess_size)
+        reduction_amount = (str.length.to_f / str.to_json.bytesize) * excess_size
+        new_length = [str.length - reduction_amount, 0].max
+        str.replace(str[0...new_length])
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-fluent-plugin-json-size-limit
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.27
 platform: ruby
 authors:
 - Mykola Panin