http-2 0.10.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dd78ba6a3468b6a3ceda2ebabc37ceb895a90d675d9fecc035b74d2f479a457
-  data.tar.gz: d70542d69e57050ab9ee3c837b6123fea81424a03bf3b99ffdc889a54a2fd20c
+  metadata.gz: d1788e5559bb1f36b98896322d1c846ef73b0fba4a7a45b524845735deacb9aa
+  data.tar.gz: 62ea957139ea576aa4553303f6db141cd9297a8ce75624553e79a90a69f74717
 SHA512:
-  metadata.gz: f678316f6235ed93ce5a3902ef3bf4c48854605de0875054d1f3e05196fc161bdfe49d149ff930413bef5ca76c61ab2d193092867a383f1f5dbe309cfef0f012
-  data.tar.gz: 52fce71379a9299df1cd8c93d44964d668d09c199564482193513b109a6339f220b4ae1e724c5965892b3e53855820a810e95405b8eb198797ea130611d39a05
+  metadata.gz: fb252eeff936187cf2ebebdf93e69fb6f82dba50a0fece880f40a8235b790165ad5d3f167b0c3948adf040388fc7cd49bc1bd1a24b754447c83dd2020be78eaa
+  data.tar.gz: 0657b1b61f526041167473faf29e50a0cbf4bbfcbac80a458a98a205ab5a01f409da7d62010e5620e5e5fe6cb6e7d1bd5a2ae2a831fcac7da1c1ab2192511c1e

data/README.md

@@ -1,9 +1,7 @@
 # HTTP-2
 
 [![Gem Version](https://badge.fury.io/rb/http-2.svg)](http://rubygems.org/gems/http-2)
-[![Build Status](https://travis-ci.org/igrigorik/http-2.svg?branch=master)](https://travis-ci.org/igrigorik/http-2)
 [![Coverage Status](https://coveralls.io/repos/igrigorik/http-2/badge.svg)](https://coveralls.io/r/igrigorik/http-2)
-[![Analytics](https://ga-beacon.appspot.com/UA-71196-10/http-2/readme)](https://github.com/igrigorik/ga-beacon)
 
 Pure Ruby, framework and transport agnostic, implementation of HTTP/2 protocol and HPACK header compression with support for:
 

data/lib/http/2/buffer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module HTTP2
@@ -6,11 +8,11 @@ module HTTP2
   class Buffer
     extend Forwardable
 
-    def_delegators :@buffer, :ord, :encoding, :setbyte, :unpack,
+    def_delegators :@buffer, :ord, :encoding, :setbyte, :unpack, :unpack1,
                    :size, :each_byte, :to_str, :to_s, :length, :inspect,
                    :[], :[]=, :empty?, :bytesize, :include?
 
-    UINT32 = 'N'.freeze
+    UINT32 = 'N'
     private_constant :UINT32
 
     # Forces binary encoding on the string
@@ -59,12 +61,12 @@ module HTTP2
     # Slice unsigned 32-bit integer from buffer.
     # @return [Integer]
     def read_uint32
-      read(4).unpack(UINT32).first
+      read(4).unpack1(UINT32)
     end
 
     # Ensures that data that is added is binary encoded as well,
     # otherwise this could lead to the Buffer instance changing its encoding.
-    [:<<, :prepend].each do |mutating_method|
+    %i[<< prepend].each do |mutating_method|
       define_method(mutating_method) do |string|
         string = string.dup if string.frozen?
         @buffer.send mutating_method, string.force_encoding(Encoding::BINARY)

data/lib/http/2/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HTTP2
   # HTTP 2.0 client connection class that implements appropriate header
   # compression / decompression algorithms and stream management logic.
@@ -45,7 +47,8 @@ module HTTP2
 
     # sends the preface and initializes the first stream in half-closed state
     def upgrade
-      fail ProtocolError unless @stream_id == 1
+      raise ProtocolError unless @stream_id == 1
+
       send_connection_preface
       new_stream(state: :half_closed_local)
     end
@@ -53,6 +56,7 @@ module HTTP2
     # Emit the connection preface if not yet
     def send_connection_preface
       return unless @state == :waiting_connection_preface
+
       @state = :connected
       emit(:frame, CONNECTION_PREFACE_MAGIC)
 

data/lib/http/2/compressor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HTTP2
   # Implementation of header compression for HTTP 2.0 (HPACK) format adapted
   # to efficiently represent HTTP headers in the context of HTTP 2.0.
@@ -74,7 +76,7 @@ module HTTP2
         ['user-agent',                  ''],
         ['vary',                        ''],
         ['via',                         ''],
-        ['www-authenticate',            ''],
+        ['www-authenticate',            '']
       ].each { |pair| pair.each(&:freeze).freeze }.freeze
 
       # Current table of header key-value pairs.
@@ -96,9 +98,9 @@ module HTTP2
       #   :index       Symbol   :all, :static, :never
       def initialize(**options)
         default_options = {
-          huffman:    :shorter,
-          index:      :all,
-          table_size: 4096,
+          huffman: :shorter,
+          index: :all,
+          table_size: 4096
         }
         @table = []
         @options = default_options.merge(options)
@@ -112,7 +114,7 @@ module HTTP2
         t = @table
         l = @limit
         other.instance_eval do
-          @table = t.dup              # shallow copy
+          @table = t.dup # shallow copy
           @limit = l
         end
         other
@@ -131,7 +133,8 @@ module HTTP2
       def dereference(index)
         # NOTE: index is zero-based in this module.
         value = STATIC_TABLE[index] || @table[index - STATIC_TABLE.size]
-        fail CompressionError, 'Index too large' unless value
+        raise CompressionError, 'Index too large' unless value
+
         value
       end
 
@@ -146,9 +149,8 @@ module HTTP2
 
         case cmd[:type]
         when :changetablesize
-          if cmd[:value] > @limit
-            fail CompressionError, 'dynamic table size update exceed limit'
-          end
+          raise CompressionError, 'dynamic table size update exceed limit' if cmd[:value] > @limit
+
           self.table_size = cmd[:value]
 
         when :indexed
@@ -186,7 +188,7 @@ module HTTP2
           add_to_table(emit) if cmd[:type] == :incremental
 
         else
-          fail CompressionError, "Invalid type: #{cmd[:type]}"
+          raise CompressionError, "Invalid type: #{cmd[:type]}"
         end
 
         emit
@@ -202,7 +204,7 @@ module HTTP2
       def encode(headers)
         commands = []
         # Literals commands are marked with :noindex when index is not used
-        noindex = [:static, :never].include?(@options[:index])
+        noindex = %i[static never].include?(@options[:index])
         headers.each do |field, value|
           # Literal header names MUST be translated to lowercase before
           # encoding and transmission.
@@ -232,7 +234,7 @@ module HTTP2
         exact = nil
         name_only = nil
 
-        if [:all, :static].include?(@options[:index])
+        if %i[all static].include?(@options[:index])
           STATIC_TABLE.each_index do |i|
             if STATIC_TABLE[i] == header
               exact ||= i
@@ -284,6 +286,7 @@ module HTTP2
       # @param cmd [Array] +[name, value]+
       def add_to_table(cmd)
         return unless size_check(cmd)
+
         @table.unshift(cmd)
       end
 
@@ -309,11 +312,11 @@ module HTTP2
 
     # Header representation as defined by the spec.
     HEADREP = {
-      indexed:      { prefix: 7, pattern: 0x80 },
-      incremental:  { prefix: 6, pattern: 0x40 },
-      noindex:      { prefix: 4, pattern: 0x00 },
+      indexed: { prefix: 7, pattern: 0x80 },
+      incremental: { prefix: 6, pattern: 0x40 },
+      noindex: { prefix: 4, pattern: 0x00 },
       neverindexed: { prefix: 4, pattern: 0x10 },
-      changetablesize: { prefix: 5, pattern: 0x20 },
+      changetablesize: { prefix: 5, pattern: 0x20 }
     }.each_value(&:freeze).freeze
 
     # Predefined options set for Compressor
@@ -330,8 +333,9 @@ module HTTP2
     # Responsible for encoding header key-value pairs using HPACK algorithm.
     class Compressor
       # @param options [Hash] encoding options
+      # @see EncodingContext#initialize
       def initialize(**options)
-        @cc = EncodingContext.new(options)
+        @cc = EncodingContext.new(**options)
       end
 
       # Set dynamic table size in EncodingContext
@@ -356,14 +360,14 @@ module HTTP2
       # @param n [Integer] number of available bits
       # @return [String] binary string
       def integer(i, n)
-        limit = 2**n - 1
+        limit = (2**n) - 1
         return [i].pack('C') if i < limit
 
         bytes = []
         bytes.push limit unless n.zero?
 
         i -= limit
-        while (i >= 128)
+        while i >= 128
           bytes.push((i % 128) + 128)
           i /= 128
         end
@@ -393,7 +397,8 @@ module HTTP2
       # @param str [String]
       # @return [String] binary string
       def string(str)
-        plain, huffman = nil, nil
+        plain = nil
+        huffman = nil
         unless @cc.options[:huffman] == :always
           plain = integer(str.bytesize, 7) << str.dup.force_encoding(Encoding::BINARY)
         end
@@ -463,14 +468,11 @@ module HTTP2
     # Responsible for decoding received headers and maintaining compression
     # context of the opposing peer. Decompressor must be initialized with
     # appropriate starting context based on local role: client or server.
-    #
-    # @example
-    #   server_role = Decompressor.new(:request)
-    #   client_role = Decompressor.new(:response)
     class Decompressor
       # @param options [Hash] decoding options.  Only :table_size is effective.
+      # @see EncodingContext#initialize
       def initialize(**options)
-        @cc = EncodingContext.new(options)
+        @cc = EncodingContext.new(**options)
       end
 
       # Set dynamic table size in EncodingContext
@@ -485,16 +487,18 @@ module HTTP2
       # @param n [Integer] number of available bits
       # @return [Integer]
       def integer(buf, n)
-        limit = 2**n - 1
-        i = !n.zero? ? (buf.getbyte & limit) : 0
+        limit = (2**n) - 1
+        i = n.zero? ? 0 : (buf.getbyte & limit)
 
         m = 0
-        while (byte = buf.getbyte)
-          i += ((byte & 127) << m)
-          m += 7
+        if i == limit
+          while (byte = buf.getbyte)
+            i += ((byte & 127) << m)
+            m += 7
 
-          break if (byte & 128).zero?
-        end if (i == limit)
+            break if (byte & 128).zero?
+          end
+        end
 
         i
       end
@@ -508,7 +512,8 @@ module HTTP2
         huffman = (buf.readbyte(0) & 0x80) == 0x80
         len = integer(buf, 7)
         str = buf.read(len)
-        fail CompressionError, 'string too short' unless str.bytesize == len
+        raise CompressionError, 'string too short' unless str.bytesize == len
+
         str = Huffman.new.decode(Buffer.new(str)) if huffman
         str.force_encoding(Encoding::UTF_8)
       end
@@ -526,13 +531,14 @@ module HTTP2
           mask == desc[:pattern]
         end
 
-        fail CompressionError unless header[:type]
+        raise CompressionError unless header[:type]
 
         header[:name] = integer(buf, type[:prefix])
 
         case header[:type]
         when :indexed
-          fail CompressionError if (header[:name]).zero?
+          raise CompressionError if (header[:name]).zero?
+
           header[:name] -= 1
         when :changetablesize
           header[:value] = header[:name]
@@ -558,10 +564,12 @@ module HTTP2
         until buf.empty?
           next_header = @cc.process(header(buf))
           next if next_header.nil?
+
           is_pseudo_header = next_header.first.start_with? ':'
           if !decoding_pseudo_headers && is_pseudo_header
-            fail ProtocolError, 'one or more pseudo headers encountered after regular headers'
+            raise ProtocolError, 'one or more pseudo headers encountered after regular headers'
           end
+
           decoding_pseudo_headers = is_pseudo_header
           list << next_header
         end