jsonapi-resources 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1484af26137219f05b85088a8ffcdf07c7bfd4d3
-  data.tar.gz: 3b8441b43cab89ec1701343027d9308d8a9c523d
+  metadata.gz: ef3f720982dbbec9843218ac90131071c97bfb9c
+  data.tar.gz: 52fd35cd6696dfebf7b9fc69c8d22f09cffce8df
 SHA512:
-  metadata.gz: a900be54a2ba2b6d3d4bba35e845960f50f4fae790a7b89168100419d1bb3451437acfd2700f5cbc309c52432e4980f059fc72eef628e9cbeaa19af7c66d8885
-  data.tar.gz: 9698bf894815ee7b0a261bb7985c0cdf93a33083a1b640728cdbf7ad4850d1daca2ec3d5cfca2abe7635888a3a58e7e4c375f3c58877179ef2a07b6961c85a6d
+  metadata.gz: 6fec7c3f9bf100b0d4fd92fa4401285907529344e24eaa8d66fc82f5026911006102b1d72e4b39c688b83d4604ebbe66049f17c11487579f176c78b3165ec78c
+  data.tar.gz: 607f360e9517e3f80341426d1126875a798b969e7740f371804be072e7b47142c3d26181d1534f25b011fb260b8135b67e29f2622650b947b90733c32bc14fb1

data/lib/jsonapi/link_builder.rb

@@ -77,7 +77,7 @@ module JSONAPI
 
     def engine_resource_path_name_from_source(source)
       scopes         = module_scopes_from_class(source.class)[1..-1]
-      base_path_name = scopes.map { |scope| scope.downcase }.join("_")
+      base_path_name = scopes.map { |scope| scope.underscore }.join("_")
       end_path_name  = source.class._type.to_s.singularize
       "#{ base_path_name }_#{ end_path_name }_path"
     end
@@ -88,7 +88,7 @@ module JSONAPI
 
     def engine_resources_path_name_from_class(klass)
       scopes         = module_scopes_from_class(klass)[1..-1]
-      base_path_name = scopes.map { |scope| scope.downcase }.join("_")
+      base_path_name = scopes.map { |scope| scope.underscore }.join("_")
       end_path_name  = klass._type.to_s
       "#{ base_path_name }_#{ end_path_name }_path"
     end
@@ -101,7 +101,7 @@ module JSONAPI
       scopes = module_scopes_from_class(klass)
 
       unless scopes.empty?
-        "/#{ scopes.map(&:downcase).join('/') }/"
+        "/#{ scopes.map(&:underscore).join('/') }/"
       else
         "/"
       end

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.5.3'
+    VERSION = '0.5.4'
   end
 end

data/test/fixtures/active_record.rb

@@ -1233,6 +1233,13 @@ module Api
   end
 end
 
+module AdminApi
+  module V1
+    class PersonResource < JSONAPI::Resource
+    end
+  end
+end
+
 module MyEngine
   module Api
     module V1
@@ -1240,6 +1247,13 @@ module MyEngine
       end
     end
   end
+
+  module AdminApi
+    module V1
+      class PersonResource < JSONAPI::Resource
+      end
+    end
+  end
 end
 
 warn 'start testing Name Collisions'

data/test/test_helper.rb

@@ -208,6 +208,12 @@ TestApp.routes.draw do
     end
   end
 
+  namespace :admin_api do
+    namespace :v1 do
+      jsonapi_resources :people
+    end
+  end
+
   mount MyEngine::Engine => "/boomshaka", as: :my_engine
 end
 
@@ -217,6 +223,12 @@ MyEngine::Engine.routes.draw do
       jsonapi_resources :people
     end
   end
+
+  namespace :admin_api do
+    namespace :v1 do
+      jsonapi_resources :people
+    end
+  end
 end
 
 # Ensure backward compatibility with Minitest 4

data/test/unit/serializer/link_builder_test.rb

@@ -63,6 +63,22 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
     assert_equal expected_link, builder.self_link(source)
   end
 
+  def test_self_link_with_engine_app_and_camel_case_scope
+    primary_resource_klass = MyEngine::AdminApi::V1::PersonResource
+
+    config = {
+      base_url: @base_url,
+      route_formatter: @route_formatter,
+      primary_resource_klass: primary_resource_klass,
+    }
+
+    builder = JSONAPI::LinkBuilder.new(config)
+    source  = primary_resource_klass.new(@steve)
+    expected_link = "#{ @base_url }/boomshaka/admin_api/v1/people/#{ source.id }"
+
+    assert_equal expected_link, builder.self_link(source)
+  end
+
   def test_primary_resources_url_for_regular_app
     config = {
       base_url: @base_url,
@@ -167,6 +183,20 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
     assert_equal expected_link, builder.query_link(query)
   end
 
+  def test_query_link_for_regular_app_with_camel_case_scope
+    config = {
+      base_url: @base_url,
+      route_formatter: @route_formatter,
+      primary_resource_klass: AdminApi::V1::PersonResource
+    }
+
+    query         = { page: { offset: 0, limit: 12 } }
+    builder       = JSONAPI::LinkBuilder.new(config)
+    expected_link = "#{ @base_url }/admin_api/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,
@@ -180,4 +210,18 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
 
     assert_equal expected_link, builder.query_link(query)
   end
+
+  def test_query_link_for_engine_with_camel_case_scope
+    config = {
+      base_url: @base_url,
+      route_formatter: @route_formatter,
+      primary_resource_klass: MyEngine::AdminApi::V1::PersonResource
+    }
+
+    query         = { page: { offset: 0, limit: 12 } }
+    builder       = JSONAPI::LinkBuilder.new(config)
+    expected_link = "#{ @base_url }/boomshaka/admin_api/v1/people?page%5Blimit%5D=12&page%5Boffset%5D=0"
+
+    assert_equal expected_link, builder.query_link(query)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Dan Gebhardt