libwebsocket 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## 0.1.1 / 2011-10-24
+
+- Fixed bug that prevented query strings from being included in requests
+
+## 0.1.0 / 2010-12-05
+
+- new features:
+  - rename Handshake to OpeningHandshake(we will need ClosingHandshake in new drafts)
+- bugfixes:
+  - relax response string parser(allow custom text after 'HTTP/1.1 101')
+
+## 0.0.4 / 2010-12-04
+
+- initial release

data/lib/libwebsocket.rb

@@ -3,7 +3,7 @@
 # or clients to provide WebSocket support.
 module LibWebSocket
 
-  VERSION = '0.1.0' # Version of LibWebSocket
+  VERSION = '0.1.1' # Version of LibWebSocket
 
   autoload :Cookie,           "#{File.dirname(__FILE__)}/libwebsocket/cookie"
   autoload :Frame,            "#{File.dirname(__FILE__)}/libwebsocket/frame"

data/lib/libwebsocket/url.rb

@@ -36,9 +36,10 @@ module LibWebSocket
       self.host = host
       self.port = uri.port.to_s if uri.port
 
-      path = uri.path
-      path = '/' unless path && path != ''
-      self.resource_name = path
+      request_uri = uri.path
+      request_uri = '/' unless request_uri && request_uri != ''
+      request_uri += "?" + uri.query if uri.query
+      self.resource_name = request_uri
 
       return self
     end

data/libwebsocket.gemspec

@@ -1,84 +1,63 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{libwebsocket}
-  s.version = "0.1.0"
+  s.name = "libwebsocket"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bernard Potocki"]
-  s.date = %q{2010-12-05}
-  s.description = %q{Universal Ruby library to handle WebSocket protocol}
-  s.email = %q{bernard.potocki@imanel.org}
+  s.date = "2011-10-24"
+  s.description = "Universal Ruby library to handle WebSocket protocol"
+  s.email = "bernard.potocki@imanel.org"
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
+    "CHANGELOG.md",
     "README.md",
-     "Rakefile",
-     "examples/eventmachine_server.rb",
-     "examples/plain_client.rb",
-     "examples/thin_server.rb",
-     "lib/libwebsocket.rb",
-     "lib/libwebsocket/cookie.rb",
-     "lib/libwebsocket/cookie/request.rb",
-     "lib/libwebsocket/cookie/response.rb",
-     "lib/libwebsocket/frame.rb",
-     "lib/libwebsocket/message.rb",
-     "lib/libwebsocket/opening_handshake.rb",
-     "lib/libwebsocket/opening_handshake/client.rb",
-     "lib/libwebsocket/opening_handshake/server.rb",
-     "lib/libwebsocket/request.rb",
-     "lib/libwebsocket/response.rb",
-     "lib/libwebsocket/stateful.rb",
-     "lib/libwebsocket/url.rb",
-     "libwebsocket.gemspec",
-     "test/libwebsocket/cookie/request.rb",
-     "test/libwebsocket/cookie/response.rb",
-     "test/libwebsocket/opening_handshake/test_client.rb",
-     "test/libwebsocket/opening_handshake/test_server.rb",
-     "test/libwebsocket/test_cookie.rb",
-     "test/libwebsocket/test_frame.rb",
-     "test/libwebsocket/test_message.rb",
-     "test/libwebsocket/test_request_75.rb",
-     "test/libwebsocket/test_request_76.rb",
-     "test/libwebsocket/test_request_common.rb",
-     "test/libwebsocket/test_response_75.rb",
-     "test/libwebsocket/test_response_76.rb",
-     "test/libwebsocket/test_response_common.rb",
-     "test/libwebsocket/test_url.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/imanel/libwebsocket}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Universal Ruby library to handle WebSocket protocol}
-  s.test_files = [
+    "Rakefile",
+    "examples/eventmachine_server.rb",
+    "examples/plain_client.rb",
+    "examples/thin_server.rb",
+    "lib/libwebsocket.rb",
+    "lib/libwebsocket/cookie.rb",
+    "lib/libwebsocket/cookie/request.rb",
+    "lib/libwebsocket/cookie/response.rb",
+    "lib/libwebsocket/frame.rb",
+    "lib/libwebsocket/message.rb",
+    "lib/libwebsocket/opening_handshake.rb",
+    "lib/libwebsocket/opening_handshake/client.rb",
+    "lib/libwebsocket/opening_handshake/server.rb",
+    "lib/libwebsocket/request.rb",
+    "lib/libwebsocket/response.rb",
+    "lib/libwebsocket/stateful.rb",
+    "lib/libwebsocket/url.rb",
+    "libwebsocket.gemspec",
     "test/libwebsocket/cookie/request.rb",
-     "test/libwebsocket/cookie/response.rb",
-     "test/libwebsocket/opening_handshake/test_client.rb",
-     "test/libwebsocket/opening_handshake/test_server.rb",
-     "test/libwebsocket/test_cookie.rb",
-     "test/libwebsocket/test_frame.rb",
-     "test/libwebsocket/test_message.rb",
-     "test/libwebsocket/test_request_75.rb",
-     "test/libwebsocket/test_request_76.rb",
-     "test/libwebsocket/test_request_common.rb",
-     "test/libwebsocket/test_response_75.rb",
-     "test/libwebsocket/test_response_76.rb",
-     "test/libwebsocket/test_response_common.rb",
-     "test/libwebsocket/test_url.rb",
-     "test/test_helper.rb",
-     "examples/eventmachine_server.rb",
-     "examples/plain_client.rb",
-     "examples/thin_server.rb"
+    "test/libwebsocket/cookie/response.rb",
+    "test/libwebsocket/opening_handshake/test_client.rb",
+    "test/libwebsocket/opening_handshake/test_server.rb",
+    "test/libwebsocket/test_cookie.rb",
+    "test/libwebsocket/test_frame.rb",
+    "test/libwebsocket/test_message.rb",
+    "test/libwebsocket/test_request_75.rb",
+    "test/libwebsocket/test_request_76.rb",
+    "test/libwebsocket/test_request_common.rb",
+    "test/libwebsocket/test_response_75.rb",
+    "test/libwebsocket/test_response_76.rb",
+    "test/libwebsocket/test_response_common.rb",
+    "test/libwebsocket/test_url.rb",
+    "test/test_helper.rb"
   ]
+  s.homepage = "http://github.com/imanel/libwebsocket"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Universal Ruby library to handle WebSocket protocol"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/libwebsocket/opening_handshake/test_client.rb

@@ -4,14 +4,14 @@ class TestServerOpeningHandshake < Test::Unit::TestCase
 
   def test_to_s
     h = LibWebSocket::OpeningHandshake::Client.new
-    h.url = 'ws://example.com/demo'
+    h.url = 'ws://example.com/demo?param=true&another=hello'
 
     # Mocking
     h.req.key1 = "18x 6]8vM;54 *(5:  {   U1]8  z [  8"
     h.req.key2 = "1_ tx7X d  <  nw  334J702) 7]o}` 0"
     h.req.challenge = "Tm[K T2u"
 
-    assert_equal h.to_s, "GET /demo HTTP/1.1\x0d\x0a" +
+    assert_equal h.to_s, "GET /demo?param=true&another=hello HTTP/1.1\x0d\x0a" +
       "Upgrade: WebSocket\x0d\x0a" +
       "Connection: Upgrade\x0d\x0a" +
       "Host: example.com\x0d\x0a" +
@@ -61,4 +61,4 @@ class TestServerOpeningHandshake < Test::Unit::TestCase
     assert_equal 'Wrong response line', h.error
   end
 
-end
+end

data/test/libwebsocket/test_url.rb

@@ -26,7 +26,7 @@ class TestURL < Test::Unit::TestCase
     assert url.parse('ws://example.com/demo?foo=bar')
     assert !url.secure
     assert_equal 'example.com', url.host
-    assert_equal '/demo', url.resource_name
+    assert_equal '/demo?foo=bar', url.resource_name
   end
 
   def test_to_s

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: libwebsocket
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-05 00:00:00 +01:00
-default_executable: 
+date: 2011-10-24 00:00:00.000000000Z
 dependencies: []
-
 description: Universal Ruby library to handle WebSocket protocol
 email: bernard.potocki@imanel.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
+- CHANGELOG.md
 - README.md
 - Rakefile
 - examples/eventmachine_server.rb
@@ -62,56 +53,28 @@ files:
 - test/libwebsocket/test_response_common.rb
 - test/libwebsocket/test_url.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/imanel/libwebsocket
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Universal Ruby library to handle WebSocket protocol
-test_files: 
-- test/libwebsocket/cookie/request.rb
-- test/libwebsocket/cookie/response.rb
-- test/libwebsocket/opening_handshake/test_client.rb
-- test/libwebsocket/opening_handshake/test_server.rb
-- test/libwebsocket/test_cookie.rb
-- test/libwebsocket/test_frame.rb
-- test/libwebsocket/test_message.rb
-- test/libwebsocket/test_request_75.rb
-- test/libwebsocket/test_request_76.rb
-- test/libwebsocket/test_request_common.rb
-- test/libwebsocket/test_response_75.rb
-- test/libwebsocket/test_response_76.rb
-- test/libwebsocket/test_response_common.rb
-- test/libwebsocket/test_url.rb
-- test/test_helper.rb
-- examples/eventmachine_server.rb
-- examples/plain_client.rb
-- examples/thin_server.rb
+test_files: []