logstash-codec-json_lines 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1506140c8e501d6674a9240c5e0e943dbad0adc
-  data.tar.gz: 86a5df4679925793a96dd8d41093c2ca69b6dabc
+  metadata.gz: b030a41f7df36a3d8606f34ed585c0985fb90df7
+  data.tar.gz: b8219c1875098c8bfdb8bd50035563431edc6864
 SHA512:
-  metadata.gz: c1f3ea023534e310a9b3215909118af6b0709f4e20ec34b450b556ac2c97f8f05ae830e46e4ada813ebb4d3b720d1fec3bce83351a9ec4eab2d307321c51084a
-  data.tar.gz: c97a1312cb5c1f89a0c8763e1da59f25ea2fa942a5da7008422920e51f85578ccc9981b3556bf1649d8699241b5f2b71cc5a36c310e77e2616b373ce9e483835
+  metadata.gz: 4f68fda702d25dd2d51492b13fc96f081fe03ae9bf85b34d6a22e1d437b5fd3142b4cbd02844e52634f6cd1ada88b10ca80e8b8aa6000b0ab190781442fc4196
+  data.tar.gz: 4bd5013f23e24fe1ceada38d87a23c536bcffd921c35d3e393d24f36664c12f53b256b1b808a483f2fd83893945dbd7efad85db6fb989e3f860486663bb592ed

data/Gemfile

@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gemspec
+gemspec

data/lib/logstash/codecs/json_lines.rb

@@ -59,11 +59,14 @@ class LogStash::Codecs::JSONLines < LogStash::Codecs::Base
 
   # legacy_parse uses the LogStash::Json class to deserialize json
   def legacy_parse(json, &block)
-    yield LogStash::Event.new(LogStash::Json.load(json))
+    # ignore empty/blank lines which LogStash::Json#load returns as nil
+    o = LogStash::Json.load(json)
+    yield(LogStash::Event.new(o)) if o
   rescue LogStash::Json::ParserError
     yield LogStash::Event.new("message" => json, "tags" => ["_jsonparsefailure"])
   end
 
+  # keep compatibility with all v2.x distributions. only in 2.3 will the Event#from_json method be introduced
+  # and we need to keep compatibility for all v2 releases.
   alias_method :parse, LogStash::Event.respond_to?(:from_json) ? :from_json_parse : :legacy_parse
-
-end # class LogStash::Codecs::JSONLines
+end

data/logstash-codec-json_lines.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-json_lines'
-  s.version         = '2.1.0'
+  s.version         = '2.1.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This codec will decode streamed JSON that is newline delimited."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

data/spec/codecs/json_lines_spec.rb

@@ -78,7 +78,6 @@ describe LogStash::Codecs::JSONLines do
     end
 
     context "when json could not be parsed" do
-
       let(:message)    { "random_message\n" }
 
       it "add the failure tag" do
@@ -98,8 +97,26 @@ describe LogStash::Codecs::JSONLines do
           expect(event['tags']).to include "_jsonparsefailure"
         end
       end
+    end
+
+    context "blank lines" do
+      let(:collector) { Array.new }
 
+      it "should ignore bare blanks" do
+        subject.decode("\n\n") do |event|
+          collector.push(event)
+        end
+        expect(collector.size).to eq(0)
+      end
+
+      it "should ignore in between blank lines" do
+        subject.decode("\n{\"a\":1}\n\n{\"b\":2}\n\n") do |event|
+          collector.push(event)
+        end
+        expect(collector.size).to eq(2)
+      end
     end
+
   end
 
   context "#encode" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-json_lines
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core