Return 405 correctly even if version is using as header and wrong request method

CHANGELOG.md

@@ -10,8 +10,8 @@
 #### Fixes
 
 * [#1357](https://github.com/ruby-grape/grape/pull/1357): Don't include fixed named captures as route params - [@namusyaka](https://github.com/namusyaka).
-* [#1359](https://github.com/ruby-grape/grape/pull/1359): Return 404 even if version is using as header - [@namusyaka](https://github.com/namusyaka).
 * [#1359](https://github.com/ruby-grape/grape/pull/1359): Avoid evaluating the same route twice - [@namusyaka](https://github.com/namusyaka), [@dblock](https://github.com/dblock).
+* [#1361](https://github.com/ruby-grape/grape/pull/1361): Return 405 correctly even if version is using as header and wrong request method - [@namusyaka](https://github.com/namusyaka), [@dblock](https://github.com/dblock).
 
 0.16.1 (4/3/2016)
 =================

lib/grape/endpoint.rb

@@ -231,7 +231,7 @@ def run
 
         run_filters before_validations, :before_validation
 
-        run_validators validations, request unless @method_not_allowed
+        run_validators validations, request unless env[Grape::Env::GRAPE_METHOD_NOT_ALLOWED]
 
         run_filters after_validations, :after_validation
 

lib/grape/middleware/versioner/header.rb

@@ -32,7 +32,7 @@ class Header < Base
         def before
           strict_header_checks if strict?
 
-          if media_type
+          if media_type || env[Grape::Env::GRAPE_METHOD_NOT_ALLOWED]
             media_type_header_handler
           elsif headers_contain_wrong_vendor?
             fail_with_invalid_accept_header!('API vendor not found.')

lib/grape/router.rb

@@ -125,12 +125,12 @@ def greedy_match?(input)
     end
 
     def method_not_allowed(env, methods, endpoint)
+      env[Grape::Env::GRAPE_METHOD_NOT_ALLOWED] = true
       current = endpoint.dup
       current.instance_eval do
-        namespace_inheritable_to_nil(:version)
         @lazy_initialized = false
+        lazy_initialize!
         run_filters befores, :before
-        @method_not_allowed = true
         @block = proc do
           fail Grape::Exceptions::MethodNotAllowed, header.merge('Allow' => methods)
         end

lib/grape/util/env.rb

@@ -18,5 +18,6 @@ module Env
     GRAPE_REQUEST_HEADERS = 'grape.request.headers'.freeze
     GRAPE_REQUEST_PARAMS = 'grape.request.params'.freeze
     GRAPE_ROUTING_ARGS = 'grape.routing_args'.freeze
+    GRAPE_METHOD_NOT_ALLOWED = 'grape.method_not_allowed'.freeze
   end
 end

spec/grape/integration/version_header_spec.rb → spec/grape/api/patch_method_helpers_spec.rb

@@ -41,40 +41,40 @@ def app
     PatchHelpersSpec::Main
   end
 
-  context 'default' do
+  context 'patch' do
     it 'public' do
-      get '/', {}, 'HTTP_ACCEPT' => 'application/vnd.grape-public-v1+json'
-      expect(last_response.status).to eq 200
-      expect(last_response.body).to eq({ ok: 'public' }.to_json)
+      patch '/', {}, 'HTTP_ACCEPT' => 'application/vnd.grape-public-v1+json'
+      expect(last_response.status).to eq 405
     end
 
     it 'private' do
-      get '/', {}, 'HTTP_ACCEPT' => 'application/vnd.grape-private-v1+json'
-      expect(last_response.status).to eq 200
-      expect(last_response.body).to eq({ ok: 'private' }.to_json)
+      patch '/', {}, 'HTTP_ACCEPT' => 'application/vnd.grape-private-v1+json'
+      expect(last_response.status).to eq 405
     end
 
     it 'default' do
-      get '/'
-      expect(last_response.status).to eq 200
-      expect(last_response.body).to eq({ ok: 'public' }.to_json)
+      patch '/'
+      expect(last_response.status).to eq 405
     end
   end
 
-  context 'patch' do
+  context 'default' do
     it 'public' do
-      patch '/', {}, 'HTTP_ACCEPT' => 'application/vnd.grape-public-v1+json'
-      expect(last_response.status).to eq 405
+      get '/', {}, 'HTTP_ACCEPT' => 'application/vnd.grape-public-v1+json'
+      expect(last_response.status).to eq 200
+      expect(last_response.body).to eq({ ok: 'public' }.to_json)
     end
 
     it 'private' do
-      patch '/', {}, 'HTTP_ACCEPT' => 'application/vnd.grape-private-v1+json'
-      expect(last_response.status).to eq 405
+      get '/', {}, 'HTTP_ACCEPT' => 'application/vnd.grape-private-v1+json'
+      expect(last_response.status).to eq 200
+      expect(last_response.body).to eq({ ok: 'private' }.to_json)
     end
 
     it 'default' do
-      patch '/'
-      expect(last_response.status).to eq 405
+      get '/'
+      expect(last_response.status).to eq 200
+      expect(last_response.body).to eq({ ok: 'public' }.to_json)
     end
   end
 end