Merge pull request #429 from tildeio/backport-grape-fix

Backport grape fix

.travis.yml

@@ -144,7 +144,18 @@ matrix:
     # Grape
     - rvm: 2.5
       env:
-        - GRAPE_VERSION=0.13.0
+        - GRAPE_VERSION="~> 0.13.0"
+      gemfile: gemfiles/Gemfile.grape
+    - stage: extra
+      rvm: 2.5
+      env:
+        - GRAPE_VERSION="~> 1.1.0"
+      gemfile: gemfiles/Gemfile.grape
+    - stage: extra
+      rvm: 2.5
+      env:
+        # there are significant architectural changes between 1.1 and 1.2
+        - GRAPE_VERSION="~> 1.2.0"
       gemfile: gemfiles/Gemfile.grape
     - rvm: 2.5
       env:

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.2 (November 29, 2018)
+* [BUGFIX] Fix derived endpoint names under Grape 1.2
+
 ## 3.1.1 (October 25, 2018)
 * [IMPROVEMENT] Get AMS version from `Gem.loaded_specs` (thanks @mattias-lundell!)
 

SKYLIGHT_VERSION

@@ -1 +1 @@
-3.1.1
+3.1.2

lib/skylight/version.rb

@@ -1,3 +1,3 @@
 module Skylight
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

skylight-core/lib/skylight/core/normalizers/grape/endpoint_run.rb

@@ -24,7 +24,16 @@ def get_endpoint_name(endpoint)
               path = "#{namespace}#{path}"
             end
 
-            "#{endpoint.options[:for]} [#{method}] #{path}"
+            "#{base_app_name(endpoint)} [#{method}] #{path}".strip
+          end
+
+          def base_app_name(endpoint)
+            ep = endpoint.options[:for]
+            return ep.name if ep.name
+
+            if ep.respond_to?(:base) && ep.base.respond_to?(:name)
+              ep.base.name
+            end
           end
 
       end

skylight-core/lib/skylight/core/version.rb

@@ -1,6 +1,6 @@
 module Skylight
   module Core
-    VERSION = '3.1.1'
+    VERSION = '3.1.2'
   end
 end