logstash-filter-languagedetect 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTU0NTY0ODEwZTZhYWE0NjY0MjJkMmQ5NzhkNzhlZDZjMGZkNGJiNA==
+    NzczODI1YjUxZmFiZmY4NmY3ZGM4Mjc0MWM1ZmEwZTdhNGM0NmUwNA==
   data.tar.gz: !binary |-
-    NjgxMGUxNWFlYTgxOTkxMjBmMWQ5NDBiNjBjMWNlNWNlZmZlMDY4NQ==
+    N2U2MDZiZDkzMDYzYWUwZWIzYjY0YjI4MzI1N2Y0ZjE4NTEzYmFlMA==
 SHA512:
   metadata.gz: !binary |-
-    YTczYjUzMjI2MWE1OGQxN2QyOWUwZDcyYmNmM2NmNTU0MmE4NDVlNjk4MmJl
-    NGU5NmQ3ODM4MDFhYjQwNzFjN2U3NWM2M2U2YTMyMGM5NGIzMGUwZDcwNWNj
-    MWI2ZGE5ZGMzMmNlMzBiZmJhMzY2N2RjZGQzYjc5NzM5NTE2M2I=
+    MTQ2NmJlMzliZGY1YjQ2M2Y3ZjYyNDFkODJjNDA3YTMwNjE2NDM4NmZhYTk3
+    YWJhYWVjOWRkNmM5NWJkNzk5MWY5ZjQ2YTFiZDBhMTk0N2RjOGVhZDYzMjQ4
+    YmRmNWMxMjlhZTNhYTgyMTQ4M2Q2YjUzNmYzZGY1YzYzYjhmZjU=
   data.tar.gz: !binary |-
-    MDM1Y2FkOWQwMGRjZTFiOWIxYjM2MTgxZDAyZjNmZDVkYTc5NTExYTA4Yjhm
-    ZjA4NTI5NGQ5Y2E0Y2Y2OGUzYzFlZmVjMjY0YjAxNjZjNjM0YTc4ZGE2MTQz
-    MmZhZTJiNWEwMDE0MzJhODA0Mzg0Njk0NjYwNTg3OGQ3OTUzNDY=
+    OWE3ZmNiNGIzNjdjOGEzOTNjN2M3ZjQzNTE2ZDk0ZDUxZmExNDEzMDU3NzFh
+    ODRkNWJlMTA4NGE3MmEwMmQ4M2M0OGU1NDg0Y2E3MGMxMjJiYWJiZmMyOGMx
+    MTg5ZTcwYjhjZjgwZmZhZWE3MmUyNjJjNDUzYzM4ZmQ3MGJlODI=

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.bak
 .bundle
 vendor
 .idea/
+coverage/

data/.travis.yml

@@ -1,16 +1,17 @@
 language: ruby
 rvm:
-  - jruby-1.7.20
-#  - jruby-19mode
-#  - jruby-head
-#jdk:
-#  - openjdk7
-#  - oraclejdk7
-#  - oraclejdk8
+- jruby-1.7.20
 before_install:
-  - gem install bundler -v 1.10.1
+- gem install bundler -v 1.10.1
 script: bundle exec rspec
 deploy:
   provider: rubygems
   api_key:
     secure: J3/E3dTIv1ZkCLLbDj0EJVh5toxHOACsqjTuoUjwnV0dc6GQsqhlgxxOebtOU+LMyO7WaXncPH9Yy3zYpI2G7hulOczGiF+9JG1SqysMg0RS5LX0lyZlE8UPb/C3ILKPAbMfyrp/dMhS+9M36p6ZOjtS2PMXVgAi/tUUvFEgXLmoi1yzfbG1Dy0JLOURPgLdKgXdV54VxxPb/V3YZXq2S0XVu5MTDQOJoblYJ6RyBfkFVcDoSFI3qBUD6m2xmw1qpv0rfiKEZmiImpTi1/jOIxBEIIARBi0X1RWM1p/mOcXxiWMpJ925crYftibd39acuAO2bIMiYyeevB76QhM4va+OlQ1/yHe85EibixH+kRL7Xd99j+Ouwdpa6m14M8NWFo2Lx3Rr99MjAYeDNMV++OBS3KBMmyAZIqA/sosAjnzMeZHFKRxRMdkZW1/AFHkXVcOFYIIGn83l0ciLBFpjRnDimBN2KVA6Alslu7+qPGEuQKTSEpVZF1uNui+tF1z/MgnllX1IMnNN4RODNbYKAUc+drL2nRit1QCnUAR7BYZ7Q4LcmcSmnGX2dPD1ovUSbiCNDbWCDecZAd2TFqbMn9Bgx9jHyNgfo4yEednDgrYmk1OGNExIunWJckirYBhYGDQN4Lv39Kb4Xyqe4jV35HvYVZIKBwnSyHIfwJykFeA=
+after_success:
+- coveralls
+addons:
+  code_climate:
+    repo_token:
+      secure: vzwI+AOiJguz+WBpkjrKZg3WRhVoOefFN2QHb1OqREiD9lewxGAD13d2xAphUU8V+rimUBzaSTwj3pdJ3/Ap11Y05IqRcaLE9E+fvWj4sRRHWR5l8A4KLlQKE11erHfBa2EC8jrh00MrtBsNU37e10YvXQhN2XsPQI+1QG8RGUDjZ0yFXVPoDbnzLw7q333nzbz5zpzcBCgfTxljaO6oNG1MzRgs0l/To/oJV9pyHtYkHALIUjlt9racBDG+i+EehrzqmBKHWDKYpOW6Yzy158Fz8w8BVw7dabDXyfxSp9r0YFK0Ca8V1GCvMD3YNh8zG1EgH9cRWgaI1dscof1MAT4YpAy978D0/c0ssKHF3ElAT+3InlirtZr9kMN4lTLwAgGlTsERW6qKc/mroh6axCftY2NFJeWe9rnt+z9GHfUO6tZZ5Y5VY/zngBJkZDyL0sDxCg3IkD7EeCRqbP/IMUkateMn9Ju7zNT0l4Pva6a+vEWOv20+U7EYJ0sBAEsXejo+fy0+lN9tzxF/H2es2HCmwBabcV1qHUHsrSS17+S37djxeW8/MKdepk2jFA6AULVkuITUezWxAxUPNeqED/nSO90iN488CLv6pf7uiAwbv0kooKqsN0HPjI/bqw1R5h2kwBcRrNoHQ63Ndf+UWznVSanF1sYct0GcV/CPmOo=
+cache: bundler

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 gemspec
-gem 'whatlanguage', :git => "https://github.com/peterc/whatlanguage.git", :ref => "0192301022"
+gem 'coveralls', require: false

data/README.md

@@ -4,83 +4,23 @@ This is a plugin for [Logstash](https://github.com/elasticsearch/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.
 
-## Documentation
+# Status
+- [![Gem Version](https://badge.fury.io/rb/logstash-filter-languagedetect.svg)](http://badge.fury.io/rb/logstash-filter-languagedetect)
+- [![Build Status](https://travis-ci.org/torstenfeld/logstash-filter-languagedetect.svg?branch=master)](https://travis-ci.org/torstenfeld/logstash-filter-languagedetect) (master)
+- [![Coverage Status](https://coveralls.io/repos/torstenfeld/logstash-filter-languagedetect/badge.svg)](https://coveralls.io/r/torstenfeld/logstash-filter-languagedetect)
+- [![Code Climate](https://codeclimate.com/github/torstenfeld/logstash-filter-languagedetect/badges/gpa.svg)](https://codeclimate.com/github/torstenfeld/logstash-filter-languagedetect)
+- [![Dependency Status](https://gemnasium.com/torstenfeld/logstash-filter-languagedetect.svg)](https://gemnasium.com/torstenfeld/logstash-filter-languagedetect)
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+# Installation
 
-- For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
-
-## Need Help?
-
-Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
-
-## Developing
-
-### 1. Plugin Developement and Testing
-
-#### Code
-- To get started, you'll need JRuby with the Bundler gem installed.
-
-- Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. We also provide [example plugins](https://github.com/logstash-plugins?query=example).
-
-- Install dependencies
-```sh
-bundle install
-```
-
-#### Test
-
-- Update your dependencies
-
-```sh
-bundle install
-```
-
-- Run tests
-
-```sh
-bundle exec rspec
-```
-
-### 2. Running your unpublished Plugin in Logstash
-
-#### 2.1 Run in a local Logstash clone
-
-- Edit Logstash `Gemfile` and add the local plugin path, for example:
+- Edit Logstash `Gemfile` and add needed requirements:
 ```ruby
-gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
-```
-- Install plugin
-```sh
-bin/plugin install --no-verify
-```
-- Run Logstash with your plugin
-```sh
-bin/logstash -e 'filter {awesome {}}'
+gem "whatlanguage", :git => "https://github.com/peterc/whatlanguage.git", :ref => "0192301022"
+gem "logstash-filter-languagedetect", ">= 0.1.1", :git => "https://github.com/torstenfeld/logstash-filter-languagedetect.git"
 ```
-At this point any modifications to the plugin code will be applied to this local Logstash setup. After modifying the plugin, simply rerun Logstash.
 
-#### 2.2 Run in an installed Logstash
 
-You can use the same **2.1** method to run your plugin in an installed Logstash by editing its `Gemfile` and pointing the `:path` to your local plugin development directory or you can build the gem and install it using:
-
-- Build your plugin gem
-```sh
-gem build logstash-filter-awesome.gemspec
-```
-- Install the plugin from the Logstash home
+- Install and update dependencies
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+bundle install
 ```
-- Start Logstash and proceed to test the plugin
-
-## Contributing
-
-All contributions are welcome: ideas, patches, documentation, bug reports, complaints, and even something you drew up on a napkin.
-
-Programming is not a required skill. Whatever you've seen about open source and maintainers or community members  saying "send patches or die" - you will not see that here.
-
-It is more important to the community that you are able to contribute.
-
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/filters/languagedetect.rb

@@ -65,10 +65,34 @@ class LogStash::Filters::Languagedetect < LogStash::Filters::Base
   def filter(event)
 
     text_to_detect = event[@source]
+    lang_found = @wl.language(text_to_detect)
+
     if @useiso
-      lang_found = @wl.language_iso(text_to_detect)
-    else
-      lang_found = @wl.language(text_to_detect)
+      iso_codes = {
+        nil => nil,
+        :arabic => :ar,
+        :danish => :da,
+        :dutch  => :nl,
+        :english => :en,
+        :farsi => :fa,
+        :finnish => :fi,
+        :french => :fr,
+        :german => :de,
+        :greek => :el,
+        :hebrew => :he,
+        :hungarian => :hu,
+        :italian => :it,
+        :korean => :ko,
+        :norwegian => :no,
+        :pinyin => :zh,
+        :polish => :pl,
+        :portuguese => :pt,
+        :russian => :ru,
+        :spanish => :es,
+        :swedish => :sv
+      }
+
+      lang_found = iso_codes[lang_found]
     end
 
     event[@target] = lang_found.to_s.force_encoding(Encoding::UTF_8)

data/logstash-filter-languagedetect.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-languagedetect'
-  s.version = '0.1.1'
-  s.version = "#{s.version}.pre.#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS_BRANCH'] != 'master'
+  s.version = '0.2.0'
+  s.version = "#{s.version}.pre.#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS'] and ENV['TRAVIS_BRANCH'] != 'master'
   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"
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   # Files
   s.files = `git ls-files`.split($\)
-   # Tests
+  # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   # Special flag to let us know this is actually a logstash plugin
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
-  s.add_runtime_dependency "whatlanguage", '>= 1.0.6'
+  s.add_runtime_dependency "whatlanguage", '~> 1.0.5'
   s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'coveralls', '~> 0.8.1'
 end

data/spec/spec_helper.rb

@@ -1 +1,3 @@
 require "logstash/devutils/rspec/spec_helper"
+require "coveralls"
+Coveralls.wear!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-languagedetect
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Torsten Feld
@@ -34,16 +34,16 @@ dependencies:
   name: whatlanguage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 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
@@ -66,6 +80,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .travis.yml
 - CHANGELOG.md