slanger 0.2.0 → 0.2.1

data/README.md

@@ -1,4 +1,5 @@
 # Slanger
+[![Build Status](https://secure.travis-ci.org/stevegraham/slanger.png?branch=master)](http://travis-ci.org/stevegraham/slanger)
 
 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 same channel are NOT required to be connected to the same Slanger node. Multiple Slanger nodes can sit behind a load balancer with no special configuration. In essence it was designed to be very easy to scale.
 
@@ -96,6 +97,12 @@ Slanger supports several configuration options, which can be supplied as command
 
 -w or --websocket_host This is the address that Slanger will bind the WebSocket part of the service to. This is an optional argument and defaults to 0.0.0.0:8080
 
+-i or --require Require an additional file before starting Slanger to tune it to your needs. This is an optional argument
+
+-p or --private_key_file Private key file for SSL support. This argument is optional, if given, SSL will be enabled
+
+-c or --cert_chain_file Certificate chain file for SSL support. This argument is optional, if given, SSL will be enabled
+
 -v or --[no-]verbose This makes Slanger run verbosely, meaning WebSocket frames will be echoed to STDOUT. Useful for debugging
 </pre>
 

data/bin/slanger

@@ -11,6 +11,7 @@ options = {
 
 OptionParser.new do |opts|
   opts.on '-h', '--help', 'Display this screen' do
+    puts opts
     exit
   end
 
@@ -34,6 +35,11 @@ OptionParser.new do |opts|
     options[:websocket_host], options[:websocket_port] = p.split(':')
   end
 
+  opts.on '-i', '--require FILE', "Require a file before starting Slanger" do |p|
+    options[:require] ||= []
+    options[:require] << p
+  end
+
   opts.on '-p', '--private_key_file FILE', "Private key file for SSL transport" do |p|
     options[:tls_options] ||= {}
     options[:tls_options][:private_key_file] = p
@@ -60,6 +66,9 @@ if options[:tls_options]
   end
 end
 
+EM.epoll
+EM.kqueue
+
 EM.run do
   File.tap { |f| require f.expand_path(f.join(f.dirname(__FILE__),'..', 'slanger.rb')) }
   Slanger::Config.load options

data/lib/slanger/api_server.rb

@@ -1,6 +1,7 @@
+# encoding: utf-8
 require 'sinatra/base'
 require 'signature'
-require 'active_support/json'
+require 'json'
 require 'active_support/core_ext/hash'
 require 'eventmachine'
 require 'em-hiredis'
@@ -35,7 +36,7 @@ module Slanger
 
     def payload
       payload = {
-        event: params['name'], data: request.body.read, channel: params[:channel_id], socket_id: params[:socket_id]
+        event: params['name'], data: request.body.read.tap { |s| s.force_encoding('utf-8') }, channel: params[:channel_id], socket_id: params[:socket_id]
       }
       Hash[payload.reject { |k,v| v.nil? }].to_json
     end

data/lib/slanger/channel.rb

@@ -1,7 +1,7 @@
 # Channel class.
 #
 # Uses an EventMachine channel to let clients interact with the
-# Pusher channel. Relay events received from Redis into the 
+# Pusher channel. Relay events received from Redis into the
 # EM channel.
 #
 
@@ -16,6 +16,21 @@ module Slanger
 
     def_delegators :channel, :subscribe, :unsubscribe, :push
 
+    class << self
+      def from channel_id
+        klass = channel_id[/^presence-/] ? PresenceChannel : Channel
+        klass.find_or_create_by_channel_id channel_id
+      end
+
+      def unsubscribe channel_id, subscription_id
+        from(channel_id).try :unsubscribe, subscription_id
+      end
+
+      def send_client_message msg
+        from(msg['channel']).try :send_client_message, msg
+      end
+    end
+
     def initialize(attrs)
       super
       Slanger::Redis.subscribe channel_id

data/lib/slanger/config.rb

@@ -13,7 +13,8 @@ module Slanger
     def options
       @options ||= {
         api_host: '0.0.0.0', api_port: '4567', websocket_host: '0.0.0.0',
-        websocket_port: '8080', debug: false, redis_address: 'redis://0.0.0.0:6379/0'
+        websocket_port: '8080', debug: false, redis_address: 'redis://0.0.0.0:6379/0',
+        socket_handler: Slanger::Handler, require: []
       }
     end
 

data/lib/slanger/connection.rb

@@ -0,0 +1,34 @@
+module Slanger
+  class Connection
+    attr_accessor :socket, :socket_id
+
+    def initialize socket, socket_id=nil
+      @socket, @socket_id = socket, socket_id
+    end
+
+    def send_message m
+      msg = JSON.parse m
+      s = msg.delete 'socket_id'
+      socket.send msg.to_json unless s == socket_id
+    end
+
+    def send_payload *args
+      socket.send format(*args)
+    end
+
+    def error e
+      send_payload nil, 'pusher:error', e
+    end
+
+    def establish
+      @socket_id = SecureRandom.uuid
+      send_payload nil, 'pusher:connection_established', { socket_id: @socket_id }
+    end
+
+    private
+
+    def format(channel_id, event_name, payload = {})
+      { channel: channel_id, event: event_name, data: payload }.to_json
+    end
+  end
+end

data/lib/slanger/handler.rb

@@ -1,7 +1,6 @@
 # Handler class.
 # Handles a client connected via a websocket connection.
 
-require 'active_support/json'
 require 'active_support/core_ext/hash'
 require 'securerandom'
 require 'signature'
@@ -9,156 +8,81 @@ require 'fiber'
 
 module Slanger
   class Handler
+
+    attr_accessor :connection
+    delegate :error, :establish, :send_payload, to: :connection
+
     def initialize(socket)
       @socket        = socket
+      @connection    = Connection.new(@socket)
       @subscriptions = {}
       authenticate
     end
 
-    # Dispatches message handling to method with same name as the event name
+    # Dispatches message handling to method with same name as
+    # the event name
     def onmessage(msg)
-      msg   = JSON.parse msg
-      event = msg['event'].gsub('pusher:', 'pusher_')
-
-      if event =~ /^pusher_/
-        # Pusher event, call method if it exists.
-        send(event, msg) if respond_to? event, true
-      elsif event =~ /^client-/
-        # Client event. Send it to the destination channel.
-        msg['socket_id'] = @socket_id
-        channel = find_channel msg['channel']
-        channel.try :send_client_message, msg
-      end
-    rescue Exception => e
-      handle_error(e)
-    end
+      begin
+        msg   = JSON.parse msg
+        event = msg['event'].gsub(/^pusher:/, 'pusher_')
+
+        if event =~ /^client-/
+          msg['socket_id'] = @socket_id
+          Channel.send_client_message msg
+        elsif respond_to? event, true
+          send event, msg
+        end
 
-    # Unsubscribe this connection from all the channels on close.
-    def onclose
-      @subscriptions.each do |channel_id, subscription_id|
-        channel = find_channel channel_id
-        channel.try :unsubscribe, subscription_id
+      rescue Exception => e
+        case e
+        when JSON::ParserError
+          error({ code: 5001, message: "Invalid JSON" })
+        else
+          error({ code: 500, message: "#{e.message}\n #{e.backtrace}" })
+        end
       end
     end
 
-    private
-
-    def find_channel(channel_id)
-      channel_class(channel_id).find_by_channel_id(channel_id)
-    end
-
-    def channel_class(channel_name)
-      channel_name =~ /^presence-/ ? PresenceChannel : Channel
+    def onclose
+      @subscriptions.each { |c, s| Channel.unsubscribe c, s }
     end
 
-    # Verify app key. Send connection_established message to connection if it checks out. Send error message and disconnect if invalid.
     def authenticate
-      app_key = @socket.request['path'].split(/\W/)[2]
-      if app_key == Slanger::Config.app_key
-        @socket_id = SecureRandom.uuid
-        @socket.send(payload nil, 'pusher:connection_established', { socket_id: @socket_id })
-      else
-        @socket.send(payload nil, 'pusher:error', { code: '4001', message: "Could not find app by key #{app_key}" })
-        @socket.close_websocket
-      end
-    end
+      return establish if valid_app_key? app_key
 
-    # Dispatch to handler method if channel requires authentication, otherwise subscribe.
-    def pusher_subscribe(msg)
-      channel_id = msg['data']['channel']
-      subscription_id = if match = channel_id.match(/^((private)|(presence))-/)
-        send "handle_#{match.captures[0]}_subscription", msg
-      else
-        subscribe_channel channel_id
-      end
-      @subscriptions[channel_id] = subscription_id
+      error({ code: '4001', message: "Could not find app by key #{app_key}" })
+      @socket.close_websocket
     end
 
     def pusher_ping(msg)
-      @socket.send(payload nil, 'pusher:ping')
+      send_payload nil, 'pusher:ping'
     end
 
     def pusher_pong msg; end
 
-    #TODO: think about moving all subscription stuff into channel classes
-    # Add connection to channel subscribers
-    def subscribe_channel(channel_id)
-      channel = Slanger::Channel.find_or_create_by_channel_id(channel_id)
-      @socket.send(payload channel_id, 'pusher_internal:subscription_succeeded')
-      # Subscribe to the channel and have the events received from it
-      # sent to the client's socket.
-      subscription_id = channel.subscribe do |msg|
-        msg       = JSON.parse(msg)
-        # Don't send the event if it was sent by the client
-        socket_id = msg.delete 'socket_id'
-        @socket.send msg.to_json unless socket_id == @socket_id
-      end
-    end
+    def pusher_subscribe(msg)
+      channel_id = msg['data']['channel']
+      klass      = subscription_klass channel_id
 
-    # Validate authentication token for private channel and add connection to channel subscribers if it checks out
-    def handle_private_subscription(msg)
-      channel = msg['data']['channel']
-      if msg['data']['auth'] && token(channel, msg['data']['channel_data']) != msg['data']['auth'].split(':')[1]
-        @socket.send(payload nil, 'pusher:error', {
-          message: "Invalid signature: Expected HMAC SHA256 hex digest of #{@socket_id}:#{channel}, but got #{msg['data']['auth']}"
-        })
-      else
-        subscribe_channel channel
-      end
+      @subscriptions[channel_id] = klass.new(connection.socket, connection.socket_id, msg).subscribe
     end
 
-    # Validate authentication token and check channel_data. Add connection to channel subscribers if it checks out
-    def handle_presence_subscription(msg)
-      channel_id = msg['data']['channel']
-      if token(channel_id, msg['data']['channel_data']) != msg['data']['auth'].split(':')[1]
-        @socket.send(payload nil, 'pusher:error', {
-          message: "Invalid signature: Expected HMAC SHA256 hex digest of #{@socket_id}:#{msg['data']['channel']}, but got #{msg['data']['auth']}"
-        })
-      elsif !msg['data']['channel_data']
-        @socket.send(payload nil, 'pusher:error', {
-          message: "presence-channel is a presence channel and subscription must include channel_data"
-        })
-      else
-        channel = Slanger::PresenceChannel.find_or_create_by_channel_id(channel_id)
-        callback = Proc.new {
-          @socket.send(payload channel_id, 'pusher_internal:subscription_succeeded', {
-            presence: {
-              count: channel.subscribers.size,
-              ids:   channel.ids,
-              hash:  channel.subscribers
-            }
-          })
-        }
-        # Subscribe to channel, call callback when done to send a 
-        # subscription_succeeded event to the client.
-        channel.subscribe(msg, callback) do |msg|
-          # Send channel messages to the client, unless it is the
-          # sender of the event.
-          msg       = JSON.parse(msg)
-          socket_id = msg.delete 'socket_id'
-          @socket.send msg.to_json unless socket_id == @socket_id
-        end
-      end
-    end
+    private
 
-    # Message helper method. Converts a hash into the Pusher JSON protocol
-    def payload(channel_id, event_name, payload = {})
-      { channel: channel_id, event: event_name, data: payload }.to_json
+    def app_key
+      @socket.request['path'].split(/\W/)[2]
     end
 
-    # HMAC token validation
-    def token(channel_id, params=nil)
-      string_to_sign = [@socket_id, channel_id, params].compact.join ':'
-      HMAC::SHA256.hexdigest(Slanger::Config.secret, string_to_sign)
+    def valid_app_key? app_key
+      Slanger::Config.app_key == app_key
     end
 
-    def handle_error(e)
-      case e
-      when JSON::ParserError
-        @socket.send(payload nil, 'pusher:error', { code: '5001', message: "Invalid JSON" })
-      else
-        @socket.send(payload nil, 'pusher:error', { code: '5000', message: "Internal Server error" })
+    def subscription_klass channel_id
+      klass = channel_id.match(/^(private|presence)-/) do |match|
+        Slanger.const_get "#{match[1]}_subscription".classify
       end
+
+      klass || Slanger::Subscription
     end
   end
 end

data/lib/slanger/presence_channel.rb

@@ -1,9 +1,9 @@
 # PresenceChannel class.
 #
 # Uses an EventMachine channel to let handlers interact with the
-# Pusher channel. Relay events received from Redis into the 
+# Pusher channel. Relay events received from Redis into the
 # EM channel. Keeps data on the subscribers to send it to clients.
-# 
+#
 
 require 'glamazon'
 require 'eventmachine'
@@ -57,11 +57,11 @@ module Slanger
     end
 
     def ids
-      subscriptions.map { |k,v| v['user_id'] }
+      subscriptions.map { |_,v| v['user_id'] }
     end
 
     def subscribers
-      Hash[subscriptions.map { |k,v| [v['user_id'], v['user_info']] }]
+      Hash[subscriptions.map { |_,v| [v['user_id'], v['user_info']] }]
     end
 
     def unsubscribe(public_subscription_id)
@@ -105,7 +105,7 @@ module Slanger
     # This is the state of the presence channel across the system. kept in sync
     # with redis pubsub
     def subscriptions
-      @subscriptions = @subscriptions || get_roster || Hash.new
+      @subscriptions ||= get_roster || {}
     end
 
     # This is used map public subscription ids to em channel subscription ids.

data/lib/slanger/presence_subscription.rb

@@ -0,0 +1,33 @@
+module Slanger
+  class PresenceSubscription < Subscription
+    def subscribe
+      return handle_invalid_signature if invalid_signature?
+
+      unless channel_data?
+        return connection.error({
+          message: "presence-channel is a presence channel and subscription must include channel_data"
+        })
+      end
+
+      channel.subscribe(@msg, callback) { |m| connection.send_message m }
+    end
+
+    private
+
+    def channel_data?
+      @msg['data']['channel_data']
+    end
+
+    def callback
+      Proc.new {
+        connection.send_payload(channel_id, 'pusher_internal:subscription_succeeded', {
+          presence: {
+            count: channel.subscribers.size,
+            ids:   channel.ids,
+            hash:  channel.subscribers
+          }
+        })
+      }
+    end
+  end
+end

data/lib/slanger/private_subscription.rb

@@ -0,0 +1,9 @@
+module Slanger
+  class PrivateSubscription < Subscription
+    def subscribe
+      return handle_invalid_signature if auth && invalid_signature?
+
+      Subscription.new(connection.socket, connection.socket_id, @msg).subscribe
+    end
+  end
+end

data/lib/slanger/redis.rb

@@ -11,8 +11,8 @@ module Slanger
       # Dispatch messages received from Redis to their destination channel.
       base.on(:message) do |channel, message|
         message = JSON.parse message
-        klass = message['channel'][/^presence-/] ? PresenceChannel : Channel
-        klass.find_or_create_by_channel_id(message['channel']).dispatch message, channel
+        c = Channel.from message['channel']
+        c.dispatch message, channel
       end
     end
 

data/lib/slanger/service.rb

@@ -4,6 +4,7 @@ require 'rack'
 module Slanger
   module Service
     def run
+      Slanger::Config[:require].each { |f| require f }
       Thin::Logging.silent = true
       Rack::Handler::Thin.run Slanger::ApiServer, Host: Slanger::Config.api_host, Port: Slanger::Config.api_port
       Slanger::WebSocketServer.run

data/lib/slanger/subscription.rb

@@ -0,0 +1,51 @@
+module Slanger
+  class Subscription
+    attr_accessor :connection, :socket
+    delegate :send_payload, :send_message, :error, :socket_id, to: :connection
+
+    def initialize socket, socket_id, msg
+      @connection = Connection.new socket, socket_id
+      @msg       = msg
+    end
+
+    def subscribe
+      send_payload channel_id, 'pusher_internal:subscription_succeeded'
+
+      channel.subscribe { |m| send_message m }
+    end
+
+    private
+
+    def channel
+      Channel.from channel_id
+    end
+
+    def channel_id
+      @msg['data']['channel']
+    end
+
+    def token(channel_id, params=nil)
+      to_sign = [socket_id, channel_id, params].compact.join ':'
+      HMAC::SHA256.hexdigest Slanger::Config.secret, to_sign
+    end
+
+    def invalid_signature?
+      token(channel_id, data) != auth.split(':')[1]
+    end
+
+    def auth
+      @msg['data']['auth']
+    end
+
+    def data
+      @msg['data']['channel_data']
+    end
+
+    def handle_invalid_signature
+      message = "Invalid signature: Expected HMAC SHA256 hex digest of "
+      message << "#{socket_id}:#{channel_id}, but got #{auth}"
+
+      error({ message: message})
+    end
+  end
+end

data/lib/slanger/web_socket_server.rb

@@ -4,6 +4,9 @@ require 'em-websocket'
 module Slanger
   module WebSocketServer
     def run
+      EM.epoll
+      EM.kqueue
+
       EM.run do
         options = {
           host:    Slanger::Config[:websocket_host],
@@ -21,7 +24,7 @@ module Slanger
           # Keep track of handler instance in instance of EM::Connection to ensure a unique handler instance is used per connection.
           ws.class_eval    { attr_accessor :connection_handler }
           # Delegate connection management to handler instance.
-          ws.onopen        { ws.connection_handler = Slanger::Handler.new ws }
+          ws.onopen        { ws.connection_handler = Slanger::Config.socket_handler.new ws }
           ws.onmessage     { |msg| ws.connection_handler.onmessage msg }
           ws.onclose       { ws.connection_handler.onclose }
         end

data/slanger.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'bundler/setup'
 
 require 'eventmachine'
@@ -7,6 +8,9 @@ require 'active_support/core_ext/string'
 
 module Slanger; end
 
+EM.epoll
+EM.kqueue
+
 EM.run do
   File.tap do |f|
     Dir[f.expand_path(f.join(f.dirname(__FILE__),'lib', 'slanger', '*.rb'))].each do |file|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slanger
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70260724123600 !ruby/object:Gem::Requirement
+  requirement: &70166097146020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70260724123600
+  version_requirements: *70166097146020
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70260724155460 !ruby/object:Gem::Requirement
+  requirement: &70166097145140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70260724155460
+  version_requirements: *70166097145140
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70260724154320 !ruby/object:Gem::Requirement
+  requirement: &70166097144120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70260724154320
+  version_requirements: *70166097144120
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70260724152840 !ruby/object:Gem::Requirement
+  requirement: &70166097142720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70260724152840
+  version_requirements: *70166097142720
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
-  requirement: &70260724149120 !ruby/object:Gem::Requirement
+  requirement: &70166097141600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70260724149120
+  version_requirements: *70166097141600
 - !ruby/object:Gem::Dependency
   name: signature
-  requirement: &70260724182220 !ruby/object:Gem::Requirement
+  requirement: &70166097140380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70260724182220
+  version_requirements: *70166097140380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70260724178720 !ruby/object:Gem::Requirement
+  requirement: &70166097138660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70260724178720
+  version_requirements: *70166097138660
 - !ruby/object:Gem::Dependency
   name: glamazon
-  requirement: &70260724177880 !ruby/object:Gem::Requirement
+  requirement: &70166097137500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70260724177880
+  version_requirements: *70166097137500
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70260724206740 !ruby/object:Gem::Requirement
+  requirement: &70166097136360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70260724206740
+  version_requirements: *70166097136360
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70260724205980 !ruby/object:Gem::Requirement
+  requirement: &70166097135480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70260724205980
+  version_requirements: *70166097135480
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70260724205260 !ruby/object:Gem::Requirement
+  requirement: &70166097134400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70260724205260
+  version_requirements: *70166097134400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70260724203820 !ruby/object:Gem::Requirement
+  requirement: &70166097133020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70260724203820
+  version_requirements: *70166097133020
 - !ruby/object:Gem::Dependency
   name: pusher
-  requirement: &70260724202560 !ruby/object:Gem::Requirement
+  requirement: &70166097131960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *70260724202560
+  version_requirements: *70166097131960
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70260724199480 !ruby/object:Gem::Requirement
+  requirement: &70166097131100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +164,29 @@ dependencies:
         version: 3.1.2
   type: :development
   prerelease: false
-  version_requirements: *70260724199480
+  version_requirements: *70166097131100
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70166097129660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70166097129660
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: &70166097128500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70166097128500
 description: A websocket service compatible with Pusher libraries
 email: sjtgraham@mac.com
 executables:
@@ -176,11 +198,15 @@ files:
 - lib/slanger/api_server.rb
 - lib/slanger/channel.rb
 - lib/slanger/config.rb
+- lib/slanger/connection.rb
 - lib/slanger/handler.rb
 - lib/slanger/logger.rb
 - lib/slanger/presence_channel.rb
+- lib/slanger/presence_subscription.rb
+- lib/slanger/private_subscription.rb
 - lib/slanger/redis.rb
 - lib/slanger/service.rb
+- lib/slanger/subscription.rb
 - lib/slanger/web_socket_server.rb
 - slanger.rb
 - !binary |-
@@ -210,3 +236,4 @@ signing_key:
 specification_version: 3
 summary: A websocket service compatible with Pusher libraries
 test_files: []
+has_rdoc: