http2 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ceccc4ed3d44786cd9e606a534761f41e14fac6
-  data.tar.gz: e89411685ce84e2fa7d2de4275a6a94fe60dfa5d
+  metadata.gz: a747caea21ace1b6e3aea354a4d9e9ffe437dc08
+  data.tar.gz: 4cd7db8fbe2d498efcf28fdfad1cba6d9388c491
 SHA512:
-  metadata.gz: 00e97764f4dfea2d97014bc8e88e43e4ad3644a73570775789b293c89fbd5bc991f77b9411e36548f3d3ab473291b8794e228893066b25c5e8548144a788523a
-  data.tar.gz: b7a44522fa4032401c88e6f552702e9f50a6c207edb357211b91f5af645e4d40e666041abda4b7c37eadaf2bd5555cc20e4e275fbf8d6e1b4297ebc47662ff0f
+  metadata.gz: 5ed8bec6e8c5abaa859799a1cb378189eac83e13fccd947c736555a249d6b1de291da4b1beb65df1fba46982023c757a9374ae287f70b7a7ee1808f26f211c04
+  data.tar.gz: e36e5e10eb01b93e219b5912de26c9b049605c55628770e356c9d34faa11c37cfc74c28feb0d4efa0b8212729cc82424497596faa58afa4b9b7628a3f507e353

data/Gemfile

@@ -1,7 +1,5 @@
 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.

data/Gemfile.lock

@@ -3,38 +3,43 @@ GEM
   specs:
     addressable (2.3.6)
     builder (3.2.2)
-    codeclimate-test-reporter (0.3.0)
+    codeclimate-test-reporter (0.4.0)
       simplecov (>= 0.7.1, < 1.0.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
     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)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.8)
+    github_api (0.12.0)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    hashie (2.1.1)
+    hashie (3.2.0)
     highline (1.6.21)
-    jeweler (1.8.8)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
     json (1.8.1)
     jwt (1.0.0)
+    mini_portile (0.6.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.4)
+    multipart-post (2.0.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
@@ -52,12 +57,13 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simplecov (0.8.2)
+    simplecov (0.9.0)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     string-cases (0.0.0)
+    thread_safe (0.3.4)
 
 PLATFORMS
   ruby

data/README.md

@@ -2,6 +2,7 @@
 
 [![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)
+[![Code Climate](https://codeclimate.com/github/kaspernj/http2/coverage.png)](https://codeclimate.com/github/kaspernj/http2)
 
 Example of usage:
 

data/VERSION

@@ -1 +1 @@
-0.0.24
+0.0.25

data/http2.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: http2 0.0.25 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "http2"
-  s.version = "0.0.24"
+  s.version = "0.0.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Kasper Johansen"]
-  s.date = "2014-07-09"
+  s.date = "2014-08-04"
   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 = [
@@ -26,20 +28,26 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "http2.gemspec",
+    "include/connection.rb",
     "include/errors.rb",
-    "include/post_multipart_helper.rb",
+    "include/get_request.rb",
+    "include/post_data_generator.rb",
+    "include/post_multipart_request.rb",
+    "include/post_request.rb",
     "include/response.rb",
     "include/response_reader.rb",
+    "include/url_builder.rb",
     "include/utils.rb",
     "lib/http2.rb",
     "shippable.yml",
+    "spec/http2/post_data_generator_spec.rb",
+    "spec/http2/url_builder_spec.rb",
     "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 = "2.0.14"
+  s.rubygems_version = "2.4.0"
   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
@@ -50,20 +58,20 @@ Gem::Specification.new do |s|
       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"])
+      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"])
+      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"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.4"])
   end
 end
 

data/include/connection.rb

@@ -0,0 +1,142 @@
+class Http2::Connection
+  def initialize(http2)
+    @http2, @debug, @args = http2, http2.debug, http2.args
+    reconnect
+  end
+
+  def destroy
+    @sock.close if @sock and !@sock.closed?
+    @sock = nil
+
+    @sock_plain.close if @sock_plain and !@sock_plain.closed?
+    @sock_plain = nil
+
+    @sock_ssl.close if @sock_ssl and !@sock_ssl.closed?
+    @sock_ssl = nil
+  end
+
+  def gets
+    @sock.gets
+  end
+
+  def read(length)
+    @sock.read(length)
+  end
+
+  def close
+    @sock.close
+  end
+
+  def closed?
+    @sock.closed?
+  end
+
+  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
+
+  def sock_puts(str)
+    sock_write("#{str}#{@nl}")
+  end
+
+  # Tries to write a string to the socket. If it fails it reconnects and tries again.
+  def write(str)
+    reconnect unless socket_working?
+
+    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
+      sock_write(str)
+    end
+
+    @request_last = Time.now
+  end
+
+  # Reconnects to the host.
+  def reconnect
+    puts "Http2: Reconnect." if @debug
+
+    #Open connection.
+    if @args[:proxy] && @args[:ssl]
+      connect_proxy_ssl
+    elsif @args[:proxy]
+      connect_proxy
+    else
+      print "Http2: Opening socket connection to '#{@args[:host]}:#{@args[:port]}'.\n" if @debug
+      @sock_plain = TCPSocket.new(@args[:host], @args[:port].to_i)
+    end
+
+    if @args[:ssl]
+      apply_ssl
+    else
+      @sock = @sock_plain
+    end
+  end
+
+  # Returns boolean based on the if the object is connected and the socket is working.
+  #===Examples
+  # puts "Socket is working." if http.socket_working?
+  def socket_working?
+    return false if !@sock or @sock.closed?
+
+    if @keepalive_timeout && @request_last
+      between = Time.now.to_i - @request_last.to_i
+      if between >= @keepalive_timeout
+        puts "Http2: We are over the keepalive-wait - returning false for socket_working?." if @debug
+        return false
+      end
+    end
+
+    return true
+  end
+
+  # Closes the current connection if any.
+  def close
+    @sock.close if @sock && !@sock.closed?
+    @sock_ssl.close if @sock_ssl && !@sock_ssl.closed?
+    @sock_plain.close if @sock_plain && !@sock_plain.closed?
+  end
+
+  def connect_proxy_ssl
+    puts "Http2: Initializing proxy stuff." 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}")
+
+    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}")
+    end
+
+    @sock_plain.write(@nl)
+
+    res = @sock_plain.gets
+    raise res if res.to_s.downcase != "http/1.0 200 connection established#{@nl}"
+  end
+
+  def connect_proxy
+    puts "Http2: Opening socket connection 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].to_i)
+  end
+
+  def apply_ssl
+    puts "Http2: Initializing SSL." if @debug
+    require "openssl" unless ::Kernel.const_defined?(:OpenSSL)
+
+    ssl_context = OpenSSL::SSL::SSLContext.new
+    #ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+    @sock_ssl = OpenSSL::SSL::SSLSocket.new(@sock_plain, ssl_context)
+    @sock_ssl.sync_close = true
+    @sock_ssl.connect
+
+    @sock = @sock_ssl
+  end
+end

data/include/get_request.rb

@@ -0,0 +1,34 @@
+class Http2::GetRequest
+  def initialize(http2, args)
+    @http2, @args, @debug, @nl = http2, http2.parse_args(args), http2.debug, http2.nl
+  end
+
+  def execute
+    @http2.mutex.synchronize do
+      puts "Http2: Writing headers: #{header_string}" if @debug
+      @http2.connection.write(header_string)
+
+      puts "Http2: Reading response." if @debug
+      resp = @http2.read_response(@args)
+
+      puts "Http2: Done with get request." if @debug
+      return resp
+    end
+  end
+
+private
+
+  def method
+    if @args[:method]
+      @args[:method].to_s.upcase
+    else
+      "GET"
+    end
+  end
+
+  def header_string
+    header_str = "#{method} /#{@args[:url]} HTTP/1.1#{@nl}"
+    header_str << @http2.header_str(@http2.default_headers(@args), @args)
+    header_str << @nl
+  end
+end

data/include/post_data_generator.rb

@@ -0,0 +1,62 @@
+class Http2::PostDataGenerator
+  def initialize(pdata, args = {})
+    @pdata, @args = pdata, args
+  end
+
+  def generate
+    praw = ""
+
+    if @pdata.is_a?(Hash)
+      praw << generate_for_hash(@pdata)
+    elsif @pdata.is_a?(Array)
+      praw << generate_for_array(@pdata)
+    else
+      return @pdata.to_s
+    end
+
+    return praw
+  end
+
+private
+
+  def generate_for_hash(hash)
+    praw = ""
+
+    @pdata.each do |key, val|
+      praw << "&" if praw != ""
+      key = "#{@args[:orig_key]}[#{key}]" if @args[:orig_key]
+      praw << generate_key_value(key, val)
+    end
+
+    praw
+  end
+
+  def generate_for_array(array)
+    praw = ""
+
+    count = 0
+    @pdata.each do |val|
+      praw << "&" if praw != ""
+
+      if @args[:orig_key]
+        key = "#{@args[:orig_key]}[#{count}]"
+      else
+        key = count
+      end
+
+      praw << generate_key_value(key, val)
+      count += 1
+    end
+
+    praw
+  end
+
+  def generate_key_value(key, value)
+    if value.is_a?(Hash) || value.is_a?(Array)
+      return ::Http2::PostDataGenerator.new(value, :orig_key => key).generate
+    else
+      data = ::Http2::PostDataGenerator.new(value).generate
+      return "#{Http2::Utils.urlenc(key)}=#{Http2::Utils.urlenc(data)}"
+    end
+  end
+end

data/include/post_multipart_request.rb

@@ -0,0 +1,113 @@
+require "tempfile"
+
+class Http2::PostMultipartRequest
+  def initialize(http2, *args)
+    @http2, @nl, @args = http2, http2.nl, http2.parse_args(*args)
+    @phash = @args[:post].clone
+    @http2.autostate_set_on_post_hash(phash) if @http2.autostate
+    @boundary = rand(36**50).to_s(36)
+    @conn = @http2.connection
+  end
+
+  def execute
+    generate_raw(@phash) do |helper, praw|
+      puts "Http2: Header string: #{header_string}" if @debug
+
+      @http2.mutex.synchronize do
+        @conn.write(header_string(praw))
+
+        praw.rewind
+        praw.each_line do |data|
+          @conn.sock_write(data)
+        end
+
+        return @http2.read_response(@args)
+      end
+    end
+  end
+
+private
+
+  def header_string(praw)
+    header_str = "POST /#{@args[:url]} HTTP/1.1#{@nl}"
+    header_str << @http2.header_str(@http2.default_headers(@args).merge(
+      "Content-Type" => "multipart/form-data; boundary=#{@boundary}",
+      "Content-Length" => praw.size
+    ), @args)
+    header_str << @nl
+
+    return header_str
+  end
+
+  def generate_raw(phash)
+    Tempfile.open("http2_post_multipart_tmp_#{@boundary}") do |praw|
+      phash.each do |key, val|
+        add_headers(praw, key, val)
+        add_body(praw, val)
+      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
+
+  def add_headers(praw, 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
+  end
+
+  def add_body(praw, val)
+    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
+end