h2 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd3251c0bd00b269688a2e87b54e009be339aff
-  data.tar.gz: ec1799dd72604f8e089bd7be923f1f5083ec8c2d
+  metadata.gz: 59101b19f83a2994cc9186c11121c95645e5cdf4
+  data.tar.gz: fd22e1173757e89c855641daf391e9b55de79204
 SHA512:
-  metadata.gz: e99a4e6d24b280b3ca9b60189e067c4382f585723a8aae28185e5e85423d0f2ad11cb5d8758082bc323f51a9fcffbdbaa522c12552d1777d27c37c93994ddb62
-  data.tar.gz: cb8952f4b441870ee7b8fc3d1dd839c74fd653ce8a7b41eaf1d0c4b0a84fb4eab687c995f2505b1fe3ccaa5fb6134f8739ba8fbad8fbd419f838ef9e0c0ca16b
+  metadata.gz: 3431f613af4aea436ae44e2ef3e617408012553bf9d3b5ab36b6d4d0068d46d7485560b02037cb98b6eac7edaa8d07f3b79350e150c57330c4fe8f66c2d8a4be
+  data.tar.gz: f8e98e3d6838005d1c83848a35f48166eeb76a06dc87b53b9cf03c7ea6543c7b339285626a9d8de9a4ce90e2d1859babd3b78cd4e2d51f0088541e91f84dcee1

data/.travis.yml

@@ -1,9 +1,10 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.0
-  - 2.3.1
-  - 2.3.2
-  - 2.3.3
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
   - 2.4.1
+  - jruby-9.1.12.0
+matrix:
+  allow_failures:
+  - rvm: jruby-9.1.12.0

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 h2 changelog
 ============
 
+### 0.4.0 17 jun 2017
+
+* downgrade required ruby version to 2.2
+* update .travis.yml for latest supported versions
+* refactor exceptionless IO handling to prepended modules
+* refactor On#on for lack of safe-nil operator
+* refactor SSL context handling for 2.2/jruby
+
 ### 0.3.1 13 may 2017
 
 * `servername` should not be set on client socket when IP address (#1)

data/Gemfile

@@ -12,6 +12,7 @@ end
 
 group :development, :test do
   gem 'awesome_print'
-  gem 'pry-byebug'
-  gem 'reel', require: 'reel/h2', git: 'https://github.com/kenichi/reel', branch: 'h2'
+  gem 'guard-rake'
+  gem 'pry-byebug', platforms: [:mri]
+  gem 'reel', require: 'reel/h2', git: 'https://github.com/kenichi/reel', branch: 'rebase_h2'
 end

data/Guardfile

@@ -0,0 +1,3 @@
+guard :rake, task: 'test' do
+  watch %r{^(lib|test).*}
+end

data/bin/console

@@ -4,22 +4,5 @@ require 'bundler/setup'
 require 'h2'
 require 'irb'
 
-#Bundler.require :development
-
-def trunc_payload f
-  x = f.dup
-  size = x[:payload]&.to_s&.bytesize || 0
-  x[:payload] = "#{size} redacted" if size > 64
-  x
-end
-
-def new_client
-  # H2::Client.new url: 'https://127.0.0.1:4430', tls: { ca_file: '/Users/ken/src/ruby/other_reel/tmp/certs/ca.crt' } do |client|
-  # H2::Client.new url: 'http://127.0.0.1:1234' do |client|
-  H2::Client.new url: 'https://vux.nakamura.io:4430', tls: { ca_file: '/usr/local/etc/cacert-201611290415.pem' } do |client|
-    client.client.on(:frame_sent){|f| STDERR.puts ">> #{trunc_payload(f).inspect}"}
-    client.client.on(:frame_received){|f| STDERR.puts "<< #{trunc_payload(f).inspect}"}
-  end
-end
-
+Bundler.require :development
 IRB.start

data/exe/h2

@@ -66,6 +66,10 @@ OptionParser.new do |o|
     options[:method] = meth
   end
 
+  o.on '--version', 'print version information' do
+    puts "#{H2::USER_AGENT['user-agent']} using http-2-#{HTTP2::VERSION}"
+    exit
+  end
 
 end.parse!
 

data/h2.gemspec

@@ -1,15 +1,13 @@
 # coding: utf-8
 require_relative './lib/h2/version'
 
-IGNORE = %w[ test/ spec/ features/ .gitignore .travis.yml ]
-
 Gem::Specification.new do |spec|
   spec.name          = "h2"
   spec.version       = H2::VERSION
   spec.authors       = ["Kenichi Nakamura"]
   spec.email         = ["kenichi.nakamura@gmail.com"]
   spec.summary       = 'an http/2 client based on http-2 and modern ruby'
-  spec.description   = 'a pure ruby http/2 client based on http-2 for ruby 2.3 and above'
+  spec.description   = 'a pure ruby http/2 client based on http-2 for ruby 2.2 and above'
   spec.homepage      = 'https://github.com/kenichi/h2'
   spec.license       = 'MIT'
   spec.bindir        = 'exe'
@@ -17,12 +15,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.files         = `git ls-files`.split.reject {|f| f.start_with? 'test', 'spec', 'features'}
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.2'
 
   spec.add_dependency 'http-2', '~> 0.8', '>= 0.8.4'
   spec.add_dependency 'colored', '1.2'
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/h2/client/tcp_socket.rb

@@ -7,13 +7,11 @@ module H2
       DEFAULT_TIMEOUT = 10
       # ON_LINUX = !!(RUBY_PLATFORM =~ /linux/)
 
-      attr_reader :selector
-
       def initialize addr, port, timeout = DEFAULT_TIMEOUT
 
         # resolve name & pack addr
         family, addr = Socket.getaddrinfo(addr, port, nil, :STREAM, nil, AI_ALL).first.values_at(0,3)
-        sockaddr = Socket.sockaddr_in port, addr
+        @_sockaddr = Socket.sockaddr_in port, addr
 
         super family, SOCK_STREAM
 
@@ -23,23 +21,46 @@ module H2
         # cork on linux
         # setsockopt IPPROTO_TCP, TCP_CORK, 1 if ON_LINUX
 
-        if connect_nonblock(sockaddr, exception: false) == :wait_writable
-          if IO.select nil, [self], nil, timeout
-            begin
-              connect_nonblock sockaddr
-            rescue Errno::EISCONN
-            rescue
-              close
-              raise
-            end
-          else
+        handle_wait_writable(timeout){ _connect } if _connect == :wait_writable
+      end
+
+      def selector
+        @selector ||= [self]
+      end
+
+      private
+
+      def _connect
+        connect_nonblock @_sockaddr
+      rescue IO::WaitWritable
+        :wait_writable
+      end
+
+      def handle_wait_writable timeout, &block
+        if IO.select nil, selector, nil, timeout
+          begin
+            handle_wait_writable(timeout, &block) if yield == :wait_writable
+          rescue Errno::EISCONN
+          rescue
             close
-            raise Errno::ETIMEDOUT
+            raise
           end
+        else
+          close
+          raise Errno::ETIMEDOUT
+        end
+      end
+
+      module ExceptionlessIO
+
+        def _connect
+          connect_nonblock(@_sockaddr, exception: false)
         end
 
       end
 
+      prepend ExceptionlessIO if H2.exceptionless_io?
+
     end
   end
 end

data/lib/h2/client.rb

@@ -14,7 +14,6 @@ module H2
       :promise
     ]
 
-    ALPN_OPENSSL_MIN_VERSION = 0x10002001
     ALPN_PROTOCOLS           = ['h2']
     DEFAULT_MAXLEN           = 4096
     RE_IP_ADDR               = Regexp.union Resolv::IPv4::Regex, Resolv::IPv6::Regex
@@ -131,6 +130,10 @@ module H2
 
     # ---
 
+    def selector
+      @selector ||= [@socket]
+    end
+
     def read maxlen = DEFAULT_MAXLEN
       main = Thread.current
       @reader = Thread.new do
@@ -145,10 +148,9 @@ module H2
     def _read maxlen = DEFAULT_MAXLEN
       begin
         data = nil
-        selector = [@socket]
 
         loop do
-          data = @socket.read_nonblock maxlen, exception: false
+          data = read_from_socket maxlen
           case data
           when :wait_readable
             IO.select selector
@@ -171,6 +173,12 @@ module H2
       end
     end
 
+    def read_from_socket maxlen
+      @socket.read_nonblock maxlen
+    rescue IO::WaitReadable
+      :wait_readable
+    end
+
     # ---
 
     def on_close
@@ -184,7 +192,7 @@ module H2
       if ::H2::Client::TCPSocket === @socket
         total = bytes.bytesize
         loop do
-          n = @socket.sendmsg_nonblock bytes, exception: false
+          n = write_to_socket bytes
           if n == :wait_writable
             IO.select nil, @socket.selector
           elsif n < total
@@ -199,6 +207,12 @@ module H2
       @socket.flush
     end
 
+    def write_to_socket bytes
+      @socket.write_nonblock bytes
+    rescue IO::WaitWritable
+      :wait_writable
+    end
+
     def on_goaway *args
       on :goaway, *args
       close
@@ -240,11 +254,14 @@ module H2
       ctx.ssl_version    = :TLSv1_2
       ctx.verify_mode    = @tls[:verify_mode] || ( OpenSSL::SSL::VERIFY_PEER |
                                                    OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT )
-      set_ssl_context_protocols ctx
+
+      # https://github.com/jruby/jruby-openssl/issues/99
+      set_ssl_context_protocols ctx unless H2.jruby?
+
       ctx
     end
 
-    if OpenSSL::OPENSSL_VERSION_NUMBER >= ALPN_OPENSSL_MIN_VERSION
+    if H2.alpn?
       def set_ssl_context_protocols ctx
         ctx.alpn_protocols = ALPN_PROTOCOLS
       end
@@ -254,5 +271,21 @@ module H2
       end
     end
 
+    # ---
+
+    module ExceptionlessIO
+
+      def read_from_socket maxlen
+        @socket.read_nonblock maxlen, exception: false
+      end
+
+      def write_to_socket bytes
+        @socket.write_nonblock bytes, exception: false
+      end
+
+    end
+
+    prepend ExceptionlessIO if H2.exceptionless_io?
+
   end
 end

data/lib/h2/version.rb

@@ -1,3 +1,23 @@
 module H2
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
+
+  class << self
+
+    ALPN_OPENSSL_MIN_VERSION = 0x10002001
+
+    def alpn?
+      exceptionless_io? && OpenSSL::OPENSSL_VERSION_NUMBER >= ALPN_OPENSSL_MIN_VERSION
+    end
+
+    def exceptionless_io?
+      RUBY_VERSION >= '2.3' && !jruby?
+    end
+
+    def jruby?
+      return @jruby if defined? @jruby
+      @jruby = RUBY_ENGINE == 'jruby'
+    end
+
+  end
+
 end

data/lib/h2.rb

@@ -2,7 +2,6 @@
 
 require 'http/2'
 require 'uri'
-
 require 'h2/version'
 
 module H2
@@ -87,9 +86,14 @@ module H2
 
     def on event, *args, &block
       @on ||= {}
-      return @on[event]&.call(*args) unless block_given?
-      return @on[event] = block if block_given?
-      self
+      event_handler = @on[event]
+      if block_given?
+        @on[event] = block
+        self
+      else
+        return if event_handler.nil?
+        return event_handler.call(*args)
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-13 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: a pure ruby http/2 client based on http-2 for ruby 2.3 and above
+description: a pure ruby http/2 client based on http-2 for ruby 2.2 and above
 email:
 - kenichi.nakamura@gmail.com
 executables:
@@ -99,6 +99,7 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -124,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="