logstash-codec-s3plain 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 891713a5ec6c73043666abf82d4aa6f64c7fb2a8
-  data.tar.gz: 84e04292e832d8cca8c2c1aa2f4a3457f51f62c6
+SHA256:
+  metadata.gz: 526b0e774aa22da2fd2ca1f2ca2bbe8bc16c1b0cb38d9a28add90d65b0cb2296
+  data.tar.gz: eb10efd6859ef9a03abe5c5bc16ad018bbb8ac1880bb26caeb7cb419f69c6f46
 SHA512:
-  metadata.gz: 2b0613d12d513371fe887cc45ab8c1a4a89dc8ddd8120c448ac3e0a1078492b584c047e5fd64f72de224ce94e727035a55f5ca8325446b4d9bd64ea9c53fa383
-  data.tar.gz: 5915b73785b713df7af5282fed79d8cc629108fb4e81ae8c035fe5ce62968a2c393e525bea3f0a402a903a9b6666a3bc76a37a29232187a0d328208937afc0cb
+  metadata.gz: 064b7206102ece8b9d4626feb337053abb169b7578028cdc499c828555c5665967154e8e2892b9c9dbf10f6e2e17791d2ce06070d569e1909db7cb9773f49d45
+  data.tar.gz: a84f9c6dee3f101e43ff0cf735086bbdac4850677aefcae1b6c843c6db5759edff7d6a2a2e483ee5cada4f39e3af0f564cfb3e83504b5478c22986207ffc74ba

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.7
+  - Code cleanup. See https://github.com/logstash-plugins/logstash-codec-s3plain/pull/2
+
 ## 2.0.6
   - Fix some documentation issues
 

data/CONTRIBUTORS

@@ -3,6 +3,7 @@ reports, or in general have helped logstash along its way.
 
 Contributors:
 * Pier-Hugues Pellerin (ph)
+* Colin Surprenant (colinsurprenant)
 
 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/lib/logstash/codecs/s3_plain.rb

@@ -7,24 +7,21 @@ require "logstash/util/charset"
 class LogStash::Codecs::S3Plain < LogStash::Codecs::Base
   config_name "s3_plain"
 
-  public
+  SOURCE_FIELD = "source".freeze
+  TAGS_FIELD = "tags".freeze
+  MESSAGE_FIELD = "message".freeze
+
   def decode(data)
     raise RuntimeError.new("This codec is only used for backward compatibility with the previous S3 output.")
-  end # def decode
+  end
 
-  public
   def encode(event)
-    if event.is_a?(LogStash::Event)
-
-      message = "Date: #{event[LogStash::Event::TIMESTAMP]}\n"
-      message << "Source: #{event["source"]}\n"
-      message << "Tags: #{Array(event["tags"]).join(', ')}\n"
-      message << "Fields: #{event.to_hash.inspect}\n"
-      message << "Message: #{event["message"]}"
+    message = "Date: #{event.get(LogStash::Event::TIMESTAMP)}\n"
+    message << "Source: #{event.get(SOURCE_FIELD)}\n"
+    message << "Tags: #{Array(event.get(TAGS_FIELD)).join(', ')}\n"
+    message << "Fields: #{event.to_hash.inspect}\n"
+    message << "Message: #{event.get(MESSAGE_FIELD)}"
 
-      @on_event.call(message)
-    else
-      @on_event.call(event.to_s)
-    end
-  end # def encode
-end # class LogStash::Codecs::S3Plain
+    @on_event.call(message)
+  end
+end

data/logstash-codec-s3plain.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-s3plain'
-  s.version         = '2.0.6'
+  s.version         = '2.0.7'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This codec may be used to encode (via outputs) S3plain text format, this make the S3 outputs backward compatible with Logstash 1.4.2"
   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 gemname. This gem is not a stand-alone program"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "codec" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'logstash-devutils'
 end
 

data/spec/codecs/s3_plain_spec.rb

@@ -9,7 +9,7 @@ describe LogStash::Codecs::S3Plain do
   describe "#encode" do
     it 'should accept a nil list for the tags' do
       subject.on_event do |data|
-        data.should match(/\nTags:\s\n/)
+        expect(data).to match(/\nTags:\s\n/)
       end
 
       subject.encode(LogStash::Event.new)
@@ -19,20 +19,10 @@ describe LogStash::Codecs::S3Plain do
       event = LogStash::Event.new({"tags" => ["elasticsearch", "logstash", "kibana"] })
 
       subject.on_event do |data|
-        data.should match(/\nTags:\selasticsearch,\slogstash,\skibana\n/)
+        expect(data).to match(/\nTags:\selasticsearch,\slogstash,\skibana\n/)
       end
 
       subject.encode(event)
     end
-
-    it "return to_s if its not LogStash::Event" do
-      event = {"test" => "A-B-C" }
-
-      subject.on_event do |data|
-        data.should == event.to_s
-      end
-
-      subject.encode(event)
-    end
-  end
+   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-s3plain
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.99'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -38,7 +44,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-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 gemname. This gem is not a stand-alone program
+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 gemname. This
+  gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
@@ -76,9 +84,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
-summary: This codec may be used to encode (via outputs) S3plain text format, this make the S3 outputs backward compatible with Logstash 1.4.2
+summary: This codec may be used to encode (via outputs) S3plain text format, this
+  make the S3 outputs backward compatible with Logstash 1.4.2
 test_files:
 - spec/codecs/s3_plain_spec.rb