Add support for making requests relative to the target URI

Author: rastating

lib/wpxf/net/http_client.rb

@@ -125,7 +125,7 @@ def execute_request(opts)
           return Wpxf::Net::HttpResponse.new(res)
         end
 
-        emit_info "Requesting #{opts[:url]}...", true
+        emit_info "Requesting #{req.url}...", true
         req.run
       end
 

lib/wpxf/net/typhoeus_helper.rb

@@ -37,7 +37,15 @@ def create_typhoeus_request(opts)
           opts[:body],
           headers
         )
-        Typhoeus::Request.new(opts[:url], options)
+        Typhoeus::Request.new(normalize_relative_uri(opts[:url]), options)
+      end
+
+      def normalize_relative_uri(uri)
+        if uri.start_with?('/')
+          normalize_uri(full_uri, uri)
+        else
+          uri
+        end
       end
     end
   end

spec/net/typhoeus_helper_spec.rb

@@ -9,6 +9,10 @@
     end.new
   end
 
+  before :each do
+    allow(subject).to receive(:full_uri).and_return('http://127.0.0.1/path')
+  end
+
   describe '#advanced_typhoeus_options' do
     it 'contains Typhoeus options using values in the datastore' do
       subject.set_option_value('basic_auth_creds', 'root:toor')
@@ -71,5 +75,25 @@
       expect(subject.create_typhoeus_request(method: :get, url: 'github.com'))
         .to be_a Typhoeus::Request
     end
+
+    it 'creates a relative request if the url begins with a forward slash' do
+      req = subject.create_typhoeus_request(method: :get, url: '/test.txt')
+      expect(req.url).to eq 'http://127.0.0.1/path/test.txt'
+    end
+
+    it 'creates an absolute request if the url does not start with a forward slash' do
+      req = subject.create_typhoeus_request(method: :get, url: 'http://www.github.com/')
+      expect(req.url).to eq 'http://www.github.com/'
+    end
+  end
+
+  describe '#normalize_relative_uri' do
+    it 'joins the uri on to the value of #full_uri if it starts with a forward slash' do
+      expect(subject.normalize_relative_uri('/test.txt')).to eq 'http://127.0.0.1/path/test.txt'
+    end
+
+    it 'uses the full url specified if it does not start with a forward slash' do
+      expect(subject.normalize_relative_uri('www.github.com')).to eq 'www.github.com'
+    end
   end
 end