plum 0.1.3 → 0.2.0

data/test/plum/test_connection.rb

@@ -23,7 +23,6 @@ class ConnectionTest < Minitest::Test
         con << Frame.new(type: :settings, stream_id: 0, payload: _settings * (limit / 6 + 1)).assemble
       }
     }
-
     new_con.call {|con|
       assert_connection_error(:frame_size_error) {
         con << Frame.new(type: :headers, stream_id: 3, payload: "\x00" * (limit + 1)).assemble
@@ -89,8 +88,16 @@ class ConnectionTest < Minitest::Test
     }
     prepare.call {|con|
       assert_equal(:waiting_continuation, con.state)
-      con << Frame.new(type: :continuation, flags: [:end_headers], stream_id: 3, payload: "hello").assemble
+      con << Frame.new(type: :continuation, flags: [:end_headers], stream_id: 3, payload: "").assemble
       assert_equal(:open, con.state)
     }
   end
+
+  def test_connection_local_error
+    open_server_connection { |con|
+      assert_raises(LocalConnectionError) {
+        con << Frame.goaway(0, :frame_size_error).assemble
+      }
+    }
+  end
 end

data/test/plum/test_connection_utils.rb

@@ -26,4 +26,13 @@ class ServerConnectionUtilsTest < Minitest::Test
       assert_equal(HTTPError::ERROR_CODES[:stream_closed], last.payload.uint32(4))
     }
   end
+
+  def test_push_enabled
+    open_server_connection {|con|
+      con << Frame.settings(enable_push: 0).assemble
+      assert_equal(false, con.push_enabled?)
+      con << Frame.settings(enable_push: 1).assemble
+      assert_equal(true, con.push_enabled?)
+    }
+  end
 end

data/test/plum/test_error.rb

@@ -7,7 +7,6 @@ class ErrorTest < Minitest::Test
       assert_equal(0x08, e.http2_error_code)
     }
 
-    test.call ConnectionError
-    test.call StreamError
+    test.call HTTPError
   end
 end

data/test/plum/test_frame_factory.rb

@@ -53,4 +53,41 @@ class FrameFactoryTest < Minitest::Test
                  flags: [:ack],
                  payload: "12345678")
   end
+
+  def test_continuation
+    frame = Frame.continuation(123, "abc", :end_headers)
+    assert_frame(frame,
+                 type: :continuation,
+                 stream_id: 123,
+                 flags: [:end_headers],
+                 payload: "abc")
+  end
+
+  def test_data
+    frame = Frame.data(123, "abc".force_encoding("UTF-8"))
+    assert_frame(frame,
+                 type: :data,
+                 stream_id: 123,
+                 flags: [],
+                 payload: "abc")
+    assert_equal(Encoding::BINARY, frame.payload.encoding)
+  end
+
+  def test_headers
+    frame = Frame.headers(123, "abc", :end_stream)
+    assert_frame(frame,
+                 type: :headers,
+                 stream_id: 123,
+                 flags: [:end_stream],
+                 payload: "abc")
+  end
+
+  def test_push_promise
+    frame = Frame.push_promise(345, 2, "abc", :end_headers)
+    assert_frame(frame,
+                 type: :push_promise,
+                 stream_id: 345,
+                 flags: [:end_headers],
+                 payload: "\x00\x00\x00\x02abc")
+  end
 end

data/test/plum/test_stream.rb

@@ -19,14 +19,34 @@ class StreamTest < Minitest::Test
     }
   end
 
-  def test_stream_close
-    open_new_stream(state: :half_closed_local) {|stream|
-      stream.close(:frame_size_error)
+  def test_stream_remote_error
+    open_server_connection { |con|
+      stream = nil
+      con.on(:headers) { |s|
+        stream = s
+        raise RemoteStreamError.new(:frame_size_error)
+      }
+
+      assert_stream_error(:frame_size_error) {
+        con << Frame.headers(1, "", :end_headers).assemble
+      }
 
       last = sent_frames.last
       assert_equal(:rst_stream, last.type)
-      assert_equal(StreamError.new(:frame_size_error).http2_error_code, last.payload.uint32)
+      assert_equal(HTTPError::ERROR_CODES[:frame_size_error], last.payload.uint32)
       assert_equal(:closed, stream.state)
     }
   end
+
+  def test_stream_local_error
+    open_server_connection { |con|
+      stream = nil
+      con.on(:headers) { |s| stream = s }
+
+      con << Frame.headers(1, "", :end_headers).assemble
+      assert_raises(LocalStreamError) {
+        con << Frame.rst_stream(1, :frame_size_error).assemble
+      }
+    }
+  end
 end

data/test/plum/test_stream_utils.rb

@@ -1,7 +1,6 @@
 require "test_helper"
 
 using BinaryString
-
 class StreamUtilsTest < Minitest::Test
   def test_stream_promise
     open_new_stream {|stream|

data/test/test_helper.rb

@@ -1,5 +1,3 @@
-LISTEN_PORT = ENV["PLUM_LISTEN_PORT"] || 40444
-
 unless ENV["SKIP_COVERAGE"]
   begin
     require "simplecov"
@@ -26,3 +24,8 @@ include Plum
 Dir.glob(File.expand_path("../utils/*.rb", __FILE__)).each do |file|
   require file
 end
+
+LISTEN_PORT = ENV["PLUM_LISTEN_PORT"] || 40444
+TLS_CERT = OpenSSL::X509::Certificate.new File.read(File.expand_path("../server.crt", __FILE__))
+TLS_KEY = OpenSSL::PKey::RSA.new File.read(File.expand_path("../server.key", __FILE__))
+ExampleError = Class.new(RuntimeError)

data/test/utils/assertions.rb

@@ -1,21 +1,21 @@
 module CustomAssertions
   def assert_connection_error(type, &blk)
-    assert_http_error(Plum::ConnectionError, type, &blk)
+    assert_http_error(Plum::RemoteConnectionError, type, &blk)
   end
 
   def assert_stream_error(type, &blk)
-    assert_http_error(Plum::StreamError, type, &blk)
+    assert_http_error(Plum::RemoteStreamError, type, &blk)
   end
 
   def assert_no_error(stream: nil, connection: nil, &blk)
-    Plum::ConnectionError.reset
-    Plum::StreamError.reset
+    Plum::RemoteConnectionError.reset
+    Plum::RemoteStreamError.reset
     begin
       blk.call
-    rescue Plum::HTTPError
+    rescue Plum::RemoteHTTPError
     end
-    assert_nil(Plum::StreamError.last, "No stream error expected but raised: #{Plum::StreamError.last}")
-    assert_nil(Plum::ConnectionError.last, "No connection error expected but raised: #{Plum::ConnectionError.last}")
+    assert_nil(Plum::RemoteStreamError.last, "No stream error expected but raised: #{Plum::RemoteStreamError.last}")
+    assert_nil(Plum::RemoteConnectionError.last, "No connection error expected but raised: #{Plum::RemoteConnectionError.last}")
   end
 
   def assert_frame(frame, **args)
@@ -56,5 +56,5 @@ module LastErrorExtension
     base.reset
   end
 end
-Plum::ConnectionError.__send__(:prepend, LastErrorExtension)
-Plum::StreamError.__send__(:prepend, LastErrorExtension)
+Plum::RemoteConnectionError.__send__(:prepend, LastErrorExtension)
+Plum::RemoteStreamError.__send__(:prepend, LastErrorExtension)

data/test/utils/client.rb

@@ -0,0 +1,19 @@
+require "timeout"
+
+module ServerUtils
+  def open_client_connection(scheme = :https)
+    io = StringIO.new
+    @_ccon = ClientConnection.new(io.method(:write))
+    @_ccon << Frame.new(type: :settings, stream_id: 0, flags: [:ack]).assemble
+    @_ccon << Frame.new(type: :settings, stream_id: 0).assemble
+    if block_given?
+      yield @_ccon
+    else
+      @_ccon
+    end
+  end
+end
+
+class Minitest::Test
+  include ServerUtils
+end

data/test/utils/server.rb

@@ -3,7 +3,7 @@ require "timeout"
 module ServerUtils
   def open_server_connection(scheme = :https)
     io = StringIO.new
-    @_con = (scheme == :https ? HTTPSConnection : HTTPConnection).new(io)
+    @_con = (scheme == :https ? HTTPSServerConnection : HTTPServerConnection).new(io)
     @_con << Connection::CLIENT_CONNECTION_PREFACE
     @_con << Frame.new(type: :settings, stream_id: 0).assemble
     if block_given?
@@ -13,16 +13,16 @@ module ServerUtils
     end
   end
 
-  def open_new_stream(arg1 = nil, **kwargs)
-    if arg1.is_a?(Connection)
+  def open_new_stream(arg1 = nil, state: :idle, **kwargs)
+    if arg1.is_a?(ServerConnection)
       con = arg1
     else
       con = open_server_connection
     end
 
-    @_stream = con.instance_eval {
-      new_stream((con.streams.keys.last||0/2)*2+1, **kwargs)
-    }
+    @_stream = con.instance_eval { stream(((@max_stream_id+1)/2)*2+1) }
+    @_stream.set_state(state)
+    @_stream.update_dependency(**kwargs)
     if block_given?
       yield @_stream
     else

data/test/utils/string_socket.rb

@@ -0,0 +1,15 @@
+class StringSocket < IO
+  # remove all methods
+  (IO.instance_methods - Object.instance_methods).each { |symbol| undef_method symbol }
+
+  extend Forwardable
+  def_delegators :@rio, :readpartial
+  def_delegators :@wio, :<<, :write
+
+  attr_reader :rio, :wio
+
+  def initialize(str = nil)
+    @rio = StringIO.new(str.to_s)
+    @wio = StringIO.new
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plum
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - rhenium
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: 5.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: 5.8.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A minimal implementation of HTTP/2 server.
+description: An HTTP/2 Library for Ruby
 email:
 - k@rhe.jp
 executables:
@@ -167,11 +167,20 @@ files:
 - Rakefile
 - bin/.gitkeep
 - bin/plum
+- circle.yml
+- examples/client/large.rb
+- examples/client/twitter.rb
 - examples/non_tls_server.rb
 - examples/rack.ru
 - examples/static_server.rb
 - lib/plum.rb
 - lib/plum/binary_string.rb
+- lib/plum/client.rb
+- lib/plum/client/client_session.rb
+- lib/plum/client/connection.rb
+- lib/plum/client/legacy_client_session.rb
+- lib/plum/client/response.rb
+- lib/plum/client/upgrade_client_session.rb
 - lib/plum/connection.rb
 - lib/plum/connection_utils.rb
 - lib/plum/errors.rb
@@ -185,8 +194,6 @@ files:
 - lib/plum/hpack/decoder.rb
 - lib/plum/hpack/encoder.rb
 - lib/plum/hpack/huffman.rb
-- lib/plum/http_connection.rb
-- lib/plum/https_connection.rb
 - lib/plum/rack.rb
 - lib/plum/rack/cli.rb
 - lib/plum/rack/config.rb
@@ -194,16 +201,26 @@ files:
 - lib/plum/rack/listener.rb
 - lib/plum/rack/server.rb
 - lib/plum/rack/session.rb
+- lib/plum/server/connection.rb
+- lib/plum/server/http_connection.rb
+- lib/plum/server/https_connection.rb
 - lib/plum/stream.rb
 - lib/plum/stream_utils.rb
 - lib/plum/version.rb
 - lib/rack/handler/plum.rb
 - plum.gemspec
+- test/plum/client/test_client.rb
+- test/plum/client/test_connection.rb
+- test/plum/client/test_legacy_client_session.rb
+- test/plum/client/test_response.rb
+- test/plum/client/test_upgrade_client_session.rb
 - test/plum/connection/test_handle_frame.rb
 - test/plum/hpack/test_context.rb
 - test/plum/hpack/test_decoder.rb
 - test/plum/hpack/test_encoder.rb
 - test/plum/hpack/test_huffman.rb
+- test/plum/server/test_http_connection.rb
+- test/plum/server/test_https_connection.rb
 - test/plum/stream/test_handle_frame.rb
 - test/plum/test_binary_string.rb
 - test/plum/test_connection.rb
@@ -214,8 +231,6 @@ files:
 - test/plum/test_frame.rb
 - test/plum/test_frame_factory.rb
 - test/plum/test_frame_utils.rb
-- test/plum/test_http_connection.rb
-- test/plum/test_https_connection.rb
 - test/plum/test_stream.rb
 - test/plum/test_stream_utils.rb
 - test/server.crt
@@ -223,7 +238,9 @@ files:
 - test/server.key
 - test/test_helper.rb
 - test/utils/assertions.rb
+- test/utils/client.rb
 - test/utils/server.rb
+- test/utils/string_socket.rb
 homepage: https://github.com/rhenium/plum
 licenses:
 - MIT
@@ -247,13 +264,20 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: A minimal implementation of HTTP/2 server.
+summary: An HTTP/2 Library for Ruby
 test_files:
+- test/plum/client/test_client.rb
+- test/plum/client/test_connection.rb
+- test/plum/client/test_legacy_client_session.rb
+- test/plum/client/test_response.rb
+- test/plum/client/test_upgrade_client_session.rb
 - test/plum/connection/test_handle_frame.rb
 - test/plum/hpack/test_context.rb
 - test/plum/hpack/test_decoder.rb
 - test/plum/hpack/test_encoder.rb
 - test/plum/hpack/test_huffman.rb
+- test/plum/server/test_http_connection.rb
+- test/plum/server/test_https_connection.rb
 - test/plum/stream/test_handle_frame.rb
 - test/plum/test_binary_string.rb
 - test/plum/test_connection.rb
@@ -264,8 +288,6 @@ test_files:
 - test/plum/test_frame.rb
 - test/plum/test_frame_factory.rb
 - test/plum/test_frame_utils.rb
-- test/plum/test_http_connection.rb
-- test/plum/test_https_connection.rb
 - test/plum/test_stream.rb
 - test/plum/test_stream_utils.rb
 - test/server.crt
@@ -273,5 +295,7 @@ test_files:
 - test/server.key
 - test/test_helper.rb
 - test/utils/assertions.rb
+- test/utils/client.rb
 - test/utils/server.rb
+- test/utils/string_socket.rb
 has_rdoc: