faye-websocket 0.1.0 → 0.1.1

data/examples/index.html

@@ -20,10 +20,10 @@
         socket.send('Hello, world');
       };
       
-      socket.onmessage = function(event) {
+      socket.addEventListener('message', function(event) {
         logger.innerHTML += '<li>MESSAGE: ' + event.data + '</li>';
         setTimeout(function() { socket.send(++index + ' ' + event.data) }, 2000);
-      };
+      });
       
       socket.onclose = function(event) {
         logger.innerHTML += '<li>CLOSE: ' + event.code + ', ' + event.reason + '</li>';

data/lib/faye/websocket/api.rb

@@ -50,13 +50,13 @@ module Faye
         end
       end
       
-      def add_event_listener(type, listener, use_capture)
+      def add_event_listener(event_type, listener, use_capture = false)
         @listeners ||= {}
         list = @listeners[event_type] ||= []
         list << listener
       end
       
-      def remove_event_listener(type, listener, use_capture)
+      def remove_event_listener(event_type, listener, use_capture = false)
         return unless @listeners and @listeners[event_type]
         return @listeners.delete(event_type) unless listener
         
@@ -70,9 +70,9 @@ module Faye
         callback = __send__("on#{ event.type }")
         callback.call(event) if callback
         
-        return unless @listeners and @listeners[event_type]
-        @listeners[event_type].each do |listener|
-          listener.call(*args)
+        return unless @listeners and @listeners[event.type]
+        @listeners[event.type].each do |listener|
+          listener.call(event)
         end
       end
     end

data/spec/faye/websocket/client_spec.rb

@@ -51,7 +51,7 @@ WebSocketSteps = EM::RSpec.async_steps do
   end
   
   def listen_for_message(&callback)
-    @ws.onmessage = lambda { |e| @message = e.data }
+    @ws.add_event_listener('message', lambda { |e| @message = e.data })
     callback.call
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 Z
+date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152439260 !ruby/object:Gem::Requirement
+  requirement: &5563640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152439260
+  version_requirements: *5563640
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2152438100 !ruby/object:Gem::Requirement
+  requirement: &5561880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2152438100
+  version_requirements: *5561880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152437380 !ruby/object:Gem::Requirement
+  requirement: &5559960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2152437380
+  version_requirements: *5559960
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152436360 !ruby/object:Gem::Requirement
+  requirement: &5558480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152436360
+  version_requirements: *5558480
 description: 
 email: jcoglan@gmail.com
 executables: []
@@ -63,22 +63,22 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - README.rdoc
-- examples/autobahn_client.rb
 - examples/client.rb
-- examples/index.html
 - examples/server.rb
-- lib/faye/thin_extensions.rb
-- lib/faye/websocket/api.rb
-- lib/faye/websocket/client.rb
+- examples/index.html
+- examples/autobahn_client.rb
 - lib/faye/websocket/draft75_parser.rb
-- lib/faye/websocket/draft76_parser.rb
+- lib/faye/websocket/client.rb
 - lib/faye/websocket/protocol8_parser.rb
+- lib/faye/websocket/draft76_parser.rb
+- lib/faye/websocket/api.rb
 - lib/faye/websocket.rb
-- spec/faye/websocket/client_spec.rb
+- lib/faye/thin_extensions.rb
 - spec/faye/websocket/draft75_parser_spec.rb
+- spec/faye/websocket/client_spec.rb
 - spec/faye/websocket/protocol8_parser_spec.rb
-- spec/server.crt
 - spec/server.key
+- spec/server.crt
 - spec/spec_helper.rb
 homepage: http://github.com/jcoglan/faye-websocket-ruby
 licenses: []