Merge pull request #703 from corthmann/master

Fix dasherized paths for scoped routes

Author: lgebhardt

lib/jsonapi/link_builder.rb

@@ -106,7 +106,7 @@ def formatted_module_path_from_class(klass)
       scopes = module_scopes_from_class(klass)
 
       unless scopes.empty?
-        "/#{ scopes.map(&:underscore).join('/') }/"
+        "/#{ scopes.map{ |scope| format_route(scope.to_s.underscore) }.join('/') }/"
       else
         "/"
       end

test/fixtures/active_record.rb

@@ -1559,6 +1559,13 @@ class PersonResource < JSONAPI::Resource
   end
 end
 
+module DasherizedNamespace
+  module V1
+    class PersonResource < JSONAPI::Resource
+    end
+  end
+end
+
 module MyEngine
   module Api
     module V1
@@ -1573,6 +1580,13 @@ class PersonResource < JSONAPI::Resource
       end
     end
   end
+
+  module DasherizedNamespace
+    module V1
+      class PersonResource < JSONAPI::Resource
+      end
+    end
+  end
 end
 
 module Legacy

test/test_helper.rb

@@ -374,6 +374,12 @@ class CatResource < JSONAPI::Resource
     end
   end
 
+  namespace :dasherized_namespace, path: 'dasherized-namespace' do
+    namespace :v1 do
+      jsonapi_resources :people
+    end
+  end
+
   namespace :pets do
     namespace :v1 do
       jsonapi_resources :cats
@@ -395,6 +401,12 @@ class CatResource < JSONAPI::Resource
       jsonapi_resources :people
     end
   end
+
+  namespace :dasherized_namespace, path: 'dasherized-namespace' do
+    namespace :v1 do
+      jsonapi_resources :people
+    end
+  end
 end
 
 # Ensure backward compatibility with Minitest 4

test/unit/serializer/link_builder_test.rb

@@ -4,6 +4,11 @@
 
 class LinkBuilderTest < ActionDispatch::IntegrationTest
   def setup
+    # the route format is being set directly in test_helper and is being set differently depending on
+    # the order in which the namespaces get loaded. in order to prevent random test seeds to fail we need to set the
+    # default configuration in the test 'setup'.
+    JSONAPI.configuration.route_format = :underscored_route
+
     @base_url        = "http://example.com"
     @route_formatter = JSONAPI.configuration.route_formatter
     @steve           = Person.create(name: "Steve Rogers", date_joined: "1941-03-01")
@@ -214,6 +219,20 @@ def test_query_link_for_regular_app_with_camel_case_scope
     assert_equal expected_link, builder.query_link(query)
   end
 
+  def test_query_link_for_regular_app_with_dasherized_scope
+    config = {
+        base_url: @base_url,
+        route_formatter: DasherizedRouteFormatter,
+        primary_resource_klass: DasherizedNamespace::V1::PersonResource
+    }
+
+    query         = { page: { offset: 0, limit: 12 } }
+    builder       = JSONAPI::LinkBuilder.new(config)
+    expected_link = "#{ @base_url }/dasherized-namespace/v1/people?page%5Blimit%5D=12&page%5Boffset%5D=0"
+
+    assert_equal expected_link, builder.query_link(query)
+  end
+
   def test_query_link_for_engine
     config = {
       base_url: @base_url,
@@ -228,6 +247,20 @@ def test_query_link_for_engine
     assert_equal expected_link, builder.query_link(query)
   end
 
+  def test_query_link_for_engine_with_dasherized_scope
+    config = {
+        base_url: @base_url,
+        route_formatter: DasherizedRouteFormatter,
+        primary_resource_klass: MyEngine::DasherizedNamespace::V1::PersonResource
+    }
+
+    query         = { page: { offset: 0, limit: 12 } }
+    builder       = JSONAPI::LinkBuilder.new(config)
+    expected_link = "#{ @base_url }/boomshaka/dasherized-namespace/v1/people?page%5Blimit%5D=12&page%5Boffset%5D=0"
+
+    assert_equal expected_link, builder.query_link(query)
+  end
+
   def test_query_link_for_engine_with_camel_case_scope
     config = {
       base_url: @base_url,