jira-ruby 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d500867486cb6b1bd336052a0ecfc8d7074a91e0
-  data.tar.gz: fe5e8f0fea4235def463b9224b20d354769d1f33
+  metadata.gz: e3dba12b300beb17d9fa96eedccd1d7d12f89d79
+  data.tar.gz: '09dbc7b324844b080c211098ec939b61f6c07389'
 SHA512:
-  metadata.gz: bb6a109900b2d8b7a39e5f2ce07820e4414dd3ade3e34e90054d739eb27c88b96c494ccd2c7240a777fd01dba39e7ce5ff5e3e7602b91bc586772bf42dd046d1
-  data.tar.gz: d7e408d142019a4c92dbf801caf132929750d81692fd94a05fbd3053165affc1cba6dc50785cabe8ca0450216bf77d35cffac57b90ce07fcfc0ef324550c7a67
+  metadata.gz: 3a28d13eef6768243696eaba28218c45d5ba0018b7f0537bbb91c3ef0b0c4d16dc9245b239dfde587215130a9cbf59a20dba60408f9907d9b4ecc92c546a9f69
+  data.tar.gz: 2025610542803cd4934cc415dd5902f47c739cdf3493ee7eafc60f4d842cf38dbdc6afdcc247c66e09d148d204b8c08c73d8502cd10605b49b0f6b7e63c79069

data/lib/jira/http_client.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'net/https'
 require 'cgi/cookie'
+require 'uri'
 
 module JIRA
   class HttpClient < RequestClient
@@ -24,7 +25,9 @@ module JIRA
       make_request(:post, @options[:context_path] + '/rest/auth/1/session', body, {'Content-Type' => 'application/json'})
     end
 
-    def make_request(http_method, path, body='', headers={})
+    def make_request(http_method, url, body='', headers={})
+      # When a proxy is enabled, Net::HTTP expects that the request path omits the domain name
+      path = request_path(url)
       request = Net::HTTP.const_get(http_method.to_s.capitalize).new(path, headers)
       request.body = body unless body.nil?
       add_cookies(request) if options[:use_cookies]
@@ -62,6 +65,14 @@ module JIRA
 
     private
 
+    def request_path(url)
+      parsed_uri = URI(url)
+
+      return url unless parsed_uri.is_a?(URI::HTTP)
+
+      parsed_uri.request_uri
+    end
+
     def store_cookies(response)
       cookies = response.get_fields('set-cookie')
       if cookies

data/lib/jira/version.rb

@@ -1,3 +1,3 @@
 module JIRA
-  VERSION = "1.4.0"
+  VERSION = '1.4.1'
 end

data/spec/jira/http_client_spec.rb

@@ -138,6 +138,19 @@ describe JIRA::HttpClient do
     basic_client.make_request(:get, '/foo', body, headers)
   end
 
+  it "performs a basic http client request with a full domain" do
+    body = nil
+    headers = double()
+    basic_auth_http_conn = double()
+    http_request = double()
+    expect(Net::HTTP::Get).to receive(:new).with('/foo', headers).and_return(http_request)
+
+    expect(basic_auth_http_conn).to receive(:request).with(http_request).and_return(response)
+    expect(http_request).to receive(:basic_auth).with(basic_client.options[:username], basic_client.options[:password]).and_return(http_request)
+    allow(basic_client).to receive(:basic_auth_http_conn).and_return(basic_auth_http_conn)
+    basic_client.make_request(:get, 'http://mydomain.com/foo', body, headers)
+  end
+
   it "returns a URI" do
     uri = URI.parse(basic_client.options[:site])
     expect(basic_client.uri).to eq(uri)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jira-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - SUMO Heavy Industries
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth