http2 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7a58ef37e262df0923fbbcabfbb596dda05eb4c
-  data.tar.gz: 4d9b2368eeb6a303ea63e392f15883429ffc0ab7
+  metadata.gz: 00dd7c4f177f2a7c84ef8f9ef463fe6f2675a400
+  data.tar.gz: 7c28395bf02c20a50d2b8633e6ddd8156c8972f3
 SHA512:
-  metadata.gz: e39cd726b145f5143567b7a54f0b8e79f77668a7ac8011351e817b99b4487783a91197b7440cb2ad1a3659268f8259eb5da73c5996e2d4ce2c110853aa035fbe
-  data.tar.gz: 971fd5c395b68e5e4c0d83bf57d6a8c5a6abb7f63afaaf8a8246ebd65070f7144df7739759989c8ae56b60011965fdb43ba6ce1c67215bc1dc483243a0d927e9
+  metadata.gz: bdc915bf5453cb50d0d58e298f661b833d5086f370d66bfda2e5f654d01572ea4880f340d99dd3e6853abfd20e6d3a7bed5892758add2ad4c7187087f71e59b4
+  data.tar.gz: 54923d3a26cfe73698df0fbde92cd1dd517b61efaad45e77102fb469716d3efc4833b337bb2d915fb367d826e6370b5e068e6175a8ea7884b6b14bc9069f3024

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://api.shippable.com/projects/53bd3eef2e23bdcb03c0df9e/badge/master)](https://www.shippable.com/projects/53bd3eef2e23bdcb03c0df9e)
+[![Build Status](https://api.shippable.com/projects/540e7b9b3479c5ea8f9ec21d/badge?branchName=master)](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)
 
@@ -23,7 +23,17 @@ http = Http2.new(...)
 
 # Do requests here.
 
-http.close
+http.destroy # Closes the connection and frees up any variables used
+```
+
+Or through a proxy:
+```ruby
+Http2.new(host: "www.google.com", proxy: {host: "myproxy.com", port: 80, user: "myname", passwd: "mypassword"})
+```
+
+You can also use SSL:
+```ruby
+Http2.new(host: "myhost.com", ssl: true, ssl_skip_verify: true)
 ```
 
 ## Get requests
@@ -31,6 +41,11 @@ http.close
 res = http.get("path/to/something")
 ```
 
+Or as a hash:
+```ruby
+res = http.get(url: "path/to/something")
+```
+
 ## Post requests
 ```ruby
 res = http.post(url: "path/to/something", post: {
@@ -52,6 +67,13 @@ res = http.post(
 res = http.post(url: "path/to/something", json: {some_argument: true})
 ```
 
+### Reading JSON from request
+```ruby
+res = http.post(url: "something", json: {some_argument: true})
+res.json? #=> true (if content-type is application/json)
+res.json #=> {"value" => "something"}
+```
+
 ## Delete requests
 ```ruby
 res = http.delete(url: "path/to/something")
@@ -120,6 +142,19 @@ Handy when doing retries.
 http.reconnect
 ```
 
+
+## Basic HTTP authentication for all requests
+
+```ruby
+http = Http2.new(
+  host: "www.somehost.com",
+  basic_auth: {
+    user: "username",
+    passwd: "password"
+  }
+)
+```
+
 ## Contributing to http2
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/include/connection.rb

@@ -1,17 +1,17 @@
 class Http2::Connection
   def initialize(http2)
-    @http2, @debug, @args = http2, http2.debug, http2.args
+    @http2, @debug, @args, @nl = http2, http2.debug, http2.args, http2.nl
     reconnect
   end
 
   def destroy
-    @sock.close if @sock and !@sock.closed?
+    @sock.close if @sock && !@sock.closed?
     @sock = nil
 
-    @sock_plain.close if @sock_plain and !@sock_plain.closed?
+    @sock_plain.close if @sock_plain && !@sock_plain.closed?
     @sock_plain = nil
 
-    @sock_ssl.close if @sock_ssl and !@sock_ssl.closed?
+    @sock_ssl.close if @sock_ssl && !@sock_ssl.closed?
     @sock_ssl = nil
   end
 
@@ -62,10 +62,12 @@ class Http2::Connection
     puts "Http2: Reconnect." if @debug
 
     #Open connection.
-    if @args[:proxy] && @args[:ssl]
-      connect_proxy_ssl
-    elsif @args[:proxy]
-      connect_proxy
+    if @args[:proxy]
+      if @args[:proxy][:connect]
+        connect_proxy_connect
+      else
+        connect_proxy
+      end
     else
       puts "Http2: Opening socket connection to '#{@http2.host}:#{@http2.port}'." if @debug
       @sock_plain = TCPSocket.new(@http2.host, @http2.port)
@@ -102,23 +104,39 @@ class Http2::Connection
     @sock_plain.close if @sock_plain && !@sock_plain.closed?
   end
 
-  def connect_proxy_ssl
-    puts "Http2: Initializing proxy stuff." if @debug
+  def connect_proxy_connect
+    puts "Http2: Initializing proxy connect to '#{@args[:host]}:#{@args[:port]}' through proxy '#{@args[:proxy][:host]}:#{@args[:proxy][:port]}'." if @debug
     @sock_plain = TCPSocket.new(@args[:proxy][:host], @args[:proxy][:port])
 
-    @sock_plain.write("CONNECT #{@args[:host]}:#{@args[:port]} HTTP/1.0#{@nl}")
-    @sock_plain.write("User-Agent: #{@uagent}#{@nl}")
+    connect = "CONNECT #{@args[:host]}:#{@args[:port]} HTTP/1.1#{@nl}"
+    puts "Http2: Sending connect: #{connect}" if @debug
+    @sock_plain.write(connect)
+
+    headers = {
+      "Host" => "#{@args[:host]}:#{@args[:port]}"
+    }
 
     if @args[:proxy][:user] && @args[:proxy][:passwd]
-      credential = ["#{@args[:proxy][:user]}:#{@args[:proxy][:passwd]}"].pack("m")
-      credential.delete!("\r\n")
-      @sock_plain.write("Proxy-Authorization: Basic #{credential}#{@nl}")
+      headers["Proxy-Authorization"] = "Basic #{["#{@args[:proxy][:user]}:#{@args[:proxy][:passwd]}"].pack("m").chomp}"
+    end
+
+    headers.each do |key, value|
+      header = "#{key}: #{value}"
+      puts "Http2: Sending header to proxy: #{header}" if @debug
+      @sock_plain.write("#{header}#{@nl}")
     end
 
     @sock_plain.write(@nl)
 
-    res = @sock_plain.gets
-    raise res if res.to_s.downcase != "http/1.0 200 connection established#{@nl}"
+    res = @sock_plain.gets.to_s
+    raise "Couldn't connect through proxy: #{res}" unless res.match(/^http\/1\.(0|1)\s+200/i)
+    @sock_plain.gets
+
+    @proxy_connect = true
+  end
+
+  def proxy_connect?
+    @proxy_connect
   end
 
   def connect_proxy
@@ -131,8 +149,7 @@ class Http2::Connection
     require "openssl" unless ::Kernel.const_defined?(:OpenSSL)
 
     ssl_context = OpenSSL::SSL::SSLContext.new
-    #ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
-
+    ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER unless @args[:ssl_skip_verify]
     @sock_ssl = OpenSSL::SSL::SSLSocket.new(@sock_plain, ssl_context)
     @sock_ssl.sync_close = true
     @sock_ssl.connect

data/include/cookie.rb

@@ -0,0 +1,19 @@
+class Http2::Cookie
+  attr_reader :name, :value, :path, :expires_raw
+
+  def initialize(args)
+    @name, @value, @path, @expires_raw = args[:name], args[:value], args[:path], args[:expires]
+  end
+
+  def inspect
+    "#<Http2::Cookie name=#{@name} value=#{@value} path=#{@path}>"
+  end
+
+  def to_s
+    inspect
+  end
+
+  def expires
+    @expires ||= Time.parse(@expires_raw) if @expires_raw
+  end
+end

data/include/response_reader.rb

@@ -57,8 +57,8 @@ class Http2::ResponseReader
     # Validate that the response is as it should be.
     puts "Http2: Validating response." if @debug
 
-    if !@response.code
-      raise "No status-code was received from the server. Headers: '#{@response.headers}' Body: '#{resp.body}'."
+    unless @response.code
+      raise "No status-code was received from the server. Headers: '#{@response.headers}' Body: '#{@response.body}'."
     end
 
     @response.validate!
@@ -74,10 +74,10 @@ class Http2::ResponseReader
 private
 
   def check_and_follow_redirect
-    if (@response.code == "302" || @response.code == "303" || @response.code == "307") && @response.header?("location") && @http2.args[:follow_redirects]
+    if redirect_response?
       url, args = url_and_args_from_location
 
-      if !args[:host] || args[:host] == @args[:host]
+      if redirect_using_same_connection?(args)
         return @http2.get(url)
       else
         ::Http2.new(args).get(url)
@@ -85,6 +85,19 @@ private
     end
   end
 
+  REDIRECT_CODES = [302, 303, 307]
+  def redirect_response?
+    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
+    else
+      return false
+    end
+  end
+
   def url_and_args_from_location
     uri = URI.parse(@response.header("location"))
     url = uri.path
@@ -145,8 +158,8 @@ private
   end
 
   def parse_cookie(cookie_line)
-    ::Http2::Utils.parse_set_cookies(cookie_line).each do |cookie_data|
-      @http2.cookies[cookie_data["name"]] = cookie_data
+    ::Http2::Utils.parse_set_cookies(cookie_line).each do |cookie|
+      @http2.cookies[cookie.name] = cookie
     end
   end
 

data/include/utils.rb

@@ -1,6 +1,6 @@
-#This class holds various methods for encoding, decoding and parsing of HTTP-related stuff.
+# This class holds various methods for encoding, decoding and parsing of HTTP-related stuff.
 class Http2::Utils
-  #URL-encodes a string.
+  # URL-encodes a string.
   def self.urlenc(string)
     #Thanks to CGI framework
     string.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/) do
@@ -8,7 +8,7 @@ class Http2::Utils
     end.tr(' ', '+')
   end
 
-  #URL-decodes a string.
+  # URL-decodes a string.
   def self.urldec(string)
     #Thanks to CGI framework
     str = string.to_s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/) do
@@ -16,25 +16,35 @@ class Http2::Utils
     end
   end
 
-  #Parses a cookies-string and returns them in an array.
+  # Parses a cookies-string and returns them in an array.
   def self.parse_set_cookies(str)
-    str = String.new(str.to_s)
-    return [] if str.length <= 0
-    args = {}
+    str = "#{str}"
+    return [] if str.empty?
     cookie_start_regex = /^(.+?)=(.*?)(;\s*|$)/
 
     match = str.match(cookie_start_regex)
-    raise "Could not match cookie: '#{str}'." if !match
+    raise "Could not match cookie: '#{str}'" unless match
     str.gsub!(cookie_start_regex, "")
 
-    args["name"] = self.urldec(match[1].to_s)
-    args["value"] = self.urldec(match[2].to_s)
+    cookie_data = {
+      name: urldec(match[1].to_s),
+      value: self.urldec(match[2].to_s)
+    }
 
     while match = str.match(/(.+?)=(.*?)(;\s*|$)/)
       str = str.gsub(match[0], "")
-      args[match[1].to_s.downcase] = match[2].to_s
+      key = match[1].to_s.downcase
+      value = match[2].to_s
+
+      if key == "path" || key == "expires"
+        cookie_data[key.to_sym] = value
+      else
+        cookie_data[key] = value
+      end
     end
 
-    return [args]
+    cookie = Http2::Cookie.new(cookie_data)
+
+    return [cookie]
   end
 end

data/lib/http2.rb

@@ -15,16 +15,16 @@ require "string-cases"
 #  print "#{res.headers}"
 # end
 class Http2
-  #Autoloader for subclasses.
+  # Autoloader for subclasses.
   def self.const_missing(name)
     require "#{File.dirname(__FILE__)}/../include/#{::StringCases.camel_to_snake(name)}.rb"
     return Http2.const_get(name)
   end
 
-  #Converts a URL to "is.gd"-short-URL.
+  # 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}")
+      resp = http.get("api.php?longurl=#{url}")
       return resp.body
     end
   end
@@ -32,7 +32,7 @@ class Http2
   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, :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]
   def initialize(args = {})
     @args = parse_init_args(args)
     set_default_values
@@ -78,7 +78,7 @@ class Http2
     @connection = ::Http2::Connection.new(self)
   end
 
-  #Destroys the object unsetting all variables and closing all sockets.
+  # Destroys the object unsetting all variables and closing all sockets.
   #===Examples
   # http.destroy
   def destroy
@@ -94,26 +94,22 @@ class Http2
     @connection = nil
   end
 
-  #Forces various stuff into arguments-hash like URL from original arguments and enables single-string-shortcuts and more.
+  # Forces various stuff into arguments-hash like URL from original arguments and enables single-string-shortcuts and more.
   def parse_args(*args)
     if args.length == 1 && args.first.is_a?(String)
       args = {url: args.first}
-    elsif args.length >= 2
-      raise "Couldnt parse arguments."
-    elsif args.is_a?(Array) && args.length == 1
+    elsif args.length == 1
       args = args.first
     else
-      raise "Invalid arguments: '#{args.class.name}'."
+      raise "Invalid arguments: '#{args.class.name}'"
     end
 
-    if args[:url].to_s.split("\n").length != 1
-      raise "Invalid URL: '#{args[:url]}'."
-    end
+    raise "Invalid URL: '#{args[:url]}'" unless args[:url].to_s.split("\n").length == 1
 
     return args
   end
 
-  #Returns a result-object based on the arguments.
+  # Returns a result-object based on the arguments.
   #===Examples
   # res = http.get("somepage.html")
   # print res.body #=> <String>-object containing the HTML gotten.
@@ -130,7 +126,7 @@ class Http2
     end
   end
 
-  #Returns the default headers for a request.
+  # Returns the default headers for a request.
   #===Examples
   # headers_hash = http.default_headers
   # print "#{headers_hash}"
@@ -139,15 +135,10 @@ class Http2
 
     headers = {
       "Connection" => "Keep-Alive",
-      "User-Agent" => @uagent
+      "User-Agent" => @uagent,
+      "Host" => host_header
     }
 
-    #Possible to give custom host-argument.
-    host = args[:host] || self.host
-    port = args[:port] || self.port
-
-    headers["Host"] = "#{host}" # Copy host string to avoid changing the original string if port has been given!
-    headers["Host"] << ":#{port}" if port && ![80, 443].include?(port.to_i) && !@args[:skip_port_in_host_header]
     headers["Accept-Encoding"] = "gzip" if @args[:encoding_gzip]
 
     if @args[:basic_auth]
@@ -155,26 +146,32 @@ class Http2
       headers["Authorization"] = "Basic #{Base64.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}"
+    end
+
     headers.merge!(@args[:extra_headers]) if @args[:extra_headers]
     headers.merge!(args[:headers]) if args[:headers]
     return headers
   end
 
-  #Posts to a certain page.
+  # Posts to a certain page.
   #===Examples
   # res = http.post("login.php", {"username" => "John Doe", "password" => 123)
   def post(args)
     ::Http2::PostRequest.new(self, args).execute
   end
 
-  #Posts to a certain page using the multipart-method.
+  # Posts to a certain page using the multipart-method.
   #===Examples
   # res = http.post_multipart("upload.php", {"normal_value" => 123, "file" => Tempfile.new(?)})
   def post_multipart(*args)
     ::Http2::PostMultipartRequest.new(self, *args).execute
   end
 
-  #Returns a header-string which normally would be used for a request in the given state.
+  # Returns a header-string which normally would be used for a request in the given state.
   def header_str(headers_hash, args = {})
     headers_hash["Cookie"] = cookie_header_string
 
@@ -190,30 +187,33 @@ class Http2
     cstr = ""
 
     first = true
-    @cookies.each do |cookie_name, cookie_data|
+    @cookies.each do |cookie_name, cookie|
       cstr << "; " unless first
       first = false if first
-
-      if cookie_data.is_a?(Hash)
-        name = cookie_data["name"]
-        value = cookie_data["value"]
-      else
-        name = cookie_name
-        value = cookie_data
-      end
-
-      raise "Unexpected lines: #{value.lines.to_a.length}." if value.lines.to_a.length != 1
-      cstr << "#{Http2::Utils.urlenc(name)}=#{Http2::Utils.urlenc(value)}"
+      ensure_single_lines([cookie.name, cookie.value])
+      cstr << "#{Http2::Utils.urlenc(cookie.name)}=#{Http2::Utils.urlenc(cookie.value)}"
     end
 
     return cstr
   end
 
+  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
+
+  def ensure_single_lines(*strings)
+    strings.each do |string|
+      raise "More than one line: #{string}." unless string.to_s.lines.to_a.length == 1
+    end
+  end
+
   def on_content_call(args, str)
     args[:on_content].call(str) if args.key?(:on_content)
   end
 
-  #Reads the response after posting headers and data.
+  # Reads the response after posting headers and data.
   #===Examples
   # res = http.read_response
   def read_response(args = {})
@@ -230,7 +230,17 @@ class Http2
 
 private
 
-  #Registers the states from a result.
+  def host_header
+    #Possible to give custom host-argument.
+    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 << ":#{port}" if port && ![80, 443].include?(port.to_i) && !@args[:skip_port_in_host_header]
+    return host_header_string
+  end
+
+  # Registers the states from a result.
   def autostate_register(res)
     puts "Http2: Running autostate-register on result." if @debug
     @autostate_values.clear
@@ -247,7 +257,7 @@ private
     raise "No states could be found." if @autostate_values.empty?
   end
 
-  #Sets the states on the given post-hash.
+  # Sets the states on the given post-hash.
   def autostate_set_on_post_hash(phash)
     phash.merge!(@autostate_values)
   end
@@ -260,6 +270,8 @@ private
       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]
     return args
   end

data/spec/http2/cookies_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe Http2 do
+  include Helpers
+
+  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
+
+      cookie = http.cookie("TestCookie")
+      cookie.name.should eq "TestCookie"
+      cookie.value.should eq "TestValue"
+      cookie.path.should eq "/"
+      cookie.expires.should > Time.now
+    end
+  end
+end

data/spec/spec_root/cookie_test.rhtml

@@ -0,0 +1,8 @@
+<%
+  _hb.cookie(
+    "name" => "TestCookie",
+    "value" => "TestValue",
+    "expires" => Time.new + 3600,
+    "path" => "/"
+  )
+%>

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: http2
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-cases
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: hayabusa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.25
 - !ruby/object:Gem::Dependency
@@ -135,6 +135,7 @@ files:
 - README.md
 - Rakefile
 - include/connection.rb
+- include/cookie.rb
 - include/errors.rb
 - include/get_request.rb
 - include/post_data_generator.rb
@@ -146,12 +147,14 @@ files:
 - include/utils.rb
 - lib/http2.rb
 - spec/helpers.rb
+- spec/http2/cookies_spec.rb
 - spec/http2/post_data_generator_spec.rb
 - spec/http2/response_spec.rb
 - spec/http2/url_builder_spec.rb
 - spec/http2_spec.rb
 - spec/spec_helper.rb
 - spec/spec_root/content_type_test.rhtml
+- spec/spec_root/cookie_test.rhtml
 - spec/spec_root/json_test.rhtml
 - spec/spec_root/multipart_test.rhtml
 - spec/spec_root/redirect_test.rhtml
@@ -175,19 +178,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.2.2
 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/helpers.rb
+- spec/http2/cookies_spec.rb
 - spec/http2/post_data_generator_spec.rb
-- spec/http2/url_builder_spec.rb
 - spec/http2/response_spec.rb
-- spec/spec_root/redirect_test.rhtml
+- spec/http2/url_builder_spec.rb
+- spec/http2_spec.rb
+- spec/spec_helper.rb
+- spec/spec_root/content_type_test.rhtml
+- spec/spec_root/cookie_test.rhtml
 - spec/spec_root/json_test.rhtml
 - spec/spec_root/multipart_test.rhtml
-- spec/spec_root/content_type_test.rhtml
-- spec/helpers.rb
-- spec/spec_helper.rb
+- spec/spec_root/redirect_test.rhtml