svn commit: r1078714 - in /incubator/deltacloud/trunk/server: lib/deltacloud/helpers/application_helper.rb server.rb tests/drivers/mock/instances_test.rb

[mf...@apache.org]

Author: mfojtik
Date: Mon Mar  7 08:49:10 2011
New Revision: 1078714

URL: http://svn.apache.org/viewvc?rev=1078714&view=rev
Log:
Added 204 code after successful DELETE action

Modified:
    incubator/deltacloud/trunk/server/lib/deltacloud/helpers/application_helper.rb
    incubator/deltacloud/trunk/server/server.rb
    incubator/deltacloud/trunk/server/tests/drivers/mock/instances_test.rb

Modified: incubator/deltacloud/trunk/server/lib/deltacloud/helpers/application_helper.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/helpers/application_helper.rb?rev=1078714&r1=1078713&r2=1078714&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/helpers/application_helper.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/helpers/application_helper.rb Mon Mar  7 08:49:10 2011
@@ -126,7 +126,13 @@ module ApplicationHelper
 
     @instance = driver.send(:"#{name}_instance", credentials, params["id"])
 
-    return redirect(instances_url) if name.eql?(:destroy) or @instance.class!=Instance
+    if name == :destroy or @instance.class!=Instance
+      respond_to do |format|
+        format.xml { return 204 }
+        format.json { return 204 }
+        format.html { return redirect(instances_url) }
+      end
+    end
 
     respond_to do |format|
       format.xml { haml :"instances/show" }
@@ -146,7 +152,7 @@ module ApplicationHelper
 
   def link_to_action(action, url, method)
     capture_haml do
-      haml_tag :form, :method => :post, :action => url, :class => :link do
+      haml_tag :form, :method => :post, :action => url, :class => [:link, method] do
         haml_tag :input, :type => :hidden, :name => '_method', :value => method
         haml_tag :button, :type => :submit do 
           haml_concat action

Modified: incubator/deltacloud/trunk/server/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=1078714&r1=1078713&r2=1078714&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/server.rb (original)
+++ incubator/deltacloud/trunk/server/server.rb Mon Mar  7 08:49:10 2011
@@ -296,7 +296,11 @@ collection :load_balancers do
     param :id,  :string,  :required
     control do
       driver.destroy_load_balancer(credentials, params[:id])
-      redirect(load_balancers_url)
+      respond_to do |format|
+        format.xml { return 204 }
+        format.json { return 204 }
+        format.html { return redirect(load_balancers_url) }
+      end
     end
   end
 
@@ -479,7 +483,11 @@ collection :storage_snapshots do
     param :id,  :string,  :required
     control do
       driver.create_storage_snapshot(credentials, params)
-      redirect(storage_snapshot_url(params[:id]))
+      respond_to do |format|
+        format.xml { return 204 }
+        format.json { return 204 }
+        format.html { return redirect(storage_snapshots_url) }
+      end
     end
   end
 
@@ -560,7 +568,11 @@ collection :storage_volumes do
     param :id,          :string,  :optional
     control do
       driver.destroy_storage_volume(credentials, params)
-      redirect(storage_volumes_url)
+      respond_to do |format|
+        format.xml { return 204 }
+        format.json { return 204 }
+        format.html { return redirect(storage_volumes_url) }
+      end
     end
   end
 
@@ -609,7 +621,11 @@ collection :keys do
     param :id,  :string,  :required
     control do
       driver.destroy_key(credentials, { :key_name => params[:id]})
-      redirect(keys_url)
+      respond_to do |format|
+        format.xml { return 204 }
+        format.json { return 204 }
+        format.html { return redirect(keys_url) }
+      end
     end
   end
 
@@ -654,7 +670,11 @@ delete '/api/buckets/:bucket/:blob' do
   bucket_id = params[:bucket]
   blob_id = params[:blob]
   driver.delete_blob(credentials, bucket_id, blob_id)
-  redirect(bucket_url(bucket_id))
+  respond_to do |format|
+    format.xml { return 204 }
+    format.json { return 204 }
+    format.html { return bucket_url(bucket_id) }
+  end
 end
 
 #get blob metadata
@@ -763,7 +783,11 @@ collection :buckets do
     param :id,    :string,    :required
     control do
       driver.delete_bucket(credentials, params[:id], params)
-      redirect(buckets_url)
+      respond_to do |format|
+        format.xml { return 204 }
+        format.json { return 204 }
+        format.html { return redirect(buckets_url) }
+      end
     end
   end
 

Modified: incubator/deltacloud/trunk/server/tests/drivers/mock/instances_test.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/tests/drivers/mock/instances_test.rb?rev=1078714&r1=1078713&r2=1078714&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/tests/drivers/mock/instances_test.rb (original)
+++ incubator/deltacloud/trunk/server/tests/drivers/mock/instances_test.rb Mon Mar  7 08:49:10 2011
@@ -166,11 +166,7 @@ module DeltacloudUnitTest
         destroy_url = (last_xml_response/'actions/link[@rel="destroy"]').first['href']
         destroy_url.should_not == nil
         delete create_url(destroy_url), {}, authenticate
-        last_response.status.should == 302
-        do_xml_request last_response.headers['Location'], {}, true
-        (last_xml_response/'instances').should_not == nil
-        do_xml_request "/api/instances/#{instance_id}", {}, true
-        last_response.status.should == 404
+        last_response.status.should == 204
       end
     end