websocket_parser 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e45c5d450a8c75baa97f7c1019935ece33763c44
-  data.tar.gz: 1842fd255487115f5d66a135a073bcac3e8e3350
+  metadata.gz: dc4855a9ac712ce4e9122a142cd5b7c7490fc1f2
+  data.tar.gz: c5f772d978806e57e200e77f833f0af1d86f078d
 SHA512:
-  metadata.gz: 8e543dd1f7299e1e3b08d95085597b523bc46adf09824254b93db9042e3970d5c2600184435457fa059e2b6b0f4675971a6539a348a8aefac84149505cb93c2e
-  data.tar.gz: 4ec4c8e0e8c877009c6b29013e0ea9ff7745add5ba23ab75f3bda51c20d892e4dcc67733edd504ea8b8c287a2eeff5747ee45055131e0b5b680fdbb5ce9ff970
+  metadata.gz: 5152da6ff5e0fbd83670b892744ea26ae641b46710c62be3e405209bc3571fe6d2bfeb38d105336c99a71c5eaa3d6a308ee56d73f3441ef50be9266e11af636d
+  data.tar.gz: 5c20f099efa09f71e44e1e16980c0a924a30dd83e6a9cfe76048966555919a4e8c44263d7116f299458b4e01efbaa3af8a8d1d4c76e3dcefd82969385cc0b7a1

data/README.md

@@ -1,5 +1,6 @@
 # WebSocketParser
 [![Build Status](https://secure.travis-ci.org/afcapel/websocket_parser.png)](http://travis-ci.org/afcapel/websocket_parser)
+[![Code Climate](https://codeclimate.com/github/afcapel/websocket_parser.png)](https://codeclimate.com/github/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

@@ -2,12 +2,19 @@ require 'digest/sha1'
 require 'base64'
 
 module WebSocket
-  class ClientHandshake < Http::Request
+  class ClientHandshake
+
+    attr_reader :verb, :uri, :headers, :proxy, :body, :version
 
     def self.accept_token_for(websocket_key)
       Base64.encode64(Digest::SHA1.digest(websocket_key.strip + GUID)).strip
     end
 
+    def initialize(verb, uri, headers = {}, proxy = {}, body = nil, version = '1.1')
+      @verb, @headers, @proxy, @body, @version = verb, headers, proxy, body, version
+      @uri = uri.is_a?(URI) ? uri : URI(uri.to_s)
+    end
+
     def errors
       @errors ||= []
     end
@@ -18,10 +25,8 @@ module 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']}'"
+      if websocket_version_header.to_i != PROTOCOL_VERSION
+        errors << "Protocol version not supported '#{websocket_version_header}'"
         return false
       end
 
@@ -33,16 +38,23 @@ module WebSocket
     end
 
     def response_headers
-      websocket_key = headers['Sec-Websocket-Key']
       {
         'Upgrade'    => 'websocket',
         'Connection' => 'Upgrade',
-        'Sec-WebSocket-Accept' => ClientHandshake.accept_token_for(websocket_key)
+        'Sec-WebSocket-Accept' => ClientHandshake.accept_token_for(websocket_key_header)
       }
     end
 
+    def websocket_version_header
+      headers['Sec-WebSocket-Version'] || headers['Sec-Websocket-Version']
+    end
+
+    def websocket_key_header
+      headers['Sec-Websocket-Key'] || headers['Sec-WebSocket-Key']
+    end
+
     def to_data
-      data = "#{method.to_s.upcase} #{uri.path} HTTP/#{version}#{CRLF}"
+      data = "#{verb.to_s.upcase} #{uri.path} HTTP/#{version}#{CRLF}"
       @headers.each do |field, value|
         data << "#{field}: #{value}#{CRLF}"
       end

data/lib/websocket/server_handshake.rb

@@ -1,5 +1,7 @@
 module WebSocket
-  class ServerHandshake < Http::Response
+  class ServerHandshake
+    attr_reader :headers
+
     def initialize(headers = {})
       @headers = headers
     end

data/lib/websocket/version.rb

@@ -1,3 +1,3 @@
 module WebSocket
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/websocket_parser.rb

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

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'bundler/setup'
-require 'http'
 require 'websocket_parser'
 
 RSpec.configure do |config|

data/spec/websocket/handshake_spec.rb

@@ -26,4 +26,20 @@ describe WebSocket::ClientHandshake do
     response.headers['Connection'].should eq('Upgrade')
     response.headers['Sec-WebSocket-Accept'].should eq('s3pPLMBiTxaQ9kYGzzhZRbK+xOo=')
   end
+
+  it "can be seariakized to data" do
+    expected_lines = [
+      "GET / HTTP/1.1",
+      "Host: server.example.com",
+      "Upgrade: websocket",
+      "Connection: Upgrade",
+      "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==",
+      "Origin: http://example.com",
+      "Sec-WebSocket-Protocol: chat, superchat",
+      "Sec-WebSocket-Version: 13",
+      "\r\n"
+    ]
+
+    client_handshake.to_data.should eq expected_lines.join("\r\n")
+  end
 end

data/websocket_parser.gemspec

@@ -15,8 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = WebSocket::VERSION
 
-  gem.add_runtime_dependency 'http'
-
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: websocket_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Alberto Fernandez-Capel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement