logstash-filter-math 0.2 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37262009c86e48cd019b721d6bb269c0bfe52318
-  data.tar.gz: 271fe236c1a90db7c3d1d8286140adf324f07892
+  metadata.gz: d4dbbbc58d14856fcd8e53f57c6897c2a2eb7221
+  data.tar.gz: c939090de8e97cfd20622fb6c84064f59c2e67ae
 SHA512:
-  metadata.gz: a01b48cd38aeb46540f7ce4f1bbfb28fae2b89933f0369e9ecafa88ff34b3ad4ca351152e3f2def8e4058440bbe6eee4358a330170a5590c413a965f8fa087c4
-  data.tar.gz: 09f83514974a21b6c35410df62ddf5d52769876fb77335a36d8bbeed64957c6f760ddf64095816fef3351af19e470e078978503cd2a234a7d9521b1041551439
+  metadata.gz: 4f9340a61978c42ef4c56436a4b29f15d38f1fffa433bb27bae632888b7b0e9d16232ae785752521cfa157fe4f05b0f6f5c7e47b525fda6cdbdd8ddec0090334
+  data.tar.gz: 4df67712a02104a781721991bf36221004056efad23a1e50c745fd8048691a8d126b9e8727001743c8b7ed93304869dc081f60b4cc857f431521e2a9f3663a37

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-#gem "logstash", :github => "elastic/logstash", :branch => "1.5"

data/lib/logstash/filters/math.rb

@@ -46,19 +46,19 @@ class LogStash::Filters::Math < LogStash::Filters::Base
       # Check that all the fields exist and are numeric
       next unless event.include?(calculation[1])
       next unless event.include?(calculation[2])
-      next unless event[calculation[1]] == 0 or event[calculation[1]].is_a? Float or event[calculation[1]].is_a? Integer
-      next unless event[calculation[2]] == 0 or event[calculation[2]].is_a? Float or event[calculation[2]].is_a? Integer
+      next unless event.get(calculation[1]) == 0 or event.get(calculation[1]).is_a? Float or event.get(calculation[1]).is_a? Integer
+      next unless event.get(calculation[2]) == 0 or event.get(calculation[2]).is_a? Float or event.get(calculation[2]).is_a? Integer
       case calculation[0]
       when "add"
-        event[calculation[3]] = event[calculation[1]] + event[calculation[2]]
+        event.set( calculation[3], event.get(calculation[1]) + event.get(calculation[2]) )
       when "sub"
-        event[calculation[3]] = event[calculation[1]] - event[calculation[2]]
+        event.set(calculation[3], event.get(calculation[1]) - event.get(calculation[2]) )
       when "div"
         # Avoid division by zero
-        next if event[calculation[2]] == 0
-        event[calculation[3]] = event[calculation[1]].to_f / event[calculation[2]]
+        next if event.get( calculation[2] ) == 0
+        event.set( calculation[3], event.get( calculation[1]).to_f / event.get(calculation[2]) )
       when "mpx"
-        event[calculation[3]] = event[calculation[1]] * event[calculation[2]]
+        event.set( calculation[3], event.get( calculation[1]) * event.get( calculation[2] ) )
       end # case calculation[0]
     end # for each calculate
     filter_matched(event)

data/logstash-filter-math.gemspec

@@ -1,26 +1,24 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-filter-math'
-  s.version         = '0.2'
+  s.version         = '1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Do simple math functions on numeric fields."
   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"
-  s.authors         = ["Elastics.co"]
-  s.email           = 'info@elastics.co'
+  s.authors         = ["Robin Clarke"]
+  s.email           = 'robin@robinclarke.net'
   s.homepage        = "http://www.elastics.co/guide/en/logstash/current/index.html"
   s.require_paths = ["lib"]
 
-  # Files
-  s.files = `git ls-files`.split($\)
 
-  # Tests
+  # Files
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   # Special flag to let us know this is actually a logstash plugin
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 3.0.0'
-
-  s.add_development_dependency 'logstash-devutils', '~> 0'
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  s.add_development_dependency 'logstash-devutils'
 end
-

data/spec/filters/math_spec.rb

@@ -12,37 +12,37 @@ describe LogStash::Filters::Math do
   
     describe "should add two integers" do
       sample( "var1" => -2,  "var2" => 7 ) do
-        expect( subject["result"] ).to eq( 5 )
+        expect( subject.get("result") ).to eq( 5 )
       end
     end
     
     describe "should add two floats" do
       sample( "var1" => -2.4,  "var2" => 7.8 ) do
-        expect( subject["result"] ).to eq( 5.4  )
+        expect( subject.get("result") ).to eq( 5.4  )
       end
     end
     
     describe "two huge numbers should add to infinity" do
       sample( "var1" => 1.79769313486232e+308,  "var2" => 1e+308 ) do
-        expect( subject["result"] ).to eq( Float::INFINITY )
+        expect( subject.get("result") ).to eq( Float::INFINITY )
       end
     end
 
     describe "one value being 0 should work" do
       sample( "var1" => 0,  "var2" => 7.8 ) do
-        expect( subject["result"] ).to eq( 7.8 )
+        expect( subject.get("result") ).to eq( 7.8 )
       end
     end
 
     describe "first value missing should result in nil" do
       sample( "var2" => 3 ) do
-        expect( subject["result"] ).to be_nil
+        expect( subject.get("result") ).to be_nil
       end
     end
   
     describe "Second value missing should result in nil" do
       sample( "var1" => 3 ) do
-        expect( subject["result"] ).to be_nil
+        expect( subject.get("result") ).to be_nil
       end
     end
   end
@@ -55,37 +55,37 @@ describe LogStash::Filters::Math do
   
     describe "should subtract two integers" do
       sample( "var1" => -2,  "var2" => 7 ) do
-        expect( subject["result"] ).to eq( -9 )
+        expect( subject.get("result") ).to eq( -9 )
       end
     end
     
     describe "should subtract two floats" do
       sample( "var1" => -2.4,  "var2" => 7.8 ) do
-        expect( subject["result"] ).to eq( -10.2  )
+        expect( subject.get("result") ).to eq( -10.2  )
       end
     end
     
     describe "two huge negative numbers should subtract to negative infinity" do
       sample( "var1" => -1.79769313486232e+308,  "var2" => -1e+308 ) do
-        expect( subject["result"] ).to eq( -Float::INFINITY )
+        expect( subject.get("result") ).to eq( -Float::INFINITY )
       end
     end
     
     describe "one value being 0 should work" do
       sample( "var1" => 0,  "var2" => 7.8 ) do
-        expect( subject["result"] ).to eq( -7.8 )
+        expect( subject.get("result") ).to eq( -7.8 )
       end
     end
 
     describe "first value missing should result in nil" do
       sample( "var2" => 3 ) do
-        expect( subject["result"] ).to be_nil
+        expect( subject.get("result") ).to be_nil
       end
     end
     
     describe "Second value missing should result in nil" do
       sample( "var1" => 3 ) do
-        expect( subject["result"] ).to be_nil
+        expect( subject.get("result") ).to be_nil
       end
     end
   end
@@ -98,37 +98,37 @@ describe LogStash::Filters::Math do
   
     describe "should multiply two integers" do
       sample( "var1" => -2,  "var2" => 7 ) do
-        expect( subject["result"] ).to eq( -14 )
+        expect( subject.get("result") ).to eq( -14 )
       end
     end
     
     describe "should multiply two floats" do
       sample( "var1" => -2.4,  "var2" => 7.8 ) do
-        expect( subject["result"] ).to eq( -18.72 )
+        expect( subject.get("result") ).to eq( -18.72 )
       end
     end
     
     describe "two huge numbers should multiply to infinity" do
       sample( "var1" => 1.79769313486232e+300,  "var2" => 1e+300 ) do
-        expect( subject["result"] ).to eq( Float::INFINITY )
+        expect( subject.get("result") ).to eq( Float::INFINITY )
       end
     end
     
     describe "one value being 0 should result in 0" do
       sample( "var1" => 0,  "var2" => 7.8 ) do
-        expect( subject["result"] ).to eq( 0 )
+        expect( subject.get("result") ).to eq( 0 )
       end
     end
 
     describe "first value missing should result in nil" do
       sample( "var2" => 3 ) do
-        expect( subject["result"] ).to be_nil
+        expect( subject.get("result") ).to be_nil
       end
     end
     
     describe "Second value missing should result in nil" do
       sample( "var1" => 3 ) do
-        expect( subject["result"] ).to be_nil
+        expect( subject.get("result") ).to be_nil
       end
     end
   end
@@ -141,43 +141,43 @@ describe LogStash::Filters::Math do
   
     describe "should divide two integers" do
       sample( "var1" => -2,  "var2" => 7 ) do
-        expect( subject["result"] ).to eq( -0.2857142857142857 )
+        expect( subject.get("result") ).to eq( -0.2857142857142857 )
       end
     end
     
     describe "should divide two floats" do
       sample( "var1" => -2.4,  "var2" => 7.8 ) do
-        expect( subject["result"] ).to eq( -0.3076923076923077 )
+        expect( subject.get("result") ).to eq( -0.3076923076923077 )
       end
     end
     
     describe "1 divided by a huge number should give zero" do
       sample( "var1" => 1, "var2" => 1.79769313486232e+308 ) do
-        expect( subject["result"] ).to eq( 0 )
+        expect( subject.get("result") ).to eq( 0 )
       end
     end
     
     describe "First variable being zero should result in 0" do
       sample( "var1" => 0,  "var2" => 7.8 ) do
-        expect( subject["result"] ).to eq( 0 )
+        expect( subject.get("result") ).to eq( 0 )
       end
     end
     
     describe "Second variable being zero should result in nil (would be infinity, but this can't be represented in JSON)" do
       sample( "var1" => 2,  "var2" => 0 ) do
-        expect( subject["result"] ).to be_nil
+        expect( subject.get("result") ).to be_nil
       end
     end
 
     describe "first value missing should result in nil" do
       sample( "var2" => 3 ) do
-        expect( subject["result"] ).to be_nil
+        expect( subject.get("result") ).to be_nil
       end
     end
     
     describe "Second value missing should result in nil" do
       sample( "var1" => 3 ) do
-        expect( subject["result"] ).to be_nil
+        expect( subject.get("result") ).to be_nil
       end
     end
   end
@@ -195,7 +195,7 @@ describe LogStash::Filters::Math do
     describe "results of one calculation can be used in the next calculation"
       sample( "var1" => 3.4,  "var2" => 6.6, "var3" => 4.4, "var4" => 2.4 ) do
         # I would really expect 20.0 here... what kind of floating point error is this?!
-        expect( subject["result"] ).to eq( 20.000000000000004 )
+        expect( subject.get("result") ).to eq( 20.000000000000004 )
       end
     end
 

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"

metadata

@@ -1,39 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-math
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '1.0'
 platform: ruby
 authors:
-- Elastics.co
+- Robin Clarke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: logstash-core
+        version: '2.0'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
@@ -41,23 +35,22 @@ dependencies:
   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@elastics.co
+email: robin@robinclarke.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - lib/logstash/filters/math.rb
 - logstash-filter-math.gemspec
 - spec/filters/math_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.elastics.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -86,3 +79,4 @@ specification_version: 4
 summary: Do simple math functions on numeric fields.
 test_files:
 - spec/filters/math_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,2 +0,0 @@
-require "logstash/devutils/rake"
-require "logstash/devutils/rake"