Merge pull request #1 from DanKnox/em-websocket-compatibility

Ensure ruby uses top-level WebSocket constant in client.rb. Provides em-websocket compatibility.
imanel · Dec 26, 2012 · 5bd9d86 · 5bd9d86
2 parents 47262a5 + 60ebcba
commit 5bd9d86
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/websocket/eventmachine/client.rb b/lib/websocket/eventmachine/client.rb
@@ -53,7 +53,7 @@ def initialize(args)
       # @private
       def post_init
         @state = :connecting
-        @handshake = WebSocket::Handshake::Client.new(@args)
+        @handshake = ::WebSocket::Handshake::Client.new(@args)
       end
 
       # Called by EventMachine after connecting.
@@ -67,11 +67,11 @@ def connection_completed
       private
 
       def incoming_frame
-        WebSocket::Frame::Incoming::Client
+        ::WebSocket::Frame::Incoming::Client
       end
 
       def outgoing_frame
-        WebSocket::Frame::Outgoing::Client
+        ::WebSocket::Frame::Outgoing::Client
       end
 
       public