logstash-codec-multiline 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad1702d90e9bf8fb69ffd334989def88c34b8afa
-  data.tar.gz: dc3b95f3bac523a85107eeb5c0142f6687a09b25
+  metadata.gz: bb29402e4fc64969af12f38713f553e18dc57418
+  data.tar.gz: f8a9fb89870cc25e7a252b11c47e7c5e5dc94eb7
 SHA512:
-  metadata.gz: f29daf9944841236fd22a7c4dfe80a3fa7f4ba3efd3e06809cc35d8b8345b7e691aec1695413bcbc1a4f288feceb923ed4798ff1eec8f5ea710b29fbd97915f5
-  data.tar.gz: 3ba39d672418818e50deafc4f24c9d6ca9196eada5b88ca884c406eafcfdb0e4d6c9650418071623d2a229e675346ac8d0f8205f902a6b298c3f8e70e727ab2c
+  metadata.gz: 89e537074ac1b46b495e0ae0a926abed3a9609ef906f519e70b3b68753b4ecdebb6e4ef04cd8d926a535fc65ac2335677b85cba500d5061dbbe9e8c68364aaca
+  data.tar.gz: 76e16b208297f0bbeb47bb8f00daabd8b89017d7a4181478e06e72b19bfa73c99e7065ad6cc9e229786d772298c7eb0eea936f68f953aa3cbdb62ce42f12a690

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.6
+ - Isolate spec helper classes in their own namespace.
+
 ## 2.0.5
  - Add auto_flush config option, with no default. If not set, no auto_flush is done.
  - Add evict method to identity_map_codec that allows for an input, when done with an identity, to auto_flush and remove the identity from the map.

data/CONTRIBUTORS

@@ -9,6 +9,7 @@ Contributors:
 * Pier-Hugues Pellerin (ph)
 * Richard Pijnenburg (electrical)
 * Suyog Rao (suyograo)
+* Guy Boertje (guyboertje)
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/logstash-codec-multiline.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-multiline'
-  s.version         = '2.0.5'
+  s.version         = '2.0.6'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The multiline codec will collapse multiline messages and merge them into a single event."
   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/auto_flush_spec.rb

@@ -4,7 +4,7 @@ require "logstash/codecs/multiline"
 require_relative "../supports/helpers.rb"
 
 describe "AutoFlush and AutoFlushUnset" do
-  let(:flushable)  { AutoFlushTracer.new }
+  let(:flushable)  { Mlc::AutoFlushTracer.new }
   let(:flush_wait) { 0.1 }
 
   describe LogStash::Codecs::AutoFlush do

data/spec/codecs/identity_map_codec_spec.rb

@@ -5,7 +5,7 @@ require "logstash/codecs/multiline"
 require_relative "../supports/helpers.rb"
 
 describe LogStash::Codecs::IdentityMapCodec do
-  let(:codec)   { IdentityMapCodecTracer.new }
+  let(:codec)   { Mlc::IdentityMapCodecTracer.new }
   let(:logger)  { codec.logger }
   let(:demuxer) { described_class.new(codec) }
   let(:stream1) { "stream-a" }
@@ -198,15 +198,15 @@ describe LogStash::Codecs::IdentityMapCodec do
   end
 
   describe "observer/listener based processing" do
-    let(:listener) { LineListener }
+    let(:listener) { Mlc::LineListener }
     let(:queue)    { [] }
     let(:identity) { "stream1" }
     let(:config)   { {"pattern" => "^\\s", "what" => "previous"} }
-    let(:mlc) { MultilineRspec.new(config).tap {|c| c.register } }
+    let(:mlc) { Mlc::MultilineRspec.new(config).tap {|c| c.register } }
     let(:imc) { described_class.new(mlc) }
 
     before do
-      listener = LineListener.new(queue, imc, identity)
+      listener = Mlc::LineListener.new(queue, imc, identity)
       listener.accept("foo")
     end
 

data/spec/codecs/multiline_spec.rb

@@ -217,14 +217,14 @@ describe LogStash::Codecs::Multiline do
 
   describe "auto flushing" do
     let(:config) { {} }
-    let(:codec) { MultilineRspec.new(config).tap {|c| c.register} }
+    let(:codec) { Mlc::MultilineRspec.new(config).tap {|c| c.register} }
     let(:events) { [] }
     let(:lines) do
       { "en.log" => ["hello world", " second line", " third line"],
         "fr.log" => ["Salut le Monde", " deuxième ligne", " troisième ligne"],
         "de.log" => ["Hallo Welt"] }
     end
-    let(:listener_class) { LineListener }
+    let(:listener_class) { Mlc::LineListener }
     let(:auto_flush_interval) { 0.5 }
 
     let(:line_producer) do
@@ -249,12 +249,12 @@ describe LogStash::Codecs::Multiline do
 
     context "when the auto_flush raises an exception" do
       let(:errmsg) { "OMG, Daleks!" }
-      let(:listener_class) { LineErrorListener }
+      let(:listener_class) { Mlc::LineErrorListener }
 
       it "does not build any events, logs an error and the buffer data remains" do
         config.update("pattern" => "^\\s", "what" => "previous",
           "auto_flush_interval" => auto_flush_interval)
-        codec.logger = MultilineLogTracer.new
+        codec.logger = Mlc::MultilineLogTracer.new
         line_producer.call("en.log")
         sleep(auto_flush_interval + 0.1)
         msg, args = codec.logger.trace_for(:error)

data/spec/supports/helpers.rb

@@ -13,95 +13,97 @@ def decode_events
   events
 end
 
-class LineListener
-  attr_reader :data, :path, :queue, :codec
-  # use attr_reader to define noop methods of Listener API
-  attr_reader :deleted, :created, :error, :eof #, :line
-
-  def initialize(queue, codec, path = '')
-    # store state from upstream
-    @queue = queue
-    @codec = codec
-    @path = path
+module Mlc
+  class LineListener
+    attr_reader :data, :path, :queue, :codec
+    # use attr_reader to define noop methods of Listener API
+    attr_reader :deleted, :created, :error, :eof #, :line
+
+    def initialize(queue, codec, path = '')
+      # store state from upstream
+      @queue = queue
+      @codec = codec
+      @path = path
+    end
+
+    # receives a line from some upstream source
+    # and sends it downstream
+    def accept(data)
+      @codec.accept dup_adding_state(data)
+    end
+
+    def process_event(event)
+      event["path"] = path
+      @queue << event
+    end
+
+    def add_state(data)
+      @data = data
+      self
+    end
+
+    private
+
+    # dup and add state for downstream
+    def dup_adding_state(line)
+      self.class.new(queue, codec, path).add_state(line)
+    end
   end
 
-  # receives a line from some upstream source
-  # and sends it downstream
-  def accept(data)
-    @codec.accept dup_adding_state(data)
+  class LineErrorListener < LineListener
+    def process_event(event)
+      raise StandardError.new("OMG, Daleks!")
+    end
   end
 
-  def process_event(event)
-    event["path"] = path
-    @queue << event
+  class MultilineRspec < LogStash::Codecs::Multiline
+    def internal_buffer
+      @buffer
+    end
+    def buffer_size
+      @buffer.size
+    end
   end
 
-  def add_state(data)
-    @data = data
-    self
-  end
+  class TracerBase
+    def initialize() @tracer = []; end
 
-  private
+    def trace_for(symbol)
+      params = @tracer.assoc(symbol)
+      params.nil? ? false : params.last
+    end
 
-  # dup and add state for downstream
-  def dup_adding_state(line)
-    self.class.new(queue, codec, path).add_state(line)
+    def clear()
+      @tracer.clear()
+    end
   end
-end
 
-class LineErrorListener < LineListener
-  def process_event(event)
-    raise StandardError.new("OMG, Daleks!")
-  end
-end
+  class MultilineLogTracer < TracerBase
+    def warn(*args) @tracer.push [:warn, args]; end
+    def error(*args) @tracer.push [:error, args]; end
+    def debug(*args) @tracer.push [:debug, args]; end
+    def info(*args) @tracer.push [:info, args]; end
 
-class MultilineRspec < LogStash::Codecs::Multiline
-  def internal_buffer
-    @buffer
+    def info?() true; end
+    def debug?() true; end
+    def warn?() true; end
+    def error?() true; end
   end
-  def buffer_size
-    @buffer.size
-  end
-end
-
-class TracerBase
-  def initialize() @tracer = []; end
 
-  def trace_for(symbol)
-    params = @tracer.assoc(symbol)
-    params.nil? ? false : params.last
+  class AutoFlushTracer < TracerBase
+    def auto_flush() @tracer.push [:auto_flush, true]; end
   end
 
-  def clear()
-    @tracer.clear()
+  class IdentityMapCodecTracer < TracerBase
+    def clone() self.class.new; end
+    def decode(data) @tracer.push [:decode, data]; end
+    def encode(event) @tracer.push [:encode, event]; end
+    def flush(&block) @tracer.push [:flush, block.call]; end
+    def close() @tracer.push [:close, true]; end
+    def logger() @logger ||= MultilineLogTracer.new; end
   end
 end
 
-class MultilineLogTracer < TracerBase
-  def warn(*args) @tracer.push [:warn, args]; end
-  def error(*args) @tracer.push [:error, args]; end
-  def debug(*args) @tracer.push [:debug, args]; end
-  def info(*args) @tracer.push [:info, args]; end
-
-  def info?() true; end
-  def debug?() true; end
-  def warn?() true; end
-  def error?() true; end
-end
-
-class AutoFlushTracer < TracerBase
-  def auto_flush() @tracer.push [:auto_flush, true]; end
-end
-
-class IdentityMapCodecTracer < TracerBase
-  def clone() self.class.new; end
-  def decode(data) @tracer.push [:decode, data]; end
-  def encode(event) @tracer.push [:encode, event]; end
-  def flush(&block) @tracer.push [:flush, block.call]; end
-  def close() @tracer.push [:close, true]; end
-  def logger() @logger ||= MultilineLogTracer.new; end
-end
-
 RSpec::Matchers.define(:have_an_empty_buffer) do
   match do |actual|
     actual.buffer_size.zero?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-multiline
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core