lib/routes/services.rb in gaptool-server-0.3.0 vs lib/routes/services.rb in gaptool-server-0.3.1

@@ -1,18 +1,18 @@
 # encoding: utf-8
 class GaptoolServer < Sinatra::Application
 
-  get '/servicekeys/get/:service' do
+  get '/servicekeys/use/:service' do
     svcapi_getkey(params[:service])
   end
 
-  get '/servicekeys/list/:service' do
-    unless :service.nil?
-      svcapi_showkeys(params[:service]).to_json
-    else
+  get '/servicekeys/:service' do
+    svcapi_showkeys(params[:service]).to_json
+  end
+
+  get '/servicekeys' do
       svcapi_showkeys(:all).to_json
-    end
   end
 
   post '/servicekeys/release/:service' do
     data = JSON.parse request.body.read
     svcapi_releasekey(params[:service], data['key'])
@@ -22,9 +22,10 @@
     data = JSON.parse request.body.read
     svcapi_putkey(params[:service], data['key'])
   end
 
   delete '/servicekeys/:service' do
+    data = JSON.parse request.body.read
     svcapi_deletekey(params[:service], data['key'])
   end
 
   put '/service/:role/:environment' do
     data = JSON.parse request.body.read