logstash-output-websocket_topics 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9e4c5eb5d4cc91603996d0d702155c0bcf0bf0a
-  data.tar.gz: 09b24686fbb1ea1e85bae41044d048ae7147634d
+  metadata.gz: 338fd64ac8c5da5276c2f72482df84fad68e214a
+  data.tar.gz: cb2898519383759bab5e2577ae509f2e754128f5
 SHA512:
-  metadata.gz: d1a05e95f40bee08aabcc266b36b81b8ea26c94bd71a96282c1a6c6948ed9e11abc09dc4db9edc786fa192b6777a624c3091cd7ec094a2f95ceabde155674a09
-  data.tar.gz: 4526946065677fdf74229eb9a55410c80642da5e952f22cc73d618057efb30e06a58990385411210fd6df8cbf1dd853fe1b6f0bb003f2d88da8a2df5e8a9a52d
+  metadata.gz: c5bb6394e9e53dfc8f751b32dab8e0fa61a976e4485e1390d2ab8c5d1056cecdbef1104bf9af4b7aa60c8a475818059fbbd3e632d420103bda3b864ccfb4200f
+  data.tar.gz: 87274dd58434fe740fb53edbbcef0451237114c26a163b02a0977a37de4559d5824921c6467fca87ee358fc8bcbffe0842d447a19d76d1c8af9b315feb37ec47

data/lib/logstash/outputs/websocket_topics.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
+require "json"
 require "logstash/namespace"
 require "logstash/outputs/base"
 
-
 # This output runs a websocket server and publishes any 
 # messages to all connected websocket clients.
 #
@@ -18,16 +18,10 @@ class LogStash::Outputs::WebSocket < LogStash::Outputs::Base
   # The port to serve websocket data from
   config :port, :validate => :number, :default => 3232
 
-  def make_pubsub(topic)
-      pubsub = Logstash::Outputs::WebSocket::Pubsub.new
-      pubsub.logger = @logger
-  end
-
   public
   def register
     require "ftw"
-    require "logstash/outputs/websocket/app"
-    require "logstash/outputs/websocket/pubsub"
+    require "logstash/outputs/websocket_topics/app"
     @channels = {}
     @server = Thread.new(@channels) do |channels|
       begin
@@ -44,12 +38,15 @@ class LogStash::Outputs::WebSocket < LogStash::Outputs::Base
   public
   def receive(event)
     topic = event['topic']
+    json = JSON.generate(event)
     if @channels.has_key?(topic) 
-      @channels[topic].publish(event.to_json)
+      @channels[topic].publish(json)
     else
-      pubsub = make_pubsub(topic) 
+      require "logstash/outputs/websocket_topics/pubsub"
+      pubsub = LogStash::Outputs::WebSocket::Pubsub.new
+      pubsub.logger = @logger
       @channels[topic] = pubsub
-      pubsub.publish(event.to_json)
+      pubsub.publish(json)
     end # if
   end # def receive
 

data/lib/logstash/outputs/{websocket → websocket_topics}/pubsub.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require "logstash/namespace"
-require "logstash/outputs/websocket"
+require "logstash/outputs/websocket_topics"
 
 class LogStash::Outputs::WebSocket::Pubsub
   attr_accessor :logger

data/logstash-output-websocket_topics.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-websocket_topics'
-  s.version         = '2.1.8'
+  s.version         = '2.1.9'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output runs a websocket server and publishes any messages to those conencted clients that have subscribed to the topic being published."
   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/outputs/websocket_topics_spec.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/outputs/websocket_topics"
+
+describe "output/websocket_topics" do
+
+  subject(:output) { LogStash::Outputs::WebSocket.new }
+
+  it "should register" do
+    expect {output.register}.to_not raise_error
+  end
+
+  it "should receive a simple message with a topic" do
+    output.register()
+    expect {output.receive({ "topic" => "blah" })}.to_not raise_error
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-websocket_topics
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Andrew Osheroff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -98,11 +98,11 @@ files:
 - LICENSE
 - NOTICE.TXT
 - README.md
-- lib/logstash/outputs/websocket/app.rb
-- lib/logstash/outputs/websocket/pubsub.rb
 - lib/logstash/outputs/websocket_topics.rb
+- lib/logstash/outputs/websocket_topics/app.rb
+- lib/logstash/outputs/websocket_topics/pubsub.rb
 - logstash-output-websocket_topics.gemspec
-- spec/outputs/websocket_spec.rb
+- spec/outputs/websocket_topics_spec.rb
 homepage: ''
 licenses:
 - Apache License (2.0)
@@ -130,4 +130,4 @@ signing_key:
 specification_version: 4
 summary: This output runs a websocket server and publishes any messages to those conencted clients that have subscribed to the topic being published.
 test_files:
-- spec/outputs/websocket_spec.rb
+- spec/outputs/websocket_topics_spec.rb

data/spec/outputs/websocket_spec.rb

@@ -1,12 +0,0 @@
-# encoding: utf-8
-require "logstash/devutils/rspec/spec_helper"
-require "logstash/outputs/websocket"
-
-describe "output/websocket" do
-
-  subject(:output) { LogStash::Outputs::WebSocket.new }
-
-  it "should register" do
-    expect {output.register}.to_not raise_error
-  end
-end