Changeset 106

Timestamp:

05/15/08 21:52:26 (6 months ago)

Author:

jweiss

Message:

fix #81 - Fix XML output of stage tasks

Location:

trunk

Files:

• CHANGELOG.txt (modified) (1 diff)
• app/controllers/stages_controller.rb (modified) (1 diff)
• app/models/stage.rb (modified) (1 diff)
• app/views/stages/tasks.html.erb (modified) (1 diff)
• test/functional/stages_controller_test.rb (modified) (1 diff)
• test/unit/webistrano_deployer_test.rb (modified) (1 diff)

trunk/CHANGELOG.txt

@@ -1 +1 @@
 
 SVN
+
+* Fix XML output of stage tasks. Provided by Mathias Meyer
 
 * Add version info XML action. Provided by Mathias Meyer

trunk/app/controllers/stages_controller.rb

@@ -11 +11 @@
   end
 
+  def index
+    @stages = current_project.stages.find(:all)
+    respond_to do |format|
+      format.xml { render :xml => @stages.to_xml}
+    end
+  end
   # GET /projects/1/stages/1
   # GET /projects/1/stages/1.xml
   def show
     @stage = current_project.stages.find(params[:id])
-    @task_list = [['All tasks: ', '']] + @stage.list_tasks.collect{|x| [x.first, x.first]}.sort
+    @task_list = [['All tasks: ', '']] + @stage.list_tasks.collect{|task| [task[:name], task[:name]]}.sort()
 
     respond_to do |format|

trunk/app/models/stage.rb

@@ -124 +124 @@
     d.stage = self
     deployer = Webistrano::Deployer.new(d)
-    deployer.list_tasks.collect { |t| [t.fully_qualified_name, t.description] }.delete_if{|x| x.first == 'shell' || x.first == 'invoke'}
+    deployer.list_tasks.collect { |t| {:name => t.fully_qualified_name, :description => t.description} }.delete_if{|t| t[:name] == 'shell' || t[:name] == 'invoke'}
   end
   

trunk/app/views/stages/tasks.html.erb

@@ -4 +4 @@
   <legend>All Tasks</legend>
     <table>
-    <% @tasks.sort.each do |key, value| %>
+    <% @tasks.sort{|a, b| a[:name] <=> b[:name]}.each do |task| %>
         <tr>
-        <td valign="top"><%= link_to key, new_project_stage_deployment_path(current_project, @stage) + "?task=#{key}", :class => 'arrow_link', :name => h(key)%></td>
+        <td valign="top"><%= link_to task[:name], new_project_stage_deployment_path(current_project, @stage) + "?task=#{task[:name]}", :class => 'arrow_link', :name => h(task[:name])%></td>
         <td>&nbsp;&nbsp;</td>
-          <td valign="top"><%= simple_format value %></td>
+          <td valign="top"><%= simple_format task[:description] %></td>
         </tr>
     <% end %>

trunk/test/functional/stages_controller_test.rb

@@ -107 +107 @@
   end
   
+  def test_should_render_xml_for_stage_tasks
+    get :tasks, :id => @stage.id, :project_id => @project.id, :format => "xml"
+    assert_response :success
+    assert_match /webistrano:mongrel:start/, @response.body
+  end
+  
   def test_index
     get :index, :project_id => @project.id, :format => 'xml'

trunk/test/unit/webistrano_deployer_test.rb

@@ -753 +753 @@
     assert_equal 22, @stage.list_tasks.size # filter shell and invoke
     assert_equal 1, deployer.list_tasks.delete_if{|t| t.fully_qualified_name != 'foo:bar'}.size
-    assert_equal 1, @stage.list_tasks.delete_if{|t| t[0] != 'foo:bar'}.size
+    assert_equal 1, @stage.list_tasks.delete_if{|t| t[:name] != 'foo:bar'}.size
   end