logstash-filter-ruby 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37053bb464b80461213c0a54776667f58fac9b8d
-  data.tar.gz: dd792872a96962ae9e7a0baeba3ef40a25a01255
+  metadata.gz: ec10427dca014198834f2b11320b35263c3a1122
+  data.tar.gz: 7c8c9575babd81c28c6b24c03c2bac9d5a9d2271
 SHA512:
-  metadata.gz: 5f99c80daab16d9efc7a0afc55471232d88a7ed6da3504596382d751074a9283ce5d2703364869d8908bfe6733d2d31506462b6d03900c96b9e30e643887cb3e
-  data.tar.gz: 5c150ef1b9b4782233bc88ca65c618d266cd0860fe5d2272e9b78460f6dae743c5b7b82303b944ad5d15804f7644f64b6d21cfd9a14991a3f4daea448a52fa42
+  metadata.gz: a220311c4039c9e02ef52a1284c3060e8f90bae838ac2c59bf7b30491341b723bcc3b3fb4ddb1f1b60c56b8e0f4b368daea0b6da50ff44d22b4744c4b59f63f4
+  data.tar.gz: 1fc435118eb13a6edfeb1f068b443a60e54fbe0e27a6d0c05c61f918bbfbda0ae1e6be65488a2fa7d7a484cac39168f48093b96db4e766b800e46683d2a40a6a

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+## 2.0.3
+ - Code cleanup and fixed json order verification is specs
+
 ## 2.0.0
- - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
  - Dependency on logstash-core update to 2.0
 

data/README.md

@@ -1,5 +1,8 @@
 # Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-ruby-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-ruby-unit/)
+
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.

data/lib/logstash/filters/ruby.rb

@@ -10,8 +10,8 @@ require "logstash/namespace"
 #       ruby {
 #         # Cancel 90% of events
 #         code => "event.cancel if rand <= 0.90"
-#       } 
-#     } 
+#       }
+#     }
 #
 class LogStash::Filters::Ruby < LogStash::Filters::Base
   config_name "ruby"
@@ -23,17 +23,13 @@ class LogStash::Filters::Ruby < LogStash::Filters::Base
   # You will have an `event` variable available that is the event itself.
   config :code, :validate => :string, :required => true
 
-  public
   def register
     # TODO(sissel): Compile the ruby code
     eval(@init, binding, "(ruby filter init)") if @init
     eval("@codeblock = lambda { |event| #{@code} }", binding, "(ruby filter code)")
-  end # def register
+  end
 
-  public
   def filter(event)
-    
-
     begin
       @codeblock.call(event)
       filter_matched(event)
@@ -41,5 +37,5 @@ class LogStash::Filters::Ruby < LogStash::Filters::Base
       @logger.error("Ruby exception occurred: #{e}")
       event.tag("_rubyexception")
     end
-  end # def filter
-end # class LogStash::Filters::Ruby
+  end
+end

data/logstash-filter-ruby.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-ruby'
-  s.version         = '2.0.2'
+  s.version         = '2.0.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Filter for executing ruby code on the 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/filters/ruby_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/filters/ruby"
 require "logstash/filters/date"
@@ -25,7 +27,10 @@ describe LogStash::Filters::Ruby do
 
     sample("message" => "hello world", "mydate" => "2014-09-23T00:00:00-0800") do
       # json is rendered in pretty json since the JSON.pretty_generate created json from the event hash
-      insist { subject["pretty"] } == "{\n  \"message\": \"hello world\",\n  \"mydate\": \"2014-09-23T00:00:00-0800\",\n  \"@version\": \"1\",\n  \"@timestamp\": \"2014-09-23T08:00:00.000Z\"\n}"
+      # pretty json contains \n
+      insist { subject["pretty"].count("\n") } == 5
+      # usage of JSON.parse here is to avoid parser-specific order assertions
+      insist { JSON.parse(subject["pretty"]) } == JSON.parse("{\n  \"message\": \"hello world\",\n  \"mydate\": \"2014-09-23T00:00:00-0800\",\n  \"@version\": \"1\",\n  \"@timestamp\": \"2014-09-23T08:00:00.000Z\"\n}")
     end
   end
 
@@ -49,7 +54,10 @@ describe LogStash::Filters::Ruby do
 
     sample("message" => "hello world", "mydate" => "2014-09-23T00:00:00-0800") do
       # if this eventually breaks because we removed the custom to_json and/or added pretty support to JrJackson then all is good :)
-      insist { subject["pretty"] } == "{\"message\":\"hello world\",\"mydate\":\"2014-09-23T00:00:00-0800\",\"@version\":\"1\",\"@timestamp\":\"2014-09-23T08:00:00.000Z\"}"
+      # non-pretty json does not contain \n
+      insist { subject["pretty"].count("\n") } == 0
+      # usage of JSON.parse here is to avoid parser-specific order assertions
+      insist { JSON.parse(subject["pretty"]) } == JSON.parse("{\"message\":\"hello world\",\"mydate\":\"2014-09-23T00:00:00-0800\",\"@version\":\"1\",\"@timestamp\":\"2014-09-23T08:00:00.000Z\"}")
     end
   end
 

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,34 +28,36 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-filter-date
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-filter-date
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !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/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []