http2 0.0.32 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5a6f33cdd27db12f717a7364f0b01e003fa136f4
-  data.tar.gz: e5db49475ea7e1d94d3637273098d3e5fa3c40ba
+SHA256:
+  metadata.gz: aaaa3b5476a0d9233f4ef5977f64d0368f009021f92bd821280058f518463bca
+  data.tar.gz: 24942b90af076019fc755a6abdc61ae049ec2a7178dcad6f6df5c0aba9c5a945
 SHA512:
-  metadata.gz: d1502af03635d87d6c13253a5f160fb697cf83f5489a99e0b2de1ed7ce3a59b38cc11c970a4848fedc8ab6ddb88c24af31d2d651360b3081ee23a12bf6700770
-  data.tar.gz: f4ac8597f0752a57342e0166a1bf017fc1f320d1eda7b093e7706eec8320827a5f895b320fc6bfe9e55b19dee6e58a59c62a0710a90b9cc0a177be1d5176b5f2
+  metadata.gz: eb01eb1aab89764bcaa356f5c89341e926ef0ebe5818aa5b22be70e64dd0e926f6ab9807723ae15b0f33d125397be759c89d5e896ab3b25d486b312bd44e252c
+  data.tar.gz: 7ff240f8d775175b3b5f9fdbfe1f8a4d380c83c26729c3c31730672d5e3dbea1e8d3ccc8899f39c06f27199799243c87b8de9c6483d00ff8335fb1c279a024e5

data/README.md

@@ -1,6 +1,6 @@
-[![Build Status](https://img.shields.io/shippable/540e7b9b3479c5ea8f9ec21d.svg)](https://app.shippable.com/projects/540e7b9b3479c5ea8f9ec21d/builds/latest)
 [![Code Climate](https://codeclimate.com/github/kaspernj/http2.png)](https://codeclimate.com/github/kaspernj/http2)
-[![Code Climate](https://codeclimate.com/github/kaspernj/http2/coverage.png)](https://codeclimate.com/github/kaspernj/http2)
+[![Build Status](https://www.peakflow.io/en/projects/http2/branch-statuses/master.svg
+)](https://www.peakflow.io/en/projects/http2/build-groups)
 
 # http2
 

data/Rakefile

@@ -1,12 +1,10 @@
-# encoding: utf-8
-
 require "rubygems"
 require "bundler"
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn "Run `bundle install` to install missing gems"
   exit e.status_code
 end
 require "rake"

data/lib/http2/base_request.rb

@@ -1,7 +1,7 @@
 class Http2::BaseRequest
   attr_reader :http2, :args, :debug
 
-  VALID_ARGUMENTS_POST = [:post, :url, :default_headers, :headers, :json, :method, :cookies, :on_content, :content_type]
+  VALID_ARGUMENTS_POST = [:post, :url, :default_headers, :headers, :json, :method, :cookies, :on_content, :content_type].freeze
 
   def initialize(http2, args)
     @http2 = http2
@@ -9,7 +9,7 @@ class Http2::BaseRequest
     @debug = http2.debug
     @nl = http2.nl
 
-    @args.each do |key, _val|
+    @args.each_key do |key|
       raise "Invalid key: '#{key}'." unless VALID_ARGUMENTS_POST.include?(key)
     end
 

data/lib/http2/connection.rb

@@ -33,6 +33,7 @@ class Http2::Connection
   def sock_write(str)
     str = str.to_s
     return if str.empty?
+
     count = @sock.write(str)
     raise "Couldnt write to socket: '#{count}', '#{str}'." if count <= 0
   end
@@ -49,6 +50,7 @@ class Http2::Connection
 
     begin
       raise Errno::EPIPE, "The socket is closed." if !@sock || @sock.closed?
+
       sock_write(str)
     rescue Errno::EPIPE # this can also be thrown by puts.
       reconnect
@@ -130,7 +132,8 @@ class Http2::Connection
     @sock_plain.write(@nl)
 
     res = @sock_plain.gets.to_s
-    raise "Couldn't connect through proxy: #{res}" unless res.match(/^http\/1\.(0|1)\s+200/i)
+    raise "Couldn't connect through proxy: #{res}" unless res.match?(/^http\/1\.(0|1)\s+200/i)
+
     @sock_plain.gets
 
     @proxy_connect = true
@@ -150,8 +153,15 @@ class Http2::Connection
     require "openssl" unless ::Kernel.const_defined?(:OpenSSL)
 
     ssl_context = OpenSSL::SSL::SSLContext.new
-    ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER unless @args[:ssl_skip_verify]
+
+    if @args[:ssl_skip_verify]
+      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    else
+      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    end
+
     @sock_ssl = OpenSSL::SSL::SSLSocket.new(@sock_plain, ssl_context)
+    @sock_ssl.hostname = @http2.host
     @sock_ssl.sync_close = true
     @sock_ssl.connect
 

data/lib/http2/errors.rb

@@ -1,11 +1,18 @@
 # This class holds various classes for error-handeling.
 class Http2::Errors
-  class Http2error < RuntimeError
+  class BaseError < RuntimeError
     attr_accessor :response
   end
 
-  class Noaccess < Http2error; end
-  class Internalserver < Http2error; end
-  class Notfound < Http2error; end
-  class Badrequest < Http2error; end
+  class Noaccess < BaseError; end
+
+  class Internalserver < BaseError; end
+
+  class Notfound < BaseError; end
+
+  class Badrequest < BaseError; end
+
+  class Unauthorized < BaseError; end
+
+  class UnsupportedMediaType < BaseError; end
 end

data/lib/http2/post_data_generator.rb

@@ -54,10 +54,10 @@ private
 
   def generate_key_value(key, value)
     if value.is_a?(Hash) || value.is_a?(Array)
-      return ::Http2::PostDataGenerator.new(value, orig_key: key).generate
+      ::Http2::PostDataGenerator.new(value, orig_key: key).generate
     else
       data = ::Http2::PostDataGenerator.new(value).generate
-      return "#{Http2::Utils.urlenc(key)}=#{Http2::Utils.urlenc(data)}"
+      "#{Http2::Utils.urlenc(key)}=#{Http2::Utils.urlenc(data)}"
     end
   end
 end

data/lib/http2/post_multipart_request.rb

@@ -56,15 +56,11 @@ private
 
   def read_file(path, praw)
     File.open(path, "r") do |fp|
-      begin
-        while (data = fp.sysread(4096))
-          praw << data
-        end
-      # rubocop:disable Lint/HandleExceptions
-      rescue EOFError
-        # rubocop:enable Lint/HandleExceptions
-        # Happens when done.
+      while (data = fp.sysread(4096))
+        praw << data
       end
+    rescue EOFError
+      # Happens when done.
     end
   end
 

data/lib/http2/post_request.rb

@@ -60,11 +60,7 @@ private
       "Content-Type" => content_type
     }
     headers_hash.merge! @http2.default_headers(@args)
-
-    unless headers_hash["Accept"]
-      headers_hash["Accept"] = "application/json" if @args[:json]
-    end
-
+    headers_hash["Accept"] = "application/json" if @args[:json] && !headers_hash["Accept"]
     headers_hash
   end
 end

data/lib/http2/response.rb

@@ -1,38 +1,34 @@
 # This object will be returned as the response for each request.
 class Http2::Response
   # All the data the response contains. Headers, body, cookies, requested URL and more.
-  attr_reader :args, :request
-  attr_accessor :body, :charset, :code, :content_type, :http_version
+  attr_reader :headers, :request, :request_args, :requested_url
+  attr_accessor :body, :charset, :code, :http_version
+  attr_writer :content_type
 
   # This method should not be called manually.
-  def initialize(args = {})
-    @args = args
-    @args[:headers] ||= {}
-    @body = args[:body] || ""
-    @debug = args[:debug]
-    @request = args.fetch(:request)
-  end
-
-  # Returns headers given from the host for the result.
-  #===Examples
-  # headers_hash = res.headers
-  def headers
-    @args.fetch(:headers)
+  def initialize(body: "", debug: false, headers: {}, request:)
+    @body = body
+    @debug = debug
+    @headers = headers
+    @request = request
+    @requested_url = request.path
   end
 
   # Returns a certain header by name or false if not found.
   #===Examples
   # val = res.header("content-type")
   def header(key)
-    return false unless @args.fetch(:headers).key?(key)
-    @args.fetch(:headers).fetch(key).first.to_s
+    return false unless headers.key?(key)
+
+    headers.fetch(key).first.to_s
   end
 
   # Returns true if a header of the given string exists.
   #===Examples
   # print "No content-type was given." if !http.header?("content-type")
   def header?(key)
-    return true if @args[:headers].key?(key) && @args[:headers][key].first.to_s.length > 0
+    return true if headers.key?(key) && !headers[key].first.to_s.empty?
+
     false
   end
 
@@ -40,7 +36,7 @@ class Http2::Response
     if header?("content-length")
       header("content-length").to_i
     elsif @body
-      return @body.bytesize
+      @body.bytesize
     else
       raise "Couldn't calculate content-length."
     end
@@ -48,20 +44,12 @@ class Http2::Response
 
   def content_type
     if header?("content-type")
-      return header("content-type")
+      header("content-type")
     else
       raise "No content-type was given."
     end
   end
 
-  # Returns the requested URL as a string.
-  #===Examples
-  # res.requested_url #=> "?show=status&action=getstatus"
-  def requested_url
-    raise "URL could not be detected." unless @args[:request_args][:url]
-    @args[:request_args][:url]
-  end
-
   # Checks the data that has been sat on the object and raises various exceptions, if it does not validate somehow.
   def validate!
     puts "Http2: Validating response length." if @debug
@@ -70,7 +58,7 @@ class Http2::Response
 
   # Returns true if the result is JSON.
   def json?
-    content_type == "application/json"
+    content_type&.start_with?("application/json")
   end
 
   def json
@@ -105,7 +93,7 @@ private
 
   # Checks that the length of the body is the same as the given content-length if given.
   def validate_body_versus_content_length!
-    unless self.header?("content-length")
+    unless header?("content-length")
       puts "Http2: No content length given - skipping length validation." if @debug
       return nil
     end

data/lib/http2/response_reader.rb

@@ -1,20 +1,21 @@
 class Http2::ResponseReader
   attr_reader :response
 
-  def initialize(args)
+  def initialize(args:, http2:, sock:, request:)
     @mode = "headers"
     @transfer_encoding = nil
-    @response = Http2::Response.new(request: args.fetch(:request), request_args: args, debug: @debug)
+    @request = request
+    @response = Http2::Response.new(debug: http2.debug, request: request)
     @rec_count = 0
-    @args = args[:args]
-    @debug = args[:http2].debug
-    @http2 = args[:http2]
-    @sock = args[:sock]
+    @args = args
+    @debug = http2.debug
+    @http2 = http2
+    @sock = sock
     @nl = @http2.nl
     @conn = @http2.connection
 
     read_headers
-    read_body if @length == nil || @length > 0
+    read_body if @length == nil || @length.positive?
     finish
   end
 
@@ -26,6 +27,7 @@ class Http2::ResponseReader
       if line == "\n" || line == "\r\n" || line == @nl
         puts "Http2: Changing mode to body!" if @debug
         raise "No headers was given at all? Possibly corrupt state after last request?" if @response.headers.empty?
+
         @mode = "body"
         @http2.on_content_call(@args, @nl)
         break
@@ -53,16 +55,12 @@ class Http2::ResponseReader
 
   def finish
     # Check if we should reconnect based on keep-alive-max.
-    if @keepalive_max == 1 || @connection == "close"
-      @conn.close unless @conn.closed?
-    end
+    @conn.close if !@conn.closed? && (@keepalive_max == 1 || @connection == "close")
 
     # Validate that the response is as it should be.
     puts "Http2: Validating response." if @debug
 
-    unless @response.code
-      raise "No status-code was received from the server. Headers: '#{@response.headers}' Body: '#{@response.body}'."
-    end
+    raise "No status-code was received from the server. Headers: '#{@response.headers}' Body: '#{@response.body}'." unless @response.code
 
     @response.validate!
     check_and_decode
@@ -81,35 +79,41 @@ private
       url, args = url_and_args_from_location
 
       if redirect_using_same_connection?(args)
-        return @http2.get(url)
+        @http2.get(url)
       else
         ::Http2.new(args).get(url)
       end
     end
   end
 
-  REDIRECT_CODES = [302, 303, 307]
+  REDIRECT_CODES = [301, 302, 303, 307, 308].freeze
   def redirect_response?
-    REDIRECT_CODES.include?(@response.code.to_i) && @response.header?("location") && @http2.args[:follow_redirects]
+    REDIRECT_CODES.include?(response.code.to_i) && response.header?("location") && @http2.args[:follow_redirects]
   end
 
   def redirect_using_same_connection?(args)
     if !args[:host] || args[:host] == @args[:host]
-      return true
+      true
     else
-      return false
+      false
     end
   end
 
+  def url
+    @url ||= response.header("location")
+  end
+
+  SSL_AND_PORT_KEYS = [:ssl, :port].freeze
+
   def url_and_args_from_location
-    uri = URI.parse(@response.header("location"))
+    uri = URI.parse(url)
 
     url = uri.path
-    url << "?#{uri.query}" if uri.query.to_s.length > 0
-    url = url.gsub(/\A\//, "")
+    url << "?#{uri.query}" unless uri.query.to_s.empty?
+    url = url.delete_prefix("/")
 
     args = @http2.args
-      .reject { |k, _v| [:ssl, :port].include? k }
+      .reject { |k, _v| SSL_AND_PORT_KEYS.include?(k) }
       .merge(host: uri.host)
 
     args[:ssl] = true if uri.scheme == "https"
@@ -130,7 +134,7 @@ private
 
       begin
         valid_string = ic.encode("UTF-8")
-      rescue
+      rescue StandardError
         valid_string = untrusted_str.force_encoding("UTF-8").encode("UTF-8", invalid: :replace, replace: "").encode("UTF-8")
       end
 
@@ -141,14 +145,19 @@ private
   def handle_errors
     return unless @http2.raise_errors
 
-    if @response.code == "500"
+    case @response.code
+    when "500"
       err = Http2::Errors::Internalserver.new("A internal server error occurred")
-    elsif @response.code == "403"
+    when "403"
       err = Http2::Errors::Noaccess.new("No access")
-    elsif @response.code == "400"
+    when "400"
       err = Http2::Errors::Badrequest.new("Bad request")
-    elsif @response.code == "404"
+    when "401"
+      err = Http2::Errors::Unauthorized.new("Unauthorized")
+    when "404"
       err = Http2::Errors::Notfound.new("Not found")
+    when "415"
+      err = Http2::Errors::UnsupportedMediaType.new("Unsupported media type")
     end
 
     if err
@@ -161,7 +170,13 @@ private
     if line
       @rec_count += line.length
     elsif !line && @rec_count <= 0
-      raise Errno::ECONNABORTED, "Server closed the connection before being able to read anything (KeepAliveMax: '#{@http2.keepalive_max}', Connection: '#{@connection}', PID: '#{Process.pid}')."
+      parts = [
+        "KeepAliveMax: '#{@http2.keepalive_max}'",
+        "Connection: '#{@connection}'",
+        "PID: '#{Process.pid}'"
+      ]
+
+      raise Errno::ECONNABORTED, "Server closed the connection before being able to read anything (#{parts.join(", ")})."
     end
   end
 
@@ -201,7 +216,7 @@ private
       key = match[1].downcase
       set_header_special_values(key, match[2])
       parse_normal_header(line, key, match[1], match[2])
-    elsif (match = line.match(/^HTTP\/([\d\.]+)\s+(\d+)\s+(.+)$/))
+    elsif (match = line.match(/^HTTP\/([\d\.]+)\s+(\d+)\s+(.+)$/)) # rubocop:disable Style/RedundantRegexpEscape
       @response.code = match[2]
       @response.http_version = match[1]
       @http2.on_content_call(@args, line)
@@ -232,18 +247,16 @@ private
     @response.headers[key] = [] unless @response.headers.key?(key)
     @response.headers[key] << value
 
-    if key != "transfer-encoding" && key != "content-length" && key != "connection" && key != "keep-alive"
-      @http2.on_content_call(@args, line)
-    end
+    @http2.on_content_call(@args, line) if key != "transfer-encoding" && key != "content-length" && key != "connection" && key != "keep-alive"
   end
 
   # Parses the body based on given headers and saves it to the result-object.
   # http.parse_body(str)
   def parse_body(line)
-    return :break if @length == 0
+    return :break if @length&.zero?
 
     if @transfer_encoding == "chunked"
-      return parse_body_chunked(line)
+      parse_body_chunked(line)
     else
       puts "Http2: Adding #{line.to_s.bytesize} to the body." if @debug
       @response.body << line
@@ -255,15 +268,16 @@ private
   def parse_body_chunked(line)
     len = line.strip.hex
 
-    if len > 0
+    if len.positive?
       read = @conn.read(len)
       return :break if read == "" || read == "\n" || read == "\r\n"
+
       @response.body << read
       @http2.on_content_call(@args, read)
     end
 
     nl = @conn.gets
-    if len == 0
+    if len.zero?
       if nl == "\n" || nl == "\r\n"
         return :break
       else

data/lib/http2/url_builder.rb

@@ -28,7 +28,7 @@ class Http2::UrlBuilder
   end
 
   def build_path_and_params
-    url = "#{path}"
+    url = path.to_s
 
     if params?
       url << "?"

data/lib/http2/utils.rb

@@ -4,7 +4,7 @@ class Http2::Utils
   def self.urlenc(string)
     # Thanks to CGI framework
     string.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/) do
-      "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
+      "%#{Regexp.last_match(1).unpack("H2" * Regexp.last_match(1).bytesize).join("%").upcase}"
     end.tr(" ", "+")
   end
 
@@ -12,18 +12,20 @@ class Http2::Utils
   def self.urldec(string)
     # Thanks to CGI framework
     string.to_s.tr("+", " ").gsub(/((?:%[0-9a-fA-F]{2})+)/) do
-      [$1.delete("%")].pack("H*")
+      [Regexp.last_match(1).delete("%")].pack("H*")
     end
   end
 
   # Parses a cookies-string and returns them in an array.
   def self.parse_set_cookies(str)
-    str = "#{str}"
+    str = str.to_s
     return [] if str.empty?
+
     cookie_start_regex = /^(.+?)=(.*?)(;\s*|$)/
 
     match = str.match(cookie_start_regex)
     raise "Could not match cookie: '#{str}'" unless match
+
     str.gsub!(cookie_start_regex, "")
 
     cookie_data = {

data/lib/http2.rb

@@ -3,7 +3,8 @@ require "uri"
 require "monitor" unless ::Kernel.const_defined?(:Monitor)
 require "string-cases"
 
-# This class tries to emulate a browser in Ruby without any visual stuff. Remember cookies, keep sessions alive, reset connections according to keep-alive rules and more.
+# This class tries to emulate a browser in Ruby without any visual stuff.
+# Remember cookies, keep sessions alive, reset connections according to keep-alive rules and more.
 #===Examples
 # Http2.new(host: "www.somedomain.com", port: 80, ssl: false, debug: false) do |http|
 #  res = http.get("index.rhtml?show=some_page")
@@ -17,28 +18,28 @@ require "string-cases"
 class Http2
   # Autoloader for subclasses.
   def self.const_missing(name)
-    require "#{File.dirname(__FILE__)}/http2/#{::StringCases.camel_to_snake(name)}.rb"
-    Http2.const_get(name)
-  end
+    file_path = "#{File.dirname(__FILE__)}/http2/#{::StringCases.camel_to_snake(name)}.rb"
 
-  # Converts a URL to "is.gd"-short-URL.
-  def self.isgdlink(url)
-    Http2.new(host: "is.gd") do |http|
-      resp = http.get("api.php?longurl=#{url}")
-      return resp.body
+    if File.exist?(file_path)
+      require file_path
+      return Http2.const_get(name) if Http2.const_defined?(name)
     end
+
+    super
   end
 
   attr_reader :autostate, :connection, :cookies, :args, :debug, :mutex, :resp, :raise_errors, :nl
   attr_accessor :keepalive_max, :keepalive_timeout
 
-  VALID_ARGUMENTS_INITIALIZE = [:host, :port, :skip_port_in_host_header, :ssl, :ssl_skip_verify, :nl, :user_agent, :raise_errors, :follow_redirects, :debug, :encoding_gzip, :autostate, :basic_auth, :extra_headers, :proxy]
+  VALID_ARGUMENTS_INITIALIZE = [
+    :host, :port, :skip_port_in_host_header, :ssl, :ssl_skip_verify, :nl, :user_agent, :raise_errors,
+    :follow_redirects, :debug, :encoding_gzip, :autostate, :basic_auth, :extra_headers, :proxy
+  ].freeze
   def initialize(args = {})
     @args = parse_init_args(args)
     set_default_values
     @cookies = {}
     @mutex = Monitor.new
-
     @connection = ::Http2::Connection.new(self)
 
     if block_given?
@@ -86,7 +87,6 @@ class Http2
   #===Examples
   # http.destroy
   def destroy
-    @args = nil
     @cookies = nil
     @debug = nil
     @mutex = nil
@@ -124,9 +124,9 @@ class Http2
   # Proxies the request to another method but forces the method to be "DELETE".
   def delete(args)
     if args[:json]
-      return post(args.merge(method: :delete))
+      post(args.merge(method: :delete))
     else
-      return get(args.merge(method: :delete))
+      get(args.merge(method: :delete))
     end
   end
 
@@ -147,17 +147,18 @@ class Http2
 
     if @args[:basic_auth]
       require "base64" unless ::Kernel.const_defined?(:Base64)
-      headers["Authorization"] = "Basic #{Base64.encode64("#{@args[:basic_auth][:user]}:#{@args[:basic_auth][:passwd]}").strip}"
+      headers["Authorization"] = "Basic #{Base64.strict_encode64("#{@args[:basic_auth][:user]}:#{@args[:basic_auth][:passwd]}").strip}"
     end
 
     if @args[:proxy] && @args[:proxy][:user] && @args[:proxy][:passwd] && !@connection.proxy_connect?
       require "base64" unless ::Kernel.const_defined?(:Base64)
       puts "Http2: Adding proxy auth header to request" if @debug
-      headers["Proxy-Authorization"] = "Basic #{Base64.encode64("#{@args[:proxy][:user]}:#{@args[:proxy][:passwd]}").strip}"
+      headers["Proxy-Authorization"] = "Basic #{Base64.strict_encode64("#{@args[:proxy][:user]}:#{@args[:proxy][:passwd]}").strip}"
     end
 
     headers.merge!(@args[:extra_headers]) if @args[:extra_headers]
     headers.merge!(args[:headers]) if args[:headers]
+
     headers
   end
 
@@ -177,7 +178,7 @@ class Http2
 
   # Returns a header-string which normally would be used for a request in the given state.
   def header_str(headers_hash)
-    headers_hash["Cookie"] = cookie_header_string
+    headers_hash["Cookie"] = cookie_header_string unless cookie_header_string.empty?
 
     headers_str = ""
     headers_hash.each do |key, val|
@@ -204,6 +205,7 @@ class Http2
   def cookie(name)
     name = name.to_s
     return @cookies.fetch(name) if @cookies.key?(name)
+
     raise "No cookie by that name: '#{name}' in '#{@cookies.keys.join(", ")}'"
   end
 
@@ -239,7 +241,7 @@ private
     host = args[:host] || self.host
     port = args[:port] || self.port
 
-    host_header_string = "#{host}" # Copy host string to avoid changing the original string if port has been given!
+    host_header_string = host.dup # Copy host string to avoid changing the original string if port has been given!
     host_header_string << ":#{port}" if port && ![80, 443].include?(port.to_i) && !@args[:skip_port_in_host_header]
     host_header_string
   end
@@ -269,13 +271,14 @@ private
     args = {host: args} if args.is_a?(String)
     raise "Arguments wasnt a hash." unless args.is_a?(Hash)
 
-    args.each do |key, _val|
+    args.each_key do |key|
       raise "Invalid key: '#{key}'." unless VALID_ARGUMENTS_INITIALIZE.include?(key)
     end
 
     args[:proxy][:connect] = true if args[:proxy] && !args[:proxy].key?(:connect) && args[:ssl]
 
     raise "No host was given." unless args[:host]
+
     args
   end
 

data/spec/helpers.rb

@@ -17,13 +17,11 @@ module Helpers
   def with_http(args = {})
     with_webserver do |hayabusa|
       Http2.new({host: "localhost", port: hayabusa.port, encoding_gzip: false}.merge(args)) do |http|
-        begin
-          yield http
-        rescue Http2::Errors::Internalserver => e
-          puts "Body of error-response: #{e.response.body}"
-          raise e
-        end
+        yield http
       end
+    rescue Http2::Errors::Internalserver => e
+      puts "Body of error-response: #{e.response.body}"
+      raise e
     end
   end
 end

data/spec/http2/cookies_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 
-describe Http2 do
+describe Http2::Cookie do
   include Helpers
 
-  it "should parse cookies and let them be read" do
+  it "parses cookies and let them be read" do
     with_http do |http|
       http.get("cookie_test.rhtml")
       expect(http.cookies.length).to eq 2

data/spec/http2/post_data_generator_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Http2::PostDataGenerator do
-  it "should be able to recursively parse post-data-hashes." do
+  it "recursively parses post-data-hashes." do
     res = Http2::PostDataGenerator.new(
       "test1" => "test2"
     ).generate
@@ -19,6 +19,7 @@ describe Http2::PostDataGenerator do
         }
       }
     ).generate
-    raise "Expected 'test1%5Border%5D%5B%5B%3ABnet_profile%2C+%22profile_id%22%5D%5D=5' but got: '#{res}'." if res != "test1%5Border%5D%5B%5B%3ABnet_profile%2C+%22profile_id%22%5D%5D=5"
+
+    expect(res).to eq "test1%5Border%5D%5B%5B%3ABnet_profile%2C+%22profile_id%22%5D%5D=5"
   end
 end

data/spec/http2/response_spec.rb

@@ -15,10 +15,30 @@ describe Http2::Response do
     end
   end
 
-  it "#json?" do
-    with_http do |http|
-      res = http.get("json_test.rhtml")
-      expect(res.json?).to eq true
+  describe "#json?" do
+    it "returns true for 'application/json'" do
+      with_http do |http|
+        res = http.get("json_test.rhtml")
+
+        expect(res).to receive(:content_type).and_return("application/json")
+        expect(res.json?).to eq true
+      end
+    end
+
+    it "returns true for 'application/json' and getting" do
+      with_http do |http|
+        res = http.get("json_test.rhtml")
+        expect(res.json?).to eq true
+      end
+    end
+
+    it "returns true for 'application/json' and posting" do
+      with_http do |http|
+        res = http.post(url: "json_test.rhtml", post: {test: "test2"})
+
+        expect(res).to receive(:content_type).and_return("application/json; charset=utf-8")
+        expect(res.json?).to eq true
+      end
     end
   end
 

data/spec/http2/url_builder_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Http2::UrlBuilder do
-  context "#build" do
+  describe "#build" do
     it "builds correctly" do
       ub = Http2::UrlBuilder.new
       ub.protocol = "https"

data/spec/http2_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require "json"
 
 describe "Http2" do
-  it "should be able to do normal post-requests." do
+  it "does normal post-requests" do
     # Test posting keep-alive and advanced post-data.
     with_http do |http|
       0.upto(5) do
@@ -26,7 +26,7 @@ describe "Http2" do
                 }
               ]
             },
-            "val9" => ["a", "b", "d"]
+            "val9" => %w[a b d]
           }
         )
         res = JSON.parse(resp.body)
@@ -44,17 +44,19 @@ describe "Http2" do
     end
   end
 
-  it "#reconnect" do
-    with_http(follow_redirects: false, encoding_gzip: false) do |http|
-      resp1 = http.get("multipart_test.rhtml")
-      http.reconnect
-      resp2 = http.get("multipart_test.rhtml")
+  describe "#reconnect" do
+    it "reconnects" do
+      with_http(follow_redirects: false, encoding_gzip: false) do |http|
+        resp1 = http.get("multipart_test.rhtml")
+        http.reconnect
+        resp2 = http.get("multipart_test.rhtml")
 
-      expect(resp1.body).to eq resp2.body
+        expect(resp1.body).to eq resp2.body
+      end
     end
   end
 
-  it "should be able to do multipart-requests and keep-alive when using multipart." do
+  it "handles multipart-requests and keep-alive when using multipart." do
     with_http(follow_redirects: false) do |http|
       0.upto(5) do
         fpath = File.realpath(__FILE__)
@@ -84,7 +86,7 @@ describe "Http2" do
     end
   end
 
-  it "it should be able to handle keep-alive correctly" do
+  it "handles keep-alive correctly" do
     urls = [
       "content_type_test.rhtml",
       "json_test.rhtml"
@@ -100,18 +102,13 @@ describe "Http2" do
     end
   end
 
-  it "should be able to convert URL's to 'is.gd'-short-urls" do
-    isgd = Http2.isgdlink("https://github.com/kaspernj/http2")
-    raise "Expected isgd-var to be valid but it wasnt: '#{isgd}'." unless isgd.match(/^http:\/\/is\.gd\/([A-z\d]+)$/)
-  end
-
-  it "should raise exception when something is not found" do
+  it "raises an error when something is not found" do
     with_http do |http|
       expect { http.get("something_that_does_not_exist.rhtml") }.to raise_error(::Http2::Errors::Notfound)
     end
   end
 
-  it "should be able to post json" do
+  it "posts json" do
     with_http do |http|
       res = http.post(
         url: "json_test.rhtml",
@@ -131,7 +128,7 @@ describe "Http2" do
     end
   end
 
-  it "should be able to post custom content types" do
+  it "posts custom content types" do
     with_http do |http|
       res = http.post(
         url: "content_type_test.rhtml",
@@ -147,7 +144,7 @@ describe "Http2" do
     end
   end
 
-  it "should set various timeouts" do
+  it "sets various timeouts" do
     with_http do |http|
       http.get("content_type_test.rhtml")
       expect(http.keepalive_timeout).to eq 15
@@ -155,10 +152,26 @@ describe "Http2" do
     end
   end
 
-  it "should follow redirects" do
+  it "follows redirects" do
     with_http(follow_redirects: true) do |http|
       resp = http.get("redirect_test.rhtml")
       expect(resp.code).to eq "200"
     end
   end
+
+  it "throws errors on unauhtorized" do
+    with_http do |http|
+      expect do
+        http.get("unauthorized.rhtml")
+      end.to raise_error(Http2::Errors::Unauthorized)
+    end
+  end
+
+  it "throws errors on unsupported media type" do
+    with_http do |http|
+      expect do
+        http.get("unsupported_media_type.rhtml")
+      end.to raise_error(Http2::Errors::UnsupportedMediaType)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,15 +1,13 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require "rspec"
 require "http2"
 require "helpers"
+require "json"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|

data/spec/spec_root/unauthorized.rhtml

@@ -0,0 +1,3 @@
+<%
+  _httpsession.resp.status = 401
+%>

data/spec/spec_root/unsupported_media_type.rhtml

@@ -0,0 +1,3 @@
+<%
+  _httpsession.resp.status = 415
+%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http2
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.36
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-cases
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: best_practice_project
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,63 +39,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hayabusa
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 0.0.28
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 0.0.28
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hayabusa
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.25
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.25
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,33 +137,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: best_practice_project
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: '0'
 description: A lightweight framework for doing http-connections in Ruby. Supports
   cookies, keep-alive, compressing and much more.
 email: k@spernj.org
@@ -191,6 +219,8 @@ files:
 - spec/spec_root/json_test.rhtml
 - spec/spec_root/multipart_test.rhtml
 - spec/spec_root/redirect_test.rhtml
+- spec/spec_root/unauthorized.rhtml
+- spec/spec_root/unsupported_media_type.rhtml
 homepage: http://github.com/kaspernj/http2
 licenses:
 - MIT
@@ -210,26 +240,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A lightweight framework for doing http-connections in Ruby. Supports cookies,
   keep-alive, compressing and much more.
 test_files:
-- spec/http2_spec.rb
+- spec/http2/post_multipart_request_spec.rb
+- spec/http2/response_reader_spec.rb
 - spec/http2/get_request_spec.rb
-- spec/http2/post_request_spec.rb
-- spec/http2/post_data_generator_spec.rb
-- spec/http2/cookies_spec.rb
 - spec/http2/url_builder_spec.rb
-- spec/http2/response_reader_spec.rb
-- spec/http2/post_multipart_request_spec.rb
+- spec/http2/cookies_spec.rb
+- spec/http2/post_data_generator_spec.rb
+- spec/http2/post_request_spec.rb
 - spec/http2/response_spec.rb
-- spec/spec_root/redirect_test.rhtml
-- spec/spec_root/json_test.rhtml
-- spec/spec_root/multipart_test.rhtml
-- spec/spec_root/content_type_test.rhtml
-- spec/spec_root/cookie_test.rhtml
 - spec/helpers.rb
+- spec/http2_spec.rb
 - spec/spec_helper.rb
+- spec/spec_root/json_test.rhtml
+- spec/spec_root/unauthorized.rhtml
+- spec/spec_root/redirect_test.rhtml
+- spec/spec_root/cookie_test.rhtml
+- spec/spec_root/content_type_test.rhtml
+- spec/spec_root/multipart_test.rhtml
+- spec/spec_root/unsupported_media_type.rhtml