logstash-filter-wkt_to_geojson 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5467ccd27635becd2302ac6dfd610b621d86a23
-  data.tar.gz: 46f9e11d87cdbe6dbcaa3b77e6f130e35f916efb
+  metadata.gz: 7137703d484089ebb77cc379e37046bf36a8d291
+  data.tar.gz: f0b3bfdb561a681e0f56b31355cee90da825de33
 SHA512:
-  metadata.gz: 177e83bee54359bf075447d3ff14076e2035feaf35363c5ea89c22f936275ae55a91b22646ae10941c640c83257d65b01bd6c5bc82a7923cea050b463b690096
-  data.tar.gz: eed36512cd3c6fd89ad7dcba435230164ceb66bae2daa10368619012c8c9da794dbd1b2370ce7e143626357844cd8377cae69c9295da987d3e691e5f0271ae4e
+  metadata.gz: 6712fb46514d81f06a8885fa0e5e9210212070745906b8f21c87baecfed10f5fdeba6fcd765ae33d0d0a96cc5d3017638f3cb4f56ff1e708a34c397dc942ae59
+  data.tar.gz: 1deb8aa8a0a36019003e8f2501e7b87f738bbf457a3c19e0158d2fc8ee28a13e2baabbd0b064892f047cc80aec738d0d450882986593c867bd39cf7414ceec10

data/Gemfile

@@ -1,2 +1,2 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 gemspec

data/lib/logstash/filters/wkt_to_geojson.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
-require "rgeo"
-require "rgeo-geojson"
-require "json"
+require 'geo_ruby'
+require 'geo_ruby/ewk'
+require 'geo_ruby/geojson'
 
 class LogStash::Filters::WktToGeojson < LogStash::Filters::Base
 
@@ -15,8 +15,6 @@ class LogStash::Filters::WktToGeojson < LogStash::Filters::Base
 
   public
   def register
-    @parser = RGeo::WKRep::WKTParser.new()
-    @encoder = RGeo::GeoJSON.coder()
   end # def register
 
   public
@@ -25,9 +23,16 @@ class LogStash::Filters::WktToGeojson < LogStash::Filters::Base
     wkt = event.get(@field)
 
     begin
-      geo = @parser.parse(wkt)
-      json = @encoder.encode(geo)
-      event.set(@target, json.to_json)
+      factory = GeoRuby::SimpleFeatures::GeometryFactory::new()
+      ewkt_parser = GeoRuby::SimpleFeatures::EWKTParser::new(factory)
+      ewkt_parser.parse(wkt)
+
+      if (factory.geometry.nil?)
+        raise "Failed to parse to SimpleFeature"
+      end
+
+      event.set(@target, factory.geometry.to_json)
+      factory.geometry.to_json
     rescue Exception => e
       @logger.error('WKT Parse Error',
           :wkt => wkt, :exception => e)

data/logstash-filter-wkt_to_geojson.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-wkt_to_geojson'
-  s.version       = '0.1.1'
+  s.version       = '0.1.2'
   s.licenses      = ['Apache-2.0']
-  s.summary       = 'Converts WKT geography shapes to GeoJSON.'
-  s.homepage      = 'https://kalmas.net'
+  s.summary       = 'Logstash filter to convert WKT geography shapes to GeoJSON.'
+  s.homepage      = 'https://github.com/kalmas/logstash-filter-wkt_to_geojson'
   s.authors       = ['kalmas']
   s.email         = 'kylealmas@gmail.com'
   s.require_paths = ['lib']
@@ -16,10 +16,9 @@ Gem::Specification.new do |s|
   # Special flag to let us know this is actually a logstash plugin
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
-  s.add_runtime_dependency 'rgeo', '0.6.0'
-  s.add_runtime_dependency 'rgeo-geojson', '0.4.3'
+  s.add_dependency 'georuby', '2.5.2'
 
-  # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
-  s.add_development_dependency 'logstash-devutils'
+  
+  s.add_development_dependency 'logstash-devutils', '1.3.3'
 end

data/spec/filters/wkt_to_geojson_spec.rb

@@ -29,9 +29,9 @@ describe LogStash::Filters::WktToGeojson do
     CONFIG
     end
 
-    sample("geometry" => "GeometryCollection(Point(3 5), LineString(-2 0, -3 -4))") do
+    sample("geometry" => "GEOMETRYCOLLECTION(POINT(3 5), LINESTRING(-2 0, -3 -4))") do
       expect(subject.get('geoff_jason')).to eq("{\"type\":\"GeometryCollection\",\"geometries\":[{\"type\":\"Point\",\"coordinates\":[3.0,5.0]},{\"type\":\"LineString\",\"coordinates\":[[-2.0,0.0],[-3.0,-4.0]]}]}")
-      expect(subject.get('geometry')).to eq("GeometryCollection(Point(3 5), LineString(-2 0, -3 -4))")
+      expect(subject.get('geometry')).to eq("GEOMETRYCOLLECTION(POINT(3 5), LINESTRING(-2 0, -3 -4))")
     end
   end
 
@@ -45,9 +45,9 @@ describe LogStash::Filters::WktToGeojson do
     CONFIG
     end
 
-    sample("geometry" => "MULTIPOLYGON (((40, 20, 45, 40)))") do
+    sample("geometry" => "MULTIPOLYGON((()))") do
       expect(subject).to_not include("geo_json")
-      expect(subject.get('geometry')).to eq("MULTIPOLYGON (((40, 20, 45, 40)))")
+      expect(subject.get('geometry')).to eq("MULTIPOLYGON((()))")
       expect(subject.get('tags')).to include('_wkt_parse_failure')
     end
   end
@@ -80,7 +80,7 @@ describe LogStash::Filters::WktToGeojson do
     CONFIG
     end
 
-    sample("geometry" => "GeometryCollection(Point(3 5), LineString(-2 0, -3 -4))") do
+    sample("geometry" => "GEOMETRYCOLLECTION(POINT(3 5), LINESTRING(-2 0, -3 -4))") do
       expect(subject).to_not include("geo_json")
     end
   end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-wkt_to_geojson
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - kalmas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
-  name: rgeo
+        version: 2.5.2
+  name: georuby
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.3
-  name: rgeo-geojson
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -61,17 +47,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.3
   name: logstash-devutils
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.3
 description:
 email: kylealmas@gmail.com
 executables: []
@@ -84,7 +70,7 @@ files:
 - logstash-filter-wkt_to_geojson.gemspec
 - spec/filters/wkt_to_geojson_spec.rb
 - spec/spec_helper.rb
-homepage: https://kalmas.net
+homepage: https://github.com/kalmas/logstash-filter-wkt_to_geojson
 licenses:
 - Apache-2.0
 metadata:
@@ -109,7 +95,7 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
-summary: Converts WKT geography shapes to GeoJSON.
+summary: Logstash filter to convert WKT geography shapes to GeoJSON.
 test_files:
 - spec/filters/wkt_to_geojson_spec.rb
 - spec/spec_helper.rb