Spec and fix for #1721. (#1722)

* Failing spec for #1721.

* Fix for #1721 - Defining a catch-all after multiple versions of an endpoint hide endpoints after the first definition

* De-duplicate router logic.

* Fix: build, remove bundler update.

Author: dblock

.travis.yml

@@ -56,6 +56,3 @@ matrix:
     - rvm: rbx-3
 
 bundler_args: --without development
-
-before_install: gem update --system
-

CHANGELOG.md

@@ -10,6 +10,7 @@
 #### Fixes
 
 * [#1710](https://github.com/ruby-grape/grape/pull/1710): Fix wrong transformation of empty Array in declared params - [@pablonahuelgomez](https://github.com/pablonahuelgomez).
+* [#1722](https://github.com/ruby-grape/grape/pull/1722): Fix catch-all hiding multiple versions of an endpoint after the first definition - [@zherr](https://github.com/zherr).
 * Your contribution here.
 
 ### 1.0.1 (9/8/2017)

lib/grape/router.rb

@@ -104,6 +104,8 @@ def transaction(env)
       ) if neighbor && method == 'OPTIONS' && !cascade
 
       route = match?(input, '*')
+      return neighbor.endpoint.call(env) if neighbor && cascade && route
+
       if route
         response = process_route(route, env)
         return response if response && !(cascade = cascade?(response))

spec/shared/versioning_examples.rb

@@ -149,4 +149,62 @@
     versioned_get '/api_version_with_version_param?version=1', 'v1', macro_options
     expect(last_response.body).to eql '1'
   end
+
+  context 'with catch-all' do
+    let(:options) { macro_options }
+    let(:v1) do
+      klass = Class.new(Grape::API)
+      klass.version 'v1', options
+      klass.get 'version' do
+        'v1'
+      end
+      klass
+    end
+    let(:v2) do
+      klass = Class.new(Grape::API)
+      klass.version 'v2', options
+      klass.get 'version' do
+        'v2'
+      end
+      klass
+    end
+    before do
+      subject.format :txt
+
+      subject.mount v1
+      subject.mount v2
+
+      subject.route :any, '*path' do
+        params[:path]
+      end
+    end
+
+    context 'v1' do
+      it 'finds endpoint' do
+        versioned_get '/version', 'v1', macro_options
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('v1')
+      end
+
+      it 'finds catch all' do
+        versioned_get '/whatever', 'v1', macro_options
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to end_with 'whatever'
+      end
+    end
+
+    context 'v2' do
+      it 'finds endpoint' do
+        versioned_get '/version', 'v2', macro_options
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('v2')
+      end
+
+      it 'finds catch all' do
+        versioned_get '/whatever', 'v2', macro_options
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to end_with 'whatever'
+      end
+    end
+  end
 end