em-websocket 0.0.2 → 0.0.4

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gemspec.homepage = "http://github.com/igrigorik/em-websocket"
     gemspec.authors = ["Ilya Grigorik"]
     gemspec.add_dependency("eventmachine", ">= 0.12.9")
+    gemspec.add_dependency("addressable")
     gemspec.rubyforge_project = "em-websocket"
   end
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/examples/test.html

@@ -11,6 +11,7 @@
         ws.onopen = function() {
           debug("connected...");
           ws.send("hello server");
+          ws.send("hello again");
         };
       });
     </script>

data/lib/em-websocket/connection.rb

@@ -1,5 +1,5 @@
 require 'addressable/uri'
-require 'uri'
+
 module EventMachine
   module WebSocket
     class Connection < EventMachine::Connection
@@ -7,9 +7,11 @@ module EventMachine
       PATH   = /^GET (\/[^\s]*) HTTP\/1\.1$/
       HEADER = /^([^:]+):\s*([^$]+)/
 
+      attr_reader :state
+
       # define WebSocket callbacks
       def onopen(&blk);     @onopen = blk;    end
-      def onclose(&blk);    @onclode = blk;   end
+      def onclose(&blk);    @onclose = blk;   end
       def onmessage(&blk);  @onmessage = blk; end
 
       def initialize(options)
@@ -31,6 +33,8 @@ module EventMachine
 
       def unbind
         debug [:unbind, :connection]
+        
+        @state = :closed
         @onclose.call if @onclose
       end
 
@@ -107,10 +111,16 @@ module EventMachine
       end
 
       def process_message
+        return if not @onmessage
         debug [:message, @data]
-        @onmessage.call(@data) if @onmessage
-        @data = ''
 
+        # slice the message out of the buffer and pass in
+        # for processing, and buffer data otherwise
+        while msg = @data.slice!(/\000([^\377]*)\377/)
+          msg.gsub!(/^\x00|\xff$/, '')
+          @onmessage.call(msg)
+        end
+       
         false
       end
 

data/spec/websocket_spec.rb

@@ -26,8 +26,6 @@ describe EventMachine::WebSocket do
           puts "WebSocket connection open"
           ws.send MSG
         }
-
-        # TODO: need .terminate method on EM-http to invoke & test .onclose callback
       end
     end
   end
@@ -47,4 +45,55 @@ describe EventMachine::WebSocket do
     end
   end
 
+  it "should split multiple messages into separate callbacks" do
+    EM.run do
+      messages = %w[1 2]
+      recieved = []
+
+      EventMachine.add_timer(0.1) do
+        http = EventMachine::HttpRequest.new('ws://127.0.0.1:8080/').get :timeout => 0
+        http.errback { failed }
+        http.stream {|msg|}
+        http.callback {
+          http.response_header.status.should == 101
+          http.send messages[0]
+          http.send messages[1]
+        }
+      end
+
+      EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8080) do |ws|
+        ws.onopen {}
+        ws.onclose {}
+        ws.onmessage {|msg|
+          msg.should == messages[recieved.size]
+          recieved.push msg
+
+          EventMachine.stop if recieved.size == messages.size
+        }
+      end
+    end
+  end
+
+  it "should call onclose callback when client closes connection" do
+    EM.run do
+      EventMachine.add_timer(0.1) do
+        http = EventMachine::HttpRequest.new('ws://127.0.0.1:8080/').get :timeout => 0
+        http.errback { failed }
+        http.callback {
+          http.response_header.status.should == 101
+          http.close_connection
+        }
+        http.stream{|msg|}
+      end
+
+      EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8080) do |ws|
+        ws.onopen {}
+        ws.onclose {
+          ws.state.should == :closed
+          EventMachine.stop
+        }
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: em-websocket
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 -05:00
+date: 2009-12-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.12.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: EventMachine based WebSocket server
 email: ilya@igvita.com
 executables: []