http-2 0.6.1 → 0.6.3

data/spec/connection_spec.rb

@@ -2,20 +2,12 @@ require "helper"
 
 describe HTTP2::Connection do
   before(:each) do
-    @conn = Connection.new
+    @conn = Client.new
   end
 
   let(:f) { Framer.new }
 
   context "initialization and settings" do
-    it "should return odd ids for client requests" do
-      @conn = Connection.new(:client)
-      @conn.new_stream.id.should_not be_even
-
-      @conn = Connection.new(:server)
-      @conn.new_stream.id.should be_even
-    end
-
     it "should raise error if first frame is not SETTINGS" do
       (FRAME_TYPES - [SETTINGS]).each do |frame|
         frame = set_stream_id(f.generate(frame), 0x0)
@@ -33,8 +25,8 @@ describe HTTP2::Connection do
   end
 
   context "stream management" do
-    it "should initialize to default stream limit (infinite)" do
-      @conn.stream_limit.should eq Float::INFINITY
+    it "should initialize to default stream limit (100)" do
+      @conn.stream_limit.should eq 100
     end
 
     it "should change stream limit to received SETTINGS value" do
@@ -93,56 +85,6 @@ describe HTTP2::Connection do
 
       stream.priority.should eq 20
     end
-
-    context "push" do
-      it "should raise error on PUSH_PROMISE against stream 0" do
-        expect {
-          @conn << set_stream_id(f.generate(PUSH_PROMISE), 0)
-        }.to raise_error(ProtocolError)
-      end
-
-      it "should raise error on PUSH_PROMISE against bogus stream" do
-        expect {
-          @conn << set_stream_id(f.generate(PUSH_PROMISE), 31415)
-        }.to raise_error(ProtocolError)
-      end
-
-      it "should raise error on PUSH_PROMISE against non-idle stream" do
-        expect {
-          s = @conn.new_stream
-          s.send HEADERS
-
-          @conn << set_stream_id(f.generate(PUSH_PROMISE), s.id)
-          @conn << set_stream_id(f.generate(PUSH_PROMISE), s.id)
-       }.to raise_error(ProtocolError)
-      end
-
-      it "should emit stream object for received PUSH_PROMISE" do
-        s = @conn.new_stream
-        s.send HEADERS
-
-        promise = nil
-        @conn.on(:promise) {|s| promise = s }
-        @conn << set_stream_id(f.generate(PUSH_PROMISE), s.id)
-
-        promise.id.should eq 2
-        promise.state.should eq :reserved_remote
-      end
-
-      it "should auto RST_STREAM promises against locally-RST stream" do
-        s = @conn.new_stream
-        s.send HEADERS
-        s.close
-
-        @conn.stub(:send)
-        @conn.should_receive(:send) do |frame|
-          frame[:type].should eq :rst_stream
-          frame[:stream].should eq 2
-        end
-
-        @conn << set_stream_id(f.generate(PUSH_PROMISE), s.id)
-      end
-    end
   end
 
   context "flow control" do
@@ -295,24 +237,22 @@ describe HTTP2::Connection do
 
     it "should raise connection error on decode exception" do
       @conn << f.generate(SETTINGS)
+      frame = f.generate(HEADERS.dup)
+      frame[1] = 0.chr
 
-      headers = HEADERS.dup
-      headers[:payload] = [0x44, 0x16].pack("C*")
-      expect { @conn << f.generate(headers) }.to raise_error(CompressionError)
+      expect { @conn << frame }.to raise_error(ProtocolError)
     end
 
     it "should emit encoded frames via on(:frame)" do
       bytes = nil
       @conn.on(:frame) {|d| bytes = d }
-      @conn.settings({
-        settings_max_concurrent_streams: 10,
-        settings_flow_control_options: 1
-      })
+      @conn.settings(stream_limit: 10, window_limit: Float::INFINITY)
 
       bytes.should eq f.generate(SETTINGS)
     end
 
     it "should compress stream headers" do
+      @conn.ping("12345678")
       @conn.on(:frame) do |bytes|
         bytes.force_encoding('binary')
         bytes.should_not match('get')
@@ -331,6 +271,16 @@ describe HTTP2::Connection do
   end
 
   context "connection management" do
+    it "should raise error on invalid connection header" do
+      srv = Server.new
+      expect { srv.dup << f.generate(SETTINGS) }.to raise_error(HandshakeError)
+
+      expect {
+        srv << CONNECTION_HEADER
+        srv << f.generate(SETTINGS)
+      }.to_not raise_error
+    end
+
     it "should respond to PING frames" do
       @conn << f.generate(SETTINGS)
       @conn.should_receive(:send) do |frame|
@@ -408,18 +358,16 @@ describe HTTP2::Connection do
 
   context "API" do
     it ".settings should emit SETTINGS frames" do
-      settings = {
-        settings_max_concurrent_streams: 10,
-        settings_flow_control_options: 1
-      }
-
       @conn.should_receive(:send) do |frame|
         frame[:type].should eq :settings
-        frame[:payload].should eq settings
+        frame[:payload].should eq({
+          settings_max_concurrent_streams: 10,
+          settings_flow_control_options: 1
+        })
         frame[:stream].should eq 0
       end
 
-      @conn.settings settings
+      @conn.settings(stream_limit: 10, window_limit: Float::INFINITY)
     end
 
     it ".ping should generate PING frames" do
@@ -444,5 +392,6 @@ describe HTTP2::Connection do
 
       @conn.goaway(:internal_error, "payload")
     end
+
   end
 end

data/spec/emitter_spec.rb

@@ -31,6 +31,14 @@ describe HTTP2::Emitter do
     args.should eq 123
   end
 
+  it "should pass emitted callbacks to listeners" do
+    @w.on(:a)   { |&block| block.call }
+    @w.once(:a) { |&block| block.call }
+    @w.emit(:a) { @cnt += 1 }
+
+    @cnt.should eq 2
+  end
+
   it "should allow events with no callbacks" do
     expect { @w.emit(:missing) }.to_not raise_error
   end

data/spec/framer_spec.rb

@@ -14,7 +14,7 @@ describe HTTP2::Framer do
       }
     }
 
-    let(:bytes) { [0x04, 0x01, 0x7, 0x0000000F].pack("SCCL") }
+    let(:bytes) { [0x04, 0x01, 0x7, 0x0000000F].pack("nCCN") }
 
     it "should generate common 8 byte header" do
       f.commonHeader(frame).should eq bytes
@@ -64,9 +64,9 @@ describe HTTP2::Framer do
       }
 
       bytes = f.generate(frame)
-      bytes.should eq [0x4,0x0,0x3,0x1,*'text'.bytes].pack("SCCLC*")
+      bytes.should eq [0x4,0x0,0x3,0x1,*'text'.bytes].pack("nCCNC*")
 
-      f.parse(Buffer.new(bytes)).should eq frame
+      f.parse(bytes).should eq frame
     end
   end
 
@@ -81,8 +81,8 @@ describe HTTP2::Framer do
       }
 
       bytes = f.generate(frame)
-      bytes.should eq [0xc,0x1,0x7,0x1,*'header-block'.bytes].pack("SCCLC*")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0xc,0x1,0x7,0x1,*'header-block'.bytes].pack("nCCNC*")
+      f.parse(bytes).should eq frame
     end
 
     it "should carry an optional stream priority" do
@@ -96,8 +96,8 @@ describe HTTP2::Framer do
       }
 
       bytes = f.generate(frame)
-      bytes.should eq [0x10,0x1,0xc,0x1,0xf,*'header-block'.bytes].pack("SCCLLC*")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0x10,0x1,0xc,0x1,0xf,*'header-block'.bytes].pack("nCCNNC*")
+      f.parse(bytes).should eq frame
     end
   end
 
@@ -111,8 +111,8 @@ describe HTTP2::Framer do
       }
 
       bytes = f.generate(frame)
-      bytes.should eq [0x4,0x2,0x0,0x1,0xf].pack("SCCLL")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0x4,0x2,0x0,0x1,0xf].pack("nCCNN")
+      f.parse(bytes).should eq frame
     end
   end
 
@@ -126,8 +126,8 @@ describe HTTP2::Framer do
       }
 
       bytes = f.generate(frame)
-      bytes.should eq [0x4,0x3,0x0,0x1,0x5].pack("SCCLL")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0x4,0x3,0x0,0x1,0x5].pack("nCCNN")
+      f.parse(bytes).should eq frame
     end
   end
 
@@ -136,6 +136,7 @@ describe HTTP2::Framer do
       {
         length: 8,
         type: :settings,
+        flags: [],
         stream: 0,
         payload: {
           settings_max_concurrent_streams: 10
@@ -146,20 +147,19 @@ describe HTTP2::Framer do
     it "should generate and parse bytes" do
 
       bytes = f.generate(frame)
-      bytes.should eq [0x8,0x4,0x0,0x0,0x4,0xa].pack("SCCLLL")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0x8,0x4,0x0,0x0,0x4,0xa].pack("nCCNNN")
+      f.parse(bytes).should eq frame
     end
 
-    it "should encode custom settings" do
-      frame[:length] = 8*3
+    it "should ignore custom settings" do
+      frame[:length] = 8*2
       frame[:payload] = {
         settings_max_concurrent_streams: 10,
-        settings_initial_window_size:    20,
-        55 => 30
+        settings_initial_window_size:    20
       }
 
-      f.parse(Buffer.new(f.generate(frame))).should eq frame
-
+      buf = f.generate(frame.merge({55 => 30}))
+      f.parse(buf).should eq frame
     end
 
     it "should raise exception on invalid stream ID" do
@@ -189,8 +189,8 @@ describe HTTP2::Framer do
       }
 
       bytes = f.generate(frame)
-      bytes.should eq [0xb,0x5,0x1,0x1,0x2,*'headers'.bytes].pack("SCCLLC*")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0xb,0x5,0x1,0x1,0x2,*'headers'.bytes].pack("nCCNNC*")
+      f.parse(bytes).should eq frame
     end
   end
 
@@ -207,8 +207,8 @@ describe HTTP2::Framer do
 
     it "should generate and parse bytes" do
       bytes = f.generate(frame)
-      bytes.should eq [0x8,0x6,0x1,0x1,*'12345678'.bytes].pack("SCCLC*")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0x8,0x6,0x1,0x1,*'12345678'.bytes].pack("nCCNC*")
+      f.parse(bytes).should eq frame
     end
 
     it "should raise exception on invalid payload" do
@@ -233,8 +233,8 @@ describe HTTP2::Framer do
 
     it "should generate and parse bytes" do
       bytes = f.generate(frame)
-      bytes.should eq [0xd,0x7,0x0,0x1,0x2,0x0,*'debug'.bytes].pack("SCCLLLC*")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0xd,0x7,0x0,0x1,0x2,0x0,*'debug'.bytes].pack("nCCNNNC*")
+      f.parse(bytes).should eq frame
     end
 
     it "should treat debug payload as optional" do
@@ -242,8 +242,8 @@ describe HTTP2::Framer do
       frame[:length] = 0x8
 
       bytes = f.generate(frame)
-      bytes.should eq [0x8,0x7,0x0,0x1,0x2,0x0].pack("SCCLLL")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0x8,0x7,0x0,0x1,0x2,0x0].pack("nCCNNN")
+      f.parse(bytes).should eq frame
     end
   end
 
@@ -256,8 +256,8 @@ describe HTTP2::Framer do
       }
 
       bytes = f.generate(frame)
-      bytes.should eq [0x4,0x9,0x0,0x0,0xa].pack("SCCLL")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0x4,0x9,0x0,0x0,0xa].pack("nCCNN")
+      f.parse(bytes).should eq frame
     end
   end
 
@@ -272,8 +272,8 @@ describe HTTP2::Framer do
       }
 
       bytes = f.generate(frame)
-      bytes.should eq [0xc,0xa,0x3,0x1,*'header-block'.bytes].pack("SCCLC*")
-      f.parse(Buffer.new(bytes)).should eq frame
+      bytes.should eq [0xc,0xa,0x3,0x1,*'header-block'.bytes].pack("nCCNC*")
+      f.parse(bytes).should eq frame
     end
   end
 
@@ -293,7 +293,7 @@ describe HTTP2::Framer do
 
     frames.each do |(frame, size)|
       bytes = f.generate(frame)
-      Buffer.new(bytes).slice(0,2).unpack("S").first.should eq size
+      bytes.slice(0,2).unpack("n").first.should eq size
     end
   end
 
@@ -303,7 +303,7 @@ describe HTTP2::Framer do
       {type: :data, stream: 1, flags: [:end_stream], payload: "abc"}
     ]
 
-    buf = Buffer.new(f.generate(frames[0]) + f.generate(frames[1]))
+    buf = f.generate(frames[0]) << f.generate(frames[1])
 
     f.parse(buf).should eq frames[0]
     f.parse(buf).should eq frames[1]
@@ -313,13 +313,9 @@ describe HTTP2::Framer do
     frame = {type: :headers, stream: 1, payload: "headers"}
     bytes = f.generate(frame)
 
-    buf = Buffer.new(bytes[0...-1])
-    f.parse(buf).should be_nil
-    buf.should eq bytes[0...-1]
-
-    buf = Buffer.new(bytes)
-    f.parse(buf).should eq frame
-    buf.should be_empty
+    f.parse(bytes[0...-1]).should be_nil
+    f.parse(bytes).should eq frame
+    bytes.should be_empty
   end
 
 end

data/spec/helper.rb

@@ -1,4 +1,8 @@
 require 'http/2'
+require 'json'
+require 'coveralls'
+
+Coveralls.wear! if ENV["CI"]
 
 include HTTP2
 include HTTP2::Header
@@ -91,8 +95,8 @@ FRAME_TYPES = [
 ]
 
 def set_stream_id(bytes, id)
-  head = bytes.slice!(0,8).unpack("SCCL")
+  head = bytes.slice!(0,8).unpack('nCCN')
   head[3] = id
 
-  head.pack("SCCL") + bytes
+  head.pack('nCCN') + bytes
 end

data/spec/server_spec.rb

@@ -0,0 +1,50 @@
+require "helper"
+
+describe HTTP2::Server do
+  before(:each) do
+    @srv = Server.new
+  end
+
+  let(:f) { Framer.new }
+
+  context "initialization and settings" do
+    it "should return even stream IDs" do
+      @srv.new_stream.id.should be_even
+    end
+
+    it "should emit SETTINGS on new connection" do
+      frames = []
+      @srv.on(:frame) { |recv| frames << recv }
+      @srv << CONNECTION_HEADER
+
+      f.parse(frames[0])[:type].should eq :settings
+    end
+
+    it "should initialize client with custom connection settings" do
+      frames = []
+
+      @srv = Server.new(streams: 200, window: 2**10)
+      @srv.on(:frame) { |recv| frames << recv }
+      @srv << CONNECTION_HEADER
+
+      frame = f.parse(frames[0])
+      frame[:type].should eq :settings
+      frame[:payload][:settings_max_concurrent_streams].should eq 200
+      frame[:payload][:settings_initial_window_size].should eq 2**10
+    end
+  end
+
+  it "should allow server push" do
+    client = Client.new
+    client.on(:frame) { |bytes| @srv << bytes }
+
+    @srv.on(:stream) do |stream|
+      expect {
+        stream.promise({}) {}
+      }.to_not raise_error
+    end
+
+    client.new_stream
+    client.send HEADERS
+  end
+end

data/spec/stream_spec.rb

@@ -2,8 +2,8 @@ require "helper"
 
 describe HTTP2::Stream do
   before(:each) do
-    @conn = Connection.new
-    @stream = @conn.new_stream
+    @client = Client.new
+    @stream = @client.new_stream
   end
 
   context "stream states" do
@@ -11,10 +11,9 @@ describe HTTP2::Stream do
       @stream.state.should eq :idle
     end
 
-    it "should set stream priority and flow window" do
-      stream = @conn.new_stream(priority: 3, window: 1024)
+    it "should set custom stream priority" do
+      stream = @client.new_stream(priority: 3)
       stream.priority.should eq 3
-      stream.window.should eq 1024
     end
 
     context "reserved (local)" do
@@ -137,7 +136,7 @@ describe HTTP2::Stream do
       end
 
       it "should transition to half closed if remote opened with END_STREAM" do
-        s = @conn.new_stream
+        s = @client.new_stream
         hclose = HEADERS.dup
         hclose[:flags] = [:end_stream]
 
@@ -146,7 +145,7 @@ describe HTTP2::Stream do
       end
 
       it "should transition to half closed if local opened with END_STREAM" do
-        s = @conn.new_stream
+        s = @client.new_stream
         hclose = HEADERS.dup
         hclose[:flags] = [:end_stream]
 
@@ -166,8 +165,8 @@ describe HTTP2::Stream do
 
       it "should emit :active on open transition" do
         openp, openr = false, false
-        sp = @conn.new_stream
-        sr = @conn.new_stream
+        sp = @client.new_stream
+        sr = @client.new_stream
         sp.on(:active) { openp = true }
         sr.on(:active) { openr = true }
 
@@ -179,7 +178,7 @@ describe HTTP2::Stream do
       end
 
       it "should not emit :active on transition from open" do
-        order, stream = [], @conn.new_stream
+        order, stream = [], @client.new_stream
 
         stream.on(:active) { order << :active }
         stream.on(:half_close) { order << :half_close }
@@ -208,7 +207,7 @@ describe HTTP2::Stream do
       end
 
       it "should emit :close after frame is processed" do
-        order, stream = [], @conn.new_stream
+        order, stream = [], @client.new_stream
 
         stream.on(:active) { order << :active }
         stream.on(:data)   { order << :data }
@@ -270,7 +269,7 @@ describe HTTP2::Stream do
 
       it "should emit :half_close event on transition" do
         order = []
-        stream = @conn.new_stream
+        stream = @client.new_stream
         stream.on(:active) { order << :active }
         stream.on(:half_close) { order << :half_close }
 
@@ -330,7 +329,7 @@ describe HTTP2::Stream do
 
       it "should emit :half_close event on transition" do
         order = []
-        stream = @conn.new_stream
+        stream = @client.new_stream
         stream.on(:active) { order << :active }
         stream.on(:half_close) { order << :half_close }
 
@@ -460,9 +459,9 @@ describe HTTP2::Stream do
       settings[:stream] = 0
 
       framer = Framer.new
-      @conn << framer.generate(settings)
+      @client << framer.generate(settings)
 
-      s1 = @conn.new_stream
+      s1 = @client.new_stream
       s1.send HEADERS
       s1.send data.merge({payload: "x" * 900, flags: []})
       s1.window.should eq 100
@@ -471,7 +470,7 @@ describe HTTP2::Stream do
       s1.window.should eq 0
       s1.buffered_amount.should eq 100
 
-      @conn << framer.generate(WINDOW_UPDATE.merge({
+      @client << framer.generate(WINDOW_UPDATE.merge({
         stream: s1.id, increment: 1000
       }))
       s1.buffered_amount.should eq 0
@@ -490,8 +489,8 @@ describe HTTP2::Stream do
     end
 
     it ".reprioritize should raise error if invoked by server" do
-      conn = Connection.new(:server)
-      stream = conn.new_stream
+      srv = Server.new
+      stream = srv.new_stream
 
       expect { stream.reprioritize(10) }.to raise_error(StreamError)
     end
@@ -557,11 +556,11 @@ describe HTTP2::Stream do
 
   context "server API" do
     before(:each) do
-      @srv = Connection.new(:server)
+      @srv = Server.new
       @frm = Framer.new
 
-      @conn.on(:frame) {|bytes| @srv << bytes }
-      @client_stream = @conn.new_stream
+      @client.on(:frame) {|bytes| @srv << bytes }
+      @client_stream = @client.new_stream
     end
 
     it "should emit received headers via on(:headers)" do
@@ -600,21 +599,15 @@ describe HTTP2::Stream do
 
     context "push" do
       before(:each) do
-        @srv.on(:frame)  {|bytes| @conn << bytes }
+        @srv.on(:frame)  {|bytes| @client << bytes }
         @srv.on(:stream) do |stream|
           @server_stream = stream
         end
 
-        @srv << @frm.generate(SETTINGS)
+        # @srv << @frm.generate(SETTINGS)
         @client_stream.headers({"key" => "value"})
       end
 
-      it ".promise should raise error on client push" do
-        expect do
-          @client_stream.promise({}) {}
-        end.to raise_error(ProtocolError)
-      end
-
       it ".promise should emit server initiated stream" do
         push = nil
         @server_stream.promise({"key" => "val"}) { |pstream| push = pstream }
@@ -651,7 +644,7 @@ describe HTTP2::Stream do
 
         it "client: headers > active > headers > .. > data > close" do
           order, headers = [], {}
-          @conn.on(:promise) do |push|
+          @client.on(:promise) do |push|
             order << :reserved
 
             push.on(:active)    { order << :active }