renaming the action name run_memory_exercise to exercise_memory to be…

… more succinct and easier to sort, and to better match the terminology used in the app

app/controllers/hosts_controller.rb

@@ -14,9 +14,9 @@ def exercise_performance
     redirect_to :action => 'watch_exercise', :id => @exercise.id
   end
 
-  verify :only => :run_memory_exercise, :params => [:id, :uri], :method => :post,
+  verify :only => :exercise_memory, :params => [:id, :uri], :method => :post,
     :add_flash => {:error => 'some information was missing from the request'}, :redirect_to => {:controller => 'hosts', :action => 'index'}
-  def run_memory_exercise
+  def exercise_memory
     @uri = params[:uri].to_s.strip
     if @uri.blank?
       flash[:error] = "the input parameter \"uri\" was absent"

app/views/hosts/_exercise.html.erb

@@ -35,7 +35,7 @@
 		<td align="right"><%= sample.page_size %></td>
 		<td align="right" class="<%= sample.changed_memory < 500 ? 'good' : 'bad' rescue nil %>"><%= sample.changed_memory %></td>
 		<td align="right" class="<%= sample.total_memory   < 500 ? 'good' : 'bad' rescue nil %>"><%= sample.total_memory   %></td>
-		<td><%= button_to 'memory test', memory_exercise_path(
+		<td><%= button_to 'memory test', exercise_memory_path(
 		          :id => @exercise.host.id, :uri => sample.page_uri) %>
 		</td>
 	</tr>

config/routes.rb

@@ -9,7 +9,7 @@
 
   # named routes
   map.exercise_performance '/hosts/:id/exercise_performance', :controller => 'hosts', :action => 'exercise_performance'
-  map.memory_exercise      '/hosts/:id/run_memory_exercise',      :controller => 'hosts', :action => 'run_memory_exercise'
+  map.exercise_memory      '/hosts/:id/exercise_memory',      :controller => 'hosts', :action => 'exercise_memory'
 
   # Install the default routes as the lowest priority.
   map.connect ':controller/:action/:id'

spec/controllers/hosts_controller_spec.rb

@@ -383,14 +383,14 @@ def do_request(id = nil)
     end
   end
 
-  describe "handling POST /hosts/:host_id/run_memory_exercise" do
+  describe "handling POST /hosts/:host_id/exercise_memory" do
 
     before(:each) do
       @host = hosts(:localhost)
     end
 
     def do_request(host_id = nil, uri = nil)
-      post :run_memory_exercise, 
+      post :exercise_memory, 
         :id          => (host_id || @host.id), 
         :uri         => uri,
         :aut_version => @aut_version = '192837',

spec/controllers/hosts_routing_spec.rb

@@ -31,8 +31,8 @@
       route_for(:controller => "hosts", :action => "exercise_performance", :id => 1).should == "/hosts/1/exercise_performance"
     end
 
-    it "should map { :controller => 'hosts', :action => 'run_memory_exercise', :id => 1 } to /hosts/1/run_memory_exercise" do
-      route_for(:controller => "hosts", :action => "run_memory_exercise", :id => 1).should == "/hosts/1/run_memory_exercise"
+    it "should map { :controller => 'hosts', :action => 'exercise_memory', :id => 1 } to /hosts/1/exercise_memory" do
+      route_for(:controller => "hosts", :action => "exercise_memory", :id => 1).should == "/hosts/1/exercise_memory"
     end
   end
 
@@ -70,8 +70,8 @@
       params_from(:get, "/hosts/1/exercise_performance").should == {:controller => "hosts", :action => "exercise_performance", :id => "1"}
     end
 
-    it "should generate params { :controller => 'hosts', action => 'run_memory_exercise', id => '1' } from POST /hosts/1/run_memory_exercise" do
-      params_from(:get, "/hosts/1/run_memory_exercise").should == {:controller => "hosts", :action => "run_memory_exercise", :id => "1"}
+    it "should generate params { :controller => 'hosts', action => 'exercise_memory', id => '1' } from POST /hosts/1/exercise_memory" do
+      params_from(:get, "/hosts/1/exercise_memory").should == {:controller => "hosts", :action => "exercise_memory", :id => "1"}
     end
   end
 end