h1p 0.1 → 0.4

data/test/{test_h1p.rb → test_h1p_server.rb}

@@ -5,13 +5,13 @@ require 'h1p'
 require 'socket'
 require_relative '../ext/h1p/limits'
 
-class H1PTest < MiniTest::Test
+class H1PRequestTest < MiniTest::Test
   Error = H1P::Error
 
   def setup
     super
     @i, @o = IO.pipe
-    @parser = H1P::Parser.new(@i)
+    @parser = H1P::Parser.new(@i, :server)
   end
   alias_method :reset_parser, :setup
 
@@ -22,7 +22,7 @@ class H1PTest < MiniTest::Test
 
     assert_equal(
       {
-        ':method' => 'get',
+        ':method' => 'GET',
         ':path' => '/',
         ':protocol' => 'http/1.1',
         ':rx' => msg.bytesize
@@ -38,7 +38,7 @@ class H1PTest < MiniTest::Test
 
     assert_equal(
       {
-        ':method' => 'get',
+        ':method' => 'GET',
         ':path' => '/',
         ':protocol' => 'http/1.1',
         ':rx' => msg.bytesize
@@ -57,17 +57,17 @@ class H1PTest < MiniTest::Test
   def test_method_case
     @o << "GET / HTTP/1.1\r\n\r\n"
     headers = @parser.parse_headers
-    assert_equal 'get', headers[':method']
+    assert_equal 'GET', headers[':method']
 
     reset_parser
     @o << "post / HTTP/1.1\r\n\r\n"
     headers = @parser.parse_headers
-    assert_equal 'post', headers[':method']
+    assert_equal 'POST', headers[':method']
 
     reset_parser
     @o << "PoST / HTTP/1.1\r\n\r\n"
     headers = @parser.parse_headers
-    assert_equal 'post', headers[':method']
+    assert_equal 'POST', headers[':method']
   end
 
   def test_bad_method
@@ -75,12 +75,12 @@ class H1PTest < MiniTest::Test
     @o.close
 
     assert_raises(Error) { @parser.parse_headers }
-  
+
     max_length = H1P_LIMITS[:max_method_length]
 
     reset_parser
     @o << "#{'a' * max_length} / HTTP/1.1\r\n\r\n"
-    assert_equal 'a' * max_length, @parser.parse_headers[':method']
+    assert_equal 'A' * max_length, @parser.parse_headers[':method']
 
     reset_parser
     @o << "#{'a' * (max_length + 1)} / HTTP/1.1\r\n\r\n"
@@ -96,7 +96,7 @@ class H1PTest < MiniTest::Test
   def test_bad_path
     @o << "GET HTTP/1.1\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
-  
+
     max_length = H1P_LIMITS[:max_path_length]
 
     reset_parser
@@ -149,26 +149,26 @@ class H1PTest < MiniTest::Test
     assert_raises(Error) { @parser.parse_headers }
 
     reset_parser
-    @o << "GET / http/1.1.1\r\n\r\n"
+    @o << "GET / HTTP/1.1.1\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
   end
 
   def test_headers_eof
     @o << "GET / HTTP/1.1\r\na"
     @o.close
-    
+
     assert_nil @parser.parse_headers
 
     reset_parser
     @o << "GET / HTTP/1.1\r\na:"
     @o.close
-    
+
     assert_nil @parser.parse_headers
 
     reset_parser
     @o << "GET / HTTP/1.1\r\na:      "
     @o.close
-    
+
     assert_nil @parser.parse_headers
   end
 
@@ -197,46 +197,46 @@ class H1PTest < MiniTest::Test
   end
 
   def test_bad_headers
-    @o << "GET / http/1.1\r\n   a: b\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\n   a: b\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
 
     reset_parser
-    @o << "GET / http/1.1\r\na b\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\na b\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
 
     max_key_length = H1P_LIMITS[:max_header_key_length]
 
     reset_parser
-    @o << "GET / http/1.1\r\n#{'a' * max_key_length}: b\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\n#{'a' * max_key_length}: b\r\n\r\n"
     headers = @parser.parse_headers
     assert_equal 'b', headers['a' * max_key_length]
 
     reset_parser
-    @o << "GET / http/1.1\r\n#{'a' * (max_key_length + 1)}: b\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\n#{'a' * (max_key_length + 1)}: b\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
 
     max_value_length = H1P_LIMITS[:max_header_value_length]
 
     reset_parser
-    @o << "GET / http/1.1\r\nfoo: #{'a' * max_value_length}\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\nfoo: #{'a' * max_value_length}\r\n\r\n"
     headers = @parser.parse_headers
     assert_equal 'a' * max_value_length, headers['foo']
 
     reset_parser
-    @o << "GET / http/1.1\r\nfoo: #{'a' * (max_value_length + 1)}\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\nfoo: #{'a' * (max_value_length + 1)}\r\n\r\n"
     assert_raises(Error) { @parser.parse_headers }
 
     max_header_count = H1P_LIMITS[:max_header_count]
 
     reset_parser
     hdrs = (1..max_header_count).map { |i| "foo#{i}: bar\r\n" }.join
-    @o << "GET / http/1.1\r\n#{hdrs}\r\n"
+    @o << "GET / HTTP/1.1\r\n#{hdrs}\r\n"
     headers = @parser.parse_headers
     assert_equal (max_header_count + 4), headers.size
 
     reset_parser
     hdrs = (1..(max_header_count + 1)).map { |i| "foo#{i}: bar\r\n" }.join
-    @o << "GET / http/1.1\r\n#{hdrs}\r\n"
+    @o << "GET / HTTP/1.1\r\n#{hdrs}\r\n"
     assert_raises(Error) { @parser.parse_headers }
   end
 
@@ -245,7 +245,7 @@ class H1PTest < MiniTest::Test
     @o << msg
     headers = @parser.parse_headers
     assert_equal({
-      ':method'   => 'get',
+      ':method'   => 'GET',
       ':path'     => '/foo',
       ':protocol' => 'http/1.1',
       'bar'       => 'baz',
@@ -256,7 +256,7 @@ class H1PTest < MiniTest::Test
   def test_read_body_with_content_length
     10.times do
       data = ' ' * rand(20..60000)
-      msg = "POST /foo HTTP/1.1\r\nContent-Length: #{data.bytesize}\r\n\r\n#{data}"
+      msg = "GET / HTTP/1.1\r\nContent-Length: #{data.bytesize}\r\n\r\n#{data}"
       Thread.new { @o << msg }
 
       headers = @parser.parse_headers
@@ -270,7 +270,7 @@ class H1PTest < MiniTest::Test
 
   def test_read_body_chunk_with_content_length
     data = 'abc' * 20000
-    msg = "POST /foo HTTP/1.1\r\nContent-Length: #{data.bytesize}\r\n\r\n#{data}"
+    msg = "GET / HTTP/1.1\r\nContent-Length: #{data.bytesize}\r\n\r\n#{data}"
     Thread.new { @o << msg }
     headers = @parser.parse_headers
     assert_equal data.bytesize.to_s, headers['content-length']
@@ -290,7 +290,7 @@ class H1PTest < MiniTest::Test
   def test_read_body_with_content_length_incomplete
     data = ' ' * rand(20..60000)
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nContent-Length: #{data.bytesize + 1}\r\n\r\n#{data}"
+      @o << "GET / HTTP/1.1\r\nContent-Length: #{data.bytesize + 1}\r\n\r\n#{data}"
       @o.close # !!! otherwise the parser will keep waiting
     end
     headers = @parser.parse_headers
@@ -300,7 +300,7 @@ class H1PTest < MiniTest::Test
 
   def test_read_body_chunk_with_content_length_incomplete
     data = 'abc' * 50
-    @o << "POST /foo HTTP/1.1\r\nContent-Length: #{data.bytesize + 1}\r\n\r\n#{data}"
+    @o << "GET / HTTP/1.1\r\nContent-Length: #{data.bytesize + 1}\r\n\r\n#{data}"
     @o.close
     headers = @parser.parse_headers
 
@@ -311,7 +311,7 @@ class H1PTest < MiniTest::Test
     chunks = []
     total_sent = 0
     Thread.new do
-      msg = "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      msg = "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       @o << msg
       total_sent += msg.bytesize
       rand(8..16).times do |i|
@@ -324,7 +324,7 @@ class H1PTest < MiniTest::Test
       msg = "0\r\n\r\n"
       @o << msg
       total_sent += msg.bytesize
-    end 
+    end
     headers = @parser.parse_headers
     assert_equal 'chunked', headers['transfer-encoding']
 
@@ -337,7 +337,7 @@ class H1PTest < MiniTest::Test
     chunks = []
     total_sent = 0
     Thread.new do
-      msg = "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      msg = "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       @o << msg
       total_sent += msg.bytesize
       rand(8..16).times do |i|
@@ -350,7 +350,7 @@ class H1PTest < MiniTest::Test
       msg = "0\r\n\r\n"
       @o << msg
       total_sent += msg.bytesize
-    end 
+    end
     headers = @parser.parse_headers
     assert_equal 'chunked', headers['transfer-encoding']
 
@@ -364,7 +364,7 @@ class H1PTest < MiniTest::Test
 
   def test_read_body_with_chunked_encoding_malformed
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' '.to_s * rand(40000..360000)
       @o << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n3"
       @o << "0\r\n\r\n"
@@ -376,22 +376,22 @@ class H1PTest < MiniTest::Test
     reset_parser
     # missing last empty chunk
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' '.to_s * rand(40000..360000)
       @o << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
       @o.close
-    end 
+    end
     headers = @parser.parse_headers
     assert_raises(H1P::Error) { @parser.read_body }
 
     reset_parser
     # bad chunk size
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' '.to_s * rand(40000..360000)
       @o << "-#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
       @o.close
-    end 
+    end
     headers = @parser.parse_headers
     assert_raises(H1P::Error) { @parser.read_body }
   end
@@ -399,7 +399,7 @@ class H1PTest < MiniTest::Test
   def test_read_body_chunk_with_chunked_encoding_malformed
     chunk = nil
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' ' * rand(40000..360000)
       @o << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n3"
       @o << "0\r\n\r\n"
@@ -415,7 +415,7 @@ class H1PTest < MiniTest::Test
     # missing last empty chunk
     chunk = nil
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' '.to_s * rand(20..1600)
       @o << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
       @o.close
@@ -429,18 +429,18 @@ class H1PTest < MiniTest::Test
 
     # bad chunk size
     Thread.new do
-      @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+      @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
       chunk = ' '.to_s * rand(20..1600)
       @o << "-#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
       @o.close
-    end 
+    end
     headers = @parser.parse_headers
     assert_raises(H1P::Error) { @parser.read_body_chunk(false) }
 
     reset_parser
 
     # missing body
-    @o << "POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
+    @o << "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"
     @o.close
     headers = @parser.parse_headers
     assert_raises(H1P::Error) { @parser.read_body_chunk(false) }
@@ -519,7 +519,7 @@ class H1PTest < MiniTest::Test
     server_thread = Thread.new do
       while (socket = server.accept)
         Thread.new do
-          parser = H1P::Parser.new(socket)
+          parser = H1P::Parser.new(socket, :server)
           headers = parser.parse_headers
           socket << headers.inspect
           socket.shutdown
@@ -534,7 +534,7 @@ class H1PTest < MiniTest::Test
     client << msg
     reply = client.read
     assert_equal({
-      ':method' => 'get',
+      ':method' => 'GET',
       ':path' => '/foo',
       ':protocol' => 'http/1.1',
       'cookie' => 'abc=def',
@@ -556,11 +556,11 @@ class H1PTest < MiniTest::Test
       request
     end
 
-    parser = H1P::Parser.new(callable)
+    parser = H1P::Parser.new(callable, :server)
 
     headers = parser.parse_headers
     assert_equal({
-      ':method' => 'get',
+      ':method' => 'GET',
       ':path' => '/foo',
       ':protocol' => 'http/1.1',
       'host' => 'bar',
@@ -572,7 +572,7 @@ class H1PTest < MiniTest::Test
     request = +"GET /bar HTTP/1.1\r\nHost: baz\r\n\r\n"
     headers = parser.parse_headers
     assert_equal({
-      ':method' => 'get',
+      ':method' => 'GET',
       ':path' => '/bar',
       ':protocol' => 'http/1.1',
       'host' => 'baz',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h1p
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.4'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -30,42 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 5.14.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.3
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 5.14.4
 description: 
 email: sharon@noteflakes.com
 executables: []
@@ -84,6 +70,8 @@ files:
 - Rakefile
 - TODO.md
 - benchmarks/bm_http1_parser.rb
+- benchmarks/pipelined.rb
+- examples/callable.rb
 - examples/http_server.rb
 - ext/h1p/extconf.rb
 - ext/h1p/h1p.c
@@ -93,7 +81,9 @@ files:
 - lib/h1p.rb
 - lib/h1p/version.rb
 - test/helper.rb
-- test/test_h1p.rb
+- test/run.rb
+- test/test_h1p_client.rb
+- test/test_h1p_server.rb
 homepage: http://github.com/digital-fabric/h1p
 licenses:
 - MIT