Merge pull request #1282 from tobias-grasse/patch-2

Consider config.relative_url_root in ActsAsResourceController.base_url

Author: lgebhardt

lib/jsonapi/acts_as_resource_controller.rb

@@ -152,7 +152,7 @@ def resource_serializer_klass
     end
 
     def base_url
-      @base_url ||= request.protocol + request.host_with_port
+      @base_url ||= "#{request.protocol}#{request.host_with_port}#{Rails.application.config.relative_url_root}"
     end
 
     def resource_klass_name

test/controllers/controller_test.rb

@@ -10,6 +10,13 @@ def setup
     JSONAPI.configuration.always_include_to_one_linkage_data = false
   end
 
+  def test_links_include_relative_root
+    Rails.application.config.relative_url_root = '/subdir'
+    assert_cacheable_get :index
+    assert json_response['data'][0]['links']['self'].include?('/subdir')
+    Rails.application.config.relative_url_root = nil
+  end
+
   def test_index
     assert_cacheable_get :index
     assert_response :success