manticore 0.6.0-java → 0.7.0-java

data/spec/manticore/cookie_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Manticore::Cookie do
   context "created from a Client request" do
@@ -9,28 +9,27 @@ describe Manticore::Cookie do
       response.cookies["x"].first
     }
 
-    its(:name)   { is_expected.to eq "x" }
-    its(:value)  { is_expected.to eq "2" }
-    its(:path)   { is_expected.to eq "/" }
+    its(:name) { is_expected.to eq "x" }
+    its(:value) { is_expected.to eq "2" }
+    its(:path) { is_expected.to eq "/" }
     its(:domain) { is_expected.to eq "localhost" }
   end
 
-
-  let(:opts) {{}}
+  let(:opts) { {} }
   subject {
     Manticore::Cookie.new({name: "foo", value: "bar"}.merge(opts))
   }
 
-  its(:secure?)     { is_expected.to be nil }
+  its(:secure?) { is_expected.to be nil }
   its(:persistent?) { is_expected.to be nil }
 
   context "created as secure" do
-    let(:opts) {{ secure: true }}
+    let(:opts) { {secure: true} }
     its(:secure?) { is_expected.to be true }
   end
 
   context "created as persistent" do
-    let(:opts) {{ persistent: true }}
+    let(:opts) { {persistent: true} }
     its(:persistent?) { is_expected.to be true }
   end
-end
+end

data/spec/manticore/facade_spec.rb

@@ -1,16 +1,16 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Manticore::Facade do
   context "when extended into an arbitrary class" do
     let(:extended_class) {
-     Class.new do
+      Class.new do
         include Manticore::Facade
         include_http_client
       end
     }
 
     let(:extended_shared_class) {
-     Class.new do
+      Class.new do
         include Manticore::Facade
         include_http_client shared_pool: true
       end
@@ -23,12 +23,12 @@ describe Manticore::Facade do
 
     it "does not use the shared client by default" do
       expect(extended_class.send(:__manticore_facade).object_id).to_not eq \
-        Manticore.send(:__manticore_facade).object_id
+                                                                          Manticore.send(:__manticore_facade).object_id
     end
 
     it "is able to use the shared client" do
       expect(extended_shared_class.send(:__manticore_facade).object_id).to eq \
-        Manticore.send(:__manticore_facade).object_id
+                                                                             Manticore.send(:__manticore_facade).object_id
     end
 
     it "should work with #http" do
@@ -43,4 +43,4 @@ describe Manticore::Facade do
       expect(result["method"]).to eq "GET"
     end
   end
-end
+end

data/spec/manticore/response_spec.rb

@@ -1,15 +1,27 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Manticore::Response do
   let(:client) { Manticore::Client.new }
-  subject { client.get( local_server ) }
+  subject { client.get(local_server) }
 
   its(:headers) { is_expected.to be_a Hash }
-  its(:body)    { is_expected.to be_a String }
-  its(:length)  { is_expected.to be_a Fixnum }
+  its(:body) { is_expected.to be_a String }
+  its(:length) { is_expected.to be_a Fixnum }
 
   it "provides response header lookup via #[]" do
-    expect(subject["Content-Type"]).to eq "text/plain"
+    expect(subject["Content-Type"]).to eq "application/json"
+  end
+
+  context "when a response contains repeated headers" do
+    subject { client.get(local_server "/repeated_headers") }
+
+    it "returns an array of values for headers with multiple occurrances" do
+      expect(subject.headers["link"]).to eq ["foo", "bar"]
+    end
+
+    it "returns only the first value when using response#[]" do
+      expect(subject["Link"]).to eq "foo"
+    end
   end
 
   it "reads the body" do
@@ -27,14 +39,14 @@ describe Manticore::Response do
   context "when the client is invoked with a block" do
     it "allows reading the body from a block" do
       response = client.get(local_server) do |response|
-        expect(response.body).to match 'Manticore'
+        expect(response.body).to match "Manticore"
       end
 
       expect(response.body).to match "Manticore"
     end
 
     it "does not read the body implicitly if called with a block" do
-      response = client.get(local_server) {}
+      response = client.get(local_server) { }
       expect { response.body }.to raise_exception(Manticore::StreamClosedException)
     end
   end
@@ -51,9 +63,9 @@ describe Manticore::Response do
     let(:responses) { {} }
     let(:response) do
       client.get(url)
-        .on_success {|resp| responses[:success] = true }
-        .on_failure {responses[:failure]        = true }
-        .on_complete {responses[:complete]      = true }
+        .on_success { |resp| responses[:success] = true }
+        .on_failure { responses[:failure] = true }
+        .on_complete { responses[:complete] = true }
     end
 
     context "a succeeded request" do
@@ -85,6 +97,5 @@ describe Manticore::Response do
         expect { response.call }.to change { responses[:complete] }.to true
       end
     end
-
   end
 end

data/spec/manticore/stubbed_response_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Manticore::StubbedResponse do
   subject {
@@ -7,9 +7,9 @@ describe Manticore::StubbedResponse do
       code: 200,
       headers: {
         "Content-Type" => "text/plain",
-        "Set-Cookie" => ["k=v; path=/; domain=localhost", "k=v; path=/sub; domain=sub.localhost", "k2=v2;2 path=/; domain=localhost"]
+        "Set-Cookie" => ["k=v; path=/; domain=localhost", "k=v; path=/sub; domain=sub.localhost", "k2=v2;2 path=/; domain=localhost"],
       },
-      cookies: {"test" => Manticore::Cookie.new(name: "test", value: "something", path: "/")}
+      cookies: {"test" => Manticore::Cookie.new(name: "test", value: "something", path: "/")},
     ).call
   }
 
@@ -31,7 +31,7 @@ describe Manticore::StubbedResponse do
 
   it "calls on_success handlers" do
     called = false
-    Manticore::StubbedResponse.stub.on_success {|resp| called = true }.call
+    Manticore::StubbedResponse.stub.on_success { |resp| called = true }.call
     expect(called).to be true
   end
 
@@ -43,7 +43,7 @@ describe Manticore::StubbedResponse do
   end
 
   it "passes bodies to blocks for streaming reads" do
-    total = ""; subject.body {|chunk| total << chunk }
+    total = ""; subject.body { |chunk| total << chunk }
     expect(total).to eq("test body")
   end
 end

data/spec/spec_helper.rb

@@ -1,14 +1,21 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'manticore'
-require 'zlib'
-require 'json'
-require 'rack'
-require 'webrick'
-require 'webrick/https'
-require 'openssl'
-require 'rspec/its'
-require 'logger'
+# encoding: utf-8
+require "rubygems"
+require "bundler/setup"
+require "simplecov"
+
+SimpleCov.start do
+  add_filter "spec/"
+end
+
+require "manticore"
+require "zlib"
+require "json"
+require "rack"
+require "webrick"
+require "webrick/https"
+require "openssl"
+require "rspec/its"
+require "logger"
 
 PORT = 55441
 
@@ -16,6 +23,9 @@ def local_server(path = "/", port = PORT)
   URI.join("http://localhost:#{port}", path).to_s
 end
 
+Thread.abort_on_exception = true
+Thread.report_on_exception = false if Thread.respond_to?(:report_on_exception)
+
 def read_nonblock(socket)
   buffer = ""
   loop {
@@ -32,8 +42,7 @@ end
 def start_server(port = PORT)
   @servers ||= {}
   @servers[port] = Thread.new {
-    Net::HTTP::Server.run(port: port, log: Logger.new("/dev/null")) do |request, stream|
-
+    Net::HTTP::Server.run(port: port, log: open("/dev/null", "a")) do |request, stream|
       query = Rack::Utils.parse_query(request[:uri][:query].to_s)
       if query["sleep"]
         sleep(query["sleep"].to_f)
@@ -43,13 +52,13 @@ def start_server(port = PORT)
         request[:body] = read_nonblock(stream.socket)
       end
 
-      content_type = request[:headers]["X-Content-Type"] || "text/plain"
+      content_type = request[:headers]["X-Content-Type"] || "application/json"
       if request[:uri][:path] == "/auth"
         if request[:headers]["Authorization"] == "Basic dXNlcjpwYXNz"
           payload = JSON.dump(request)
-          [200, {'Content-Type' => content_type, "Content-Length" => payload.length}, [payload]]
+          [200, {"Content-Type" => content_type, "Content-Length" => payload.length}, [payload]]
         else
-          [401, {'WWW-Authenticate' => 'Basic realm="test"'}, [""]]
+          [401, {"WWW-Authenticate" => 'Basic realm="test"'}, [""]]
         end
       elsif request[:uri][:path] == "/failearly"
         # Return an invalid HTTP response
@@ -63,26 +72,38 @@ def start_server(port = PORT)
         end
       elsif request[:uri][:path] == "/proxy"
         payload = JSON.dump(request.merge(server_port: port))
-        [200, {'Content-Type' => content_type, "Content-Length" => payload.length}, [payload]]
+        [200, {"Content-Type" => content_type, "Content-Length" => payload.length}, [payload]]
+      elsif request[:uri][:path] == "/json_utf8"
+        payload = JSON.dump("first_name" => "Mark", "last_name" => "Töger")
+        [200, {"Content-Type" => "application/json", "Content-Length" => payload.length}, [payload]]
+      elsif request[:uri][:path] == "/authproxy"
+        payload = JSON.dump(request.merge(server_port: port))
+        if request[:headers]["Proxy-Authorization"] == "Basic dXNlcjpwYXNz"
+          [200, {"Content-Type" => content_type, "Content-Length" => payload.length}, [payload]]
+        else
+          [407, {"Proxy-Authenticate" => 'Basic realm="localhost'}, [payload]]
+        end
       elsif request[:uri][:path] == "/keepalive"
         payload = JSON.dump(request.merge(server_port: port))
-        [200, {'Content-Type' => content_type, "Content-Length" => payload.length, "Keep-Alive" => "timeout=60"}, [payload]]
+        [200, {"Content-Type" => content_type, "Content-Length" => payload.length, "Keep-Alive" => "timeout=60"}, [payload]]
+      elsif request[:uri][:path] == "/repeated_headers"
+        payload = JSON.dump(request.merge(server_port: port))
+        [200, {"Link" => ["foo", "bar"]}, [payload]]
       elsif request[:headers]["X-Redirect"] && request[:uri][:path] != request[:headers]["X-Redirect"]
-        [301, {"Location" => local_server( request[:headers]["X-Redirect"] )}, [""]]
+        [301, {"Location" => local_server(request[:headers]["X-Redirect"])}, [""]]
       else
         if request[:headers]["Accept-Encoding"] && request[:headers]["Accept-Encoding"].match("gzip")
-          out = StringIO.new('', "w")
+          out = StringIO.new("", "w")
           io = Zlib::GzipWriter.new(out, 2)
 
           request[:body] = Base64.encode64(request[:body]) if request[:headers]["X-Base64"]
-
           io.write JSON.dump(request)
           io.close
           payload = out.string
-          [200, {'Content-Type' => content_type, 'Content-Encoding' => "gzip", "Content-Length" => payload.length}, [payload]]
+          [200, {"Content-Type" => content_type, "Content-Encoding" => "gzip", "Content-Length" => payload.length}, [payload]]
         else
           payload = JSON.dump(request)
-          [200, {'Content-Type' => content_type, "Content-Length" => payload.length}, [payload]]
+          [200, {"Content-Type" => content_type, "Content-Length" => payload.length}, [payload]]
         end
       end
     end
@@ -97,9 +118,10 @@ def start_ssl_server(port, options = {})
   cert_name = [
     %w[CN localhost],
   ]
-  cert = OpenSSL::X509::Certificate.new File.read(File.expand_path('../ssl/host.crt', __FILE__))
+  cert_file = options[:cert] || File.expand_path("../ssl/host.crt", __FILE__)
+  cert = OpenSSL::X509::Certificate.new File.read(cert_file)
   cert.version = 0  # HACK: Work around jruby-openssl in jruby-head not setting cert.version
-  pkey = OpenSSL::PKey::RSA.new File.read(File.expand_path('../ssl/host.key', __FILE__))
+  pkey = OpenSSL::PKey::RSA.new File.read(File.expand_path("../ssl/host.key", __FILE__))
   @servers[port] = Thread.new {
     server = WEBrick::HTTPServer.new(
       {
@@ -108,7 +130,7 @@ def start_ssl_server(port, options = {})
         :SSLCertificate => cert,
         :SSLPrivateKey => pkey,
         :AccessLog => [],
-        :Logger => WEBrick::Log.new("/dev/null")
+        :Logger => WEBrick::Log.new("/dev/null"),
       }.merge(options)
     )
     server.mount_proc "/" do |req, res|
@@ -120,7 +142,7 @@ def start_ssl_server(port, options = {})
 end
 
 RSpec.configure do |c|
-  require 'net/http/server'
+  require "net/http/server"
 
   c.before(:suite) {
     @server = {}
@@ -128,9 +150,10 @@ RSpec.configure do |c|
     start_server 55442
     start_ssl_server 55444
     start_ssl_server 55445, :SSLVerifyClient => OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT, :SSLCACertificateFile => File.expand_path("../ssl/root-ca.crt", __FILE__)
+    start_ssl_server 55446, cert: File.expand_path("../ssl/host-expired.crt", __FILE__)
 
     Manticore.disable_httpcomponents_logging!
   }
 
-  c.after(:suite)  { stop_servers }
+  c.after(:suite) { stop_servers }
 end

metadata

@@ -1,38 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: java
 authors:
 - Chris Heald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-  name: bundler
+        version: '0'
+  name: openssl_pkcs8_pure
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
+  name: bundler
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -44,14 +44,28 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: jar-dependencies
-  prerelease: false
+  name: rake
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  name: jar-dependencies
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: Manticore is an HTTP client built on the Apache HttpCore components
 email:
 - cheald@mashable.com
@@ -60,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".travis.yml"
 - APACHE-LICENSE-2.0.txt
 - CHANGELOG.md
@@ -121,8 +136,7 @@ requirements:
 - jar commons-logging:commons-logging,      '~> 1.2'
 - jar commons-codec:commons-codec,          '~> 1.9'
 - jar org.apache.httpcomponents:httpcore,   '~> 4.4.4'
-rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Manticore is an HTTP client built on the Apache HttpCore components