image-inspector-client 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f4778a7b8967c1922993122ec7fe7e9403cdb8b
-  data.tar.gz: a1a68da7ab4c77b68fa53f4e90ac9b5cb9117484
+  metadata.gz: a4a6c042421c36dc77cbdf06b8ac27fed24fae08
+  data.tar.gz: 4a902b2d59cafde219c5c1e4d8b66a73a37553b7
 SHA512:
-  metadata.gz: 0e47c57379ab6a79ea5f1354bf43b9122c1c31762d5909f48c83ea2234edbdbeb6507c3eef40459bdc9fed2bfc65e3443f72db08cb918cd73b7436ed982d1a00
-  data.tar.gz: 27879e3e27617d90f072b4719afb0a4e67414feb243ea3f1fe2a7bd86fa3853f18f850843d034557eac2e5886c0137d0d7a8987b3a194f3f0ff54c112c819615
+  metadata.gz: 12ff422fbadf19288d00bda3be488f967519a43784d649b3c515fc6e8ef38a7208f865f9af958de9d12678c6114c32dc0376906cab49ac27a68603673ce59c75
+  data.tar.gz: 337932fe6766926c5ffdee79e1d12c3d60aa5e661ce9ce615b3bf614e0cf6174e2658496bfc228db143ffe8fd334a261e3b200ec55303b9ab80e26d8c0a79fc0

data/lib/image-inspector-client.rb

@@ -20,11 +20,13 @@ module ImageInspectorClient
         username:          nil,
         password:          nil,
         bearer_token:      nil
-      }
+      },
+      http_proxy_uri:   nil
     )
       @endpoint = URI.parse("#{uri}/api/#{version}")
       @auth_options = auth_options
       @ssl_options = ssl_options
+      @http_proxy_uri = http_proxy_uri
       @headers = {}
     end
 
@@ -54,7 +56,7 @@ module ImageInspectorClient
       rescue JSON::ParserError
         json_error_msg = {}
       end
-      err_message = json_error_msg['message'] || e.to_s
+      err_message = json_error_msg['message'] || e.response
       raise InspectorClientException.new(e.http_code, err_message)
     end
 
@@ -66,7 +68,8 @@ module ImageInspectorClient
         ssl_cert_store:  @ssl_options[:cert_store],
         verify_ssl:      @ssl_options[:verify_ssl],
         user:            @auth_options[:username],
-        password:        @auth_options[:password]
+        password:        @auth_options[:password],
+        proxy:           @http_proxy_uri
       }
     end
 

data/lib/image-inspector-client/version.rb

@@ -1,4 +1,4 @@
 # Client for image inspector: https://github.com/simon3z/image-inspector
 module ImageInspectorClient
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/test/test_rest_client.rb

@@ -0,0 +1,49 @@
+require 'common'
+
+# Tests for rest-client return values
+class TestRestClient < MiniTest::Test
+  def test_metadata_404_plaintext
+    stub_request(:get, %r{/metadata}).to_return(
+      body: 'No Metadata Given',
+      status: 404
+    )
+
+    e = assert_raises(ImageInspectorClient::InspectorClientException) do
+      ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+      .fetch_metadata
+    end
+
+    assert_equal(404, e.error_code)
+    assert_equal('No Metadata Given', e.message)
+  end
+
+  def test_metadata_404_json
+    stub_request(:get, %r{/metadata}).to_return(
+      body: '{"message": "No Metadata Given"}',
+      status: 404
+    )
+
+    e = assert_raises(ImageInspectorClient::InspectorClientException) do
+      ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+      .fetch_metadata
+    end
+
+    assert_equal(404, e.error_code)
+    assert_equal('No Metadata Given', e.message)
+  end
+
+  def test_metadata_404_empty_body
+    stub_request(:get, %r{/metadata}).to_return(
+      body: '',
+      status: 404
+    )
+
+    e = assert_raises(ImageInspectorClient::InspectorClientException) do
+      ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+      .fetch_metadata
+    end
+
+    assert_equal(404, e.error_code)
+    assert_equal('', e.message)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image-inspector-client
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mooli Tayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ files:
 - test/test_client.rb
 - test/test_metadata.rb
 - test/test_openscap.rb
+- test/test_rest_client.rb
 - test/xml/openscap.xml
 homepage: https://github.com/moolitayer/image-inspector-client
 licenses:
@@ -175,4 +176,5 @@ test_files:
 - test/test_client.rb
 - test/test_metadata.rb
 - test/test_openscap.rb
+- test/test_rest_client.rb
 - test/xml/openscap.xml