http2 0.0.23 → 0.0.24

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1ceccc4ed3d44786cd9e606a534761f41e14fac6
+  data.tar.gz: e89411685ce84e2fa7d2de4275a6a94fe60dfa5d
+SHA512:
+  metadata.gz: 00e97764f4dfea2d97014bc8e88e43e4ad3644a73570775789b293c89fbd5bc991f77b9411e36548f3d3ab473291b8794e228893066b25c5e8548144a788523a
+  data.tar.gz: b7a44522fa4032401c88e6f552702e9f50a6c207edb357211b91f5af645e4d40e666041abda4b7c37eadaf2bd5555cc20e4e275fbf8d6e1b4297ebc47662ff0f

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
+gem "string-cases"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -9,5 +10,7 @@ group :development do
   gem "rspec", "~> 2.8.0"
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.8.4"
+  gem "jeweler", ">= 1.8.4"
 end
+
+gem "codeclimate-test-reporter", group: :test, require: nil

data/Gemfile.lock

@@ -1,15 +1,47 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.6)
+    builder (3.2.2)
+    codeclimate-test-reporter (0.3.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.8.4)
+    docile (1.1.5)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.1.1)
+    highline (1.6.21)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
-    rake (10.1.0)
+    json (1.8.1)
+    jwt (1.0.0)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.4)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.8.0)
@@ -20,12 +52,20 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    string-cases (0.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  jeweler (~> 1.8.4)
+  codeclimate-test-reporter
+  jeweler (>= 1.8.4)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
+  string-cases

data/README.md

@@ -0,0 +1,50 @@
+# http2
+
+[![Build Status](https://api.shippable.com/projects/53bd3eef2e23bdcb03c0df9e/badge/master)](https://www.shippable.com/projects/53bd3eef2e23bdcb03c0df9e)
+[![Code Climate](https://codeclimate.com/github/kaspernj/http2.png)](https://codeclimate.com/github/kaspernj/http2)
+
+Example of usage:
+
+```ruby
+require "rubygems"
+require "http2"
+
+Http2.new(:host => "www.google.dk") do |http|
+  #Get-request.
+  res = http.get("path/to/something")
+  puts res.body
+  puts "All response-headers: #{res.headers}"
+  puts "Specific header: #{res.header("HeaderName")}"
+  
+  #Post-request.
+  res = http.post(:url => "path/to/something", :post => {
+    "some_post_val" => "some_value"
+  })
+  
+  #Post-multipart (upload).
+  res = http.post_multipart(:url => "path/to/something", :post => {
+    "test_file1" => {
+      :fpath => fpath,
+      :filename => "specfile"
+    }
+  })
+  
+  puts "Cookies until now: #{http.cookies}"
+end
+```
+
+## 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.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2012 Kasper Johansen. See LICENSE.txt for
+further details.
+

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.0.24

data/http2.gemspec

@@ -5,16 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = "http2"
-  s.version = "0.0.23"
+  s.version = "0.0.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-11-15"
+  s.date = "2014-07-09"
   s.description = "A lightweight framework for doing http-connections in Ruby. Supports cookies, keep-alive, compressing and much more."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -22,38 +22,44 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "http2.gemspec",
     "include/errors.rb",
+    "include/post_multipart_helper.rb",
     "include/response.rb",
+    "include/response_reader.rb",
     "include/utils.rb",
     "lib/http2.rb",
+    "shippable.yml",
     "spec/http2_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/kaspernj/http2"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.0.14"
   s.summary = "A lightweight framework for doing http-connections in Ruby. Supports cookies, keep-alive, compressing and much more."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<string-cases>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
+      s.add_dependency(%q<string-cases>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
+    s.add_dependency(%q<string-cases>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/include/post_multipart_helper.rb

@@ -0,0 +1,77 @@
+require "tempfile"
+
+class Http2::PostMultipartHelper
+  attr_reader :boundary
+
+  def initialize(http2)
+    @nl = http2.nl
+
+    #Generate random string.
+    @boundary = rand(36**50).to_s(36)
+  end
+
+  def generate_raw(phash)
+    Tempfile.open("http2_post_multipart_tmp_#{@boundary}") do |praw|
+      phash.each do |key, val|
+        praw << "--#{@boundary}#{@nl}"
+
+        if val.is_a?(Tempfile) && val.respond_to?(:original_filename)
+          parse_temp_file(key, val, praw)
+        elsif val.is_a?(Hash) && val[:filename]
+          parse_file(key, val, praw)
+        else
+          praw << "Content-Disposition: form-data; name=\"#{key}\";#{@nl}"
+          praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
+        end
+
+        praw << "Content-Type: text/plain#{@nl}"
+        praw << @nl
+
+        if val.class.name.to_s == "StringIO"
+          praw << val.read
+        elsif val.is_a?(Hash) && val[:content]
+          praw << val[:content].to_s
+        elsif val.is_a?(Hash) && val[:fpath]
+          read_file(val[:fpath], praw)
+        else
+          praw << val.to_s
+        end
+
+        praw << @nl
+      end
+
+      praw << "--#{@boundary}--"
+
+      yield self, praw
+    end
+  end
+
+  def read_file(path, praw)
+    File.open(path, "r") do |fp|
+      begin
+        while data = fp.sysread(4096)
+          praw << data
+        end
+      rescue EOFError
+        # Happens when done.
+      end
+    end
+  end
+
+  def parse_temp_file(key, val, praw)
+    praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val.original_filename}\";#{@nl}"
+    praw << "Content-Length: #{val.to_s.bytesize}#{@nl}"
+  end
+
+  def parse_file(key, val, praw)
+    praw << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{val[:filename]}\";#{@nl}"
+
+    if val[:content]
+      praw << "Content-Length: #{val[:content].to_s.bytesize}#{@nl}"
+    elsif val[:fpath]
+      praw << "Content-Length: #{File.size(val[:fpath])}#{@nl}"
+    else
+      raise "Could not figure out where to get content from."
+    end
+  end
+end

data/include/response_reader.rb

@@ -0,0 +1,251 @@
+class Http2::ResponseReader
+  attr_reader :response
+
+  def initialize(args)
+    @mode = "headers"
+    @transfer_encoding = nil
+    @response = Http2::Response.new(:request_args => args, :debug => @debug)
+    @rec_count = 0
+    @args, @debug, @http2, @sock = args[:args], args[:debug], args[:http2], args[:sock]
+    @nl = @http2.nl
+
+    read_headers
+    read_body
+    finish
+  end
+
+  def read_headers
+    loop do
+      line = @sock.gets
+      check_line_read(line)
+
+      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?
+        break if @length == 0
+        @mode = "body"
+        @http2.on_content_call(@args, @nl)
+        break
+      end
+
+      parse_header(line)
+    end
+  end
+
+  def read_body
+    loop do
+      if @length && @length > 0
+        line = @sock.read(@length)
+        raise "Expected to get #{@length} of bytes but got #{line.bytesize}" if @length != line.bytesize
+      else
+        line = @sock.gets
+      end
+
+      check_line_read(line)
+      stat = parse_body(line)
+      break if stat == "break"
+      next if stat == "next"
+    end
+  end
+
+  def finish
+    #Check if we should reconnect based on keep-alive-max.
+    if @keepalive_max == 1 or @connection == "close"
+      @sock.close unless @sock.closed?
+    end
+
+    # Validate that the response is as it should be.
+    puts "Http2: Validating response." if @debug
+
+    if !@response.args[:code]
+      raise "No status-code was received from the server. Headers: '#{@response.headers}' Body: '#{resp.args[:body]}'."
+    end
+
+    @response.validate!
+    check_and_decode
+    check_and_follow_redirect
+    handle_errors
+
+    @http2.autostate_register(@response) if @http2.args[:autostate]
+  end
+
+private
+
+  def check_and_follow_redirect
+    if (@response.args[:code].to_s == "302" || @response.args[:code].to_s == "307") && @response.header?("location") && (!@http2.args.key?(:follow_redirects) || @http2.args[:follow_redirects])
+      uri = URI.parse(@response.header("location"))
+      url = uri.path
+      url << "?#{uri.query}" if uri.query.to_s.length > 0
+
+      args = {:host => uri.host}
+      args[:ssl] = true if uri.scheme == "https"
+      args[:port] = uri.port if uri.port
+
+      puts "Http2: Redirecting from location-header to '#{url}'." if @debug
+
+      if !args[:host] or args[:host] == @args[:host]
+        return self.get(url)
+      else
+        http = Http2.new(args)
+        return http.get(url)
+      end
+    end
+  end
+
+  def check_and_decode
+    # Check if the content is gzip-encoded - if so: decode it!
+    if @encoding == "gzip"
+      puts "Http2: Decoding GZip." if @debug
+      require "zlib"
+      require "stringio"
+      io = StringIO.new(@response.args[:body])
+      gz = Zlib::GzipReader.new(io)
+      untrusted_str = gz.read
+
+      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")
+      end
+
+      @response.args[:body] = valid_string
+    end
+  end
+
+  def handle_errors
+    if @http2.raise_errors
+      if @response.args[:code].to_i == 500
+        err = Http2::Errors::Internalserver.new("A internal server error occurred")
+      elsif @response.args[:code].to_i == 403
+        err = Http2::Errors::Noaccess.new("No access")
+      elsif @response.args[:code].to_i == 400
+        err = Http2::Errors::Badrequest.new("Bad request")
+      elsif @response.args[:code].to_i == 404
+        err = Http2::Errors::Notfound.new("Not found")
+      end
+    end
+
+    if err
+      err.response = @response
+      raise err
+    end
+  end
+
+  def check_line_read(line)
+    if line
+      @rec_count += line.length
+    elsif !line && @rec_count <= 0
+      @sock = nil
+      raise Errno::ECONNABORTED, "Server closed the connection before being able to read anything (KeepAliveMax: '#{@keepalive_max}', Connection: '#{@connection}', PID: '#{Process.pid}')."
+    end
+  end
+
+  def parse_cookie(cookie_line)
+    ::Http2::Utils.parse_set_cookies(cookie_line).each do |cookie_data|
+      @http2.cookies[cookie_data["name"]] = cookie_data
+    end
+  end
+
+  def parse_keep_alive(keep_alive_line)
+    if ka_max = keep_alive_line.match(/max=(\d+)/)
+      @keepalive_max = ka_max[1].to_i
+      print "Http2: Keepalive-max set to: '#{@keepalive_max}'.\n" if @debug
+    end
+
+    if ka_timeout = keep_alive_line.match(/timeout=(\d+)/)
+      @keepalive_timeout = ka_timeout[1].to_i
+      print "Http2: Keepalive-timeout set to: '#{@keepalive_timeout}'.\n" if @debug
+    end
+  end
+
+  def parse_content_type(content_type_line)
+    if match_charset = content_type_line.match(/\s*;\s*charset=(.+)/i)
+      @charset = match_charset[1].downcase
+      @response.args[:charset] = @charset
+      content_type_line.gsub!(match_charset[0], "")
+    end
+
+    @ctype = content_type_line
+    @response.args[:contenttype] = @content_type_line
+  end
+
+  #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}$/)
+      key = match[1].to_s.downcase
+
+      parse_cookie(match[2]) if key == "set-cookie"
+      parse_keep_alive(match[2]) if key == "keep-alive"
+      parse_content_type(match[2]) if key == "content-type"
+
+      if key == "connection"
+        @connection = match[2].to_s.downcase
+      elsif key == "content-encoding"
+        @encoding = match[2].to_s.downcase
+        puts "Http2: Setting encoding to #{@encoding}" if @debug
+      elsif key == "content-length"
+        @length = match[2].to_i
+      elsif key == "transfer-encoding"
+        @transfer_encoding = match[2].to_s.downcase.strip
+      end
+
+      puts "Http2: Parsed header: #{match[1]}: #{match[2]}" if @debug
+      @response.headers[key] = [] unless @response.headers.key?(key)
+      @response.headers[key] << match[2]
+
+      if key != "transfer-encoding" && key != "content-length" && key != "connection" && key != "keep-alive"
+        @http2.on_content_call(@args, line)
+      end
+    elsif match = line.match(/^HTTP\/([\d\.]+)\s+(\d+)\s+(.+)$/)
+      @response.args[:code] = match[2]
+      @response.args[:http_version] = match[1]
+
+      @http2.on_content_call(@args, line)
+    else
+      raise "Could not understand header string: '#{line}'.\n\n#{@sock.read(409600)}"
+    end
+  end
+
+  #Parses the body based on given headers and saves it to the result-object.
+  # http.parse_body(str)
+  def parse_body(line)
+    if @response.args[:http_version] = "1.1"
+      return "break" if @length == 0
+
+      if @transfer_encoding == "chunked"
+        parse_body_chunked(line)
+      else
+        puts "Http2: Adding #{line.to_s.bytesize} to the body." if @debug
+        @response.args[:body] << line.to_s
+        @http2.on_content_call(@args, line)
+        return "break" if @response.header?("content-length") && @response.args[:body].length >= @response.header("content-length").to_i
+      end
+    else
+      raise "Dont know how to read HTTP version: '#{@resp.args[:http_version]}'."
+    end
+  end
+
+  def parse_body_chunked(line)
+    len = line.strip.hex
+
+    if len > 0
+      read = @sock.read(len)
+      return "break" if read == "" or (read == "\n" || read == "\r\n")
+      @response.args[:body] << read
+      @http2.on_content_call(@args, read)
+    end
+
+    nl = @sock.gets
+    if len == 0
+      if nl == "\n" || nl == "\r\n"
+        return "break"
+      else
+        raise "Dont know what to do :'-("
+      end
+    end
+
+    raise "Should have read newline but didnt: '#{nl}'." if nl != @nl
+  end
+end