Move #normalize_relative_uri into HttpClient

Author: rastating

lib/wpxf/net/http_client.rb

@@ -182,6 +182,17 @@ def execute_delete_request(opts)
       def max_http_concurrency
         normalized_option_value('max_http_concurrency')
       end
+
+      # Normalize a relative URI into an absolute URL.
+      # @param uri [String] the relative or absolute URI.
+      # @return [String] the absolute URL.
+      def normalize_relative_uri(uri)
+        if uri.start_with?('/')
+          normalize_uri(full_uri, uri)
+        else
+          uri
+        end
+      end
     end
   end
 end

lib/wpxf/net/typhoeus_helper.rb

@@ -39,14 +39,6 @@ def create_typhoeus_request(opts)
         )
         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
 end

spec/net/http_client_spec.rb

@@ -350,4 +350,16 @@
       expect(queue.length).to eq 2
     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
+      allow(subject).to receive(:full_uri).and_return('http://127.0.0.1/path')
+      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
+      allow(subject).to receive(:full_uri).and_return('http://127.0.0.1/path')
+      expect(subject.normalize_relative_uri('www.github.com')).to eq 'www.github.com'
+    end
+  end
 end

spec/net/typhoeus_helper_spec.rb

@@ -86,14 +86,4 @@
       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