manticore 0.6.0-java → 0.6.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaec2b636e38b91767b212d83f2519c7e52ed085
-  data.tar.gz: 83eda4139c8cad24ccff8f9c022d5b4a8a9e7778
+  metadata.gz: f1e6b7d1ea5d4bb60011c89d4b3e7b10abff3b42
+  data.tar.gz: db35b3f276b9f5040cee58407a16858f291435d6
 SHA512:
-  metadata.gz: 9e60fe0524842aaba68b508587ef4928db16c11fbbfcdd5b29c2453d1175e6edd79322ec4068c18e921eea3f7e021d5a5a9b523e46ad12aeed5e7668c6920b1d
-  data.tar.gz: 90c45bbc808cfeeac2b79685eed88162092fe8a73c81ca928f9c81309b10897a02c0ec2e88866ab1ef97baeeb884df85a595e48916c6d63cc2c925307cc4a2bc
+  metadata.gz: e8a1d7749fd671e7f44970067dd67899d5485de989c320baa39ab6f05df886e34148a3ccdd05ec7513792138314d4d37421509a5a7fd6b47231c30f2f862acec
+  data.tar.gz: f83f8a304ad9c12d94c3b8fd8b5914fded62083a6b90ed61a67e80aa754683ec69fa122e802377f250cc6eaa40f79a09930bb482d5c337cabce3bc799271945c

data/.travis.yml

@@ -12,7 +12,7 @@ jdk:
   - oraclejdk7
   - openjdk7
 before_install:
-  - gem install ruby-maven
+  - gem install ruby-maven bundler
   - bundle install
 matrix:
   include:

data/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ### v0.6.1 (pending)
 
+* Manticore will accept a URI object (which it calls #to_s on) as an alternate to a String for the URL in client#get(url)
+
 ### v0.6.0
 
 * Dependent jars are now vendored, but managed with jar-dependencies. This solves issues installing manticore on platforms that have out-of-date root certs, and simplifies the install process.

data/lib/manticore/client.rb

@@ -446,6 +446,7 @@ module Manticore
     end
 
     def uri_from_url_and_options(url, options)
+      url = url.to_s if url.is_a?(URI)
       builder = URIBuilder.new(url)
       pairs = struct_to_name_value_pairs(options[:query])
       builder.add_parameters pairs unless pairs.empty?
@@ -486,11 +487,18 @@ module Manticore
         req.set_config config.build
       end
 
-
-      options[:headers].each {|k, v| req[k] = v } if options.key?(:headers)
-
+      headers = []
       # Support keepalive on HTTP/1.0 connections
-      req["Connection"] = "Keep-Alive" if @keepalive
+      headers.push BasicHeader.new("Connection", "Keep-Alive") if @keepalive
+
+      if options.key?(:headers)
+        options[:headers].each do |k, v|
+          Array(v).each do |_v|
+            headers.push BasicHeader.new(k, _v)
+          end
+        end
+      end
+      req.set_headers headers.to_java(BasicHeader) unless headers.empty?
 
       context = HttpClientContext.new
       proxy_user = req_options[:proxy].is_a?(Hash) && (req_options[:proxy][:user] || req_options[:proxy][:username])
@@ -529,7 +537,17 @@ module Manticore
 
     def auth_from_options(req, options, context)
       proxy = options.fetch(:proxy, {})
-      if options[:auth] || proxy[:user] || proxy[:username]
+      
+      proxy_user, proxy_pass = if proxy.is_a?(String)
+        proxy_uri = URI.parse(proxy)
+        [proxy_uri.user, proxy_uri.password]
+      else
+        [(proxy[:user] || proxy[:username]), 
+         (proxy[:pass] || proxy[:password])]
+      end
+      
+      
+      if options[:auth] || proxy_user
         provider = BasicCredentialsProvider.new
         if options[:auth]
           username = options[:auth][:user] || options[:auth][:username]
@@ -547,10 +565,8 @@ module Manticore
           end
         end
 
-        if proxy[:user] || proxy[:username]
-          username = proxy[:user] || proxy[:username]
-          password = proxy[:pass] || proxy[:password]
-          provider.set_credentials AuthScope.new(get_proxy_host(proxy)), UsernamePasswordCredentials.new(username, password)
+        if proxy_user
+          provider.set_credentials AuthScope.new(get_proxy_host(proxy)), UsernamePasswordCredentials.new(proxy_user, proxy_pass)
         end
         context.set_credentials_provider(provider)
       end

data/lib/manticore/response.rb

@@ -3,7 +3,7 @@ module Manticore
   # as a Ruby proxy for HTTPClient responses.
   #
   # @!attribute [r] headers
-  #   @return [Hash] Headers from this response
+  #   @return [Hash] Headers from this response. If a header is given more than once in a response, the value is an array of values. Otherwise, it is the header value.
   # @!attribute [r] code
   #   @return [Integer] Response code from this response
   # @!attribute [r] context
@@ -140,10 +140,14 @@ module Manticore
     end
 
     # Return the value of a single response header. Will call the request if it has not been called yet.
+    # If the header was returned with multiple values, will only return the first value. If you need to get
+    # multiple values, use response#headers[lowercase_key]
     #
-    # @return [String] Value of the header, or nil if not present
+    # @param  key [String] Case-insensitive header key
+    # @return     [String] Value of the header, or nil if not present
     def [](key)
-      headers[key.downcase]
+      v = headers[key.downcase]
+      v.is_a?(Array) ? v.first : v
     end
 
     # Return the response code from this request as an integer. Will call the request if it has not been called yet.
@@ -246,7 +250,16 @@ module Manticore
       @response        = response
       @code            = response.get_status_line.get_status_code
       @message         = response.get_status_line.get_reason_phrase
-      @headers         = Hash[* response.get_all_headers.flat_map {|h| [h.get_name.downcase, h.get_value]} ]
+      @headers         = response.get_all_headers.each_with_object({}) do |h, o|
+        key = h.get_name.downcase
+        if o.key?(key)
+          o[key] = Array(o[key]) unless o[key].is_a?(Array)
+          o[key].push h.get_value
+        else
+          o[key] = h.get_value
+        end
+      end
+
       @callback_result = @handlers[:success].call(self)
       nil
     end

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/manticore/client_spec.rb

@@ -24,6 +24,12 @@ describe Manticore::Client do
     expect(json["headers"]["X-Custom-Header"]).to eq "Blaznotts"
   end
 
+  it "accepts repeated header values" do
+    response = client.get(local_server, headers: {"X-Custom-Header" => ["Whizzles", "Blaznotts"]})
+    json = JSON.load(response.body)
+    expect(json["headers"]["X-Custom-Header"].sort).to eq ["Blaznotts", "Whizzles"]
+  end
+
   it "enables compression" do
     response = client.get(local_server)
     json = JSON.load(response.body)
@@ -46,6 +52,35 @@ describe Manticore::Client do
     expect(j["uri"]["port"]).to eq 55441
   end
 
+  context "via an authenticated proxy" do
+    let(:proxy) { "http://localhost:55442" }
+    let(:auth) { nil }
+    let(:req) { client.get(local_server("/authproxy"), proxy: proxy, auth: auth) }
+    let(:j) { JSON.parse req.body }
+
+    context "with authentication as a hash" do
+      let(:auth) { {user: "user", pass: "pass"} }
+
+      it "proxies" do
+        expect(j["server_port"]).to eq 55442
+        expect(j["uri"]["port"]).to eq 55441
+        expect(j["headers"]["Proxy-Authorization"]).to eq "Basic dXNlcjpwYXNz"
+      end
+    end
+
+    context "with authentication as a string" do
+      let(:proxy) { "http://user:pass@localhost:55442"}
+
+      it "proxies" do
+        expect(j["server_port"]).to eq 55442
+        expect(j["uri"]["port"]).to eq 55441
+        expect(j["headers"]["Proxy-Authorization"]).to eq "Basic dXNlcjpwYXNz"
+      end
+    end
+  end
+  it "proxies with authentication as a hash" do
+  end
+
   describe "with a custom user agent" do
     let(:client) { Manticore::Client.new user_agent: "test-agent/1.0" }
 
@@ -368,6 +403,11 @@ describe Manticore::Client do
       expect(JSON.load(response.body)["method"]).to eq "GET"
     end
 
+    it "works with a URI object" do
+      response = client.get(URI.parse local_server)
+      expect(JSON.load(response.body)["method"]).to eq "GET"
+    end
+
     it "send a query" do
       response = client.get local_server, query: {foo: "bar"}
       expect(CGI.parse(JSON.load(response.body)["uri"]["query"])["foo"]).to eq ["bar"]
@@ -438,10 +478,10 @@ describe Manticore::Client do
     end
 
     it "sends an arbitrary entity" do
-      f = open(__FILE__, "r").to_inputstream
+      f = open(File.expand_path(File.join(__FILE__, "..", "..", "spec_helper.rb")), "r").to_inputstream
       multipart_entity = MultipartEntityBuilder.create.add_text_body("foo", "bar").add_binary_body("whatever", f , ContentType::TEXT_PLAIN, __FILE__)
       response = client.post(local_server, entity: multipart_entity.build)
-      expect(response.body).to match "sends an arbitrary entity"
+      expect(response.body).to match "RSpec.configure"
     end
   end
 
@@ -664,7 +704,7 @@ describe Manticore::Client do
               "Hello!"
             ].join("\n"))
             client.close
-          rescue StandardError => e
+          rescue IOError => e
           end
         end
       end
@@ -714,7 +754,11 @@ describe Manticore::Client do
 
     after do
       Thread.kill @server
-      @socket.close
+      begin
+        @socket.close
+      rescue IOError
+        # pass
+      end
     end
   end
 

data/spec/manticore/response_spec.rb

@@ -12,6 +12,18 @@ describe Manticore::Response do
     expect(subject["Content-Type"]).to eq "text/plain"
   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
     expect(subject.body).to match "Manticore"
   end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ PORT = 55441
 def local_server(path = "/", port = PORT)
   URI.join("http://localhost:#{port}", path).to_s
 end
+Thread.abort_on_exception = true
 
 def read_nonblock(socket)
   buffer = ""
@@ -32,7 +33,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"]
@@ -64,9 +65,19 @@ def start_server(port = PORT)
       elsif request[:uri][:path] == "/proxy"
         payload = JSON.dump(request.merge(server_port: port))
         [200, {'Content-Type' => content_type, "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]]
+      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"] )}, [""]]
       else
@@ -75,7 +86,6 @@ def start_server(port = PORT)
           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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: java
 authors:
 - Chris Heald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ requirements:
 - jar commons-codec:commons-codec,          '~> 1.9'
 - jar org.apache.httpcomponents:httpcore,   '~> 4.4.4'
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key:
 specification_version: 4
 summary: Manticore is an HTTP client built on the Apache HttpCore components