svn commit: r1044320 - in /incubator/deltacloud/trunk/server: lib/sinatra/rabbit.rb server.rb

[mf...@apache.org]

Author: mfojtik
Date: Fri Dec 10 12:16:29 2010
New Revision: 1044320

URL: http://svn.apache.org/viewvc?rev=1044320&view=rev
Log:
On server/lib/sinatra/rabbit.rb: Fixed the variable declaration in a more ruby way On server/server.rb: Fixed on line 72 the redirect, because it's a permanent redirect and not a 302.

Modified:
    incubator/deltacloud/trunk/server/lib/sinatra/rabbit.rb
    incubator/deltacloud/trunk/server/server.rb

Modified: incubator/deltacloud/trunk/server/lib/sinatra/rabbit.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/sinatra/rabbit.rb?rev=1044320&r1=1044319&r2=1044320&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/sinatra/rabbit.rb (original)
+++ incubator/deltacloud/trunk/server/lib/sinatra/rabbit.rb Fri Dec 10 12:16:29 2010
@@ -72,7 +72,7 @@ module Sinatra
       end
 
       def path(args = {})
-        l_prefix = args[:prefix] ? args[:prefix] : prefix
+        l_prefix = args[:prefix] || prefix
         if @member
           if standard?
             "#{l_prefix}/#{@collection.name}/:id"

Modified: incubator/deltacloud/trunk/server/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=1044320&r1=1044319&r2=1044320&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/server.rb (original)
+++ incubator/deltacloud/trunk/server/server.rb Fri Dec 10 12:16:29 2010
@@ -69,7 +69,7 @@ end
 Sinatra::Application.register Sinatra::RespondTo
 
 # Redirect to /api
-get '/' do redirect url_for('/api'); end
+get '/' do redirect url_for('/api'), 301; end
 
 get '/api/drivers\/?' do
   respond_to do |format|