vmware-vra 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dae60d3196f5ec532da18527585691872db37075
-  data.tar.gz: 17359e6d0041c7872ab974375f0a25f60f1794cb
+  metadata.gz: 32967b6a528fdaea4b4c969fcc58ea9f1e84bd1a
+  data.tar.gz: 023a8634851534b756d4651373665802fb96c75b
 SHA512:
-  metadata.gz: 5f918bbddfde58b24f9c948a5f9c49c3b3648cb6cc96ae19eeb06803491fb2250881c2f02c5a2dd71a954886f6c454b18fd992f46c1b7f8fc8e80a416b5148db
-  data.tar.gz: a96438c7ff9e64f15cb076bf7a403dbe71a9b0fd57e3c662dfc9ce72a7192bb6f510c292aa510da8607d77cc8f5d4bc6c1ed3292f0dacaa53ac1fce50763d565
+  metadata.gz: 4b54eb12f4e39519bb79fba806443064e019a34a917d9b1710186fa55ce99ecd9571e681b638df8bfadcc5d26398f7235e5476522d4984c293b456b39fdde91a
+  data.tar.gz: e59668d3a5130eb86d671d57bd5ecc83b1b31fb3c7d4b052faf75ce8fd1da241e51440bc2ccf38bd52519c8d70ab70e235d231849457c055b8b58ea795417af6

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # vmware-vra-gem CHANGELOG
 
+## v1.6.0 (2016-05-10)
+* [pr#28](https://github.com/chef-partners/vmware-vra-gem/pull/28) Remove rest-client dependency
+
 ## v1.5.4 (2016-04-27)
 * [pr#29](https://github.com/chef-partners/vmware-vra-gem/pull/29) Bug fix: handle more gracefully the situations where a resource or catalog item is missing data in the API response
 
@@ -25,7 +28,7 @@
 * [pr#11](https://github.com/chef-partners/vmware-vra-gem/pull/11) Ability to set paginated results page size, which is a workaround for issue reported in #10 regarding duplicate items returned in paginated results.
 
 ## v1.1.0
-* [pr#9](https://github.com/chef-partners/vmware-vra-gem/pull/9) Mask password and bearer token in console/debug/log output. 
+* [pr#9](https://github.com/chef-partners/vmware-vra-gem/pull/9) Mask password and bearer token in console/debug/log output.
   Thanks to [@rubytester](https://github.com/rubytester) for the idea and initial proposal to address in [pr#7](https://github.com/chef-partners/vmware-vra-gem/pull/7)
 
 ## v1.0.0

data/lib/vra/catalog_item.rb

@@ -42,7 +42,7 @@ module Vra
     end
 
     def fetch_catalog_item
-      @catalog_item_data = FFI_Yajl::Parser.parse(client.http_get!("/catalog-service/api/consumer/catalogItems/#{id}"))
+      @catalog_item_data = client.get_parsed("/catalog-service/api/consumer/catalogItems/#{id}")
     rescue Vra::Exception::HTTPNotFound
       raise Vra::Exception::NotFound, "catalog ID #{id} does not exist"
     end

data/lib/vra/catalog_request.rb

@@ -105,7 +105,7 @@ module Vra
         raise
       end
 
-      request_id = response.headers[:location].split('/')[-1]
+      request_id = response.location.split('/')[-1]
       Vra::Request.new(client, request_id)
     end
   end

data/lib/vra/client.rb

@@ -17,8 +17,8 @@
 #
 
 require 'ffi_yajl'
-require 'rest-client'
 require 'passwordmasker'
+require 'vra/http'
 
 module Vra
   # rubocop:disable ClassLength
@@ -93,19 +93,17 @@ module Vra
       return false if @bearer_token.value.nil?
 
       response = http_head("/identity/api/tokens/#{@bearer_token.value}", :skip_auth)
-      if response.code == 204
-        true
-      else
-        false
-      end
+      response.success_no_content?
     end
 
     def generate_bearer_token
       @bearer_token.value = nil
       validate_client_options!
 
-      response = http_post('/identity/api/tokens', FFI_Yajl::Encoder.encode(bearer_token_request_body), :skip_auth)
-      if response.code != 200
+      response = http_post('/identity/api/tokens',
+                           FFI_Yajl::Encoder.encode(bearer_token_request_body),
+                           :skip_auth)
+      unless response.success_ok?
         raise Vra::Exception::Unauthorized, "Unable to get bearer token: #{response.body}"
       end
 
@@ -116,30 +114,25 @@ module Vra
       "#{@base_url}#{path}"
     end
 
-    def http_head(path, skip_auth=nil)
+    def http_fetch(method, path, skip_auth=nil)
       authorize! unless skip_auth
 
-      response = RestClient::Request.execute(method: :head,
-                                             url: full_url(path),
-                                             headers: request_headers,
-                                             verify_ssl: @verify_ssl)
+      response = Vra::Http.execute(method: method,
+                                   url: full_url(path),
+                                   headers: request_headers,
+                                   verify_ssl: @verify_ssl)
     rescue => e
       raise_http_exception(e, path)
     else
       response
     end
 
-    def http_get(path, skip_auth=nil)
-      authorize! unless skip_auth
+    def http_head(path, skip_auth=nil)
+      http_fetch(:head, path, skip_auth)
+    end
 
-      response = RestClient::Request.execute(method: :get,
-                                             url: full_url(path),
-                                             headers: request_headers,
-                                             verify_ssl: @verify_ssl)
-    rescue => e
-      raise_http_exception(e, path)
-    else
-      response
+    def http_get(path, skip_auth=nil)
+      http_fetch(:get, path, skip_auth)
     end
 
     def http_get!(path)
@@ -147,13 +140,17 @@ module Vra
       response.body
     end
 
+    def get_parsed(path)
+      FFI_Yajl::Parser.parse(http_get!(path))
+    end
+
     def http_get_paginated_array!(path)
       items = []
       page = 1
       base_path = path + "?limit=#{page_size}"
 
       loop do
-        response = FFI_Yajl::Parser.parse(http_get!("#{base_path}&page=#{page}"))
+        response = get_parsed("#{base_path}&page=#{page}")
         items += response['content']
 
         break if page >= response['metadata']['totalPages']
@@ -172,11 +169,11 @@ module Vra
     def http_post(path, payload, skip_auth=nil)
       authorize! unless skip_auth
 
-      response = RestClient::Request.execute(method: :post,
-                                             url: full_url(path),
-                                             headers: request_headers,
-                                             payload: payload,
-                                             verify_ssl: @verify_ssl)
+      response = Vra::Http.execute(method: :post,
+                                   url: full_url(path),
+                                   headers: request_headers,
+                                   payload: payload,
+                                   verify_ssl: @verify_ssl)
     rescue => e
       raise_http_exception(e, path)
     else

data/lib/vra/http.rb

@@ -0,0 +1,142 @@
+require 'net/http'
+
+module Vra
+  module Http
+    def self.execute(params)
+      request = Request.new(params)
+      response = request.call
+      response = response.forward(request).call until response.final?
+      fail error(response) unless response.success?
+      response
+    end
+
+    def self.error(response)
+      Error.from_response(response)
+    end
+
+    class Request
+      attr_reader :params
+
+      def initialize(params)
+        @params = params
+      end
+
+      def redirectable?
+        [:get, :head].include?(params[:method])
+      end
+
+      def redirect_to(location)
+        new(url: location)
+      end
+
+      def see_other(location)
+        redirect_to(location).new(method: :get)
+      end
+
+      def call
+        uri = URI(params[:url]) || fail(':url required')
+
+        Net::HTTP.start(uri.host, uri.port,
+                        use_ssl: uri.scheme == 'https') do |http|
+          request = http_request(params[:method], uri)
+          request.initialize_http_header(params[:headers] || {})
+          request.body = params[:payload] || ''
+
+          Response.new(http.request(request))
+        end
+      end
+
+      def http_request(method, uri)
+        type = {
+          get: Net::HTTP::Get,
+          head: Net::HTTP::Head,
+          post: Net::HTTP::Post
+        }.fetch(method, nil)
+
+        fail "Unknown HTTP method #{method}!" unless type
+
+        type.new(uri)
+      end
+
+      protected
+
+      def new(new_params)
+        self.class.new(params.dup.merge(new_params))
+      end
+    end
+
+    class Response
+      # For hiding the details of the HTTP response class
+      # so it can be swapped out easily
+      def initialize(response)
+        @response = response
+      end
+
+      def forward(request)
+        if redirect?
+          fail Http.error(self) unless request.redirectable?
+          request.redirect_to(location)
+        elsif see_other?
+          request.see_other(location)
+        else
+          request
+        end
+      end
+
+      def location
+        @response['location']
+      end
+
+      def body
+        @response.body
+      end
+
+      def code
+        @response.code.to_i
+      end
+
+      def message
+        @response.message
+      end
+
+      def success_ok?
+        code == 200
+      end
+
+      def success_no_content?
+        code == 204
+      end
+
+      def success?
+        (200..207).cover?(code)
+      end
+
+      def redirect?
+        [301, 302, 307].include?(code)
+      end
+
+      def see_other?
+        code == 303
+      end
+
+      def final?
+        !(redirect? || see_other?)
+      end
+    end
+
+    class Error < StandardError
+      def self.from_response(http_response)
+        new(http_response.message, http_response.code, http_response.body)
+      end
+
+      attr_reader :http_code
+      attr_reader :response
+
+      def initialize(message, http_code, response)
+        super(message)
+        @http_code = http_code
+        @response = response
+      end
+    end
+  end
+end

data/lib/vra/request.rb

@@ -32,7 +32,7 @@ module Vra
     end
 
     def refresh
-      @request_data = FFI_Yajl::Parser.parse(client.http_get!("/catalog-service/api/consumer/requests/#{@id}"))
+      @request_data = client.get_parsed("/catalog-service/api/consumer/requests/#{@id}")
     rescue Vra::Exception::HTTPNotFound
       raise Vra::Exception::NotFound, "request ID #{@id} is not found"
     end

data/lib/vra/resource.rb

@@ -45,7 +45,7 @@ module Vra
     end
 
     def fetch_resource_data
-      @resource_data = FFI_Yajl::Parser.parse(client.http_get!("/catalog-service/api/consumer/resources/#{@id}"))
+      @resource_data = client.get_parsed("/catalog-service/api/consumer/resources/#{@id}")
     rescue Vra::Exception::HTTPNotFound
       raise Vra::Exception::NotFound, "resource ID #{@id} does not exist"
     end
@@ -239,7 +239,7 @@ module Vra
     def submit_action_request(action_id)
       payload = action_request_payload(action_id).to_json
       response = client.http_post('/catalog-service/api/consumer/requests', payload)
-      request_id = response.headers[:location].split('/')[-1]
+      request_id = response.location.split('/')[-1]
       Vra::Request.new(client, request_id)
     end
   end

data/lib/vra/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Vra
-  VERSION = '1.5.4'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/spec/catalog_request_spec.rb

@@ -106,7 +106,7 @@ describe Vra::CatalogRequest do
     describe '#submit' do
       before do
         allow(request).to receive(:request_payload).and_return({})
-        response = double('response', code: 200, headers: { location: '/requests/request-12345' })
+        response = double('response', location: '/requests/request-12345')
         allow(client).to receive(:http_post).with('/catalog-service/api/consumer/requests', '{}').and_return(response)
       end
 

data/spec/client_spec.rb

@@ -104,20 +104,16 @@ describe Vra::Client do
         client.bearer_token = '12345'
       end
 
-      url = '/identity/api/tokens/12345'
-
       it 'returns true if the token validates successfully' do
-        response = double('response')
-        allow(response).to receive(:code).and_return(204)
-        allow(client).to receive(:http_head).with(url, :skip_auth).and_return(response)
+        response = double('response', success_no_content?: true, code: 204)
+        allow(Vra::Http).to receive(:execute).and_return(response)
 
         expect(client.authorized?).to be true
       end
 
       it 'returns false if the token validates unsuccessfully' do
-        response = double('response')
-        allow(response).to receive(:code).and_return(500)
-        allow(client).to receive(:http_head).with(url, :skip_auth).and_return(response)
+        response = double('response', success_no_content?: false, code: 500)
+        allow(Vra::Http).to receive(:execute).and_return(response)
 
         expect(client.authorized?).to be false
       end
@@ -132,24 +128,22 @@ describe Vra::Client do
     }.to_json
 
     it 'posts to the tokens API endpoint' do
-      response = double('response')
-      allow(response).to receive(:code).and_return(200)
-      allow(response).to receive(:body).and_return('{"id":"12345"}')
-      expect(client).to receive(:http_post).with('/identity/api/tokens',
-                                                 payload,
-                                                 :skip_auth).and_return(response)
+      response = double('response', code: 200, body: '{"id":"12345"}', success_ok?: true)
+      expect(Vra::Http).to receive(:execute)
+        .with(method: :post,
+              url: client.full_url('/identity/api/tokens'),
+              payload: payload,
+              headers: anything,
+              verify_ssl: true)
+        .and_return(response)
 
       client.generate_bearer_token
     end
 
     context 'when token is generated successfully' do
       it 'sets the token' do
-        response = double('response')
-        allow(response).to receive(:code).and_return(200)
-        allow(response).to receive(:body).and_return('{"id":"12345"}')
-        allow(client).to receive(:http_post).with('/identity/api/tokens',
-                                                  payload,
-                                                  :skip_auth).and_return(response)
+        response = double('response', code: 200, body: '{"id":"12345"}', success_ok?: true)
+        allow(Vra::Http).to receive(:execute).and_return(response)
 
         client.generate_bearer_token
 
@@ -159,13 +153,8 @@ describe Vra::Client do
 
     context 'when token is not generated successfully' do
       it 'raises an exception' do
-        response = double('response')
-        allow(response).to receive(:code).and_return(500)
-        allow(response).to receive(:body).and_return('error string')
-        allow(client).to receive(:http_post).with('/identity/api/tokens',
-                                                  payload,
-                                                  :skip_auth)
-          .and_return(response)
+        response = double('response', code: 500, body: 'error string', success_ok?: false)
+        allow(Vra::Http).to receive(:execute).and_return(response)
 
         expect { client.generate_bearer_token }.to raise_error(Vra::Exception::Unauthorized)
       end
@@ -182,7 +171,7 @@ describe Vra::Client do
     context 'when skip_auth is nil' do
       it 'authorizes before proceeding' do
         response = double('response')
-        allow(RestClient::Request).to receive(:execute).and_return(response)
+        allow(Vra::Http).to receive(:execute).and_return(response)
         expect(client).to receive(:authorize!)
 
         client.http_head('/test')
@@ -192,14 +181,14 @@ describe Vra::Client do
     context 'when skip_auth is not nil' do
       it 'does not authorize before proceeding' do
         response = double('response')
-        allow(RestClient::Request).to receive(:execute).and_return(response)
+        allow(Vra::Http).to receive(:execute).and_return(response)
         expect(client).to_not receive(:authorize!)
 
         client.http_head('/test', :skip_auth)
       end
     end
 
-    it 'calls RestClient::Request#execute' do
+    it 'calls Vra::Http.execute' do
       response   = double('response')
       path       = '/test'
       full_url   = 'https://vra.corp.local/test'
@@ -207,21 +196,21 @@ describe Vra::Client do
       verify_ssl = true
 
       allow(client).to receive(:authorize!)
-      expect(RestClient::Request).to receive(:execute).with(method: :head,
-                                                            url: full_url,
-                                                            headers: headers,
-                                                            verify_ssl: verify_ssl)
+      expect(Vra::Http).to receive(:execute).with(method: :head,
+                                                  url: full_url,
+                                                  headers: headers,
+                                                  verify_ssl: verify_ssl)
         .and_return(response)
 
       client.http_head(path)
     end
 
-    it 'calls raise_http_exception upon a RestClient error' do
+    it 'raises an HTTPNotFound on a 404 error' do
       allow(client).to receive(:authorize!)
-      allow(RestClient::Request).to receive(:execute).and_raise(RestClient::ResourceNotFound)
-      expect(client).to receive(:raise_http_exception)
+      allow(Vra::Http).to receive(:execute)
+        .and_raise(Vra::Http::Error.new('message', 404, 'Not Found'))
 
-      client.http_head('/404')
+      expect { client.http_head('/404') }.to raise_error(Vra::Exception::HTTPNotFound)
     end
   end
 
@@ -229,7 +218,7 @@ describe Vra::Client do
     context 'when skip_auth is nil' do
       it 'authorizes before proceeding' do
         response = double('response')
-        allow(RestClient::Request).to receive(:execute).and_return(response)
+        allow(Vra::Http).to receive(:execute).and_return(response)
         expect(client).to receive(:authorize!)
 
         client.http_get('/test')
@@ -239,14 +228,14 @@ describe Vra::Client do
     context 'when skip_auth is not nil' do
       it 'does not authorize before proceeding' do
         response = double('response')
-        allow(RestClient::Request).to receive(:execute).and_return(response)
+        allow(Vra::Http).to receive(:execute).and_return(response)
         expect(client).to_not receive(:authorize!)
 
         client.http_get('/test', :skip_auth)
       end
     end
 
-    it 'calls RestClient::Request#execute' do
+    it 'calls Vra::Http.execute' do
       response   = double('response')
       path       = '/test'
       full_url   = 'https://vra.corp.local/test'
@@ -254,79 +243,70 @@ describe Vra::Client do
       verify_ssl = true
 
       allow(client).to receive(:authorize!)
-      expect(RestClient::Request).to receive(:execute).with(method: :get,
-                                                            url: full_url,
-                                                            headers: headers,
-                                                            verify_ssl: verify_ssl)
+      expect(Vra::Http).to receive(:execute).with(method: :get,
+                                                  url: full_url,
+                                                  headers: headers,
+                                                  verify_ssl: verify_ssl)
         .and_return(response)
 
       client.http_get(path)
     end
 
-    it 'calls raise_http_exception upon a RestClient error' do
+    it 'raises an HTTPNotFound on a 404 error' do
       allow(client).to receive(:authorize!)
-      allow(RestClient::Request).to receive(:execute).and_raise(RestClient::ResourceNotFound)
-      expect(client).to receive(:raise_http_exception)
-
-      client.http_get('/404')
-    end
-  end
-
-  describe '#http_get!' do
-    it 'returns the response body' do
-      response = double('response', body: 'body text')
-      allow(client).to receive(:http_get).with('/test').and_return(response)
+      allow(Vra::Http).to receive(:execute)
+        .and_raise(Vra::Http::Error.new('message', 404, 'Not Found'))
 
-      expect(client.http_get!('/test')).to eq 'body text'
+      expect { client.http_get('/404') }.to raise_error(Vra::Exception::HTTPNotFound)
     end
   end
 
   describe '#http_get_paginated_array!' do
     it 'allows a limit override' do
       client.page_size = 10
-      expect(client).to receive(:http_get!)
+      expect(client).to receive(:get_parsed)
         .with('/test?limit=10&page=1')
-        .and_return({ 'content' => [], 'metadata' => { 'totalPages' => 1 } }.to_json)
+        .and_return('content' => [], 'metadata' => { 'totalPages' => 1 })
 
       client.http_get_paginated_array!('/test')
     end
 
-    it 'only calls http_get! once when total pages is 0 (no items)' do
-      expect(client).to receive(:http_get!)
+    it 'only calls get_parsed once when total pages is 0 (no items)' do
+      expect(client).to receive(:get_parsed)
         .once
         .with('/test?limit=20&page=1')
-        .and_return({ 'content' => [], 'metadata' => { 'totalPages' => 0 } }.to_json)
+        .and_return('content' => [], 'metadata' => { 'totalPages' => 0 })
 
       client.http_get_paginated_array!('/test')
     end
 
-    it 'only calls http_get! once when total pages is 1' do
-      expect(client).to receive(:http_get!)
+    it 'only calls get_parsed once when total pages is 1' do
+      expect(client).to receive(:get_parsed)
         .once
         .with('/test?limit=20&page=1')
-        .and_return({ 'content' => [], 'metadata' => { 'totalPages' => 1 } }.to_json)
+        .and_return('content' => [], 'metadata' => { 'totalPages' => 1 })
 
       client.http_get_paginated_array!('/test')
     end
 
-    it 'calls http_get! 3 times if there are 3 pages of response' do
-      expect(client).to receive(:http_get!)
+    it 'calls get_parsed 3 times if there are 3 pages of response' do
+      expect(client).to receive(:get_parsed)
         .with('/test?limit=20&page=1')
-        .and_return({ 'content' => [], 'metadata' => { 'totalPages' => 3 } }.to_json)
-      expect(client).to receive(:http_get!)
+        .and_return('content' => [], 'metadata' => { 'totalPages' => 3 })
+      expect(client).to receive(:get_parsed)
         .with('/test?limit=20&page=2')
-        .and_return({ 'content' => [], 'metadata' => { 'totalPages' => 3 } }.to_json)
-      expect(client).to receive(:http_get!)
+        .and_return('content' => [], 'metadata' => { 'totalPages' => 3 })
+      expect(client).to receive(:get_parsed)
         .with('/test?limit=20&page=3')
-        .and_return({ 'content' => [], 'metadata' => { 'totalPages' => 3 } }.to_json)
+        .and_return('content' => [], 'metadata' => { 'totalPages' => 3 })
 
       client.http_get_paginated_array!('/test')
     end
 
     it 'raises an exception if duplicate items are returned by the API' do
-      allow(client).to receive(:http_get!)
+      allow(client).to receive(:get_parsed)
         .with('/test?limit=20&page=1')
-        .and_return({ 'content' => [ 1, 2, 3, 1 ], 'metadata' => { 'totalPages' => 1 } }.to_json)
+        .and_return('content' => [ 1, 2, 3, 1 ], 'metadata' => { 'totalPages' => 1 })
 
       expect { client.http_get_paginated_array!('/test') }.to raise_error(Vra::Exception::DuplicateItemsDetected)
     end
@@ -336,7 +316,7 @@ describe Vra::Client do
     context 'when skip_auth is nil' do
       it 'authorizes before proceeding' do
         response = double('response')
-        allow(RestClient::Request).to receive(:execute).and_return(response)
+        allow(Vra::Http).to receive(:execute).and_return(response)
         expect(client).to receive(:authorize!)
 
         client.http_post('/test', 'some payload')
@@ -346,14 +326,14 @@ describe Vra::Client do
     context 'when skip_auth is not nil' do
       it 'does not authorize before proceeding' do
         response = double('response')
-        allow(RestClient::Request).to receive(:execute).and_return(response)
+        allow(Vra::Http).to receive(:execute).and_return(response)
         expect(client).to_not receive(:authorize!)
 
         client.http_post('/test', 'some payload', :skip_auth)
       end
     end
 
-    it 'calls RestClient::Request#execute' do
+    it 'calls Vra::Http.execute' do
       response   = double('response')
       path       = '/test'
       full_url   = 'https://vra.corp.local/test'
@@ -362,19 +342,19 @@ describe Vra::Client do
       verify_ssl = true
 
       allow(client).to receive(:authorize!)
-      expect(RestClient::Request).to receive(:execute).with(method: :post,
-                                                            url: full_url,
-                                                            headers: headers,
-                                                            payload: payload,
-                                                            verify_ssl: verify_ssl)
+      expect(Vra::Http).to receive(:execute).with(method: :post,
+                                                  url: full_url,
+                                                  headers: headers,
+                                                  payload: payload,
+                                                  verify_ssl: verify_ssl)
         .and_return(response)
 
       client.http_post(path, payload)
     end
 
-    it 'calls raise_http_exception upon a RestClient error' do
+    it 'calls raise_http_exception upon error' do
       allow(client).to receive(:authorize!)
-      allow(RestClient::Request).to receive(:execute).and_raise(RestClient::ResourceNotFound)
+      allow(Vra::Http).to receive(:execute).and_raise(StandardError)
       expect(client).to receive(:raise_http_exception)
 
       client.http_post('/404', 'test payload')

data/spec/http_spec.rb

@@ -0,0 +1,146 @@
+require 'spec_helper'
+require 'webmock'
+
+describe Vra::Http do
+  def expecting_request(method, url, with=nil)
+    stub = stub_request(method, url)
+    stub.with(with) if with
+    yield if block_given?
+    expect(stub).to have_been_requested
+  end
+
+  def execute(method, params)
+    Vra::Http.execute(params.merge(method: method))
+  end
+
+  def get(params)
+    execute :get, params
+  end
+
+  def post(params)
+    execute :post, params
+  end
+
+  def head(params)
+    execute :head, params
+  end
+
+  describe '#execute' do
+    it 'makes a HEAD request' do
+      headers = { 'X-Made-Up-Header' => 'Foo AND bar?  Are you sure?' }
+
+      expecting_request(:head, 'http://test.local', headers: headers) do
+        head url: 'http://test.local', headers: headers
+      end
+    end
+
+    it 'makes a GET request' do
+      headers = { 'X-Made-Up-Header' => 'Foo AND bar?  Are you sure?' }
+
+      expecting_request(:get, 'http://test.local', headers: headers) do
+        get url: 'http://test.local', headers: headers
+      end
+    end
+
+    it 'makes a POST request' do
+      headers = { 'X-Made-Up-Header' => 'Foo AND bar?  Are you sure?' }
+      payload = 'withabodylikethis'
+
+      expecting_request(:post, 'http://test.local', headers: headers, body: payload) do
+        post url: 'http://test.local', headers: headers, payload: payload
+      end
+    end
+
+    it 'preserves Location' do
+      stub_request(:head, 'http://test.local')
+        .to_return(headers: { 'Location' => 'http://test-location.local' })
+
+      response = head(url: 'http://test.local')
+
+      expect(response.location).to eq 'http://test-location.local'
+    end
+
+    it 'preserves status code' do
+      stub_request(:head, 'http://test.local')
+        .to_return(status: [204, 'No content'])
+
+      response = head(url: 'http://test.local')
+
+      expect(response.code).to eq 204
+    end
+
+    context 'when successful' do
+      it 'returns a successful response given a status 200' do
+        stub_request(:head, 'http://test.local')
+          .to_return(status: [200, 'Whatevs'])
+
+        response = head(url: 'http://test.local')
+
+        expect(response.success_ok?).to be_truthy
+      end
+
+      it 'returns a successful response given a status 204' do
+        stub_request(:head, 'http://test.local')
+          .to_return(status: [204, 'Whatevs'])
+
+        response = head(url: 'http://test.local')
+
+        expect(response.success_no_content?).to be_truthy
+      end
+    end
+
+    context 'when unsuccessful' do
+      (400..418).each do |status|
+        it 'raises an exception given a status #{status}' do
+          stub_request(:get, 'http://test.local')
+            .to_return(status: [status, 'Whatevs'],
+                       body: 'Error body')
+
+          expect { get(url: 'http://test.local') }.to raise_error do |error|
+            expect(error).to be_a(StandardError)
+            expect(error.http_code).to eq status
+            expect(error.response).to eq 'Error body'
+          end
+        end
+      end
+    end
+
+    context 'when redirected' do
+      [301, 302, 307].each do |status|
+        [:get, :head].each do |method|
+          it "follows #{status} redirected #{method.to_s.upcase} requests" do
+            stub_request(method, 'http://test.local')
+              .to_return(status: [status, 'redirect'],
+                         headers: { 'Location' => 'http://test.local/redirect' })
+            expecting_request(method, 'http://test.local/redirect') do
+              execute(method, url: 'http://test.local')
+            end
+          end
+        end
+
+        it "does not follow #{status} redirected POST requests" do
+          stub_request(:post, 'http://test.local')
+            .to_return(status: [status, 'redirect'],
+                       headers: { 'Location' => 'http://test.local/redirect' })
+
+          expect { post(url: 'http://test.local') }.to raise_error do |error|
+            expect(error).to be_a(StandardError)
+            expect(error.http_code).to eq status
+          end
+        end
+      end
+
+      [:head, :post].each do |method|
+        it "converts #{method.to_s.upcase} to GET on 303 redirect" do
+          stub_request(method, 'http://test.local')
+            .to_return(status: [303, 'See Other'],
+                       headers: { 'Location' => 'http://test.local/redirect' })
+
+          expecting_request(:get, 'http://test.local/redirect') do
+            execute method, url: 'http://test.local'
+          end
+        end
+      end
+    end
+  end
+end

data/spec/request_spec.rb

@@ -71,9 +71,9 @@ describe Vra::Request do
 
   describe '#refresh' do
     it 'calls the request API endpoint' do
-      expect(client).to receive(:http_get!)
+      expect(client).to receive(:get_parsed)
         .with("/catalog-service/api/consumer/requests/#{request_id}")
-        .and_return(in_progress_payload.to_json)
+        .and_return(in_progress_payload)
 
       request.refresh
     end

data/spec/resource_spec.rb

@@ -92,10 +92,10 @@ describe Vra::Resource do
   end
 
   describe '#fetch_resource_data' do
-    it 'calls http_get! against the resources API endpoint' do
-      expect(client).to receive(:http_get!)
+    it 'calls get_parsed against the resources API endpoint' do
+      expect(client).to receive(:get_parsed)
         .with("/catalog-service/api/consumer/resources/#{resource_id}")
-        .and_return('')
+        .and_return({})
 
       Vra::Resource.new(client, id: resource_id)
     end
@@ -356,7 +356,7 @@ describe Vra::Resource do
     describe '#submit_action_request' do
       before do
         allow(resource).to receive(:action_request_payload).and_return({})
-        response = double('response', code: 200, headers: { location: '/requests/request-12345' })
+        response = double('response', location: '/requests/request-12345')
         allow(client).to receive(:http_post).with('/catalog-service/api/consumer/requests', '{}').and_return(response)
       end
 

data/vmware-vra.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rest-client',    '~> 1.8'
   spec.add_dependency 'ffi-yajl',       '~> 2.2'
   spec.add_dependency 'passwordmasker', '~> 1.2'
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Adam Leff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +143,7 @@ files:
 - lib/vra/catalog_request.rb
 - lib/vra/client.rb
 - lib/vra/exceptions.rb
+- lib/vra/http.rb
 - lib/vra/request.rb
 - lib/vra/request_parameters.rb
 - lib/vra/requests.rb
@@ -170,6 +157,7 @@ files:
 - spec/fixtures/resource/non_vm_resource.json
 - spec/fixtures/resource/vm_resource.json
 - spec/fixtures/resource/vm_resource_no_operations.json
+- spec/http_spec.rb
 - spec/request_spec.rb
 - spec/requests_spec.rb
 - spec/resource_spec.rb
@@ -196,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Client gem for interacting with VMware vRealize Automation.
@@ -208,6 +196,7 @@ test_files:
 - spec/fixtures/resource/non_vm_resource.json
 - spec/fixtures/resource/vm_resource.json
 - spec/fixtures/resource/vm_resource_no_operations.json
+- spec/http_spec.rb
 - spec/request_spec.rb
 - spec/requests_spec.rb
 - spec/resource_spec.rb