slanger 0.4.1 → 0.4.2

data/spec/server.crt

@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBvzCCASgCCQCsMkmDVYNDETANBgkqhkiG9w0BAQUFADAkMQswCQYDVQQGEwJE
+RTEVMBMGA1UEAwwMc2xhbmdlci50ZXN0MB4XDTEyMDQxMTE2NDMwNloXDTE5MDIx
+NDE2NDMwNlowJDELMAkGA1UEBhMCREUxFTATBgNVBAMMDHNsYW5nZXIudGVzdDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmlTxrcqXw+hbdjnpNENgx4p6T+x7
+SgN/5ti3+gr5ZJElebEdJdGymM/KK817GFhLuYSEv72oEVitC1ISCfo/iOu4S71Y
+sGsrdyPVl3cDswSkvmo27J3rtAbY1fNDs68YFAQGH8wlQtPSPvd9KBKg0klafsDU
+VvDYjQ+XZ2+ZKZECAwEAATANBgkqhkiG9w0BAQUFAAOBgQCHGqUddcsTfvV0Nk3F
+zZ5kGvAiZ02MUourZ4GVs5uBYtkIrQ7HAlQbHAbC8d7e0UVgcTwUKgwpw/RfNR/O
+Ho/zn7lPciLQ7VMnOZ2+MfbJ2HIFgZL6qH1gTcQpBW4s3gKR5hFpaGJ+8l/cmEWj
+AvywaOcSLex+q0OwZaiusiDorg==
+-----END CERTIFICATE-----

data/spec/server.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCaVPGtypfD6Ft2Oek0Q2DHinpP7HtKA3/m2Lf6CvlkkSV5sR0l
+0bKYz8orzXsYWEu5hIS/vagRWK0LUhIJ+j+I67hLvViwayt3I9WXdwOzBKS+ajbs
+neu0BtjV80OzrxgUBAYfzCVC09I+930oEqDSSVp+wNRW8NiND5dnb5kpkQIDAQAB
+AoGABGzBDSGM3mIQFUCtzgDMiowO27HFCyc0iJLYG4QrCFYdA/MvCcGMZFM40a6v
+g9AsQ6JoB/NRGUY4l+V/fOe+4Iuycf8+vN1mrSVR1lTjy/mOwj900pc4ff6cDv6S
+bI/hm4BNiuj8OD11R+ZK07Lo1iCzBkAy53RkTFcBk74MYgECQQDMyAMT0DhlRBqD
+4vrPF+GZ+rMYpeTjuNDOZphIwzxpv70uyh2RNg+7F6U91Qxz6vpbIkz8Zf4TgdwM
+u/rroktxAkEAwO6wyzidm2yrPMPtnwxDIYnH/ETdNraa3JyHsjXsQwGAIG80+hCv
+QfCA/LmvNOm/Mpe1EyiAeI1/YJp4a2xwIQJBAKysFpQ1ZehVtbnxwaSwMWXiE/Q7
+pjYyl7cCoXPxVFai+8WhXa8dE8Shmo75v2dbAsGnuZy177jJLiB6vYjFL7ECQQCI
+Zri7lLVo8zVFasgO0F6N0ZmAMzeqvQNTwZ72UcVNwjvRso3j1fPyTJUFGEpUwIWa
+wUMV3mal1HQf2lYUrL/BAkBBtXqOLFHINHUmffdRSV/2HECYXHazb6lAnL8nnQX0
+vin2ujCli9mcYWnrY7zwlXdAxgQv5Q2ByQT9Fd8S7FjA
+-----END RSA PRIVATE KEY-----

data/spec/slanger_helper_methods.rb

@@ -0,0 +1,109 @@
+module SlangerHelperMethods
+  def start_slanger_with_options options={}
+    # Fork service. Our integration tests MUST block the main thread because we want to wait for i/o to finish.
+    @server_pid = EM.fork_reactor do
+      Thin::Logging.silent = true
+
+      opts = { host:             '0.0.0.0',
+               api_port:         '4567',
+               websocket_port:   '8080',
+               app_key:          '765ec374ae0a69f4ce44',
+               secret:           'your-pusher-secret',
+               activity_timeout: 100
+             }
+
+      Slanger::Config.load opts.merge(options)
+
+      Slanger::Service.run
+    end
+    wait_for_slanger
+  end
+
+  alias start_slanger start_slanger_with_options
+
+  def stop_slanger
+    # Ensure Slanger is properly stopped. No orphaned processes allowed!
+     Process.kill 'SIGKILL', @server_pid
+     Process.wait @server_pid
+  end
+
+  def wait_for_slanger opts = {}
+    opts = { port: 8080 }.update opts
+    begin
+      TCPSocket.new('0.0.0.0', opts[:port]).close
+    rescue
+      sleep 0.005
+      retry
+    end
+  end
+
+  def new_websocket opts = {}
+    opts = { key: Pusher.key, protocol: 7 }.update opts
+    uri = "ws://0.0.0.0:8080/app/#{opts[:key]}?client=js&version=1.8.5&protocol=#{opts[:protocol]}"
+
+    EM::HttpRequest.new(uri).get.tap { |ws| ws.errback &errback }
+  end
+
+  def em_stream opts = {}
+    messages = []
+
+    em_thread do
+      websocket = new_websocket opts
+
+      stream(websocket, messages) do |message|
+        yield websocket, messages
+      end
+    end
+
+    return messages
+  end
+
+  def em_thread
+    Thread.new do
+      EM.run do
+        yield
+      end
+    end.join
+  end
+
+  def stream websocket, messages
+    websocket.stream do |message|
+      messages << JSON.parse(message)
+
+      yield message
+    end
+  end
+
+  def send_subscribe options
+    info      = { user_id: options[:user_id], user_info: { name: options[:name] } }
+    socket_id = JSON.parse(options[:message]['data'])['socket_id']
+    to_sign   = [socket_id, 'presence-channel', info.to_json].join ':'
+
+    digest = OpenSSL::Digest::SHA256.new
+
+    options[:user].send({
+      event: 'pusher:subscribe',
+      data: {
+        auth: [Pusher.key, OpenSSL::HMAC.hexdigest(digest, Pusher.secret, to_sign)].join(':'),
+        channel_data: info.to_json,
+        channel: 'presence-channel'
+      }
+    }.to_json)
+  end
+
+  def private_channel websocket, message
+    socket_id = JSON.parse(message['data'])['socket_id']
+    to_sign   = [socket_id, 'private-channel'].join ':'
+
+    digest = OpenSSL::Digest::SHA256.new
+
+    websocket.send({
+      event: 'pusher:subscribe',
+      data: {
+        auth: [Pusher.key, OpenSSL::HMAC.hexdigest(digest, Pusher.secret, to_sign)].join(':'),
+        channel: 'private-channel'
+      }
+    }.to_json)
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,43 @@
+require 'bundler/setup'
+
+require 'active_support/json'
+require 'active_support/core_ext/hash'
+require 'eventmachine'
+require 'em-http-request'
+require 'pusher'
+require 'thin'
+require 'slanger_helper_methods'
+require 'have_attributes'
+require 'openssl'
+require 'socket'
+require 'timecop'
+require 'pry'
+require 'webmock/rspec'
+require 'slanger'
+
+WebMock.disable!
+
+module Slanger; end
+
+def errback
+  @errback ||= Proc.new { |e| fail 'cannot connect to slanger. your box might be too slow. try increasing sleep value in the before block' }
+end
+
+RSpec.configure do |config|
+  config.formatter = 'documentation'
+  config.color = true
+  config.mock_framework = :mocha
+  config.order = 'random'
+  config.include SlangerHelperMethods
+  config.fail_fast = true
+  config.after(:each) { stop_slanger if @server_pid }
+  config.before :all do
+    Pusher.tap do |p|
+      p.host   = '0.0.0.0'
+      p.port   = 4567
+      p.app_id = 'your-pusher-app-id'
+      p.secret = 'your-pusher-secret'
+      p.key    = '765ec374ae0a69f4ce44'
+    end
+  end
+end

data/spec/unit/channel_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+require 'slanger'
+
+def clear_redis_connections
+  Slanger::Redis.instance_variables.each do |ivar|
+    Slanger::Redis.send :remove_instance_variable, ivar
+  end
+end
+
+describe 'Slanger::Channel' do
+  let(:channel) { Slanger::Channel.create channel_id: 'test' }
+
+  before(:each) do
+    EM::Hiredis.stubs(:connect).returns stub_everything('redis', :pubsub => stub_everything('redis'))
+    clear_redis_connections
+  end
+
+  after(:each) do
+    clear_redis_connections
+    EM::Hiredis.unstub(:connect)
+  end
+
+  describe '#unsubscribe' do
+    it 'decrements channel subscribers on Redis' do
+      Slanger::Redis.expects(:hincrby).
+        with('channel_subscriber_count', channel.channel_id, -1).
+        once.returns mock { expects(:callback).once.yields(2) }
+
+      channel.unsubscribe 1
+    end
+
+    it 'activates a webhook when the last subscriber of a channel unsubscribes' do
+      Slanger::Webhook.expects(:post).
+        with(name: 'channel_vacated', channel: channel.channel_id).
+        once
+
+      Slanger::Redis.expects(:hincrby).
+        with('channel_subscriber_count', channel.channel_id, -1).
+        times(3).returns mock {
+          expects(:callback).times(3).yields(2).then.yields(1).then.yields(0)
+        }
+
+      3.times { |i| channel.unsubscribe i + 1 }
+    end
+  end
+
+  describe '#subscribe' do
+    it 'increments channel subscribers on Redis' do
+      Slanger::Redis.expects(:hincrby).
+        with('channel_subscriber_count', channel.channel_id, 1).
+        once.returns mock { expects(:callback).once.yields(2) }
+      channel.subscribe { |m| nil }
+    end
+
+    it 'activates a webhook when the first subscriber of a channel joins' do
+      Slanger::Webhook.expects(:post).
+        with(name: 'channel_occupied', channel: channel.channel_id).
+        once
+
+      Slanger::Redis.expects(:hincrby).
+        with('channel_subscriber_count', channel.channel_id, 1).
+        times(3).returns mock {
+          expects(:callback).times(3).yields(1).then.yields(2).then.yields(3)
+        }
+
+      3.times { channel.subscribe { |m| nil } }
+    end
+  end
+end

data/spec/unit/request_validation_spec.rb

@@ -0,0 +1,64 @@
+#encoding: utf-8
+require 'spec_helper'
+
+describe Slanger::Api::RequestValidation do
+  describe '#socket_id' 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(socket_id)      }.to     raise_error Slanger::Api::InvalidRequest
+      expect {validate("something 123")}.to     raise_error Slanger::Api::InvalidRequest
+
+      expect {validate("1234.12345 ")               }.to raise_error Slanger::Api::InvalidRequest
+      expect {validate(" 1234.12345")               }.to raise_error Slanger::Api::InvalidRequest
+      expect {validate("hello\n1234.123456\nhomakov") }.to raise_error Slanger::Api::InvalidRequest
+    end
+  end
+
+  before do
+    request = mock("request")
+    request.expects(:authenticate).times(0..2)
+    Signature::Request.expects(:new).times(0..2).returns request
+  end
+
+  describe "#channels" do
+    let(:body) { {socket_id: "1234.5678", channels: channels}.to_json }
+
+    context "with valid channels" do
+      let(:channels) { ["MY_CHANNEL", "presence-abcd"] }
+
+      it "returns an array of valid channel_id values" do
+        rv = Slanger::Api::RequestValidation.new(body, {}, "")
+
+        expect(rv.channels).to eq ["MY_CHANNEL", "presence-abcd"]
+      end
+    end
+
+    context "with invalid channels" do
+      let(:channels) { ["MY_CHANNEL:presence-abcd", "presence-abcd"] }
+
+      it "rejects invalid channels" do
+        expect{ Slanger::Api::RequestValidation.new(body, {}, "")}.to raise_error Slanger::Api::InvalidRequest
+      end
+    end
+  end
+
+  describe "#socket_id" do
+    it do
+      rv = Slanger::Api::RequestValidation.new(body("1234.5678"), {}, "")
+      expect(rv.socket_id).to eq "1234.5678"
+    end
+  end
+
+  def validate(socket_id)
+    Slanger::Api::RequestValidation.new(body(socket_id), {}, "").socket_id
+  end
+
+  def body(socket_id)
+    {socket_id: socket_id}.to_json
+  end
+end
+

data/spec/unit/webhook_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'lib/slanger/webhook'
+
+describe 'Slanger::Webhook' do
+
+  around do |example|
+    Slanger::Config.load webhook_url: 'https://example.com/pusher',
+      app_key: 'PUSHER_APP_KEY', secret: 'secret'
+    WebMock.enable!
+    Timecop.freeze(Time.now) { example.run }
+    WebMock.disable!
+    Slanger::Config.load webhook_url: nil
+  end
+
+  describe '.post' do
+    it 'make a POST request to the endpoint' do
+      payload = {
+        time_ms: Time.now.strftime('%s%L'),
+        events: [{ name: 'channel_occupied', channel: 'test channel' }]
+      }.to_json
+
+      digest   = OpenSSL::Digest::SHA256.new
+      hmac     = OpenSSL::HMAC.hexdigest(digest, Slanger::Config.secret, payload)
+
+      stub_request(:post, Slanger::Config.webhook_url).
+        with(body: payload, headers: {
+            "X-Pusher-Key"    => Slanger::Config.app_key,
+            "X-Pusher-Signature" => hmac,
+            "Content-Type" => 'application/json'
+        }).
+        to_return(:status => 200, :body => {}.to_json, :headers => {})
+
+      Slanger::Webhook.post name: 'channel_occupied', channel: 'test channel'
+
+      WebMock.should have_requested(:post, Slanger::Config.webhook_url).
+        with(body: payload, headers: {
+            "X-Pusher-Key"    => Slanger::Config.app_key,
+            "X-Pusher-Signature" => hmac,
+            "Content-Type" => 'application/json'
+        })
+    end
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: slanger
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Stevie Graham
+- Mark Burns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -100,28 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: glamazon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +193,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -276,8 +249,52 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.4.2
 description: A websocket service compatible with Pusher libraries
-email: sjtgraham@mac.com
+email:
+- sjtgraham@mac.com
+- markthedeveloper@gmail.com
 executables:
 - slanger
 extensions: []
@@ -285,7 +302,11 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/slanger
-- lib/slanger/api_server.rb
+- lib/slanger/api.rb
+- lib/slanger/api/event.rb
+- lib/slanger/api/event_publisher.rb
+- lib/slanger/api/request_validation.rb
+- lib/slanger/api/server.rb
 - lib/slanger/channel.rb
 - lib/slanger/config.rb
 - lib/slanger/connection.rb
@@ -301,8 +322,23 @@ files:
 - lib/slanger/web_socket_server.rb
 - lib/slanger/webhook.rb
 - slanger.rb
-homepage: http://github.com/stevegraham/slanger
-licenses: []
+- spec/have_attributes.rb
+- spec/integration/channel_spec.rb
+- spec/integration/integration_spec.rb
+- spec/integration/presence_channel_spec.rb
+- spec/integration/private_channel_spec.rb
+- spec/integration/replaced_handler_spec.rb
+- spec/integration/ssl_spec.rb
+- spec/server.crt
+- spec/server.key
+- spec/slanger_helper_methods.rb
+- spec/spec_helper.rb
+- spec/unit/channel_spec.rb
+- spec/unit/request_validation_spec.rb
+- spec/unit/webhook_spec.rb
+homepage: https://github.com/stevegraham/slanger
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -320,8 +356,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A websocket service compatible with Pusher libraries
-test_files: []
+test_files:
+- spec/have_attributes.rb
+- spec/integration/channel_spec.rb
+- spec/integration/integration_spec.rb
+- spec/integration/presence_channel_spec.rb
+- spec/integration/private_channel_spec.rb
+- spec/integration/replaced_handler_spec.rb
+- spec/integration/ssl_spec.rb
+- spec/server.crt
+- spec/server.key
+- spec/slanger_helper_methods.rb
+- spec/spec_helper.rb
+- spec/unit/channel_spec.rb
+- spec/unit/request_validation_spec.rb
+- spec/unit/webhook_spec.rb