pusher-client 0.2.1 → 0.2.2

data/examples/hello_pusher.rb

@@ -6,7 +6,7 @@ require 'pp'
 
 APP_KEY = ENV['PUSHER_KEY'] # || "YOUR_APPLICATION_KEY"
 
-PusherClient.logger = Logger.new('/dev/null')
+PusherClient.logger = Logger.new(STDOUT)
 socket = PusherClient::Socket.new(APP_KEY)
 
 # Subscribe to a channel

data/lib/pusher-client/socket.rb

@@ -1,21 +1,24 @@
 require 'json'
+require 'hmac-sha2'
+require 'digest/md5'
 
 module PusherClient
   class Socket
-    
+
     # Mimick the JavaScript client
-    CLIENT_ID = 'js' 
-    VERSION = '1.7.1'
+    CLIENT_ID = 'pusher-ruby-client'
+    VERSION = '0.2.2'
+    PROTOCOL = '5'
 
     attr_accessor :encrypted, :secure
     attr_reader :path, :connected, :channels, :global_channel, :socket_id
 
     def initialize(application_key, options={})
-
       raise ArgumentError if (!application_key.is_a?(String) || application_key.size < 1)
 
-      @path = "/app/#{application_key}?client=#{CLIENT_ID}&version=#{VERSION}"
+      @path = "/app/#{application_key}?client=#{CLIENT_ID}&version=#{VERSION}&protocol=#{PROTOCOL}"
       @key = application_key
+      @secret = options[:secret]
       @socket_id = nil
       @channels = Channels.new
       @global_channel = Channel.new('pusher_global_channel')
@@ -25,8 +28,9 @@ module PusherClient
       @encrypted = options[:encrypted] || false
 
       bind('pusher:connection_established') do |data|
+        socket = JSON.parse(data)
         @connected = true
-        @socket_id = data['socket_id']
+        @socket_id = socket['socket_id']
         subscribe_all
       end
 
@@ -35,7 +39,7 @@ module PusherClient
       end
 
       bind('pusher:error') do |data|
-        PusherClient.logger.fatal("Pusher : error : #{data.message}")
+        PusherClient.logger.fatal("Pusher : error : #{data.inspect}")
       end
     end
 
@@ -48,7 +52,8 @@ module PusherClient
       PusherClient.logger.debug("Pusher : connecting : #{url}")
 
       @connection_thread = Thread.new {
-        @connection = WebSocket.new(url)
+        options = {:ssl => @encrypted || @secure}
+        @connection = WebSocket.new(url, options)
         PusherClient.logger.debug "Websocket connected"
         loop do
           msg = @connection.receive[0]
@@ -77,13 +82,12 @@ module PusherClient
       end
     end
 
-    def subscribe(channel_name)
+    def subscribe(channel_name, user_id = nil)
+      @user_data = {:user_id => user_id}.to_json unless user_id.nil?
+
       channel = @channels << channel_name
       if @connected
-        send_event('pusher:subscribe', {
-          'channel' => channel.name
-        })
-        channel.acknowledge_subscription(nil)
+        authorize(channel, method(:authorize_callback))
       end
       return channel
     end
@@ -112,13 +116,55 @@ module PusherClient
     end
 
     def subscribe_all
-      @channels.channels.clone.each{ |k,v| 
+      @channels.channels.clone.each{ |k,v|
         subscribe(k)
       }
     end
-    
+
+    #auth for private and presence
+    def authorize(channel, callback)
+      if is_private_channel(channel.name)
+        auth_data = get_private_auth(channel)
+      elsif is_presence_channel(channel.name)
+        auth_data = get_presence_auth(channel)
+        channel_data = @user_data
+      end
+      # could both be nil if didn't require auth
+      callback.call(channel, auth_data, channel_data)
+    end
+
+    def authorize_callback(channel, auth_data, channel_data)
+      send_event('pusher:subscribe', {
+        'channel' => channel.name,
+        'auth' => auth_data,
+        'channel_data' => channel_data
+      })
+      channel.acknowledge_subscription(nil)
+    end
+
+    def is_private_channel(channel_name)
+      channel_name.match(/^private-/)
+    end
+
+    def is_presence_channel(channel_name)
+      channel_name.match(/^presence-/)
+    end
+
+    def get_private_auth(channel)
+      string_to_sign = @socket_id + ':' + channel.name
+      signature = HMAC::SHA256.hexdigest(@secret, string_to_sign)
+      return "#{@key}:#{signature}"
+    end
+
+    def get_presence_auth(channel)
+      string_to_sign = @socket_id + ':' + channel.name + ':' + @user_data
+      signature = HMAC::SHA256.hexdigest(@secret, string_to_sign)
+      return "#{@key}:#{signature}"
+    end
+
+
     # For compatibility with JavaScript client API
-    alias :subscribeAll :subscribe_all 
+    alias :subscribeAll :subscribe_all
 
     def send_event(event_name, data)
       payload = {'event' => event_name, 'data' => data}.to_json

data/lib/pusher-client/websocket.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'socket'
 require 'libwebsocket'
+require 'openssl'
 
 module PusherClient
   class WebSocket
@@ -11,6 +12,21 @@ module PusherClient
 
       @socket = TCPSocket.new(@hs.url.host, @hs.url.port || 80)
 
+      if params[:ssl] == true
+
+        ctx = OpenSSL::SSL::SSLContext.new
+        ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+        # http://curl.haxx.se/ca/cacert.pem
+        ctx.ca_file = path_to_cert()
+
+        ssl_sock = OpenSSL::SSL::SSLSocket.new(@socket, ctx)
+        ssl_sock.sync_close = true
+        ssl_sock.connect
+
+        @socket = ssl_sock
+
+      end
+
       @socket.write(@hs.to_s)
       @socket.flush
 
@@ -29,6 +45,10 @@ module PusherClient
       end
     end
 
+    def path_to_cert
+      File.join(File.dirname(File.expand_path(__FILE__)), '../../certs/cacert.pem')
+    end
+
     def send(data)
       raise "no handshake!" unless @handshaked
 

data/pusher-client.gemspec

@@ -1,17 +1,14 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{pusher-client}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Logan Koester"]
+  s.authors = ["Logan Koester", "Phil Leggetter"]
   s.date = %q{2011-01-07}
-  s.description = %q{Ruby client for consuming WebSockets from http://pusherapp.com}
-  s.email = %q{logan@logankoester.com}
+  s.description = %q{Ruby client for consuming WebSockets from http://pusher.com}
+  s.email = %q{support@pusher.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -23,7 +20,6 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
-    "VERSION",
     "examples/hello_pusher.rb",
     "examples/hello_pusher_async.rb",
     "lib/pusher-client.rb",
@@ -31,16 +27,17 @@ Gem::Specification.new do |s|
     "lib/pusher-client/channels.rb",
     "lib/pusher-client/socket.rb",
     "lib/pusher-client/websocket.rb",
+    "certs/cacert.pem",
     "pusher-client.gemspec",
     "test/pusherclient_test.rb",
     "test/test.watchr",
     "test/teststrap.rb"
   ]
-  s.homepage = %q{http://github.com/logankoester/pusher-client}
+  s.homepage = %q{http://github.com/pusher/pusher-ruby-client}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Ruby client for consuming WebSockets from http://pusherapp.com}
+  s.summary = %q{Ruby client for consuming WebSockets from http://pusher.com}
   s.test_files = [
     "examples/hello_pusher.rb",
     "examples/hello_pusher_async.rb",
@@ -48,32 +45,12 @@ Gem::Specification.new do |s|
     "test/teststrap.rb"
   ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_runtime_dependency(%q<libwebsocket>, ["0.1.5"])
+  s.add_runtime_dependency(%q<ruby-hmac>, ["~> 0.4.0"])
+  s.add_runtime_dependency(%q<addressable>, ["~> 2.3.1"])
+  s.add_development_dependency(%q<bacon>, [">= 0"])
+  s.add_development_dependency(%q<rake>, [">= 0"])
+  s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, ["~> 0.12.10"])
-      s.add_runtime_dependency(%q<libwebsocket>, ["~> 0.1.0"])
-      s.add_development_dependency(%q<bacon>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<eventmachine>, ["~> 0.12.10"])
-      s.add_dependency(%q<libwebsocket>, ["~> 0.1.0"])
-      s.add_dependency(%q<bacon>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<eventmachine>, ["~> 0.12.10"])
-    s.add_dependency(%q<libwebsocket>, ["~> 0.1.0"])
-    s.add_dependency(%q<bacon>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
 end
 

data/test/teststrap.rb

@@ -32,7 +32,7 @@ module PusherClient
     def connect(async = false)
       @connection_thread = Thread.new do
         @connection = TestConnection.new
-        @global_channel.dispatch('pusher:connection_established', {'socket_id' => '123abc'})
+        @global_channel.dispatch('pusher:connection_established', JSON.dump({'socket_id' => '123abc'}))
       end
       @connection_thread.run
       @connection_thread.join unless async

metadata

@@ -1,125 +1,127 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pusher-client
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.2.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Logan Koester
+- Phil Leggetter
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-07 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-01-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: libwebsocket
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 10
-        version: 0.12.10
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: libwebsocket
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: ruby-hmac
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bacon
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+  type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-description: Ruby client for consuming WebSockets from http://pusherapp.com
-email: logan@logankoester.com
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Ruby client for consuming WebSockets from http://pusher.com
+email: support@pusher.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - examples/hello_pusher.rb
 - examples/hello_pusher_async.rb
 - lib/pusher-client.rb
@@ -127,44 +129,37 @@ files:
 - lib/pusher-client/channels.rb
 - lib/pusher-client/socket.rb
 - lib/pusher-client/websocket.rb
+- certs/cacert.pem
 - pusher-client.gemspec
 - test/pusherclient_test.rb
 - test/test.watchr
 - test/teststrap.rb
-has_rdoc: true
-homepage: http://github.com/logankoester/pusher-client
-licenses: 
+homepage: http://github.com/pusher/pusher-ruby-client
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3350793472905548965
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Ruby client for consuming WebSockets from http://pusherapp.com
-test_files: 
+summary: Ruby client for consuming WebSockets from http://pusher.com
+test_files:
 - examples/hello_pusher.rb
 - examples/hello_pusher_async.rb
 - test/pusherclient_test.rb