websocket 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
-## 1.0.0 / 2012-11-18
+## 1.0.1
+
+- allow creating client with :uri and :url options
+- prevent strange results when header is mailformed
+- set client path to '/' when :uri option is provided but without trailing slash
+
+## 1.0.0
 
 - initial release

data/autobahn-server.json

@@ -2,7 +2,7 @@
    "options": {"failByDrop": false},
    "outdir": "./autobahn/server",
 
-   "servers": [{"agent": "WebSocket-Ruby v1.0.0", "url": "ws://localhost:9001", "options": {"version": 18}}],
+   "servers": [{"agent": "WebSocket-Ruby v1.0.1", "url": "ws://localhost:9001", "options": {"version": 18}}],
 
    "cases": ["*"],
    "exclude-cases": [],

data/lib/websocket/handshake/client.rb

@@ -10,8 +10,8 @@ module WebSocket
         @version = args[:version] || DEFAULT_VERSION
         @origin = args[:origin]
 
-        if args[:uri]
-          uri     = URI.parse(args[:uri])
+        if args[:url] || args[:uri]
+          uri     = URI.parse(args[:url] || args[:uri])
           @secure = (uri.scheme == 'wss')
           @host   = uri.host
           @port   = uri.port
@@ -25,7 +25,7 @@ module WebSocket
         @path   = args[:path]   if args[:path]
         @query  = args[:query]  if args[:query]
 
-        @path   ||= '/'
+        @path   = '/'           if @path.nil? || @path.empty?
 
         set_error(:no_host_provided) unless @host
 
@@ -69,6 +69,7 @@ module WebSocket
 
       def parse_first_line(line)
         line_parts = line.match(FIRST_LINE)
+        set_error(:invalid_header) and return unless line_parts
         status = line_parts[1]
         set_error(:invalid_status_code) and return unless status == '101'
 

data/lib/websocket/handshake/server.rb

@@ -42,6 +42,7 @@ module WebSocket
 
       def parse_first_line(line)
         line_parts = line.match(PATH)
+        set_error(:invalid_header) and return unless line_parts
         method = line_parts[1].strip
         set_error(:get_request_required) and return unless method == "GET"
 

data/lib/websocket/version.rb

@@ -1,3 +1,3 @@
 module WebSocket
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/support/all_client_drafts.rb

@@ -41,6 +41,27 @@ shared_examples_for 'all client drafts' do
     handshake.port.should eql(123)
   end
 
+  it "should parse uri" do
+    @request_params = { :uri => "ws://test.example.org:301/test_path?query=true" }
+    handshake.host.should eql('test.example.org')
+    handshake.port.should eql(301)
+    handshake.path.should eql('/test_path')
+    handshake.query.should eql('query=true')
+  end
+
+  it "should parse url" do
+    @request_params = { :url => "ws://test.example.org:301/test_path?query=true" }
+    handshake.host.should eql('test.example.org')
+    handshake.port.should eql(301)
+    handshake.path.should eql('/test_path')
+    handshake.query.should eql('query=true')
+  end
+
+  it "should resolve correct path with root server provided" do
+    @request_params = { :url => "ws://test.example.org" }
+    handshake.path.should eql('/')
+  end
+
   it "should return valid response" do
     validate_request
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4164507600771502343
+      hash: -2471372616907526003
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4164507600771502343
+      hash: -2471372616907526003
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24