artifactory 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f36b33be0b821d20e678a3f104b7fd24a41ebd93
-  data.tar.gz: 144d1a14596dd383816dbb47158249a578cf31af
+  metadata.gz: 045f5344e68d2c66a806c125dd3d0b0145ec708c
+  data.tar.gz: e99a7f99652c7b683bd6670b3d2eeed3c4f524f2
 SHA512:
-  metadata.gz: d85c333c34fa8fcb273ccf4a8fee6598f8e748c310c6f8de1b75c57c793994e5046ff98d37983ecd771a311d81c6c65e92df25b493a82e273a20e237cf7b1720
-  data.tar.gz: 9ea0a6be40e91885a8a1ea63b62a4fa2032c4e751f8536b325e60e7eea783464e2930fdd5821e37110de890952fc685f659ea13b800827dae4d2360ad2bc8cf0
+  metadata.gz: 4aa62feb08b654a27a660b093dd00ff6adf29fd60d43572eaa1d9b2dd9e23c420e03a211287c6466c2ff0b5aa7caf5dc3ed4822ce6f0d24bbe0852f3b57a3417
+  data.tar.gz: 22b8b4e79a681d4043f4d2bf67522761a39b0b0a4092555e4cdd536b302b416d8eccdd3e1abccbef07e3c70ae5f1211d94d20809efa028aa393bdde8e27ecd82

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.1 (11-13-2015)
+-------------------
+- Ensure embedded requests respect configured settings
+
 v2.3.0 (08-04-2015)
 -------------------
 - Support for Build endpoints

data/lib/artifactory/resources/artifact.rb

@@ -438,7 +438,7 @@ module Artifactory
     #   the list of properties
     #
     def properties
-      @properties ||= client.get(uri, properties: nil)['properties']
+      @properties ||= client.get(File.join('/api/storage', relative_path), properties: nil)['properties']
     end
 
     #

data/lib/artifactory/resources/base.rb

@@ -16,6 +16,7 @@
 
 require 'cgi'
 require 'json'
+require 'uri'
 
 module Artifactory
   class Resource::Base
@@ -104,8 +105,11 @@ module Artifactory
       # @return [~Resource::Base]
       #
       def from_url(url, options = {})
+        # Parse the URL and only use the path so the configured
+        # endpoint/proxy/SSL settings are used in the GET request.
+        path = URI.parse(url).path
         client = extract_client!(options)
-        from_hash(client.get(url), client: client)
+        from_hash(client.get(path), client: client)
       end
 
       #

data/lib/artifactory/version.rb

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

data/spec/unit/resources/artifact_spec.rb

@@ -452,15 +452,16 @@ module Artifactory
         { 'properties' => properties }
       end
       let(:client) { double(get: response) }
-      let(:uri) { '/artifact.deb' }
+      let(:relative_path) { '/api/storage/some-repo/path/artifact.deb' }
+      let(:artifact_uri) { File.join('http://33.33.33.11', relative_path) }
 
       before do
-        subject.client   = client
-        subject.uri = uri
+        subject.client = client
+        subject.uri    = artifact_uri
       end
 
       it 'gets the properties from the server' do
-        expect(client).to receive(:get).with(uri, properties: nil).once
+        expect(client).to receive(:get).with(relative_path, properties: nil).once
         expect(subject.properties).to eq(properties)
       end
 

data/spec/unit/resources/base_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 module Artifactory
   describe Resource::Base do
+    let(:client) { double }
+
+    before do
+      allow(Artifactory).to receive(:client).and_return(client)
+    end
+
     describe '.attribute' do
       before { described_class.attribute(:bacon) }
 
@@ -74,19 +80,30 @@ module Artifactory
           expect(options).to eq(options)
         end
       end
+    end
 
-      describe '.url_safe' do
-        let(:string) { double(to_s: 'string') }
+    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 'delegates to URI.escape' do
-          expect(URI).to receive(:escape).once
-          described_class.url_safe(string)
-        end
+      it 'only uses the path from absolute URLs' do
 
-        it 'converts the value to a string' do
-          expect(string).to receive(:to_s).once
-          described_class.url_safe(string)
-        end
+        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))
+      end
+    end
+
+    describe '.url_safe' do
+      let(:string) { double(to_s: 'string') }
+
+      it 'delegates to URI.escape' do
+        expect(URI).to receive(:escape).once
+        described_class.url_safe(string)
+      end
+
+      it 'converts the value to a string' do
+        expect(string).to receive(:to_s).once
+        described_class.url_safe(string)
       end
     end
 

data/spec/unit/resources/permission_target_spec.rb

@@ -47,7 +47,7 @@ module Artifactory
 
       it 'constructs a new instance from the result' do
         expect(described_class).to receive(:from_hash).once
-        described_class.from_url('/api/security/permissions/Any Remote')
+        described_class.from_url('/api/security/permissions/AnyRemote')
       end
     end
 

metadata

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