Fixes ISSUE-2175 - Options call failing if matching all routes (#2176)

Author: myxoh

CHANGELOG.md

@@ -6,8 +6,8 @@
 
 #### Fixes
 
+* [#2176](https://github.com/ruby-grape/grape/pull/2176): Fixes issue-2175 - options call failing if matching all routes - [@myxoh](https://github.com/myxoh).
 * Your contribution here.
-
 ### 1.5.3 (2021/03/07)
 
 #### Fixes

lib/grape/api/instance.rb

@@ -200,6 +200,8 @@ def add_head_not_allowed_methods_and_options_methods
         without_root_prefix do
           without_versioning do
             versioned_route_configs.each do |config|
+              next if config[:options][:matching_wildchar]
+
               allowed_methods = config[:methods].dup
 
               unless self.class.namespace_inheritable(:do_not_route_head)
@@ -228,7 +230,7 @@ def collect_route_config_per_pattern
           last_route        = routes.last # Most of the configuration is taken from the last endpoint
           matching_wildchar = routes.any? { |route| route.request_method == '*' }
           {
-            options: {},
+            options: { matching_wildchar: matching_wildchar },
             pattern: last_route.pattern,
             requirements: last_route.requirements,
             path: last_route.origin,
@@ -248,7 +250,6 @@ def generate_not_allowed_method(pattern, allowed_methods: [], **attributes)
             Grape::Http::Headers::SUPPORTED_METHODS_WITHOUT_OPTIONS
           end
         not_allowed_methods = supported_methods - allowed_methods
-        return if not_allowed_methods.empty?
         @router.associate_routes(pattern, not_allowed_methods: not_allowed_methods, **attributes)
       end
 

spec/grape/api_spec.rb

@@ -749,6 +749,47 @@ class DummyFormatClass
       end
     end
 
+    describe 'when a resource routes by POST, GET, PATCH, PUT, and DELETE' do
+      before do
+        subject.namespace :example do
+          get do
+            'example'
+          end
+
+          patch do
+            'example'
+          end
+
+          post do
+            'example'
+          end
+
+          delete do
+            'example'
+          end
+
+          put do
+            'example'
+          end
+        end
+        options '/example'
+      end
+
+      describe 'it adds an OPTIONS route for namespaced endpoints that' do
+        it 'returns a 204' do
+          expect(last_response.status).to eql 204
+        end
+
+        it 'has an empty body' do
+          expect(last_response.body).to be_blank
+        end
+
+        it 'has an Allow header' do
+          expect(last_response.headers['Allow']).to eql 'OPTIONS, GET, PATCH, POST, DELETE, PUT, HEAD'
+        end
+      end
+    end
+
     describe 'adds an OPTIONS route for namespaced endpoints that' do
       before do
         subject.before { header 'X-Custom-Header', 'foo' }