pusher-client 0.1.1 → 0.2.0

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem "eventmachine", "~>0.12.10"
-gem "em-http-request", "~>0.2.15"
+gem "libwebsocket"
 
 group :development do
   gem "bacon", ">= 0"

data/Gemfile.lock

@@ -1,27 +1,27 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.2)
     bacon (1.1.0)
-    em-http-request (0.2.15)
-      addressable (>= 2.0.0)
-      eventmachine (>= 0.12.9)
     eventmachine (0.12.10)
+    eventmachine (0.12.10-java)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    libwebsocket (0.1.0)
     rake (0.8.7)
     rcov (0.9.9)
+    rcov (0.9.9-java)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   bacon
   bundler (~> 1.0.0)
-  em-http-request (~> 0.2.15)
   eventmachine (~> 0.12.10)
   jeweler (~> 1.5.2)
+  libwebsocket
   rcov

data/README.rdoc

@@ -2,7 +2,9 @@
 
 pusher-client is a ruby gem for consuming WebSockets from the Pusher webservice[http://pusherapp.com]
 
-It is driven by event-machine and maintains a connection to Pusher, optionally in its own thread.
+The connection to Pusher can optionally be maintained in its own thread (see Asynchronous Usage)
+
+This gem no longer depends on em-http, and is compatible with jruby as of 0.2.
 
 == Installation
   gem install pusher-client

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/examples/hello_pusher.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'pusher-client'
+require './lib/pusher-client.rb'
 require 'pp'
 
 YOUR_APPLICATION_KEY = ''

data/examples/hello_pusher_async.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
-require 'pusher-client'
+require './lib/pusher-client.rb'
 require 'pp'
 
-YOUR_APPLICATION_KEY = ''
+YOUR_APPLICATION_KEY = '73c70db2f09b7f279382'
 
 PusherClient.logger = Logger.new('/dev/null')
 socket = PusherClient::Socket.new(YOUR_APPLICATION_KEY)

data/lib/pusher-client.rb

@@ -18,6 +18,7 @@ end
 
 Thread.abort_on_exception = true
 
+require File.dirname(__FILE__) + '/pusher-client/websocket.rb'
 require File.dirname(__FILE__) + '/pusher-client/socket.rb'
 require File.dirname(__FILE__) + '/pusher-client/channel.rb'
 require File.dirname(__FILE__) + '/pusher-client/channels.rb'

data/lib/pusher-client/socket.rb

@@ -1,6 +1,4 @@
 require 'json'
-require 'eventmachine'
-require 'em-http'
 
 module PusherClient
   class Socket
@@ -40,54 +38,36 @@ module PusherClient
     end
 
     def connect(async = false)
-      @connection_thread = Thread.new do
-        EventMachine.run {
-          if @encrypted || @secure
-            url = "wss://#{HOST}:#{WSS_PORT}#{@path}"
-          else
-            url = "ws://#{HOST}:#{WS_PORT}#{@path}"
-          end
-          PusherClient.logger.debug("Pusher : connecting : #{url}")
-
-          @connection = EventMachine::HttpRequest.new(url).get :timeout => 0
-
-          @connection.callback {
-            PusherClient.logger.debug "Websocket connected"
-          }
-
-          @connection.stream { |msg|
-            PusherClient.logger.debug "Received: #{msg}"
-            params  = parser(msg)
-            return if (params['socket_id'] && params['socket_id'] == this.socket_id)
-
-            event_name   = params['event']
-            event_data   = params['data']
-            channel_name = params['channel']
-
-            send_local_event(event_name, event_data, channel_name)
-          }
-
-          @connection.errback {
-            PusherClient.logger.fatal "Pusher : eventmachine error"
-          }
-
-          @connection.disconnect {
-            PusherClient.logger.debug "Pusher : dropped connection"
-          }
-        }
-      end
-      @connection_thread.run
-      if async
-        sleep(1)
+      if @encrypted || @secure
+        url = "wss://#{HOST}:#{WSS_PORT}#{@path}"
       else
-        @connection_thread.join
+        url = "ws://#{HOST}:#{WS_PORT}#{@path}"
       end
+      PusherClient.logger.debug("Pusher : connecting : #{url}")
+
+      @connection_thread = Thread.new {
+        @connection = WebSocket.new(url)
+        PusherClient.logger.debug "Websocket connected"
+        loop do
+          msg = @connection.receive[0]
+          params  = parser(msg)
+          next if (params['socket_id'] && params['socket_id'] == self.socket_id)
+          event_name   = params['event']
+          event_data   = params['data']
+          channel_name = params['channel']
+          send_local_event(event_name, event_data, channel_name)
+        end
+      }
+
+      @connection_thread.run
+      @connection_thread.join unless async
       return self
     end
 
     def disconnect
       if @connected
         PusherClient.logger.debug "Pusher : disconnecting"
+        @connection.close
         @connection_thread.kill if @connection_thread
         @connected = false
       else

data/lib/pusher-client/websocket.rb

@@ -0,0 +1,64 @@
+require 'rubygems'
+require 'socket'
+require 'libwebsocket'
+
+module PusherClient
+  class WebSocket
+
+    def initialize(url, params = {})
+      @hs ||= LibWebSocket::OpeningHandshake::Client.new(:url => url, :version => params[:version])
+      @frame ||= LibWebSocket::Frame.new
+
+      @socket = TCPSocket.new(@hs.url.host, @hs.url.port || 80)
+
+      @socket.write(@hs.to_s)
+      @socket.flush
+
+      loop do
+        data = @socket.getc
+        next if data.nil?
+
+        result = @hs.parse(data.chr)
+
+        raise @hs.error unless result
+
+        if @hs.done?
+          @handshaked = true
+          break
+        end
+      end
+    end
+
+    def send(data)
+      raise "no handshake!" unless @handshaked
+
+      data = @frame.new(data).to_s
+      @socket.write data
+      @socket.flush
+    end
+
+    def receive
+      raise "no handshake!" unless @handshaked
+
+      data = @socket.gets("\xff")
+      @frame.append(data)
+
+      messages = []
+      while message = @frame.next
+        messages << message
+      end
+      messages
+    end
+
+    def socket
+      @socket
+    end
+
+    def close
+      @socket.close
+    end
+
+  end
+end
+
+

data/test/teststrap.rb

@@ -36,7 +36,6 @@ module PusherClient
       end
       @connection_thread.run
       @connection_thread.join unless async
-      sleep(1)
       return self
     end
 
@@ -49,6 +48,9 @@ module PusherClient
     def send(payload)
       PusherClient.logger.test("SEND: #{payload}")
     end
+
+    def close
+    end
   end
 
   PusherClient.logger = TestLogger.new('test.log')

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Logan Koester
@@ -33,17 +33,15 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: em-http-request
+  name: libwebsocket
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 15
-        version: 0.2.15
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -113,7 +111,6 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files: 
-- .bundle/config
 - .document
 - Gemfile
 - Gemfile.lock
@@ -127,7 +124,7 @@ files:
 - lib/pusher-client/channel.rb
 - lib/pusher-client/channels.rb
 - lib/pusher-client/socket.rb
-- pkg/pusher-client-0.1.0.gem
+- lib/pusher-client/websocket.rb
 - pkg/pusher-client-0.1.1.gem
 - pusher-client.gemspec
 - test/pusherclient_test.rb
@@ -147,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4529769101084018713
+      hash: -2316521902587729957
       segments: 
       - 0
       version: "0"

data/.bundle/config

@@ -1,2 +0,0 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"