http2 0.0.31 → 0.0.32

data/spec/http2/url_builder_spec.rb

@@ -11,7 +11,7 @@ describe Http2::UrlBuilder do
       ub.params["test"] = "true"
       ub.params["test2"] = "false"
 
-      ub.build.should eq "https://www.github.com:443/index.php?test=true&test2=false"
+      expect(ub.build).to eq "https://www.github.com:443/index.php?test=true&test2=false"
     end
   end
 end

data/spec/http2_spec.rb

@@ -3,40 +3,43 @@ require "json"
 
 describe "Http2" do
   it "should be able to do normal post-requests." do
-    #Test posting keep-alive and advanced post-data.
+    # Test posting keep-alive and advanced post-data.
     with_http do |http|
       0.upto(5) do
-        resp = http.get("multipart_test.rhtml")
-
-        resp = http.post(url: "multipart_test.rhtml?choice=post-test", post: {
-          "val1" => "test1",
-          "val2" => "test2",
-          "val3" => [
-            "test3"
-          ],
-          "val4" => {
-            "val5" => "test5"
-          },
-          "val6" => {
-            "val7" => [
-              {
-                "val8" => "test8"
-              }
-            ]
-          },
-          "val9" => ["a", "b", "d"]
-        })
+        http.get("multipart_test.rhtml")
+
+        resp = http.post(
+          url: "multipart_test.rhtml?choice=post-test",
+          post: {
+            "val1" => "test1",
+            "val2" => "test2",
+            "val3" => [
+              "test3"
+            ],
+            "val4" => {
+              "val5" => "test5"
+            },
+            "val6" => {
+              "val7" => [
+                {
+                  "val8" => "test8"
+                }
+              ]
+            },
+            "val9" => ["a", "b", "d"]
+          }
+        )
         res = JSON.parse(resp.body)
 
-        res.is_a?(Hash).should eq true
-        res["val1"].should eq "test1"
-        res["val2"].should eq "test2"
-        res["val3"]["0"].should eq "test3"
-        res["val4"]["val5"].should eq "test5"
-        res["val6"]["val7"]["0"]["val8"].should eq "test8"
-        res["val9"]["0"].should eq "a"
-        res["val9"]["1"].should eq "b"
-        res["val9"]["2"].should eq "d"
+        expect(res.is_a?(Hash)).to eq true
+        expect(res["val1"]).to eq "test1"
+        expect(res["val2"]).to eq "test2"
+        expect(res["val3"]["0"]).to eq "test3"
+        expect(res["val4"]["val5"]).to eq "test5"
+        expect(res["val6"]["val7"]["0"]["val8"]).to eq "test8"
+        expect(res["val9"]["0"]).to eq "a"
+        expect(res["val9"]["1"]).to eq "b"
+        expect(res["val9"]["2"]).to eq "d"
       end
     end
   end
@@ -47,7 +50,7 @@ describe "Http2" do
       http.reconnect
       resp2 = http.get("multipart_test.rhtml")
 
-      resp1.body.should eq resp2.body
+      expect(resp1.body).to eq resp2.body
     end
   end
 
@@ -57,23 +60,26 @@ describe "Http2" do
         fpath = File.realpath(__FILE__)
         fpath2 = "#{File.realpath(File.dirname(__FILE__))}/../lib/http2.rb"
 
-        resp = http.post_multipart(url: "multipart_test.rhtml", post: {
-          "test_var" => "true",
-          "test_file1" => {
-            fpath: fpath,
-            filename: "specfile"
-          },
-          "test_file2" => {
-            fpath: fpath2,
-            filename: "http2.rb"
+        resp = http.post_multipart(
+          url: "multipart_test.rhtml",
+          post: {
+            "test_var" => "true",
+            "test_file1" => {
+              fpath: fpath,
+              filename: "specfile"
+            },
+            "test_file2" => {
+              fpath: fpath2,
+              filename: "http2.rb"
+            }
           }
-        })
+        )
 
         data = JSON.parse(resp.body)
 
-        data["post"]["test_var"].should eq "true"
-        data["files_data"]["test_file1"].should eq File.read(fpath)
-        data["files_data"]["test_file2"].should eq File.read(fpath2)
+        expect(data["post"]["test_var"]).to eq "true"
+        expect(data["files_data"]["test_file1"]).to eq File.read(fpath)
+        expect(data["files_data"]["test_file2"]).to eq File.read(fpath2)
       end
     end
   end
@@ -85,25 +91,23 @@ describe "Http2" do
     ]
 
     with_http do |http|
-      0.upto(105) do |count|
+      0.upto(105) do |_count|
         url = urls[rand(urls.size)]
-        #print "Doing request #{count} of 200 (#{url}).\n"
+        # puts "Doing request #{count} of 200 (#{url})."
         res = http.get(url)
-        res.body.to_s.length.should > 0
+        expect(res.body.to_s.length).to be > 0
       end
     end
   end
 
   it "should be able to convert URL's to 'is.gd'-short-urls" do
     isgd = Http2.isgdlink("https://github.com/kaspernj/http2")
-    raise "Expected isgd-var to be valid but it wasnt: '#{isgd}'." if !isgd.match(/^http:\/\/is\.gd\/([A-z\d]+)$/)
+    raise "Expected isgd-var to be valid but it wasnt: '#{isgd}'." unless isgd.match(/^http:\/\/is\.gd\/([A-z\d]+)$/)
   end
 
   it "should raise exception when something is not found" do
     with_http do |http|
-      expect{
-        http.get("something_that_does_not_exist.rhtml")
-      }.to raise_error(::Http2::Errors::Notfound)
+      expect { http.get("something_that_does_not_exist.rhtml") }.to raise_error(::Http2::Errors::Notfound)
     end
   end
 
@@ -115,15 +119,15 @@ describe "Http2" do
       )
 
       data = JSON.parse(res.body)
-      data["_SERVER"]["HTTP_CONTENT_TYPE"].should eq "application/json"
+      expect(data["_SERVER"]["HTTP_CONTENT_TYPE"]).to eq "application/json"
 
       # Hack JSON data from Hayabusa.
       json_data = JSON.parse(data["_POST"].keys.first)
-      json_data["testkey"].should eq "testvalue"
+      expect(json_data["testkey"]).to eq "testvalue"
 
-      res.content_type.should eq "application/json"
-      res.json?.should eq true
-      res.json["_SERVER"]["REQUEST_METHOD"].should eq "POST"
+      expect(res.content_type).to eq "application/json"
+      expect(res.json?).to eq true
+      expect(res.json["_SERVER"]["REQUEST_METHOD"]).to eq "POST"
     end
   end
 
@@ -136,25 +140,25 @@ describe "Http2" do
       )
 
       data = JSON.parse(res.body)
-      data["_SERVER"]["HTTP_CONTENT_TYPE"].should eq "plain/text"
+      expect(data["_SERVER"]["HTTP_CONTENT_TYPE"]).to eq "plain/text"
 
       raw_data = data["_POST"].keys.first
-      raw_data.should eq "test1_test2_test3"
+      expect(raw_data).to eq "test1_test2_test3"
     end
   end
 
   it "should set various timeouts" do
     with_http do |http|
-      res = http.get("content_type_test.rhtml")
-      http.keepalive_timeout.should eq 15
-      http.keepalive_max.should eq 30
+      http.get("content_type_test.rhtml")
+      expect(http.keepalive_timeout).to eq 15
+      expect(http.keepalive_max).to eq 30
     end
   end
 
   it "should follow redirects" do
     with_http(follow_redirects: true) do |http|
       resp = http.get("redirect_test.rhtml")
-      resp.code.should eq "200"
+      expect(resp.code).to eq "200"
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,19 +1,19 @@
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'http2'
-require 'helpers'
+require "rspec"
+require "http2"
+require "helpers"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
-    c.syntax = [:expect, :should]
+    c.syntax = [:expect]
   end
 
   config.include Helpers

data/spec/spec_root/redirect_test.rhtml

@@ -1,3 +1,3 @@
 <%
-  Knj::Web.redirect("/content_type_test.rhtml")
+  Knj::Web.redirect(_get["redirect_to"] || "/content_type_test.rhtml")
 %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http2
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: string-cases
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: best_practice_project
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.35.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.35.0
 description: A lightweight framework for doing http-connections in Ruby. Supports
   cookies, keep-alive, compressing and much more.
 email: k@spernj.org
@@ -134,21 +162,26 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- include/connection.rb
-- include/cookie.rb
-- include/errors.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
+- lib/http2/base_request.rb
+- lib/http2/connection.rb
+- lib/http2/cookie.rb
+- lib/http2/errors.rb
+- lib/http2/get_request.rb
+- lib/http2/post_data_generator.rb
+- lib/http2/post_multipart_request.rb
+- lib/http2/post_request.rb
+- lib/http2/response.rb
+- lib/http2/response_reader.rb
+- lib/http2/url_builder.rb
+- lib/http2/utils.rb
 - spec/helpers.rb
 - spec/http2/cookies_spec.rb
+- spec/http2/get_request_spec.rb
 - spec/http2/post_data_generator_spec.rb
+- spec/http2/post_multipart_request_spec.rb
+- spec/http2/post_request_spec.rb
+- spec/http2/response_reader_spec.rb
 - spec/http2/response_spec.rb
 - spec/http2/url_builder_spec.rb
 - spec/http2_spec.rb
@@ -178,21 +211,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.0
 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/helpers.rb
-- spec/http2/cookies_spec.rb
+- spec/http2_spec.rb
+- spec/http2/get_request_spec.rb
+- spec/http2/post_request_spec.rb
 - spec/http2/post_data_generator_spec.rb
-- spec/http2/response_spec.rb
+- spec/http2/cookies_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/http2/response_reader_spec.rb
+- spec/http2/post_multipart_request_spec.rb
+- spec/http2/response_spec.rb
+- spec/spec_root/redirect_test.rhtml
 - spec/spec_root/json_test.rhtml
 - spec/spec_root/multipart_test.rhtml
-- spec/spec_root/redirect_test.rhtml
+- spec/spec_root/content_type_test.rhtml
+- spec/spec_root/cookie_test.rhtml
+- spec/helpers.rb
+- spec/spec_helper.rb

data/include/get_request.rb

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