http2 0.0.24 → 0.0.25

data/spec/http2/post_data_generator_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe Http2::PostDataGenerator do
+  it "should be able to recursively parse post-data-hashes." do
+    res = Http2::PostDataGenerator.new(
+      "test1" => "test2"
+    ).generate
+    raise "Expected 'test1=test2' but got: '#{res}'." if res != "test1=test2"
+
+    res = Http2::PostDataGenerator.new(
+      "test1" => [1, 2, 3]
+    ).generate
+    raise "Expected 'test1%5B0%5D=1&test1%5B1%5D=2&test1%5B2%5D=3' but got: '#{res}'." if res != "test1%5B0%5D=1&test1%5B1%5D=2&test1%5B2%5D=3"
+
+    res = Http2::PostDataGenerator.new(
+      "test1" => {
+        "order" => {
+          [:Bnet_profile, "profile_id"] => 5
+        }
+      }
+    ).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"
+  end
+end

data/spec/http2/url_builder_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe Http2::UrlBuilder do
+  context "#build" do
+    it "builds correctly" do
+      ub = Http2::UrlBuilder.new
+      ub.protocol = "https"
+      ub.host = "www.github.com"
+      ub.port = "443"
+      ub.path = "index.php"
+      ub.params["test"] = "true"
+      ub.params["test2"] = "false"
+
+      ub.build.should eq "https://www.github.com:443/index.php?test=true&test2=false"
+    end
+  end
+end

data/spec/http2_spec.rb

@@ -1,27 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Http2" do
-  it "should be able to recursively parse post-data-hashes." do
-    res = Http2.post_convert_data(
-      "test1" => "test2"
-    )
-    raise "Expected 'test1=test2' but got: '#{res}'." if res != "test1=test2"
-
-    res = Http2.post_convert_data(
-      "test1" => [1, 2, 3]
-    )
-    raise "Expected 'test1%5B0%5D=1&test1%5B1%5D=2&test1%5B2%5D=3' but got: '#{res}'." if res != "test1%5B0%5D=1&test1%5B1%5D=2&test1%5B2%5D=3"
-
-    res = Http2.post_convert_data(
-      "test1" => {
-        "order" => {
-          [:Bnet_profile, "profile_id"] => 5
-        }
-      }
-    )
-    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"
-  end
-
   it "should be able to do normal post-requests." do
     require "json"
 
@@ -138,9 +117,9 @@ describe "Http2" do
 
     Http2.new(:host => "http2test.kaspernj.org") do |http|
       res = http.post(
-        :url => "/content_type_test.php",
-        :content_type => "plain/text",
-        :post => "test1_test2_test3"
+        url: "content_type_test.php",
+        content_type: "plain/text",
+        post: "test1_test2_test3"
       )
 
       data = JSON.parse(res.body)
@@ -148,4 +127,19 @@ describe "Http2" do
       data["PHP_INPUT"].should eql("test1_test2_test3")
     end
   end
+
+  it "should set various timeouts" do
+    Http2.new(:host => "http2test.kaspernj.org") do |http|
+      res = http.get("content_type_test.php")
+      http.keepalive_timeout.should eq 5
+      http.keepalive_max.should eq 100
+    end
+  end
+
+  it "should follow redirects" do
+    Http2.new(host: "http2test.kaspernj.org", follow_redirects: true) do |http|
+      resp = http.get("redirect_test.php")
+      resp.code.should eq "200"
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -11,5 +11,7 @@ require 'http2'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-
+  config.expect_with :rspec do |c|
+    c.syntax = [:expect, :should]
+  end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: http2
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-08-04 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
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.4
 description: A lightweight framework for doing http-connections in Ruby. Supports
@@ -89,8 +89,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -98,13 +98,20 @@ files:
 - 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
 homepage: http://github.com/kaspernj/http2
@@ -117,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: A lightweight framework for doing http-connections in Ruby. Supports cookies,

data/include/post_multipart_helper.rb

@@ -1,77 +0,0 @@
-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