http2 0.0.31 → 0.0.32

data/{include → lib/http2}/post_request.rb

@@ -1,13 +1,13 @@
-class Http2::PostRequest
-  VALID_ARGUMENTS_POST = [:post, :url, :default_headers, :headers, :json, :method, :cookies, :on_content, :content_type]
-
-  def initialize(http2, args)
-    args.each do |key, val|
-      raise "Invalid key: '#{key}'." unless VALID_ARGUMENTS_POST.include?(key)
+class Http2::PostRequest < Http2::BaseRequest
+  def headers_string
+    unless @headers_string
+      @headers_string = "#{method} /#{@args[:url]} HTTP/1.1#{@nl}"
+      @headers_string << @http2.header_str(headers)
+      @headers_string << @nl
+      @headers_string << @data
     end
 
-    @http2, @args, @debug, @nl = http2, http2.parse_args(args), http2.debug, http2.nl
-    @conn = @http2.connection
+    @headers_string
   end
 
   def execute
@@ -15,10 +15,9 @@ class Http2::PostRequest
 
     @http2.mutex.synchronize do
       puts "Http2: Doing post." if @debug
-      puts "Http2: Header str: #{header_string}" if @debug
 
-      @conn.write(header_string)
-      return @http2.read_response(@args)
+      @conn.write(headers_string)
+      return @http2.read_response(self, @args)
     end
   end
 
@@ -36,7 +35,7 @@ private
     if @args[:content_type]
       @args[:content_type]
     elsif @args[:json]
-      content_type = "application/json"
+      "application/json"
     else
       "application/x-www-form-urlencoded"
     end
@@ -63,20 +62,9 @@ private
     headers_hash.merge! @http2.default_headers(@args)
 
     unless headers_hash["Accept"]
-      if @args[:json]
-        headers_hash["Accept"] = "application/json"
-      end
+      headers_hash["Accept"] = "application/json" if @args[:json]
     end
 
-    return headers_hash
-  end
-
-  def header_string
-    header_str = "#{method} /#{@args[:url]} HTTP/1.1#{@nl}"
-    header_str << @http2.header_str(headers, @args)
-    header_str << @nl
-    header_str << @data
-
-    header_str
+    headers_hash
   end
 end

data/{include → lib/http2}/response.rb

@@ -1,38 +1,39 @@
-#This object will be returned as the response for each request.
+# 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
+  # 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
 
-  #This method should not be called manually.
+  # This method should not be called manually.
   def initialize(args = {})
     @args = args
-    @args[:headers] = {} unless @args.key?(:headers)
+    @args[:headers] ||= {}
     @body = args[:body] || ""
-    @debug = @args[:debug]
+    @debug = args[:debug]
+    @request = args.fetch(:request)
   end
 
-  #Returns headers given from the host for the result.
+  # Returns headers given from the host for the result.
   #===Examples
   # headers_hash = res.headers
   def headers
-    return @args[:headers]
+    @args.fetch(:headers)
   end
 
-  #Returns a certain header by name or false if not found.
+  # Returns a certain header by name or false if not found.
   #===Examples
   # val = res.header("content-type")
   def header(key)
-    return false if !@args[:headers].key?(key)
-    return @args[:headers][key].first.to_s
+    return false unless @args.fetch(:headers).key?(key)
+    @args.fetch(:headers).fetch(key).first.to_s
   end
 
-  #Returns true if a header of the given string exists.
+  # 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 false
+    false
   end
 
   def content_length
@@ -53,12 +54,12 @@ class Http2::Response
     end
   end
 
-  #Returns the requested URL as a string.
+  # 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]
-    return @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.
@@ -76,6 +77,30 @@ class Http2::Response
     @json ||= JSON.parse(body)
   end
 
+  def host
+    @request.http2.host
+  end
+
+  def port
+    @request.http2.port
+  end
+
+  def ssl?
+    @request.http2.ssl?
+  end
+
+  def path
+    @request.path
+  end
+
+  def to_s
+    "#<Http::Response host=\"#{host}\" port=#{port} ssl=#{ssl?} path=\"#{path}\">"
+  end
+
+  def inspect
+    to_s
+  end
+
 private
 
   # Checks that the length of the body is the same as the given content-length if given.

data/{include → lib/http2}/response_reader.rb

@@ -4,9 +4,12 @@ class Http2::ResponseReader
   def initialize(args)
     @mode = "headers"
     @transfer_encoding = nil
-    @response = Http2::Response.new(request_args: args, debug: @debug)
+    @response = Http2::Response.new(request: args.fetch(:request), request_args: args, debug: @debug)
     @rec_count = 0
-    @args, @debug, @http2, @sock = args[:args], args[:http2].debug, args[:http2], args[:sock]
+    @args = args[:args]
+    @debug = args[:http2].debug
+    @http2 = args[:http2]
+    @sock = args[:sock]
     @nl = @http2.nl
     @conn = @http2.connection
 
@@ -49,7 +52,7 @@ class Http2::ResponseReader
   end
 
   def finish
-    #Check if we should reconnect based on keep-alive-max.
+    # Check if we should reconnect based on keep-alive-max.
     if @keepalive_max == 1 || @connection == "close"
       @conn.close unless @conn.closed?
     end
@@ -66,7 +69,7 @@ class Http2::ResponseReader
     @http2.autostate_register(@response) if @http2.args[:autostate]
     handle_errors
 
-    if response = check_and_follow_redirect
+    if (response = check_and_follow_redirect)
       @response = response
     end
   end
@@ -100,14 +103,19 @@ private
 
   def url_and_args_from_location
     uri = URI.parse(@response.header("location"))
+
     url = uri.path
     url << "?#{uri.query}" if uri.query.to_s.length > 0
+    url = url.gsub(/\A\//, "")
+
+    args = @http2.args
+      .reject { |k, _v| [:ssl, :port].include? k }
+      .merge(host: uri.host)
 
-    args = {host: uri.host}
     args[:ssl] = true if uri.scheme == "https"
     args[:port] = uri.port if uri.port
 
-    return [url, args]
+    [url, args]
   end
 
   def check_and_decode
@@ -123,7 +131,7 @@ private
       begin
         valid_string = ic.encode("UTF-8")
       rescue
-        valid_string = untrusted_str.force_encoding("UTF-8").encode("UTF-8", :invalid => :replace, :replace => "").encode("UTF-8")
+        valid_string = untrusted_str.force_encoding("UTF-8").encode("UTF-8", invalid: :replace, replace: "").encode("UTF-8")
       end
 
       @response.body = valid_string
@@ -131,7 +139,7 @@ private
   end
 
   def handle_errors
-    return unless  @http2.raise_errors
+    return unless @http2.raise_errors
 
     if @response.code == "500"
       err = Http2::Errors::Internalserver.new("A internal server error occurred")
@@ -176,7 +184,7 @@ private
   end
 
   def parse_content_type(content_type_line)
-    if match_charset = content_type_line.match(/\s*;\s*charset=(.+)/i)
+    if (match_charset = content_type_line.match(/\s*;\s*charset=(.+)/i))
       @charset = match_charset[1].downcase
       @response.charset = @charset
       content_type_line.gsub!(match_charset[0], "")
@@ -185,15 +193,15 @@ private
     @response.content_type = content_type_line
   end
 
-  #Parse a header-line and saves it on the object.
+  # Parse a header-line and saves it on the object.
   #===Examples
   # http.parse_header("Content-Type: text/html\r\n")
   def parse_header(line)
-    if match = line.match(/^(.+?):\s*(.+)#{@nl}$/)
+    if (match = line.match(/^(.+?):\s*(.+)#{@nl}$/))
       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+(.+)$/))
       @response.code = match[2]
       @response.http_version = match[1]
       @http2.on_content_call(@args, line)
@@ -229,7 +237,7 @@ private
     end
   end
 
-  #Parses the body based on given headers and saves it to the result-object.
+  # 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

data/{include → lib/http2}/url_builder.rb

@@ -1,7 +1,7 @@
 class Http2::UrlBuilder
   attr_accessor :host, :port, :protocol, :path, :params
 
-  def initialize args = {}
+  def initialize
     @params = {}
   end
 
@@ -24,7 +24,7 @@ class Http2::UrlBuilder
       end
     end
 
-    return url_params
+    url_params
   end
 
   def build_path_and_params
@@ -35,7 +35,7 @@ class Http2::UrlBuilder
       url << build_params
     end
 
-    return url
+    url
   end
 
   def build
@@ -49,7 +49,7 @@ class Http2::UrlBuilder
 
     url << build_path_and_params
 
-    return url
+    url
   end
 
   def params?

data/{include → lib/http2}/utils.rb

@@ -2,17 +2,17 @@
 class Http2::Utils
   # URL-encodes a string.
   def self.urlenc(string)
-    #Thanks to CGI framework
+    # Thanks to CGI framework
     string.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/) do
-      '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
-    end.tr(' ', '+')
+      "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
+    end.tr(" ", "+")
   end
 
   # URL-decodes a string.
   def self.urldec(string)
-    #Thanks to CGI framework
-    str = string.to_s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/) do
-      [$1.delete('%')].pack('H*')
+    # Thanks to CGI framework
+    string.to_s.tr("+", " ").gsub(/((?:%[0-9a-fA-F]{2})+)/) do
+      [$1.delete("%")].pack("H*")
     end
   end
 
@@ -28,10 +28,10 @@ class Http2::Utils
 
     cookie_data = {
       name: urldec(match[1].to_s),
-      value: self.urldec(match[2].to_s)
+      value: urldec(match[2].to_s)
     }
 
-    while match = str.match(/(.+?)=(.*?)(;\s*|$)/)
+    while (match = str.match(/(.+?)=(.*?)(;\s*|$)/))
       str = str.gsub(match[0], "")
       key = match[1].to_s.downcase
       value = match[2].to_s
@@ -45,6 +45,6 @@ class Http2::Utils
 
     cookie = Http2::Cookie.new(cookie_data)
 
-    return [cookie]
+    [cookie]
   end
 end

data/spec/http2/cookies_spec.rb

@@ -5,14 +5,14 @@ describe Http2 do
 
   it "should parse cookies and let them be read" do
     with_http do |http|
-      res = http.get("cookie_test.rhtml")
-      http.cookies.length.should eq 2
+      http.get("cookie_test.rhtml")
+      expect(http.cookies.length).to eq 2
 
       cookie = http.cookie("TestCookie")
-      cookie.name.should eq "TestCookie"
-      cookie.value.should eq "TestValue"
-      cookie.path.should eq "/"
-      cookie.expires.should > Time.now
+      expect(cookie.name).to eq "TestCookie"
+      expect(cookie.value).to eq "TestValue"
+      expect(cookie.path).to eq "/"
+      expect(cookie.expires).to be > Time.now
     end
   end
 end

data/spec/http2/get_request_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Http2::GetRequest do
+  it "reads the headers from the request" do
+    with_http do |http|
+      res = http.get("content_type_test.rhtml")
+      headers = res.request.headers_string
+      expect(headers).to include "GET /content_type_test.rhtml"
+    end
+  end
+end

data/spec/http2/post_multipart_request_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Http2::PostMultipartRequest do
+  it "reads the headers from the request" do
+    with_http do |http|
+      res = http.post_multipart(url: "json_test.rhtml", post: {"test1" => "test2"})
+      headers = res.request.headers_string
+      expect(headers).to include "POST /json_test.rhtml"
+    end
+  end
+end

data/spec/http2/post_request_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Http2::PostRequest do
+  it "reads the headers from the request" do
+    with_http do |http|
+      res = http.post(url: "json_test.rhtml", json: {testkey: "testvalue"})
+      headers = res.request.headers_string
+      expect(headers).to include "POST /json_test.rhtml"
+    end
+  end
+end

data/spec/http2/response_reader_spec.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+
+describe Http2::ResponseReader do
+  it "#url_and_args_from_location" do
+    with_http(ssl_skip_verify: true, follow_redirects: true) do |http|
+      response = http.get("redirect_test.rhtml?redirect_to=https://www.google.dk")
+      expect(response.host).to eq "www.google.dk"
+      expect(response.ssl?).to eq true
+      expect(response.port).to eq 443
+    end
+  end
+end

data/spec/http2/response_spec.rb

@@ -1,17 +1,73 @@
 require "spec_helper"
 
 describe Http2::Response do
-  it "should register content type" do
+  it "#content_type" do
     with_http do |http|
       res = http.get("content_type_test.rhtml")
-      res.content_type.should eq "text/html"
+      expect(res.content_type).to eq "text/html"
     end
   end
 
-  it "should register content length" do
+  it "#content_length" do
     with_http do |http|
       res = http.get("content_type_test.rhtml")
-      res.content_length.should > 50
+      expect(res.content_length).to be > 50
+    end
+  end
+
+  it "#json?" do
+    with_http do |http|
+      res = http.get("json_test.rhtml")
+      expect(res.json?).to eq true
+    end
+  end
+
+  it "#host" do
+    with_http do |http|
+      res = http.get("json_test.rhtml")
+      expect(res.host).to eq "localhost"
+    end
+  end
+
+  it "#port" do
+    with_http do |http|
+      res = http.get("json_test.rhtml")
+      expect(res.port).to eq http.port
+    end
+  end
+
+  it "#ssl?" do
+    with_http do |http|
+      res = http.get("json_test.rhtml")
+      expect(res.ssl?).to eq false
+    end
+  end
+
+  it "#path" do
+    with_http do |http|
+      res = http.get("json_test.rhtml")
+      expect(res.path).to eq "json_test.rhtml"
+    end
+  end
+
+  it "#header" do
+    with_http do |http|
+      res = http.get("json_test.rhtml")
+      expect(res.header("connection")).to eq "Keep-Alive"
+    end
+  end
+
+  it "#header?" do
+    with_http do |http|
+      res = http.get("json_test.rhtml")
+      expect(res.header?("connection")).to eq true
+    end
+  end
+
+  it "#json" do
+    with_http do |http|
+      res = http.post(url: "json_test.rhtml", post: {test: "test2"})
+      expect(res.json["_POST"]).to eq("test" => "test2")
     end
   end
 end