websocket-driver 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826108e30bdbc4629bcd1ef1c6b8029f9e4fed1b
-  data.tar.gz: e117f305de4f1e50f7046e32605538cbbec763c7
+  metadata.gz: 9d47eccadd38dcb177ff49770edfe5a8bda26b87
+  data.tar.gz: d4efbfa12364856066684508a2b90abce548b072
 SHA512:
-  metadata.gz: b0d72d49469e28e6245e3df38a4769b834fb83bc5b5185ee51a32b15178dcd4b247810a0c507b190eb6e0e6411e20a9a3ccd48c0b29ead666c83b3307160bfb4
-  data.tar.gz: 15dd9190ce6ba1d40961820951c4056f60602ddac2d7d5d1c97923584a416b49a0b62d968eed95cf5eb8de7715170f999d18afb93c0fa92fd749e0c210ee16f0
+  metadata.gz: 220496d4df457463df4d0ccc30d15b8d36ffd9538dfabd01cae84f34155301eae00024afb61cd5ec54cce4f184b599661b449e5a511df8c64f28682234f6f49f
+  data.tar.gz: 5bb3d0fa0fd67ce5fa0c737def048fa880b96a220205ee140c22e3d6d9256612a55d18b1fad4de56973cef5196d2c50df30b5d238967d80db33dcd177abc1fd8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.3.3 / 2014-04-24
+
+* Fix problems with loading C and Java native extension code
+* Correct the acceptable characters used in the HTTP parser
+* Correct the draft-76 status line reason phrase
+
 ### 0.3.2 / 2013-12-29
 
 * Expand `max_length` to cover sequences of continuation frames and `draft-{75,76}`

data/README.md

@@ -308,7 +308,7 @@ after `emit('open')` has fired.
 
 (The MIT License)
 
-Copyright (c) 2010-2013 James Coglan
+Copyright (c) 2010-2014 James Coglan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the 'Software'), to deal in

data/lib/websocket/driver.rb

@@ -17,7 +17,7 @@ module WebSocket
   class Driver
 
     root = File.expand_path('../driver', __FILE__)
-    require root + '/../../websocket_mask'
+    require 'websocket_mask'
 
     if RUBY_PLATFORM =~ /java/
       require 'jruby'

data/lib/websocket/driver/draft76.rb

@@ -32,7 +32,7 @@ module WebSocket
     private
 
       def handshake_response
-        upgrade =  "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
+        upgrade =  "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
         upgrade << "Upgrade: WebSocket\r\n"
         upgrade << "Connection: Upgrade\r\n"
         upgrade << "Sec-WebSocket-Origin: #{@socket.env['HTTP_ORIGIN']}\r\n"
@@ -86,7 +86,7 @@ module WebSocket
 
       def big_endian(number)
         string = ''
-        [24,16,8,0].each do |offset|
+        [24, 16, 8, 0].each do |offset|
           string << (number >> offset & 0xFF).chr
         end
         string

data/lib/websocket/http/headers.rb

@@ -6,7 +6,7 @@ module WebSocket
       CR = 0x0D
       LF = 0x0A
 
-      HEADER_LINE = /^([!#\$%&'\*\+\-\.\^_`\|~0-9a-z]+):\s*((?:\t|[\x20-\x7e])*?)\s*$/i
+      HEADER_LINE = /^([!#\$%&'\*\+\-\.\\\^_`\|~0-9a-z]+):\s*([\x20-\x7e]*?)\s*$/i
 
       attr_reader :headers
 

data/lib/websocket/http/request.rb

@@ -4,7 +4,7 @@ module WebSocket
     class Request
       include Headers
 
-      REQUEST_LINE     = /^([A-Z]+) +([\x21-\x7e]+) +(HTTP\/[0-9]\.[0-9])$/
+      REQUEST_LINE     = /^(OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT) ([\x21-\x7e]+) (HTTP\/[0-9]+\.[0-9]+)$/
       REQUEST_TARGET   = /^(.*?)(\?(.*))?$/
       RESERVED_HEADERS = %w[content-length content-type]
 

data/lib/websocket/http/response.rb

@@ -4,7 +4,7 @@ module WebSocket
     class Response
       include Headers
 
-      STATUS_LINE = /^(HTTP\/[0-9]\.[0-9]) +([0-9]{3}) +(.*)$/
+      STATUS_LINE = /^(HTTP\/[0-9]+\.[0-9]+) ([0-9]{3}) ([\x20-\x7e]+)$/
 
       attr_reader :code
 

data/lib/websocket/websocket_mask.rb

@@ -0,0 +1,2 @@
+# Load C native extension
+require "websocket-driver/websocket_mask"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -56,16 +56,16 @@ description:
 email: jcoglan@gmail.com
 executables: []
 extensions:
-- ext/websocket_mask/extconf.rb
+- ext/websocket-driver/extconf.rb
 extra_rdoc_files:
 - README.md
 files:
 - CHANGELOG.md
 - README.md
 - examples/tcp_server.rb
-- ext/websocket_mask/WebsocketMaskService.java
-- ext/websocket_mask/extconf.rb
-- ext/websocket_mask/websocket_mask.c
+- ext/websocket-driver/WebsocketMaskService.java
+- ext/websocket-driver/extconf.rb
+- ext/websocket-driver/websocket_mask.c
 - lib/websocket/driver.rb
 - lib/websocket/driver/client.rb
 - lib/websocket/driver/draft75.rb
@@ -80,6 +80,7 @@ files:
 - lib/websocket/http/headers.rb
 - lib/websocket/http/request.rb
 - lib/websocket/http/response.rb
+- lib/websocket/websocket_mask.rb
 homepage: http://github.com/faye/websocket-driver-ruby
 licenses:
 - MIT