logstash-filter-tld 2.0.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeef7333db990195a41932ecc341a9e5d7de8a8f
-  data.tar.gz: e29d9c3a49b3c7cc318c9b546744c32aaedb3a2e
+  metadata.gz: d17e310163163fec96ac396596150cd82e0a5fb8
+  data.tar.gz: 723fdf84c764b6fbb1269a66a0e548a6fd8a6d57
 SHA512:
-  metadata.gz: 18a39a5240aeee9bffd52fb3d14e31fed746b70a389bc594ecebaff1e954e86fc82b271f045e4237740c1f711190450b2f6569ce15b8a8d37496613c5bb18480
-  data.tar.gz: 1adb995ed7a350c85d9fa61bd4dc599d5da127dbfd2f0231aac040fcbd60d1769e9d0810159e531e2e9dee276eabcd26fb7912d4e7f5bfcb92b875165f656df9
+  metadata.gz: 9b374611182491b851d18dc4919b68129cb6272b7b466972fa72f1efc2c91055a5a7a97335d8383624355acc5c3da0f7dd575e183c203253fa373f8f887d3701
+  data.tar.gz: ead43c2fbe6964a373bdd65793a61271d0aacc6168ae4f90b06ebb21a3e69fc521492adec5b5dbb1106e167685bfbceed9f91235021bb6768db68b18973e0578

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.0.0
+  - Breaking: Updated plugin to use new Java Event APIs
+  - relax logstash-core-plugin-api constrains
+  - update .travis.yml
+
 # 2.0.4
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
 # 2.0.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-tld-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-tld-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-tld.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-tld)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -56,7 +55,12 @@ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
 - Install plugin
 ```sh
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
 bin/plugin install --no-verify
+
 ```
 - Run Logstash with your plugin
 ```sh
@@ -74,7 +78,12 @@ gem build logstash-filter-awesome.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
+bin/plugin install --no-verify
+
 ```
 - Start Logstash and proceed to test the plugin
 

data/lib/logstash/filters/tld.rb

@@ -18,7 +18,6 @@ class LogStash::Filters::Tld < LogStash::Filters::Base
   # }
   #
   config_name "tld"
-  milestone 1
   
   # The source field to parse
   config :source, :validate => :string, :default => "message"
@@ -35,16 +34,17 @@ class LogStash::Filters::Tld < LogStash::Filters::Base
   public
   def filter(event)
 
-    if @source and PublicSuffix.valid?(event[@source])
-      domain = PublicSuffix.parse(event[@source])
+    if @source and PublicSuffix.valid?(event.get(@source))
+      domain = PublicSuffix.parse(event.get(@source))
       # Replace the event message with our message as configured in the
       # config file.
-      event[@target] = Hash.new
-      event[@target]['tld'] = domain.tld
-      event[@target]['sld'] = domain.sld
-      event[@target]['trd'] = domain.trd
-      event[@target]['domain'] = domain.domain
-      event[@target]['subdomain'] = domain.subdomain
+      h = Hash.new
+      h['tld'] = domain.tld
+      h['sld'] = domain.sld
+      h['trd'] = domain.trd
+      h['domain'] = domain.domain
+      h['subdomain'] = domain.subdomain
+      event.set(@target, h)
 
       # filter_matched should go in the last line of our successful code
       filter_matched(event)

data/logstash-filter-tld.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-tld'
-  s.version         = '2.0.4'
+  s.version         = '3.0.0'
   s.licenses = ['Apache License (2.0)']
   s.summary = "This example filter replaces the contents of the message field with the specified value."
-  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.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"
   s.authors = ["Elastic"]
   s.email = 'info@elastic.co'
   s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # 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 'public_suffix', '=1.4.6'
 
   s.add_development_dependency 'logstash-devutils'

data/spec/filters/tld_spec.rb

@@ -26,27 +26,27 @@ describe LogStash::Filters::Tld do
 
 
     sample("message" => "google.com") do
-      insist { subject["tld"]["tld"] } == "com"
-      insist { subject["tld"]["sld"] } == "google"
-      insist { subject["tld"]["trd"] } == nil
-      insist { subject["tld"]["domain"] } == "google.com"
-      insist { subject["tld"]["subdomain"] } == nil
+      insist { subject.get("tld")["tld"] } == "com"
+      insist { subject.get("tld")["sld"] } == "google"
+      insist { subject.get("tld")["trd"] } == nil
+      insist { subject.get("tld")["domain"] } == "google.com"
+      insist { subject.get("tld")["subdomain"] } == nil
     end
 
     sample("message" => "google.co.uk") do
-      insist { subject["tld"]["tld"] } == "co.uk"
-      insist { subject["tld"]["sld"] } == "google"
-      insist { subject["tld"]["trd"] } == nil
-      insist { subject["tld"]["domain"] } == "google.co.uk"
-      insist { subject["tld"]["subdomain"] } == nil
+      insist { subject.get("tld")["tld"] } == "co.uk"
+      insist { subject.get("tld")["sld"] } == "google"
+      insist { subject.get("tld")["trd"] } == nil
+      insist { subject.get("tld")["domain"] } == "google.co.uk"
+      insist { subject.get("tld")["subdomain"] } == nil
     end
 
     sample("message" => "www.google.com") do
-      insist { subject["tld"]["tld"] } == "com"
-      insist { subject["tld"]["sld"] } == "google"
-      insist { subject["tld"]["trd"] } == "www"
-      insist { subject["tld"]["domain"] } == "google.com"
-      insist { subject["tld"]["subdomain"] } == "www.google.com"
+      insist { subject.get("tld")["tld"] } == "com"
+      insist { subject.get("tld")["sld"] } == "google"
+      insist { subject.get("tld")["trd"] } == "www"
+      insist { subject.get("tld")["domain"] } == "google.com"
+      insist { subject.get("tld")["subdomain"] } == "www.google.com"
     end
 
   end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-tld
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-10-22 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:
@@ -52,7 +58,7 @@ 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/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: []