websocket_parser 0.0.2 → 0.0.3

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.rbx
 Gemfile.lock
 InstalledFiles
 _yardoc

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode
+script: bundle exec rspec spec

data/README.md

@@ -1,4 +1,5 @@
 # WebSocketParser
+[![Build Status](https://secure.travis-ci.org/afcapel/websocket_parser.png)](http://travis-ci.org/afcapel/websocket_parser)
 
 WebsocketParser is a RFC6455 compliant parser for websocket messages written in Ruby. It
 is intended to write websockets servers in Ruby, but it only handles the parsing of the

data/lib/websocket/client_handshake.rb

@@ -1,31 +1,44 @@
 require 'digest/sha1'
+require 'base64'
 
 module WebSocket
   class ClientHandshake < Http::Request
 
     def self.accept_token_for(websocket_key)
-      Digest::SHA1.base64digest(websocket_key.strip + GUID)
+      Base64.encode64(Digest::SHA1.digest(websocket_key.strip + GUID)).strip
     end
 
-    def initialize(method, uri, headers = {}, proxy = {}, body = nil, version = "1.1")
-      @method = method.to_s.downcase.to_sym
-      @uri = uri.is_a?(URI) ? uri : URI(uri.to_s)
-
-      @headers = headers
-      @proxy, @body, @version = proxy, body, version
+    def errors
+      @errors ||= []
     end
 
     def valid?
-      headers['Connection'] == 'Upgrade'   &&
-      headers['Upgrade']    == 'websocket' &&
-      headers['Sec-WebSocket-Version'].to_i == PROTOCOL_VERSION
+      if headers['Connection'].downcase != 'upgrade'
+        errors << 'Not connection upgrade'
+        return false
+      end
+
+      if headers['Upgrade'].downcase != 'websocket'
+        errors << 'Connection upgrade is not for websocket'
+        return false
+      end
+
+      # Careful: Http gem changes header capitalization,
+      # so Sec-WebSocket-Version becomes Sec-Websocket-Version
+      if headers['Sec-Websocket-Version'].to_i != PROTOCOL_VERSION
+        errors << "Protocol version not supported '#{headers['Sec-Websocket-Version']}'"
+        return false
+      end
+
+      return true
     end
 
     def accept_response
+      websocket_key = headers['Sec-Websocket-Key']
       response_headers = {
         'Upgrade'    => 'websocket',
         'Connection' => 'Upgrade',
-        'Sec-WebSocket-Accept' => ClientHandshake.accept_token_for(headers['Sec-WebSocket-Key'])
+        'Sec-WebSocket-Accept' => ClientHandshake.accept_token_for(websocket_key)
       }
 
       ServerHandshake.new(101, '1.1', response_headers)

data/lib/websocket/message.rb

@@ -44,16 +44,6 @@ module WebSocket
       @payload = WebSocket.mask(@payload, @mask_key)
     end
 
-    def message_size
-      if payload_length < 126
-        :small
-      elsif payload_length < 65_536 # fits in 2 bytes
-        :medium
-      else
-        :large
-      end
-    end
-
     def payload_length
       @payload ? @payload.length : 0
     end
@@ -62,10 +52,6 @@ module WebSocket
       second_byte & 0b10000000 != 0
     end
 
-    def extended_payload_length
-      message_size == :small ? nil : payload_length
-    end
-
     def to_data
       to_a.pack(pack_format)
     end
@@ -92,6 +78,20 @@ module WebSocket
       WebSocket.frame_format(payload_length, masked?)
     end
 
+    def message_size
+      if payload_length < 126
+        :small
+      elsif payload_length < 65_536 # fits in 2 bytes
+        :medium
+      else
+        :large
+      end
+    end
+
+    def extended_payload_length
+      message_size == :small ? nil : payload_length
+    end
+
     def first_byte
       @first_byte ||= if type == :continuation
         OPCODE_VALUES[type]

data/lib/websocket/parser.rb

@@ -27,27 +27,6 @@ module WebSocket
   class Parser
     def initialize
       @data =  ''.force_encoding("ASCII-8BIT")
-
-      @on_message = Proc.new do |msg|
-        puts "Received message: #{msg}"
-      end
-
-      @on_error = Proc.new do |error|
-        puts "WebSocket error: #{error}"
-      end
-
-      @on_close = Proc.new do |status, message|
-        puts "Should close connection. Status: #{status} Message: #{message}"
-      end
-
-      @on_ping = Proc.new do
-        puts "Ping received"
-      end
-
-      @on_pong = Proc.new do
-        puts "Pong received"
-      end
-
       @state = :header
     end
 
@@ -84,6 +63,8 @@ module WebSocket
 
     alias_method :<<, :receive
 
+    private
+
     def read_header
       return unless @data.length >= 2 # Not enough data
 
@@ -157,18 +138,18 @@ module WebSocket
     def process_message
       case opcode
       when :text
-        @on_message.call(@current_message.force_encoding("UTF-8"))
+        @on_message.call(@current_message.force_encoding("UTF-8")) if @on_message
       when :binary
-        @on_message.call(@current_message)
+        @on_message.call(@current_message) if @on_message
+      when :ping
+        @on_ping.call if @on_ping
+      when :pong
+        @on_pong.call if @on_ping
       when :close
         status_code, message = @current_message.unpack('S<a*')
         status = STATUS_CODES[status_code]
 
-        @on_close.call(status, message)
-      when :ping
-        @on_ping.call
-      when :pong
-        @on_pong.call
+        @on_close.call(status, message) if @on_close
       end
 
       @current_message = nil

data/lib/websocket/server_handshake.rb

@@ -1,5 +1,6 @@
 module WebSocket
   class ServerHandshake < Http::Response
+    CRLF = "\r\n"
 
     def initialize(status = 101, version = "1.1", headers = {}, body = nil, &body_proc)
       @status, @version, @body, @body_proc = status, version, body, body_proc
@@ -7,17 +8,20 @@ module WebSocket
     end
 
     def render(out)
-      response_header = "#{@version} #{@status} #{@reason}#{CRLF}"
+      out << to_data
+    end
+
+    def to_data
+      data = "#{@version} #{@status} #{@reason}#{CRLF}"
 
       unless @headers.empty?
-        response_header << @headers.map do |header, value|
+        data << @headers.map do |header, value|
           "#{header}: #{value}"
         end.join(CRLF) << CRLF
       end
 
-      response_header << CRLF
-
-      out << response_header
+      data << CRLF
+      data
     end
   end
 end

data/lib/websocket/version.rb

@@ -1,3 +1,3 @@
 module WebSocket
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/websocket_parser.rb

@@ -1,3 +1,5 @@
+require "http"
+
 require "websocket/version"
 require "websocket/client_handshake"
 require "websocket/server_handshake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -67,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -96,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3359756691541156568
+      hash: 2288242846946475689
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3359756691541156568
+      hash: 2288242846946475689
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23