libwebsocket 0.1.3 → 0.1.4

data/.gitignore

@@ -0,0 +1,2 @@
+pkg/
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,9 @@
+script: "bundle exec rake test"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - rbx
+  - ree
+

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.1.4 / 2012-07-13
+
+- New gemspec and bundler files
+- Fixed some encoding errors
+- Fixes for JRuby
+
 ## 0.1.3 / 2012-03-21
 
 - add "addressable" gem to dependencies

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Protocol::WebSocket
+# LibWebSocket [![](http://travis-ci.org/imanel/libwebsocket.png)](http://travis-ci.org/imanel/libwebsocket)
 
 A WebSocket message parser/constructor. It is not a server and is not meant to
 be one. It can be used in any server, event loop etc.
@@ -80,9 +80,9 @@ examples directory in the repository.
 
 ## Copyright
 
-Copyright (C) 2010, Bernard Potocki.
+Copyright (C) 2012, Bernard Potocki.
 
 Based on protocol-websocket perl distribution by Viacheslav Tykhanovskyi.
 
 This program is free software, you can redistribute it and/or modify it under
-the MIT License.
+the MIT License.

data/Rakefile

@@ -1,27 +1,11 @@
-$:.unshift(File.dirname(__FILE__))
-require 'rake/testtask'
-require 'lib/libwebsocket'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-task :default => :test
+require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/**/test_*.rb']
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "libwebsocket"
-    gemspec.version = LibWebSocket::VERSION
-    gemspec.summary = "Universal Ruby library to handle WebSocket protocol"
-    gemspec.description = "Universal Ruby library to handle WebSocket protocol"
-    gemspec.email = "bernard.potocki@imanel.org"
-    gemspec.homepage = "http://github.com/imanel/libwebsocket"
-    gemspec.authors = ["Bernard Potocki"]
-    gemspec.files.exclude ".gitignore"
-    gemspec.add_dependency "addressable"
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
+task :default => :test

data/examples/eventmachine_server.rb

@@ -33,4 +33,4 @@ EventMachine::run do
   port = 8080
   EventMachine::start_server host, port, EchoServer
   puts "Started EchoServer on #{host}:#{port}..."
-end
+end

data/examples/plain_client.rb

@@ -56,4 +56,4 @@ class WebSocket
     @socket.close
   end
 
-end
+end

data/examples/thin_server.rb

@@ -66,4 +66,4 @@ Thin::Server.start('127.0.0.1', 8080) do
   map '/' do
     run proc{ |env| EchoServer.new.call(env) }
   end
-end
+end

data/lib/libwebsocket.rb

@@ -2,16 +2,15 @@
 # not provide a WebSocket server or client, but is made for using in http servers
 # or clients to provide WebSocket support.
 module LibWebSocket
+  class Error < RuntimeError; end # Universal LibWebSocket error class
 
-  VERSION = '0.1.3' # Version of LibWebSocket
-
-  autoload :Cookie,           "#{File.dirname(__FILE__)}/libwebsocket/cookie"
-  autoload :Frame,            "#{File.dirname(__FILE__)}/libwebsocket/frame"
+  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"
+  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/cookie.rb

@@ -19,7 +19,7 @@ module LibWebSocket
     end
 
     # Parse cookie string to array
-    def parse(string)
+    def parse(string = nil)
       self.pairs = []
 
       return if string.nil? || string == ''

data/lib/libwebsocket/cookie/request.rb

@@ -20,12 +20,12 @@ module LibWebSocket
 
         cookie = nil
         self.pairs.each do |pair|
-          next if pair[0].nil?
+          next unless pair[0]
 
           if pair[0].match(/^[^\$]/)
-            cookies.push(cookie) unless cookie.nil?
+            cookies.push(cookie) if cookie
 
-            cookie = self.build_cookie( :name => pair[0], :value => pair[1], :version => version)
+            cookie = self.build_cookie(:name => pair[0], :value => pair[1], :version => version)
           elsif pair[0] == '$Path'
             cookie.path = pair[1]
           elsif pair[0] == '$Domain'
@@ -33,7 +33,7 @@ module LibWebSocket
           end
         end
 
-        cookies.push(cookie) unless cookie.nil?
+        cookies.push(cookie) if cookie
 
         return cookies
       end

data/lib/libwebsocket/frame.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 module LibWebSocket
   # Construct or parse a WebSocket frame.
   #
@@ -5,22 +7,50 @@ module LibWebSocket
   #
   #   # Create frame
   #   frame = LibWebSocket::Frame.new('123')
-  #   frame.to_s # \x00123\xff
+  #   frame.to_bytes
   #
   #   # Parse frames
   #   frame = LibWebSocket::Frame.new
-  #   frame.append("123\x00foo\xff56\x00bar\xff789")
-  #   frame.next # =>  foo
-  #   frame.next # =>  bar
+  #   frame.append(...)
+  #   frame.next # get next message
+  #   frame.next # get another next message
   class Frame
 
-    def initialize(buffer = nil)
-      @buffer = buffer || ''
-    end
+    autoload :Error, "#{File.dirname(__FILE__)}/frame/error"
+
+    MAX_RAND_INT = 2 ** 32
+    TYPES = {
+      :text   => 0x01,
+      :binary => 0x02,
+      :ping   => 0x09,
+      :pong   => 0x0a,
+      :close  => 0x08
+    }
+
+    attr_accessor :buffer, :version, :max_fragments_amount, :max_payload_size, :fin, :rsv, :opcode, :masked
 
-    # Create new frame without modification of current
-    def new(buffer = nil)
-      self.class.new(buffer)
+    # Create a new Frame instance. Automatically detect if the passed data is a string or bytes.
+    # Options can be buffer or hash with options:
+    #   :buffer - content of buffer
+    #   :type - frame type(allowed values: text, binary, ping, pong, close)
+    #   :version - protocol version(see readme for supported versions)
+    #   :max_fragments_amount - max number of message parts per single frame
+    #   :max_payload_size - max bytesize of single message
+    # @example
+    #   LibWebSocket::Frame->new('data')
+    #   LibWebSocket::Frame->new(:buffer => 'data', :type => 'close')
+    def initialize(options = '')
+      if options.is_a?(Hash)
+        options.each {|k,v| instance_variable_set("@#{k}",v) }
+      else
+        @buffer = options
+      end
+
+      @buffer ||= ''
+      @version ||= 'draft-ietf-hybi-10'
+      @fragments = []
+      @max_fragments_amount ||= 128
+      @max_payload_size ||= 65536
     end
 
     # Append a frame chunk.
@@ -30,37 +60,134 @@ module LibWebSocket
     def append(string = nil)
       return unless string.is_a?(String)
 
-      @buffer += string
+      string.force_encoding("ASCII-8BIT") if string.respond_to?(:force_encoding)
 
+      self.buffer += string
       return self
     end
 
     # Return the next frame.
     # @example
-    #   frame.append("\x00foo")
-    #   frame.append("\xff\x00bar\xff")
-    #
-    #   frame.next; # =>  foo
-    #   frame.next; # =>  bar
+    #   frame.append(...)
+    #   frame.next; # next message
     def next
-      return unless @buffer.slice!(/^[^\x00]*\x00(.*?)\xff/m)
+      bytes = self.next_bytes
+      return unless bytes
 
-      string = $1
-      string.force_encoding('UTF-8') if string.respond_to?(:force_encoding)
+      bytes.force_encoding('UTF-8') if bytes.respond_to?(:force_encoding)
+      return bytes
+    end
 
-      return string
+    def opcode
+      @opcode || 1
     end
 
-    # Construct a WebSocket frame.
-    # @example
-    #   frame = LibWebSocket::Frame.new('foo')
-    #   frame.to_s # => \x00foo\xff
-    def to_s
-      ary = ["\x00", @buffer.dup, "\xff"]
+    def ping?;   opcode == TYPES[:ping];   end # Check if frame is a ping request.
+    def pong?;   opcode == TYPES[:pong];   end # Check if frame is a pong response.
+    def close?;  opcode == TYPES[:close];  end # Check if frame is of close type.
+    def text?;   opcode == TYPES[:text];   end # Check if frame is of text type.
+    def binary?; opcode == TYPES[:binary]; end # Check if frame is of binary type.
+
+    # Return the next message as a UTF-8 encoded string.
+    def next_bytes
+      if ['draft-hixie-75', 'draft-ietf-hybi-00'].include? self.version
+        if self.buffer.slice!(/\A\xff\x00/m)
+          self.opcode = TYPES[:close]
+          return ''
+        end
+
+        return unless self.buffer.slice!(/^[^\x00]*\x00(.*?)\xff/m)
+        return $1
+      end
+
+      return unless self.buffer.length >= 2
+
+      while self.buffer.length > 0
+        hdr = self.buffer[0..0]
+        bits = hdr.unpack("B*").first.split(//)
+
+        self.fin = bits[0]
+        self.rsv = bits[1..3]
+        opcode = hdr.unpack('C').first & 0b00001111
+        offset = 1 # FIN,RSV[1-3],OPCODE
+
+        payload_len = buffer[1..1].unpack('C').first
+        self.masked = (payload_len & 0b10000000) >> 7
+        offset += 1 # + MASKED,PAYLOAD_LEN
+
+        payload_len = payload_len & 0b01111111
+        if payload_len == 126
+          return unless self.buffer.length >= offset + 2
+
+          payload_len = self.buffer[offset..offset+2].unpack('n').first
+          offset += 2
+        elsif payload_len > 126
+          return unless self.buffer.length >= offset + 4
+          bits = self.buffer[offset..offset+7].unpack('B*').first
+          bits.gsub!(/^./,'0') # Most significant bit must be 0.
+          bits = bits[32..-1] # No idea how to unpack 64-bit unsigned integer with big-endian byte order
+          payload_len = Array(bits).pack("B*").unpack("N").first
+          offset += 8
+        end
+
+        if payload_len > self.max_payload_size
+          self.buffer = ''
+          raise Error::MessageTooBig.new("Payload is too big. Deny big message (#{payload_len}) or increase max_payload_size (#{self.max_payload_size})")
+        end
+
+        mask = ''
+        if self.masked == 1
+          return unless self.buffer.length >= offset + 4
+
+          mask = self.buffer[offset..offset+4]
+          offset += 4
+        end
+
+        return if self.buffer.length < offset + payload_len
+
+        payload = self.buffer[offset..offset+payload_len-1]
+        payload = self.mask(payload, mask) if self.masked == 1
+
+        self.buffer[0..offset+payload_len-1] = ''
+
+        # Inject control frame
+        if !@fragments.empty? && (opcode & 0b1000 != 0)
+          self.opcode = opcode
+          return payload
+        end
+
+        if self.fin != '0'
+          if @fragments.empty?
+            self.opcode = opcode
+          else
+            self.opcode = @fragments.shift
+          end
+
+          payload = (@fragments + Array(payload)).join
+          @fragments = []
+          return payload
+        else
+          # Remember first fragment opcode
+          @fragments.push(opcode) if @fragments.empty?
+
+          @fragments.push(payload)
+          raise Error::PolicyViolation.new("Too many fragments") if @fragments.size > self.max_fragments_amount
+        end
+      end
+
+      return
+    end
 
-      ary.collect{ |s| s.force_encoding('UTF-8') if s.respond_to?(:force_encoding) }
+    protected
 
-      return ary.join
+    def mask(payload, mask)
+      mask = mask.bytes.to_a
+      payload = payload.bytes.to_a
+      payload.each_with_index do |p, i|
+        j = i % 4
+        payload[i] = p ^ mask[j]
+      end
+      return payload.collect(&:chr).join
     end
 
   end

data/lib/libwebsocket/frame/error.rb

@@ -0,0 +1,99 @@
+module LibWebSocket
+  class Frame
+
+    # Generic close error command for frame. Should not be called directly - use one of subclasses.
+    # This should be catched and responded to according to clean_close? and status.
+    class Error < LibWebSocket::Error
+
+      # Should close frame be sent before closing?
+      # If so then status code should be used to build it.
+      def clean_close?
+        true
+      end
+
+      # Status code for closing frame.
+      def status_code
+        500 # This should not be called directly
+      end
+
+      # 1000 indicates a normal closure, meaning whatever purpose the
+      # connection was established for has been fulfilled.
+      class NormalClosure < Error
+        def status_code; 1000; end
+      end
+
+      # 1001 indicates that an endpoint is "going away", such as a server
+      # going down, or a browser having navigated away from a page.
+      class GoingAway < Error
+        def status_code; 1001; end
+      end
+
+      # 1002 indicates that an endpoint is terminating the connection due
+      # to a protocol error.
+      class ProtocolError < Error
+        def status_code; 1002; end
+      end
+
+      # 1003 indicates that an endpoint is terminating the connection
+      # because it has received a type of data it cannot accept (e.g. an
+      # endpoint that understands only text data MAY send this if it
+      # receives a binary message).
+      class UnsupportedData < Error
+        def status_code; 1003; end
+      end
+
+      # 1005 is a reserved value and MUST NOT be set as a status code in a
+      # Close control frame by an endpoint.  It is designated for use in
+      # applications expecting a status code to indicate that no status
+      # code was actually present.
+      class NoStatusRcvd < Error
+        def status_code; 1005; end
+      end
+
+      # 1006 is a reserved value and MUST NOT be set as a status code in a
+      # Close control frame by an endpoint.  It is designated for use in
+      # applications expecting a status code to indicate that the
+      # connection was closed abnormally, e.g. without sending or
+      # receiving a Close control frame.
+      class AbnormalClosure < Error
+        def status_code; 1006; end
+      end
+
+      # 1007 indicates that an endpoint is terminating the connection
+      # because it has received data within a message that was not
+      # consistent with the type of the message (e.g., non-UTF-8 [RFC3629]
+      # data within a text message).
+      class InvalidFramePayloadData < Error
+        def status_code; 1007; end
+      end
+
+      # 1008 indicates that an endpoint is terminating the connection
+      # because it has received a message that violates its policy.  This
+      # is a generic status code that can be returned when there is no
+      # other more suitable status code (e.g. 1003 or 1009), or if there
+      # is a need to hide specific details about the policy.
+      class PolicyViolation < Error
+        def status_code; 1008; end
+      end
+
+      # 1009 indicates that an endpoint is terminating the connection
+      # because it has received a message which is too big for it to
+      # process.
+      class MessageTooBig < Error
+        def status_code; 1009; end
+      end
+
+      # 1010 indicates that an endpoint (client) is terminating the
+      # connection because it has expected the server to negotiate one or
+      # more extension, but the server didn't return them in the response
+      # message of the WebSocket handshake.  The list of extensions which
+      # are needed SHOULD appear in the /reason/ part of the Close frame.
+      # Note that this status code is not used by the server, because it
+      # can fail the WebSocket handshake instead.
+      class MandatoryExtension < Error
+        def status_code; 1010; end
+      end
+
+    end
+  end
+end

data/lib/libwebsocket/message.rb

@@ -126,7 +126,9 @@ module LibWebSocket
     def append(data)
       return if self.error
 
-      @buffer += data
+      data = data.encode("ASCII-8BIT") if data.respond_to?(:encode)
+
+      @buffer << data
 
       if @buffer.length > @max_message_size
         self.error = 'Message is too long'

data/lib/libwebsocket/version.rb

@@ -0,0 +1,3 @@
+module LibWebSocket
+  VERSION = '0.1.4'
+end

data/libwebsocket.gemspec

@@ -1,72 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "libwebsocket/version"
 
 Gem::Specification.new do |s|
-  s.name = "libwebsocket"
-  s.version = "0.1.3"
+  s.name        = "libwebsocket"
+  s.version     = LibWebSocket::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Bernard Potocki"]
+  s.email       = ["bernard.potocki@imanel.org"]
+  s.homepage    = "http://github.com/imanel/libwebsocket"
+  s.summary     = %q{Universal Ruby library to handle WebSocket protocol}
+  s.description = %q{Universal Ruby library to handle WebSocket protocol}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Bernard Potocki"]
-  s.date = "2012-03-20"
-  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 = "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
-    s.specification_version = 3
+  s.add_dependency 'addressable'
+  s.add_development_dependency 'rake'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<addressable>, [">= 0"])
-    else
-      s.add_dependency(%q<addressable>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<addressable>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
-

data/test/libwebsocket/{test_frame.rb → draft-ietf-hybi-00/test_frame.rb}

@@ -1,9 +1,10 @@
+# -*- encoding: binary -*-
 require 'test_helper'
 
 class TestFrame < Test::Unit::TestCase
 
-  def test_append
-    f = LibWebSocket::Frame.new
+  def test_append_ietf_hybi_00
+    f = LibWebSocket::Frame.new(:version => 'draft-ietf-hybi-00')
 
     f.append
     assert_nil f.next
@@ -21,6 +22,11 @@ class TestFrame < Test::Unit::TestCase
     f.append("\xff")
     assert_equal '', f.next
 
+    f.append("\xff")
+    f.append("\x00")
+    assert_equal '', f.next
+    assert f.close?
+
     f.append("\x00")
     assert_nil f.next
     f.append("foo")
@@ -38,28 +44,28 @@ class TestFrame < Test::Unit::TestCase
     assert_nil f.next
 
     # We append bytes, but read characters
-    msg = "\342\230\272"
+    msg = '☺'
     f.append("\x00" + msg + "\xff")
     msg.force_encoding('UTF-8') if msg.respond_to?(:force_encoding)
     assert_equal msg, f.next
   end
 
-  def test_new
-    f = LibWebSocket::Frame.new
-    msg = "\x00\xff"
-    msg.force_encoding('UTF-8') if msg.respond_to?(:force_encoding)
-    assert_equal msg, f.to_s
-
-    f = LibWebSocket::Frame.new('123')
-    msg = "\x00123\xff"
-    msg.force_encoding('UTF-8') if msg.respond_to?(:force_encoding)
-    assert_equal msg, f.to_s
-
-    # We pass characters, but send bytes
-    f = LibWebSocket::Frame.new("\342\230\272")
-    msg = "\x00\342\230\272\xff"
-    msg.force_encoding('UTF-8') if msg.respond_to?(:force_encoding)
-    assert_equal msg, f.to_s
+  def test_new_ietf_hybi_00
+    # f = LibWebSocket::Frame.new(:version => 'draft-ietf-hybi-00')
+    # msg = "\x00\xff"
+    # msg.force_encoding('UTF-8') if msg.respond_to?(:force_encoding)
+    # assert_equal msg, f.to_s
+    #
+    # f = LibWebSocket::Frame.new('123')
+    # msg = "\x00123\xff"
+    # msg.force_encoding('UTF-8') if msg.respond_to?(:force_encoding)
+    # assert_equal msg, f.to_s
+    #
+    # # We pass characters, but send bytes
+    # f = LibWebSocket::Frame.new("\342\230\272")
+    # msg = "\x00\342\230\272\xff"
+    # msg.force_encoding('UTF-8') if msg.respond_to?(:force_encoding)
+    # assert_equal msg, f.to_s
   end
 
 end

data/test/libwebsocket/draft-ietf-hybi-10/test_frame.rb

@@ -0,0 +1,84 @@
+# -*- encoding: binary -*-
+require 'test_helper'
+
+class TestFrame < Test::Unit::TestCase
+
+  def test_append_ietf_hybi_10
+    f = LibWebSocket::Frame.new(:version => 'draft-ietf-hybi-10')
+
+    f.append
+    assert_nil f.next
+    f.append('')
+    assert_nil f.next
+
+    # Not masked
+    f.append ["810548656c6c6f"].pack('H*')
+    assert_equal 'Hello', f.next_bytes
+    assert_equal 1, f.opcode
+    assert f.text?
+
+    # Multi
+    f.append(["810548656c6c6f"].pack('H*') + ["810548656c6c6f"].pack('H*'))
+    assert_equal 'Hello', f.next_bytes
+    assert_equal 'Hello', f.next_bytes
+
+    # Masked
+    f.append ["818537fa213d7f9f4d5158"].pack('H*')
+    assert_equal 'Hello', f.next_bytes
+    assert_equal 1, f.opcode
+
+    # Fragments
+    f.append ["010348656c"].pack("H*")
+    assert_nil f.next_bytes
+    f.append ["80026c6f"].pack("H*")
+    assert_equal 'Hello', f.next_bytes
+    assert_equal 1, f.opcode
+
+    # Multi fragments
+    f.append(["010348656c"].pack('H*') + ["80026c6f"].pack('H*'))
+    assert_equal 'Hello', f.next_bytes
+    assert_equal 1, f.opcode
+
+    # Injected control frame (1 fragment, ping, 2 fragment)
+    f.append ["010348656c"].pack('H*')
+    f.append ["890548656c6c6f"].pack('H*')
+    f.append ["80026c6f"].pack('H*')
+    assert_equal 'Hello', f.next_bytes
+    assert_equal 9, f.opcode
+    assert_equal 'Hello', f.next_bytes
+    assert_equal 1, f.opcode
+
+    # Too many fragments
+    130.times { f.append(["010348656c"].pack('H*')) }
+    assert_raise(LibWebSocket::Frame::Error::PolicyViolation) { f.next_bytes }
+
+    # Ping request
+    f = LibWebSocket::Frame.new(:version => 'draft-ietf-hybi-10')
+    f.append ["890548656c6c6f"].pack('H*')
+    assert_equal 'Hello', f.next_bytes
+    assert_equal 9, f.opcode
+    assert f.ping?
+
+    # Ping response
+    f.append ["8a0548656c6c6f"].pack('H*')
+    assert_equal 'Hello', f.next_bytes
+    assert_equal 10, f.opcode
+    assert f.pong?
+
+    # 256 bytes
+    f.append ["827E0100" + '05' * 256].pack('H*')
+    assert_equal 256, f.next_bytes.length
+    assert_equal 2, f.opcode
+    assert f.binary?
+
+    # 64KiB
+    f.append ["827F0000000000010000" + '05' * 65536].pack('H*')
+    assert_equal 65536, f.next_bytes.length
+    assert_equal 2, f.opcode
+
+    # Too big frame
+    f.append ["827F0000000000100000" + '05' * (65536 + 1)].pack('H*')
+    assert_raise(LibWebSocket::Frame::Error::MessageTooBig) { f.next_bytes }
+  end
+
+end

data/test/libwebsocket/test_cookie.rb

@@ -4,6 +4,7 @@ class TestCookie < Test::Unit::TestCase
 
   def test_parse
     cookie = LibWebSocket::Cookie.new
+    assert_nil cookie.parse
     assert_nil cookie.parse('')
     assert cookie.parse('foo=bar; baz = zab; hello= "the;re"; here')
     assert_equal [['foo', 'bar'], ['baz', 'zab'], ['hello', 'the;re'], ['here', nil]], cookie.pairs

data/test/libwebsocket/test_url.rb

@@ -3,6 +3,12 @@ require 'test_helper'
 class TestURL < Test::Unit::TestCase
 
   def test_parse
+    url = LibWebSocket::URL.new
+    assert url.parse('ws://example.com')
+    assert !url.secure
+    assert_equal 'example.com', url.host
+    assert_equal '/', url.resource_name
+
     url = LibWebSocket::URL.new
     assert url.parse('ws://example.com/')
     assert !url.secure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libwebsocket
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70118587928180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,39 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70118587928180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Universal Ruby library to handle WebSocket protocol
-email: bernard.potocki@imanel.org
+email:
+- bernard.potocki@imanel.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
+- Gemfile
 - README.md
 - Rakefile
 - examples/eventmachine_server.rb
@@ -40,6 +64,7 @@ files:
 - lib/libwebsocket/cookie/request.rb
 - lib/libwebsocket/cookie/response.rb
 - lib/libwebsocket/frame.rb
+- lib/libwebsocket/frame/error.rb
 - lib/libwebsocket/message.rb
 - lib/libwebsocket/opening_handshake.rb
 - lib/libwebsocket/opening_handshake/client.rb
@@ -48,13 +73,15 @@ files:
 - lib/libwebsocket/response.rb
 - lib/libwebsocket/stateful.rb
 - lib/libwebsocket/url.rb
+- lib/libwebsocket/version.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/draft-ietf-hybi-00/test_frame.rb
+- test/libwebsocket/draft-ietf-hybi-10/test_frame.rb
+- test/libwebsocket/handshake/test_client.rb
+- test/libwebsocket/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
@@ -76,16 +103,38 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2462651630557065482
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2462651630557065482
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Universal Ruby library to handle WebSocket protocol
-test_files: []
+test_files:
+- test/libwebsocket/cookie/request.rb
+- test/libwebsocket/cookie/response.rb
+- test/libwebsocket/draft-ietf-hybi-00/test_frame.rb
+- test/libwebsocket/draft-ietf-hybi-10/test_frame.rb
+- test/libwebsocket/handshake/test_client.rb
+- test/libwebsocket/handshake/test_server.rb
+- test/libwebsocket/test_cookie.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