faye-websocket 0.4.1 → 0.4.2

data/CHANGELOG.txt

@@ -1,3 +1,8 @@
+=== 0.4.2 / 2012-03-09
+
+* Port masking-function C extension to Java for JRuby
+
+
 === 0.4.1 / 2012-02-26
 
 * Treat anything other than an Array as a string when calling send()

data/ext/faye_websocket_mask/FayeWebsocketMaskService.java

@@ -0,0 +1,61 @@
+package com.jcoglan.faye;
+
+import java.lang.Long;
+import java.io.IOException;
+
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyFixnum;
+import org.jruby.RubyModule;
+import org.jruby.RubyObject;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.load.BasicLibraryService;
+
+public class FayeWebsocketMaskService implements BasicLibraryService {
+  private Ruby runtime;
+  
+  public boolean basicLoad(Ruby runtime) throws IOException {
+    this.runtime = runtime;
+    RubyModule faye = runtime.defineModule("Faye");
+    
+    RubyClass webSocketMask = faye.defineClassUnder("WebSocketMask", runtime.getObject(), new ObjectAllocator() {
+      public IRubyObject allocate(Ruby runtime, RubyClass rubyClass) {
+        return new WebsocketMask(runtime, rubyClass);
+      }
+    });
+    
+    webSocketMask.defineAnnotatedMethods(WebsocketMask.class);
+    return true;
+  }
+  
+  public class WebsocketMask extends RubyObject {
+    public WebsocketMask(final Ruby runtime, RubyClass rubyClass) {
+      super(runtime, rubyClass);
+    }
+    
+    @JRubyMethod
+    public IRubyObject mask(ThreadContext context, IRubyObject payload, IRubyObject mask) {
+      int n = ((RubyArray)payload).getLength(), i;
+      long p, m;
+      RubyArray unmasked = RubyArray.newArray(runtime, n);
+      
+      long[] maskArray = {
+        (Long)((RubyArray)mask).get(0),
+        (Long)((RubyArray)mask).get(1),
+        (Long)((RubyArray)mask).get(2),
+        (Long)((RubyArray)mask).get(3)
+      };
+      
+      for (i = 0; i < n; i++) {
+        p = (Long)((RubyArray)payload).get(i);
+        m = maskArray[i % 4];
+        unmasked.set(i, p ^ m);
+      }
+      return unmasked;
+    }
+  }
+}

data/ext/faye_websocket_mask/faye_websocket_mask.c

@@ -1,7 +1,6 @@
 #include <ruby.h>
 
 VALUE Faye = Qnil;
-VALUE FayeWebSocket = Qnil;
 VALUE FayeWebSocketMask = Qnil;
 
 void Init_faye_websocket_mask();
@@ -9,8 +8,7 @@ VALUE method_faye_websocket_mask(VALUE self, VALUE payload, VALUE mask);
 
 void Init_faye_websocket_mask() {
   Faye = rb_define_module("Faye");
-  FayeWebSocket = rb_define_class_under(Faye, "WebSocket", rb_cObject);
-  FayeWebSocketMask = rb_define_module_under(FayeWebSocket, "Mask");
+  FayeWebSocketMask = rb_define_module_under(Faye, "WebSocketMask");
   rb_define_singleton_method(FayeWebSocketMask, "mask", method_faye_websocket_mask, 2);
 }
 

data/lib/faye/eventsource.rb

@@ -116,7 +116,7 @@ module Faye
     
     def write(data)
       return unless @stream_send
-      @stream_send.call(data)
+      @stream_send.call(data) rescue nil
     end
   end
 end

data/lib/faye/websocket.rb

@@ -23,6 +23,26 @@ module Faye
     root = File.expand_path('../websocket', __FILE__)
     require root + '/../../faye_websocket_mask'
     
+    def self.jruby?
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+    end
+    
+    def self.rbx?
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+    end
+    
+    if jruby?
+      require 'jruby'
+      com.jcoglan.faye.FayeWebsocketMaskService.new.basicLoad(JRuby.runtime)
+    end
+    
+    unless WebSocketMask.respond_to?(:mask)
+      def WebSocketMask.mask(payload, mask)
+        @instance ||= new
+        @instance.mask(payload, mask)
+      end
+    end
+    
     unless String.instance_methods.include?(:force_encoding)
       require root + '/utf8_match'
     end
@@ -183,7 +203,7 @@ module Faye
     
     def write(data)
       return unless @stream_send
-      @stream_send.call(data)
+      @stream_send.call(data) rescue nil
     end
   end
 end

data/lib/faye/websocket/client.rb

@@ -75,7 +75,7 @@ module Faye
         end
         
         def write(data)
-          send_data(data)
+          send_data(data) rescue nil
         end
       end
     end

data/lib/faye/websocket/hybi_parser.rb

@@ -170,7 +170,7 @@ module Faye
         if @masking
           mask = [rand(256), rand(256), rand(256), rand(256)]
           frame[header...offset] = mask
-          buffer = Mask.mask(buffer, mask)
+          buffer = WebSocketMask.mask(buffer, mask)
         end
 
         frame.concat(buffer)
@@ -235,7 +235,7 @@ module Faye
       end
 
       def emit_frame
-        payload = @masked ? Mask.mask(@payload, @mask) : @payload
+        payload = @masked ? WebSocketMask.mask(@payload, @mask) : @payload
 
         case @opcode
           when OPCODES[:continuation] then

data/spec/faye/websocket/client_spec.rb

@@ -77,6 +77,7 @@ WebSocketSteps = EM::RSpec.async_steps do
 end
 
 describe Faye::WebSocket::Client do
+  next if Faye::WebSocket.jruby?
   include WebSocketSteps
   
   let(:protocols)      { ["foo", "echo"]       }
@@ -152,6 +153,8 @@ describe Faye::WebSocket::Client do
   end
   
   describe "with a plain-text Rainbows server" do
+    next if Faye::WebSocket.rbx?
+    
     let(:socket_url)  { plain_text_url }
     let(:blocked_url) { secure_url }
     
@@ -162,6 +165,8 @@ describe Faye::WebSocket::Client do
   end
   
   describe "with a secure Thin server" do
+    next if Faye::WebSocket.rbx?
+    
     let(:socket_url)  { secure_url }
     let(:blocked_url) { plain_text_url }
     

data/spec/spec_helper.rb

@@ -1,14 +1,17 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'thin'
-require 'rainbows'
+
+unless RUBY_PLATFORM =~ /java/
+  require 'thin'
+  Thin::Logging.silent = true
+  require 'rainbows'
+  Unicorn::Configurator::DEFAULTS[:logger] = Logger.new(StringIO.new)
+end
+
 require File.expand_path('../../lib/faye/websocket', __FILE__)
 require File.expand_path('../../vendor/em-rspec/lib/em-rspec', __FILE__)
 require File.expand_path('../faye/websocket/draft75_parser_examples', __FILE__)
 
-Thin::Logging.silent = true
-Unicorn::Configurator::DEFAULTS[:logger] = Logger.new(StringIO.new)
-
 module EncodingHelper
   def encode(message)
     message.respond_to?(:force_encoding) ?
@@ -31,7 +34,7 @@ class EchoServer
     socket.onmessage = lambda do |event|
       socket.send(event.data)
     end
-    [-1, {}, []]
+    socket.rack_response
   end
   
   def listen(port, backend, ssl = false)

metadata

@@ -1,152 +1,137 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: faye-websocket
-version: !ruby/object:Gem::Version
-  version: 0.4.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.4.2
 platform: ruby
-authors:
-- James Coglan
+authors: 
+  - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &20554820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *20554820
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &18050960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *18050960
-- !ruby/object:Gem::Dependency
-  name: rainbows
-  requirement: &18049600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *18049600
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &18047720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: *18047720
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: &18046420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *18046420
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &18045300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: *18045300
+
+date: 2012-03-09 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: eventmachine
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.12.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rack
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rake-compiler
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 2.8.0
+    type: :development
+    version_requirements: *id004
 description: 
 email: jcoglan@gmail.com
 executables: []
-extensions:
-- ext/faye_websocket_mask/extconf.rb
-extra_rdoc_files:
-- README.rdoc
-files:
-- README.rdoc
-- CHANGELOG.txt
-- ext/faye_websocket_mask/faye_websocket_mask.c
-- ext/faye_websocket_mask/extconf.rb
-- lib/faye/websocket/draft75_parser.rb
-- lib/faye/websocket/client.rb
-- lib/faye/websocket/hybi_parser.rb
-- lib/faye/websocket/draft76_parser.rb
-- lib/faye/websocket/utf8_match.rb
-- lib/faye/websocket/api.rb
-- lib/faye/websocket/hybi_parser/handshake.rb
-- lib/faye/websocket/hybi_parser/stream_reader.rb
-- lib/faye/websocket/api/event_target.rb
-- lib/faye/websocket/api/event.rb
-- lib/faye/websocket/adapter.rb
-- lib/faye/websocket.rb
-- lib/faye/eventsource.rb
-- lib/faye/adapters/thin.rb
-- lib/faye/adapters/rainbows.rb
-- lib/faye/adapters/goliath.rb
-- lib/faye/adapters/rainbows_client.rb
-- examples/app.rb
-- examples/client.rb
-- examples/haproxy.conf
-- examples/sse.html
-- examples/config.ru
-- examples/server.rb
-- examples/ws.html
-- examples/autobahn_client.rb
-- spec/faye/websocket/draft75_parser_spec.rb
-- spec/faye/websocket/client_spec.rb
-- spec/faye/websocket/draft75_parser_examples.rb
-- spec/faye/websocket/draft76_parser_spec.rb
-- spec/faye/websocket/hybi_parser_spec.rb
-- spec/server.key
-- spec/server.crt
-- spec/rainbows.conf
-- spec/spec_helper.rb
+
+extensions: 
+  - ext/faye_websocket_mask/extconf.rb
+extra_rdoc_files: 
+  - README.rdoc
+files: 
+  - README.rdoc
+  - CHANGELOG.txt
+  - ext/faye_websocket_mask/faye_websocket_mask.c
+  - ext/faye_websocket_mask/FayeWebsocketMaskService.java
+  - ext/faye_websocket_mask/extconf.rb
+  - lib/faye/eventsource.rb
+  - lib/faye/websocket.rb
+  - lib/faye/adapters/goliath.rb
+  - lib/faye/adapters/rainbows.rb
+  - lib/faye/adapters/rainbows_client.rb
+  - lib/faye/adapters/thin.rb
+  - lib/faye/websocket/adapter.rb
+  - lib/faye/websocket/api.rb
+  - lib/faye/websocket/client.rb
+  - lib/faye/websocket/draft75_parser.rb
+  - lib/faye/websocket/draft76_parser.rb
+  - lib/faye/websocket/hybi_parser.rb
+  - lib/faye/websocket/utf8_match.rb
+  - lib/faye/websocket/api/event.rb
+  - lib/faye/websocket/api/event_target.rb
+  - lib/faye/websocket/hybi_parser/handshake.rb
+  - lib/faye/websocket/hybi_parser/stream_reader.rb
+  - lib/faye_websocket_mask.jar
+  - examples/app.rb
+  - examples/autobahn_client.rb
+  - examples/client.rb
+  - examples/config.ru
+  - examples/haproxy.conf
+  - examples/server.rb
+  - examples/sse.html
+  - examples/ws.html
+  - spec/rainbows.conf
+  - spec/server.crt
+  - spec/server.key
+  - spec/spec_helper.rb
+  - spec/faye/websocket/client_spec.rb
+  - spec/faye/websocket/draft75_parser_examples.rb
+  - spec/faye/websocket/draft75_parser_spec.rb
+  - spec/faye/websocket/draft76_parser_spec.rb
+  - spec/faye/websocket/hybi_parser_spec.rb
 homepage: http://github.com/faye/faye-websocket-ruby
 licenses: []
+
 post_install_message: 
-rdoc_options:
-- --main
-- README.rdoc
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+rdoc_options: 
+  - --main
+  - README.rdoc
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      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
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Standards-compliant WebSocket server and client
 test_files: []
+