libwebsocket 0.0.4 → 0.1.0

data/README.md

@@ -5,7 +5,7 @@ be one. It can be used in any server, event loop etc.
 
 ## Server handshake
 
-    h = LibWebSocket::Handshake::Server.new
+    h = LibWebSocket::OpeningHandshake::Server.new
 
     # Parse client request
     h.parse \<<EOF
@@ -34,7 +34,7 @@ be one. It can be used in any server, event loop etc.
 
 ## Client handshake
 
-    h = LibWebSocket::Handshake::Client.new(url => 'ws://example.com')
+    h = LibWebSocket::OpeningHandshake::Client.new(url => 'ws://example.com')
 
     # Create request
     h.to_s # GET /demo HTTP/1.1

data/examples/eventmachine_server.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/libwebsocket')
 
 module EchoServer
   def receive_data(data)
-    @hs ||= LibWebSocket::Handshake::Server.new
+    @hs ||= LibWebSocket::OpeningHandshake::Server.new
     @frame ||= LibWebSocket::Frame.new
 
     if !@hs.done?

data/examples/plain_client.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/libwebsocket')
 class WebSocket
 
   def initialize(url, params = {})
-    @hs ||= LibWebSocket::Handshake::Client.new(:url => url, :version => params[:version])
+    @hs ||= LibWebSocket::OpeningHandshake::Client.new(:url => url, :version => params[:version])
     @frame ||= LibWebSocket::Frame.new
 
     @socket = TCPSocket.new(@hs.url.host, @hs.url.port || 80)

data/examples/thin_server.rb

@@ -35,7 +35,7 @@ end
 
 class EchoServer
   def call(env)
-    @hs ||= LibWebSocket::Handshake::Server.new
+    @hs ||= LibWebSocket::OpeningHandshake::Server.new
     @connection = env['async.connection']
 
     if !@hs.done?

data/lib/libwebsocket.rb

@@ -3,15 +3,15 @@
 # or clients to provide WebSocket support.
 module LibWebSocket
 
-  VERSION = '0.0.4' # Version of LibWebSocket
+  VERSION = '0.1.0' # Version of LibWebSocket
 
-  autoload :Cookie,    "#{File.dirname(__FILE__)}/libwebsocket/cookie"
-  autoload :Frame,     "#{File.dirname(__FILE__)}/libwebsocket/frame"
-  autoload :Handshake, "#{File.dirname(__FILE__)}/libwebsocket/handshake"
-  autoload :Message,   "#{File.dirname(__FILE__)}/libwebsocket/message"
-  autoload :Request,   "#{File.dirname(__FILE__)}/libwebsocket/request"
-  autoload :Response,  "#{File.dirname(__FILE__)}/libwebsocket/response"
-  autoload :Stateful,  "#{File.dirname(__FILE__)}/libwebsocket/stateful"
-  autoload :URL,       "#{File.dirname(__FILE__)}/libwebsocket/url"
+  autoload :Cookie,           "#{File.dirname(__FILE__)}/libwebsocket/cookie"
+  autoload :Frame,            "#{File.dirname(__FILE__)}/libwebsocket/frame"
+  autoload :OpeningHandshake, "#{File.dirname(__FILE__)}/libwebsocket/opening_handshake"
+  autoload :Message,          "#{File.dirname(__FILE__)}/libwebsocket/message"
+  autoload :Request,          "#{File.dirname(__FILE__)}/libwebsocket/request"
+  autoload :Response,         "#{File.dirname(__FILE__)}/libwebsocket/response"
+  autoload :Stateful,         "#{File.dirname(__FILE__)}/libwebsocket/stateful"
+  autoload :URL,              "#{File.dirname(__FILE__)}/libwebsocket/url"
 
 end

data/lib/libwebsocket/{handshake.rb → opening_handshake.rb}

@@ -1,9 +1,9 @@
 module LibWebSocket
-  # This is a base class for LibWebSocket::Handshake::Client and LibWebSocket::Handshake::Server.
-  class Handshake
+  # This is a base class for LibWebSocket::OpeningHandshake::Client and LibWebSocket::OpeningHandshake::Server.
+  class OpeningHandshake
 
-    autoload :Client, "#{File.dirname(__FILE__)}/handshake/client"
-    autoload :Server, "#{File.dirname(__FILE__)}/handshake/server"
+    autoload :Client, "#{File.dirname(__FILE__)}/opening_handshake/client"
+    autoload :Server, "#{File.dirname(__FILE__)}/opening_handshake/server"
 
     attr_accessor :secure, :error
 

data/lib/libwebsocket/{handshake → opening_handshake}/client.rb

@@ -1,12 +1,12 @@
 module LibWebSocket
-  class Handshake
+  class OpeningHandshake
     # Construct or parse a client WebSocket handshake. This module is written for
     # convenience, since using request and response directly requires the same code
     # again and again.
     #
     # SYNOPSIS
     #
-    #   h = LibWebSocket::Handshake::Client.new(:url => 'ws://example.com')
+    #   h = LibWebSocket::OpeningHandshake::Client.new(:url => 'ws://example.com')
     #
     #   # Create request
     #   h.to_s # GET /demo HTTP/1.1
@@ -32,7 +32,7 @@ module LibWebSocket
     #
     #   h.error # Check if there were any errors
     #   h.done? # Returns true
-    class Client < Handshake
+    class Client < OpeningHandshake
 
       attr_accessor :url
 

data/lib/libwebsocket/{handshake → opening_handshake}/server.rb

@@ -1,12 +1,12 @@
 module LibWebSocket
-  class Handshake
+  class OpeningHandshake
     # Construct or parse a server WebSocket handshake. This module is written for
     # convenience, since using request and response directly requires the same code
     # again and again.
     #
     # SYNOPSIS
     #
-    #   h = LibWebSocket::Handshake::Server.new
+    #   h = LibWebSocket::OpeningHandshake::Server.new
     #
     #   # Parse client request
     #   h.parse \<<EOF
@@ -32,7 +32,7 @@ module LibWebSocket
     #          # Sec-WebSocket-Location: ws://example.com/demo
     #          #
     #          # fQJ,fN/4F4!~K~MH
-    class Server < Handshake
+    class Server < OpeningHandshake
 
       # Parse client request
       # @example

data/lib/libwebsocket/response.rb

@@ -158,7 +158,7 @@ module LibWebSocket
     protected
 
     def parse_first_line(line)
-      unless line == 'HTTP/1.1 101 WebSocket Protocol Handshake'
+      unless line =~ /\AHTTP\/1.1 101 .+/
         self.error = 'Wrong response line'
         return
       end

data/libwebsocket.gemspec

@@ -0,0 +1,90 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{libwebsocket}
+  s.version = "0.1.0"
+
+  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.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    "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 = [
+    "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"
+  ]
+
+  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
+    else
+    end
+  else
+  end
+end
+

data/test/libwebsocket/{handshake → opening_handshake}/test_client.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
 
-class TestServerHandshake < Test::Unit::TestCase
+class TestServerOpeningHandshake < Test::Unit::TestCase
 
   def test_to_s
-    h = LibWebSocket::Handshake::Client.new
+    h = LibWebSocket::OpeningHandshake::Client.new
     h.url = 'ws://example.com/demo'
 
     # Mocking
@@ -21,7 +21,7 @@ class TestServerHandshake < Test::Unit::TestCase
       "Content-Length: 8\x0d\x0a" +
       "\x0d\x0aTm[K T2u"
 
-    h = LibWebSocket::Handshake::Client.new(:url => 'ws://example.com')
+    h = LibWebSocket::OpeningHandshake::Client.new(:url => 'ws://example.com')
 
     # Mocking
     h.req.key1 = "18x 6]8vM;54 *(5:  {   U1]8  z [  8"
@@ -52,11 +52,11 @@ class TestServerHandshake < Test::Unit::TestCase
     assert h.done?
 
     message = "HTTP/1.1 101 WebSocket Protocol Handshake\x0d\x0a"
-    h = LibWebSocket::Handshake::Client.new(:url => 'ws://example.com')
+    h = LibWebSocket::OpeningHandshake::Client.new(:url => 'ws://example.com')
     assert h.parse(message)
     assert !h.error
 
-    h = LibWebSocket::Handshake::Client.new
+    h = LibWebSocket::OpeningHandshake::Client.new
     assert !h.parse("HTTP/1.0 foo bar\x0d\x0a")
     assert_equal 'Wrong response line', h.error
   end

data/test/libwebsocket/{handshake → opening_handshake}/test_server.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
 
-class TestServerHandshake < Test::Unit::TestCase
+class TestServerOpeningHandshake < Test::Unit::TestCase
 
   def test_parse
-    h = LibWebSocket::Handshake::Server.new
+    h = LibWebSocket::OpeningHandshake::Server.new
     assert !h.done?
     assert h.parse('')
 
@@ -27,11 +27,11 @@ class TestServerHandshake < Test::Unit::TestCase
       "fQJ,fN/4F4!~K~MH";
 
     message = "GET /demo HTTP/1.1\x0d\x0a"
-    h = LibWebSocket::Handshake::Server.new
+    h = LibWebSocket::OpeningHandshake::Server.new
     assert h.parse(message)
     assert_nil h.error
 
-    h = LibWebSocket::Handshake::Server.new
+    h = LibWebSocket::OpeningHandshake::Server.new
     assert_nil h.parse("GET /demo\x0d\x0a")
     assert_equal 'Wrong request line', h.error
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libwebsocket
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Bernard Potocki
@@ -38,18 +38,19 @@ files:
 - lib/libwebsocket/cookie/request.rb
 - lib/libwebsocket/cookie/response.rb
 - lib/libwebsocket/frame.rb
-- lib/libwebsocket/handshake.rb
-- lib/libwebsocket/handshake/client.rb
-- lib/libwebsocket/handshake/server.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/handshake/test_client.rb
-- test/libwebsocket/handshake/test_server.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
@@ -98,8 +99,8 @@ summary: Universal Ruby library to handle WebSocket protocol
 test_files: 
 - test/libwebsocket/cookie/request.rb
 - test/libwebsocket/cookie/response.rb
-- test/libwebsocket/handshake/test_client.rb
-- test/libwebsocket/handshake/test_server.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