slanger 0.4.4 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd65a213b5685b79b1fd958a1ee446cd9dac9986
-  data.tar.gz: 428f76b4006c574491bcb308a2547b2bcb983d7f
+SHA256:
+  metadata.gz: fce992bf7da1961b629f9c2acad242d07871f7d1f6c9b7ab405f247d53887e9f
+  data.tar.gz: 33cf202ea4f9d4e7ee245eaa4d7b613dc589ce8bfa5975a2427485a0463d726b
 SHA512:
-  metadata.gz: b90d2d727f37da70e2e88a05f0cba997c43ddbd4a62472b6aba89d73914e8d0ef5b6aeb22bf12c152329a8e28d4cc15b3438521cde04434a3854a7a71fa78297
-  data.tar.gz: dbcd5c1d8070327d26adda0881766151024e0148d4a7f69afb9a16aa27c2a64933bc11dcf3a56101c65e55a43603409226e64866d5441244e79165e0459f9ce7
+  metadata.gz: a74747925333bba78821f0105464e63f692869e46065ac1c043311acf9375f677b9de75a6dc27d1482cd1a7bdc4dd4fa82f04efd66ad1a65753345ff99790bbd
+  data.tar.gz: baa4433570751fd6eb0e726230fe7040bceb357c79fcf3dba27fa6ec16b80748a2fd5ffcfa88c0534c1dd670ffaa9a33cfb6058283ba7a20ff10f22666a4e030

data/README.md

@@ -1,10 +1,12 @@
 # Slanger
 
+## UNMAINTAINED - Slanger is deprecated and unmaintained by its authors. Use at your own risk.
+
 [![Gem Version](https://badge.fury.io/rb/slanger.svg)](http://badge.fury.io/rb/slanger) [![Build Status](https://travis-ci.org/stevegraham/slanger.svg?branch=master)](https://travis-ci.org/stevegraham/slanger)
 
 **Important! Slanger is not supposed to be included in your Gemfile. RubyGems is used as a distribution mechanism. If you include it in your app, you will likely get dependency conflicts. PRs updating dependencies for compatibility with your app will be closed. Thank you for reading and enjoy Slanger!**
 
-##Typical usage
+## Typical usage
 
 ```
 gem install slanger
@@ -19,7 +21,8 @@ installed as a gem.
 
 Bundler has multiple purposes, one of which is useful for installation.
 
-##About
+## About
+
 Slanger is an open source server implementation of the Pusher protocol written
 in Ruby. It is designed to scale horizontally across N nodes and to be agnostic
 as to which Slanger node a subscriber is connected to, i.e subscribers to the

data/bin/slanger

@@ -2,7 +2,6 @@
 # encoding: utf-8
 
 require 'optparse'
-require 'bundler/setup'
 require 'eventmachine'
 require 'yaml'
 require 'active_support/core_ext/hash'
@@ -92,15 +91,17 @@ end
 
 if options[:tls_options]
   [:cert_chain_file, :private_key_file].each do |param|
-    raise RuntimeError.new "--#{param} does not exist at `#{options[:tls_options][param]}`" unless File.exists? options[:tls_options][param]
     raise RuntimeError.new "Both --cert_file and --private_key_file need to be specified" unless options[:tls_options][param]
+    raise RuntimeError.new "--#{param} does not exist at `#{options[:tls_options][param]}`" unless File.exists? options[:tls_options][param]
   end
 end
 
 STDOUT.sync = true
 
-EM.epoll
-EM.kqueue
+case
+when EM.epoll?  then EM.epoll
+when EM.kqueue? then EM.kqueue
+end
 
 EM.run do
   File.tap { |f| require f.expand_path(f.join(f.dirname(__FILE__),'..', 'slanger.rb')) }

data/lib/slanger/api/request_validation.rb

@@ -12,7 +12,7 @@ module Slanger
       end
 
       def data
-        @data ||= Oj.load(body["data"] || params["data"])
+        @data ||= Oj.strict_load(body["data"] || params["data"])
       end
 
       def body
@@ -87,7 +87,7 @@ module Slanger
       end
 
       def assert_valid_json!(string)
-        Oj.load(string)
+        Oj.strict_load(string)
       rescue Oj::ParserError
         raise Slanger::InvalidRequest.new("Invalid request body: #{raw_body}")
       end

data/lib/slanger/channel.rb

@@ -83,10 +83,24 @@ module Slanger
     # which will send it to subscribed clients.
     def dispatch(message, channel)
       push(Oj.dump(message, mode: :compat)) unless channel =~ /\Aslanger:/
+
+      perform_client_webhook!(message)
     end
 
     def authenticated?
       channel_id =~ /\Aprivate-/ || channel_id =~ /\Apresence-/
     end
+
+    private
+
+    def perform_client_webhook!(message)
+      if (message['event'].start_with?('client-')) then
+
+        event = message.merge({'name' => 'client_event'})
+        event['data'] = Oj.dump(event['data'])
+
+        Slanger::Webhook.post(event)
+      end
+    end
   end
 end

data/lib/slanger/connection.rb

@@ -9,7 +9,7 @@ module Slanger
     end
 
     def send_message m
-      msg = Oj.load m
+      msg = Oj.strict_load m
       s = msg.delete 'socket_id'
       socket.send Oj.dump(msg, mode: :compat) unless s == socket_id
     end

data/lib/slanger/handler.rb

@@ -25,9 +25,9 @@ module Slanger
     # Dispatches message handling to method with same name as
     # the event name
     def onmessage(msg)
-      msg = Oj.load(msg)
+      msg = Oj.strict_load(msg)
 
-      msg['data'] = Oj.load(msg['data']) if msg['data'].is_a? String
+      msg['data'] = Oj.strict_load(msg['data']) if msg['data'].is_a? String
 
       event = msg['event'].gsub(/\Apusher:/, 'pusher_')
 

data/lib/slanger/presence_channel.rb

@@ -32,7 +32,7 @@ module Slanger
     end
 
     def subscribe(msg, callback, &blk)
-      channel_data = Oj.load msg['data']['channel_data']
+      channel_data = Oj.strict_load msg['data']['channel_data']
       public_subscription_id = SecureRandom.uuid
 
       # Send event about the new subscription to the Redis slanger:connection_notification Channel.

data/lib/slanger/redis.rb

@@ -25,7 +25,7 @@ module Slanger
     def subscriber
       @subscriber ||= new_connection.pubsub.tap do |c|
         c.on(:message) do |channel, message|
-          message = Oj.load(message)
+          message = Oj.strict_load(message)
           c = Channel.from message['channel']
           c.dispatch message, channel
         end

data/lib/slanger/version.rb

@@ -1,3 +1,3 @@
 module Slanger
-  VERSION = '0.4.4'
+  VERSION = '0.6.1'
 end

data/lib/slanger/web_socket_server.rb

@@ -4,8 +4,10 @@ require 'em-websocket'
 module Slanger
   module WebSocketServer
     def run
-      EM.epoll
-      EM.kqueue
+      case
+      when EM.epoll?  then EM.epoll
+      when EM.kqueue? then EM.kqueue
+      end
 
       EM.run do
         options = {

data/slanger.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'bundler/setup'
-
 require 'eventmachine'
 require 'em-hiredis'
 require 'rack'
@@ -9,8 +7,10 @@ require File.join(File.dirname(__FILE__), 'lib', 'slanger', 'version')
 
 module Slanger; end
 
-EM.epoll
-EM.kqueue
+case
+when EM.epoll?  then EM.epoll
+when EM.kqueue? then EM.kqueue
+end
 
 File.tap do |f|
   Dir[f.expand_path(f.join(f.dirname(__FILE__),'lib', 'slanger', '*.rb'))].each do |file|

data/spec/integration/channel_spec.rb

@@ -18,7 +18,7 @@ describe 'Integration:' do
         end
      end
 
-      messages.should have_attributes connection_established: true, id_present: true,
+      expect(messages).to have_attributes connection_established: true, id_present: true,
         last_event: 'an_event', last_data: { some: "Mit Raben Und Wölfen" }.to_json
     end
 
@@ -36,7 +36,7 @@ describe 'Integration:' do
         end
      end
 
-      messages.should have_attributes connection_established: true, id_present: true,
+      expect(messages).to have_attributes connection_established: true, id_present: true,
         last_event: 'not_excluded_socket_event', last_data: { some: "Mit Raben Und Wölfen" }.to_json
     end
 
@@ -52,7 +52,7 @@ describe 'Integration:' do
         end
      end
 
-      messages.last.should == {"event"=>"pusher:error", "data"=>"{\"code\":null,\"message\":\"Existing subscription to MY_CHANNEL\"}"}
+      expect(messages.last).to eq({"event"=>"pusher:error", "data"=>"{\"code\":null,\"message\":\"Existing subscription to MY_CHANNEL\"}"})
     end
 
     it 'supports unsubscribing to channels without closing the socket' do
@@ -77,7 +77,7 @@ describe 'Integration:' do
         end
       end
 
-      messages.should have_attributes connection_established: true, id_present: true,
+      expect(messages).to have_attributes connection_established: true, id_present: true,
         last_event: 'pusher_internal:subscription_succeeded', count: 2
     end
 
@@ -105,10 +105,10 @@ describe 'Integration:' do
         end
       end
 
-      client1_messages.should have_attributes count: 2
+      expect(client1_messages).to have_attributes count: 2
 
-      client2_messages.should have_attributes last_event: 'an_event',
-                                              last_data: { some: 'data' }.to_json
+      expect(client2_messages).to have_attributes last_event: 'an_event',
+                                                  last_data: { some: 'data' }.to_json
     end
   end
 end

data/spec/integration/integration_spec.rb

@@ -10,7 +10,7 @@ describe 'Integration' do
       messages = em_stream(key: 'bogus_key') do |websocket, messages|
         websocket.callback { EM.stop }
       end
-      messages.should have_attributes count: 1, last_event: 'pusher:error',
+      expect(messages).to have_attributes count: 1, last_event: 'pusher:error',
         connection_established: false, id_present: false
       messages.first['data'] == 'Could not find app by key bogus_key'
     end
@@ -21,7 +21,7 @@ describe 'Integration' do
       messages = em_stream do |websocket, messages|
         websocket.callback { EM.stop }
       end
-      messages.should have_attributes activity_timeout: Slanger::Config.activity_timeout,
+      expect(messages).to have_attributes activity_timeout: Slanger::Config.activity_timeout,
         connection_established: true, id_present: true
     end
   end
@@ -31,7 +31,7 @@ describe 'Integration' do
       messages = em_stream do |websocket, messages|
         websocket.callback { EM.stop }
       end
-      messages.should have_attributes connection_established: true, id_present: true
+      expect(messages).to have_attributes connection_established: true, id_present: true
     end
   end
 
@@ -40,7 +40,7 @@ describe 'Integration' do
       messages = em_stream(protocol: "20") do |websocket, messages|
         websocket.callback { EM.stop }
       end
-      messages.should have_attributes connection_established: false, id_present: false,
+      expect(messages).to have_attributes connection_established: false, id_present: false,
         last_event: 'pusher:error'
     end
 
@@ -48,7 +48,7 @@ describe 'Integration' do
       messages = em_stream(protocol: nil) do |websocket, messages|
         websocket.callback { EM.stop }
       end
-      messages.should have_attributes connection_established: false, id_present: false,
+      expect(messages).to have_attributes connection_established: false, id_present: false,
         last_event: 'pusher:error'
     end
   end

data/spec/integration/presence_channel_spec.rb

@@ -19,7 +19,7 @@ describe 'Integration' do
             end
           end
 
-          messages.should have_attributes connection_established: true, id_present: true,
+          expect(messages).to have_attributes connection_established: true, id_present: true,
             count: 2,
             last_event: 'pusher:error'
 
@@ -46,11 +46,11 @@ describe 'Integration' do
             end
           end
 
-          messages.should have_attributes first_event: 'pusher:connection_established', count: 2,
+          expect(messages).to have_attributes first_event: 'pusher:connection_established', count: 2,
             id_present: true
 
           # Channel id should be in the payload
-          messages.last['event'].should == 'pusher:error'
+          expect(messages.last['event']).to eq('pusher:error')
           expect(JSON.parse(messages.last['data'])['message']).to match /^Invalid signature: Expected HMAC SHA256 hex digest of/
         end
       end
@@ -69,11 +69,11 @@ describe 'Integration' do
             end
           end
 
-          messages.should have_attributes connection_established: true, count: 2
+          expect(messages).to have_attributes connection_established: true, count: 2
 
-          messages.last.should == {"channel"=>"presence-channel",
+          expect(messages.last).to eq({"channel"=>"presence-channel",
                                    "event"  =>"pusher_internal:subscription_succeeded",
-                                   "data"   => "{\"presence\":{\"count\":1,\"ids\":[\"0f177369a3b71275d25ab1b44db9f95f\"],\"hash\":{\"0f177369a3b71275d25ab1b44db9f95f\":{\"name\":\"SG\"}}}}"}
+                                   "data"   => "{\"presence\":{\"count\":1,\"ids\":[\"0f177369a3b71275d25ab1b44db9f95f\"],\"hash\":{\"0f177369a3b71275d25ab1b44db9f95f\":{\"name\":\"SG\"}}}}"})
         end
 
 
@@ -87,8 +87,7 @@ describe 'Integration' do
                 send_subscribe(user: user1,
                                user_id: '0f177369a3b71275d25ab1b44db9f95f',
                                name: 'SG',
-                               message: messages.first
-                              )
+                               message: messages.first)
 
               when 2
                 new_websocket.tap do |u|
@@ -107,13 +106,13 @@ describe 'Integration' do
 
             end
 
-            messages.should have_attributes connection_established: true, count: 3
+            expect(messages).to have_attributes connection_established: true, count: 3
             # Channel id should be in the payload
-            messages[1].should == {"channel"=>"presence-channel", "event"=>"pusher_internal:subscription_succeeded",
-                                     "data"=>"{\"presence\":{\"count\":1,\"ids\":[\"0f177369a3b71275d25ab1b44db9f95f\"],\"hash\":{\"0f177369a3b71275d25ab1b44db9f95f\":{\"name\":\"SG\"}}}}"}
+            expect(messages[1]).to eq({"channel"=>"presence-channel", "event"=>"pusher_internal:subscription_succeeded",
+                                       "data"=>"{\"presence\":{\"count\":1,\"ids\":[\"0f177369a3b71275d25ab1b44db9f95f\"],\"hash\":{\"0f177369a3b71275d25ab1b44db9f95f\":{\"name\":\"SG\"}}}}"})
 
-            messages.last.should == {"channel"=>"presence-channel", "event"=>"pusher_internal:member_added",
-                                     "data"=>{"user_id"=>"37960509766262569d504f02a0ee986d", "user_info"=>{"name"=>"CHROME"}}}
+            expect(messages.last).to eq({"channel"=>"presence-channel", "event"=>"pusher_internal:member_added",
+                                         "data"=>{"user_id"=>"37960509766262569d504f02a0ee986d", "user_info"=>{"name"=>"CHROME"}}})
           end
 
           it 'does not send multiple member added and member removed messages if one subscriber opens multiple connections, i.e. multiple browser tabs.' do
@@ -147,8 +146,8 @@ describe 'Integration' do
             end
 
             # There should only be one set of presence messages sent to the refernce user for the second user.
-            messages.one? { |message| message['event'] == 'pusher_internal:member_added'   && message['data']['user_id'] == '37960509766262569d504f02a0ee986d' }.should be_true
-            messages.one? { |message| message['event'] == 'pusher_internal:member_removed' && message['data']['user_id'] == '37960509766262569d504f02a0ee986d' }.should be_true
+            expect(messages.one? { |message| message['event'] == 'pusher_internal:member_added'   && message['data']['user_id'] == '37960509766262569d504f02a0ee986d' }).to eq(true)
+            expect(messages.one? { |message| message['event'] == 'pusher_internal:member_removed' && message['data']['user_id'] == '37960509766262569d504f02a0ee986d' }).to eq(true)
 
           end
         end

data/spec/integration/private_channel_spec.rb

@@ -17,7 +17,7 @@ describe 'Integration' do
           end
         end
 
-        messages.should have_attributes connection_established: true,
+        expect(messages).to have_attributes connection_established: true,
           count: 2,
           id_present: true,
           last_event: 'pusher_internal:subscription_succeeded'
@@ -37,7 +37,7 @@ describe 'Integration' do
           end
         end
 
-        messages.should have_attributes connection_established: true, count: 2, id_present: true, last_event:
+        expect(messages).to have_attributes connection_established: true, count: 2, id_present: true, last_event:
           'pusher:error'
 
         expect(JSON.parse(messages.last['data'])['message']).to match /^Invalid signature: Expected HMAC SHA256 hex digest of/
@@ -71,8 +71,8 @@ describe 'Integration' do
           end
         end
 
-        client1_messages.one? { |m| m['event'] == 'client-something' }.should be_true
-        client2_messages.none?  { |m| m['event'] == 'client-something' }.should be_true
+        expect(client1_messages.one?  { |m| m['event'] == 'client-something' }).to eq(true)
+        expect(client2_messages.none? { |m| m['event'] == 'client-something' }).to eq(true)
       end
     end
   end

data/spec/integration/replaced_handler_spec.rb

@@ -18,6 +18,6 @@ describe 'Replacable handler' do
       end
     end
 
-    msgs.last.should == { "event" => "pusher:info", "data" =>"{\"message\":\"Welcome!\"}" }
+    expect(msgs.last).to eq({ "event" => "pusher:info", "data" =>"{\"message\":\"Welcome!\"}" })
   end
 end

data/spec/integration/ssl_spec.rb

@@ -12,7 +12,7 @@ describe 'Integration' do
       expected_cert          = OpenSSL::X509::Certificate.new(File.open('spec/server.crt'))
       ssl_socket             = OpenSSL::SSL::SSLSocket.new(socket)
       ssl_socket.connect
-      ssl_socket.peer_cert.to_s.should == expected_cert.to_s
+      expect(ssl_socket.peer_cert.to_s).to eq(expected_cert.to_s)
     end
   end
 end

data/spec/unit/channel_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'slanger'
+require 'oj'
 
 def clear_redis_connections
   Slanger::Redis.instance_variables.each do |ivar|
@@ -66,4 +67,39 @@ describe 'Slanger::Channel' do
       3.times { channel.subscribe { |m| nil } }
     end
   end
+
+  describe '#dispatch' do
+    it 'activates a webhook when client events are received' do
+      message = {
+        'event'     => 'client-test_event',
+        'channel'   => 'private-test_channel',
+        'socket_id' => '8.422225',
+        'data'      => { 'key' => 'value' }
+      }
+
+      expected_params = message.merge({
+        'name' => 'client_event',
+        'data' => Oj.dump(message['data'])
+      })
+
+      Slanger::Webhook.expects(:post).
+        with(expected_params).
+      once
+
+      channel.dispatch(message, 'private-test_channel')
+    end
+
+    it 'does not activate a webhook when non-client event messages are received' do
+      message = {
+        'event'     => 'non_client_event',
+        'channel'   => 'private-test_channel',
+        'socket_id' => '8.422225',
+        'data'      => { 'key' => 'value' }
+      }
+
+      Slanger::Webhook.expects(:post).never
+
+      channel.dispatch(message, 'private-test_channel')
+    end
+  end
 end

data/spec/unit/request_validation_spec.rb

@@ -6,8 +6,8 @@ describe Slanger::Api::RequestValidation do
     it 'validation' do
       socket_id = "POST\n/apps/99759/events\nauth_key=840543d97de9803651b1&auth_timestamp=123&auth_version=1.0&body_md5=some_md5&dummy="
 
-      expect {validate(nil)            }.not_to     raise_error Slanger::Api::InvalidRequest
-      expect {validate("1234.123455")  }.not_to raise_error Slanger::Api::InvalidRequest
+      expect {validate(nil)            }.not_to raise_error
+      expect {validate("1234.123455")  }.not_to raise_error
 
       expect {validate(socket_id)      }.to     raise_error Slanger::Api::InvalidRequest
       expect {validate("something 123")}.to     raise_error Slanger::Api::InvalidRequest

data/spec/unit/webhook_spec.rb

@@ -32,7 +32,7 @@ describe 'Slanger::Webhook' do
 
       Slanger::Webhook.post name: 'channel_occupied', channel: 'test channel'
 
-      WebMock.should have_requested(:post, Slanger::Config.webhook_url).
+      expect(WebMock).to have_requested(:post, Slanger::Config.webhook_url).
         with(body: payload, headers: {
             "X-Pusher-Key"    => Slanger::Config.app_key,
             "X-Pusher-Signature" => hmac,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slanger
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.6.1
 platform: ruby
 authors:
 - Stevie Graham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -171,14 +171,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
@@ -369,8 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A websocket service compatible with Pusher libraries
@@ -389,4 +388,3 @@ test_files:
 - spec/unit/channel_spec.rb
 - spec/unit/request_validation_spec.rb
 - spec/unit/webhook_spec.rb
-has_rdoc: