logstash-filter-rest 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2468297289c6978316c5d27c664d5c162cd0412c
-  data.tar.gz: 6bb1e1e69ef6ac4409e14e4170b81ea46f657094
+  metadata.gz: 798eff3d04ef565f8b78b1692b53f05a3d823271
+  data.tar.gz: 94d72901fbfea799a846785bd63fbe3d85fd6349
 SHA512:
-  metadata.gz: 01227dc244aeb7c369dd7d5127423ce63e21cedc63797052ec30164c7800906141a2b5249de77c4adb8d6f053d7d949790a5a8120d9e1fdcb42f2e256932ab15
-  data.tar.gz: b5d5599af27a350e07122ff29cea1dd94d9f4866005568c38a062bb1a4ac6a4e576161c457f5c59e8b145248943b46a51c9bd7e738714629e186b9daea2edd82
+  metadata.gz: 777e34a187f60db34636e69380432f020daf8dc9c7928252ea2938d65a5f35f27f8146cd40831eb7ab9eec66c4b0a3f47fd6c1f3d5003cb92eee65e2b6ecf237
+  data.tar.gz: c8a295158a7dad5737cc5ddec33d53c1ab8d3e6c6f81d05980b126617d4ccfcd74fae0cce0cd50a7702486b04368fafffeb1a12cf1302206410fc4d85efe7b3f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.2
+  - Fix behavior, where a referenced field (`%{...}`) has `ruby` chars
+  (i.e., consisting of `:`)
+  - Field interpolation is done by assigning explicit values instead
+  of converting the `sprintf` string back into a `hash`
+
 ## 0.5.0
   - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
   - Require devutils >= 0 to make `bundler` update the package

data/lib/logstash/filters/rest.rb

@@ -16,16 +16,6 @@ class Hash
   end
 end
 
-# Monkey Patch string to parse to hsh
-class String
-  def to_object(symbolize = true)
-    LogStash::Json.load(
-      gsub(/:([a-zA-z]+)/, '"\\1"').gsub('=>', ': '),
-      :symbolize_keys => symbolize
-    )
-  end
-end
-
 #  Monkey Patch Array with deep freeze
 class Array
   def deep_freeze
@@ -254,13 +244,33 @@ class LogStash::Filters::Rest < LogStash::Filters::Base
     end
   end
 
+  private
+
+  def field_intrpl(intrpl_fields, event)
+    return intrpl_fields if intrpl_fields.empty?
+    return event.sprintf(intrpl_fields) unless intrpl_fields.respond_to?(:each)
+    case intrpl_fields
+    when Array
+      result = []
+      intrpl_fields.each do |v|
+        result << field_intrpl(v, event)
+      end
+    when Hash
+      result = {}
+      intrpl_fields.each do |k, v|
+        result[k] = field_intrpl(v, event)
+      end
+    end
+    result
+  end
+
   public
 
   def filter(event)
     return unless filter?(event)
     @logger.debug? && @logger.debug('Parsing event fields',
                                     :sprintf_fields => @sprintf_fields)
-    parsed_request_fields = event.sprintf(@sprintf_fields).to_object
+    parsed_request_fields = field_intrpl(@sprintf_fields, event)
     parsed_request_fields.each do |v|
       case v
       when Hash

data/logstash-filter-rest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-rest'
-  s.version = '0.5.1'
+  s.version = '0.5.2'
   s.licenses = ['Apache License (2.0)']
   s.summary = 'This filter requests data from a RESTful Web Service.'
   s.description = 'This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install logstash-filter-rest. This gem is not a stand-alone program'

data/spec/filters/rest_spec.rb

@@ -210,7 +210,7 @@ describe LogStash::Filters::Rest do
             url => 'https://jsonplaceholder.typicode.com/posts'
             method => 'post'
             params => {
-              title => 'foo'
+              title => '%{message}'
               body => 'bar'
               userId => "%{message}"
             }
@@ -228,9 +228,24 @@ describe LogStash::Filters::Rest do
     sample('message' => '42') do
       expect(subject).to include('rest')
       expect(subject.get('rest')).to include('id')
+      expect(subject.get('[rest][title]')).to eq(42)
       expect(subject.get('[rest][userId]')).to eq(42)
       expect(subject.get('rest')).to_not include('fallback')
     end
+    sample('message' => ':5e?#!-_') do
+      expect(subject).to include('rest')
+      expect(subject.get('rest')).to include('id')
+      expect(subject.get('[rest][title]')).to eq(':5e?#!-_')
+      expect(subject.get('[rest][userId]')).to eq(':5e?#!-_')
+      expect(subject.get('rest')).to_not include('fallback')
+    end
+    sample('message' => ':4c43=>') do
+      expect(subject).to include('rest')
+      expect(subject.get('rest')).to include('id')
+      expect(subject.get('[rest][title]')).to eq(':4c43=>')
+      expect(subject.get('[rest][userId]')).to eq(':4c43=>')
+      expect(subject.get('rest')).to_not include('fallback')
+    end
   end
   describe 'Set to Rest Filter Post with body sprintf' do
     let(:config) do <<-CONFIG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-rest
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Lucas Henning
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement