artifactory 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 045f5344e68d2c66a806c125dd3d0b0145ec708c
-  data.tar.gz: e99a7f99652c7b683bd6670b3d2eeed3c4f524f2
+  metadata.gz: 88a07bebf0e1201ad10be593194583ddfa5a09f3
+  data.tar.gz: 13a8f808072f78f902bfcf74acf08d1755623ff4
 SHA512:
-  metadata.gz: 4aa62feb08b654a27a660b093dd00ff6adf29fd60d43572eaa1d9b2dd9e23c420e03a211287c6466c2ff0b5aa7caf5dc3ed4822ce6f0d24bbe0852f3b57a3417
-  data.tar.gz: 22b8b4e79a681d4043f4d2bf67522761a39b0b0a4092555e4cdd536b302b416d8eccdd3e1abccbef07e3c70ae5f1211d94d20809efa028aa393bdde8e27ecd82
+  metadata.gz: 4d4686760f8b6b8135affdc2dbc248a56b1ce95bad2f7a877342f2453971d89f09fc1923a63517c62f808c07acee96b74a1bde3b3c370e8b859df9e134f00729
+  data.tar.gz: 772bc3aa6b4101e3236677dc59c0614f9e43021201e558e395ec6dc50cab308f61d90e7a758423efea4aeb596c48b81edf46f521df190209520aedf08983f2e1

data/CHANGELOG.md

@@ -3,6 +3,10 @@ Artifactory Client CHANGELOG
 This file is used to document the changes between releases of the Artifactory
 Ruby client.
 
+v2.3.2 (11-20-2015)
+-------------------
+- Fix embedded requests when endpoint has a non-empty path
+
 v2.3.1 (11-13-2015)
 -------------------
 - Ensure embedded requests respect configured settings

data/lib/artifactory/resources/base.rb

@@ -109,6 +109,11 @@ module Artifactory
         # endpoint/proxy/SSL settings are used in the GET request.
         path = URI.parse(url).path
         client = extract_client!(options)
+        # If the endpoint contains a path part, we must remove the
+        # endpoint path part from path, because the client uses
+        # endpoint + path as its full URI.
+        endpoint_path = URI.parse(client.endpoint).path
+        path.slice!(endpoint_path)
         from_hash(client.get(path), client: client)
       end
 

data/lib/artifactory/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Artifactory
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

data/spec/unit/resources/artifact_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 module Artifactory
   describe Resource::Artifact do
     let(:client) { double(:client) }
+    let(:endpoint_host) { 'http://33.33.33.11' }
+    let(:endpoint) { "#{endpoint_host}/" }
 
     before(:each) do
       allow(Artifactory).to receive(:client).and_return(client)
@@ -369,6 +371,7 @@ module Artifactory
       let(:response) { {} }
 
       it 'constructs a new instance from the result' do
+        expect(client).to receive(:endpoint).and_return(endpoint)
         expect(described_class).to receive(:from_hash).once
         described_class.from_url('/some/artifact/path.deb')
       end

data/spec/unit/resources/base_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 module Artifactory
   describe Resource::Base do
     let(:client) { double }
+    let(:endpoint_host) { 'http://33.33.33.11' }
+    let(:endpoint) { "#{endpoint_host}/" }
 
     before do
       allow(Artifactory).to receive(:client).and_return(client)
@@ -85,11 +87,28 @@ module Artifactory
     describe '.from_url' do
       let(:relative_path) { '/api/storage/omnibus-unstable-local/com/getchef/harmony/0.1.0+20151111083608.git.15.8736e1e/el/5/harmony-0.1.0+20151111083608.git.15.8736e1e-1.el5.x86_64.rpm' }
 
-      it 'only uses the path from absolute URLs' do
+      context 'when endpoint path part is not empty' do
+        let(:endpoint) { "#{endpoint_host}/artifactory" }
+        let(:full_url) { "#{endpoint}#{relative_path}" }
 
-        expect(described_class).to receive(:from_hash)
-        expect(client).to receive(:get).with(relative_path)
-        described_class.from_url(File.join('http://33.33.33.11', relative_path))
+        it 'uses the path minus the path part of the endpoint' do
+          expect(client).to receive(:endpoint).and_return(endpoint)
+          expect(described_class).to receive(:from_hash)
+          expect(client).to receive(:get).with(relative_path)
+          described_class.from_url(full_url)
+        end
+      end
+
+      context 'when endpoint has empty path part' do
+        let(:endpoint) { "#{endpoint_host}/" }
+        let(:full_url) { "#{endpoint}#{relative_path}" }
+
+        it 'only uses the path from absolute URLs' do
+          expect(client).to receive(:endpoint).and_return(endpoint)
+          expect(described_class).to receive(:from_hash)
+          expect(client).to receive(:get).with(relative_path)
+          described_class.from_url(full_url)
+        end
       end
     end
 
@@ -115,6 +134,7 @@ module Artifactory
       it 'defaults to the Artifactory.client' do
         client = double
         allow(Artifactory).to receive(:client).and_return(client)
+        allow(client).to receive(:endpoint).and_return(endpoint)
 
         expect(subject.client).to be(client)
       end

data/spec/unit/resources/group_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 module Artifactory
   describe Resource::Group do
     let(:client) { double(:client) }
+    let(:endpoint_host) { 'http://33.33.33.11' }
+    let(:endpoint) { "#{endpoint_host}/" }
 
     before(:each) do
       allow(Artifactory).to receive(:client).and_return(client)
@@ -46,6 +48,7 @@ module Artifactory
       let(:response) { {} }
 
       it 'constructs a new instance from the result' do
+        expect(client).to receive(:endpoint).and_return(endpoint)
         expect(described_class).to receive(:from_hash).once
         described_class.from_url('/api/security/groups/readers')
       end

data/spec/unit/resources/permission_target_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 module Artifactory
   describe Resource::PermissionTarget do
     let(:client) { double(:client) }
+    let(:endpoint_host) { 'http://33.33.33.11' }
+    let(:endpoint) { "#{endpoint_host}/" }
 
     before(:each) do
       allow(Artifactory).to receive(:client).and_return(client)
@@ -46,6 +48,7 @@ module Artifactory
       let(:response) { {} }
 
       it 'constructs a new instance from the result' do
+        expect(client).to receive(:endpoint).and_return(endpoint)
         expect(described_class).to receive(:from_hash).once
         described_class.from_url('/api/security/permissions/AnyRemote')
       end

data/spec/unit/resources/user_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 module Artifactory
   describe Resource::User do
     let(:client) { double(:client) }
+    let(:endpoint_host) { 'http://33.33.33.11' }
+    let(:endpoint) { "#{endpoint_host}/" }
 
     before(:each) do
       allow(Artifactory).to receive(:client).and_return(client)
@@ -46,6 +48,7 @@ module Artifactory
       let(:response) { {} }
 
       it 'constructs a new instance from the result' do
+        expect(client).to receive(:endpoint).and_return(endpoint)
         expect(described_class).to receive(:from_hash).once
         described_class.from_url('/api/security/users/readers')
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artifactory
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler