In progress, attempting to fix ruby-grape#133.

lib/grape/api.rb

@@ -435,6 +435,7 @@ def initialize
     end
 
     def call(env)
+      p "call: #{env}"
       @route_set.call(env)
     end
 

lib/grape/endpoint.rb

@@ -111,19 +111,19 @@ def prepare_routes
     def prepare_path(path)
       parts = []
       parts << settings[:root_prefix] if settings[:root_prefix]
+      parts << settings[:version] if settings[:version]
 
-      uses_path_versioning = settings[:version] && settings[:version_options][:using] == :path
       namespace_is_empty = namespace && (namespace.to_s =~ /^\s*$/ || namespace.to_s == '/')
       path_is_empty = path && (path.to_s =~ /^\s*$/ || path.to_s == '/')
 
-      parts << ':version' if uses_path_versioning
-      if !uses_path_versioning || (!namespace_is_empty || !path_is_empty)
+      if ! settings[:version] || ! namespace_is_empty || ! path_is_empty
         parts << namespace.to_s if namespace
         parts << path.to_s if path && '/' != path
         format_suffix = '(.:format)'
       else
         format_suffix = '(/.:format)'
       end
+
       Rack::Mount::Utils.normalize_path(parts.join('/') + format_suffix)
     end
 

lib/grape/middleware/versioner/param.rb

@@ -28,7 +28,6 @@ def default_options
         def before
           paramkey = options[:parameter]
           potential_version = request.params[paramkey]
-
           unless potential_version.nil?
             if options[:versions] && !options[:versions].include?(potential_version)
               throw :error, :status => 404, :message => "404 API Version Not Found", :headers => {'X-Cascade' => 'pass'}

spec/grape/api_spec.rb

@@ -190,20 +190,16 @@ def app; subject end
     end
 
     describe 'root routes should work with' do
-      before do
-        def subject.enable_root_route!
-          self.get("/") {"root"}
-        end
-      end
-
       after do
         last_response.body.should eql 'root'
       end
 
       describe 'path versioned APIs' do
         before do
           subject.version 'v1', :using => :path
-          subject.enable_root_route!
+          subject.get "/" do
+            "root"
+          end
         end
 
         it 'without a format' do
@@ -217,20 +213,26 @@ def subject.enable_root_route!
 
       it 'header versioned APIs' do
         subject.version 'v1', :using => :header, :vendor => 'test'
-        subject.enable_root_route!
+        subject.get "/" do
+          "root"
+        end
 
         versioned_get "/", "v1", :using => :header
       end
 
       it 'param versioned APIs' do
         subject.version 'v1', :using => :param
-        subject.enable_root_route!
+        subject.get "/" do
+          "root"
+        end
 
         versioned_get "/", "v1", :using => :param
       end
 
       it 'unversioned APIs' do
-        subject.enable_root_route!
+        subject.get "/" do
+          "root"
+        end
 
         get "/"
       end
@@ -1132,8 +1134,8 @@ def self.call(object, env)
       end
       it 'sets route paths' do
          subject.routes.size.should >= 2
-         subject.routes[0].route_path.should == "/:version/version(.:format)"
-         subject.routes[1].route_path.should == "/p/:version/n1/n2/version(.:format)"
+         subject.routes[0].route_path.should == "/v1/version(.:format)"
+         subject.routes[1].route_path.should == "/p/v2/n1/n2/version(.:format)"
       end
       it 'sets route versions' do
          subject.routes[0].route_version.should == 'v1'

spec/shared/versioning_examples.rb

@@ -54,7 +54,6 @@
     versioned_get '/awesome', 'v3', macro_options
     last_response.status.should eql 404
   end
-
   context 'with different versions for the same endpoint' do
     context 'without a prefix' do
       it 'allows the same endpoint to be implemented' do
@@ -77,7 +76,6 @@
         last_response.body.should == 'version v1'
       end
     end
-
     context 'with a prefix' do
       it 'allows the same endpoint to be implemented' do
         subject.prefix 'api'
@@ -92,10 +90,10 @@
           end
         end
 
-        versioned_get '/api/version', 'v2', macro_options
+        versioned_get '/version', 'v2', macro_options.merge({ :prefix => 'api' })
         last_response.status.should == 200
         last_response.body.should == 'v2'
-        versioned_get '/api/version', 'v1', macro_options
+        versioned_get '/version', 'v1', macro_options.merge({ :prefix => 'api' })
         last_response.status.should == 200
         last_response.body.should == 'version v1'
       end