- Projects

[ranch] 49: Inject graph_form_controller into benches_controller.
by Nicolas Despr�s 19 Nov '05

19 Nov '05

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Inject graph_form_controller into benches_controller. * web/ranch/test/functional/graph_form_controller_test.rb: Remove. Inject ... * web/ranch/test/functional/benches_controller_test.rb: ...here. * web/ranch/app/controllers/graph_form_controller.rb: Remove. Becomes... * web/ranch/app/controllers/benches_controller.rb: ... regression request. * web/ranch/app/views/graph_form: Remove. * web/ranch/app/views/graph_form/draw.rhtml: Remove. Becomes ... * web/ranch/app/views/benches/regression.rhtml: New. ...it. * web/ranch/app/views/benches/_list.rhtml: Redirect to the show request instead of the index one. * web/ranch/app/views/benches/_menubar.rhtml: Add the regression item. app/controllers/benches_controller.rb | 52 +++++++++++++ app/views/benches/_list.rhtml | 2 app/views/benches/_menubar.rhtml | 5 + app/views/benches/regression.rhtml | 12 +-- test/functional/benches_controller_test.rb | 112 +++++++++++++++++++++++++++-- 5 files changed, 170 insertions(+), 13 deletions(-) Index: web/ranch/test/functional/benches_controller_test.rb --- web/ranch/test/functional/benches_controller_test.rb (revision 48) +++ web/ranch/test/functional/benches_controller_test.rb (working copy) @@ -5,6 +5,8 @@ class BenchesController; def rescue_action(e) raise e end; end class BenchesControllerTest < Test::Unit::TestCase + fixtures :projects, :benches, :outputs, :inputs + def setup @controller = BenchesController.new @request = ActionController::TestRequest.new @@ -12,11 +14,9 @@ end def test_index - get :index, { :project_id => 2 } + get :index, { :project_id => 1 } assert_response :redirect - assert_redirected_to(:controller => 'benches', - :action => 'show', - :bench_id => 4) + assert_redirected_to(:action => 'show', :bench_id => 1) assert_not_nil assigns(:project) assert_not_nil assigns(:benches) end @@ -30,4 +30,108 @@ assert_not_nil assigns(:bench) end + def test_regression + get :regression, { :bench_id => 1 } + assert_response :success + assert_template 'regression' + + assert_not_nil assigns(:project) + assert_not_nil assigns(:bench) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_kind_of Hash, assigns(:revision) + assert assigns(:revision)[:start] < assigns(:revision)[:stop] + assert assigns(:revision)[:start] >= 1 + end + + def test_regression_regular_revision_range + post :regression, { + :bench_id => 1, + :revision => { :range => "2-8" } + } + assert_response :success + assert_template 'regression' + + assert_not_nil assigns(:project) + assert_not_nil assigns(:bench) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + assert_kind_of Hash, assigns(:revision) + assert_equal 2, assigns(:revision)[:start] + assert_equal 8, assigns(:revision)[:stop] + assert_nil flash[:error] + end + + def test_regression_bad_revision_range + post :regression, { + :bench_id => 1, + :revision => { :range => "-42-500" } + } + assert_response :success + assert_template 'regression' + + assert_not_nil assigns(:project) + assert_not_nil assigns(:bench) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + assert_kind_of Hash, assigns(:revision) + assert_equal 1, assigns(:revision)[:start] + assert_equal assigns(:project).head_revision, assigns(:revision)[:stop] + assert_nil flash[:error] + end + + def test_draw_start_sup_stop + post :regression, { + :bench_id => 1, + :revision => { :range => "42-10" } + } + assert_response :success + assert_template 'regression' + + assert_equal 1, assigns(:project).id + assert_equal 'determinize', assigns(:bench).name + assert(flash.has_key?(:error)) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + assert_not_nil flash[:error] + end + + def test_draw_output_arg_num + post :regression, { + :bench_id => 1, + :revision => { :range => "1-10" }, + :output_arg_num => 0, + } + assert_response :success + assert_template 'regression' + + assert_equal 1, assigns(:project).id + assert_equal 'determinize', assigns(:bench).name + assert_equal 0, assigns(:output_arg_num) + assert_equal 3, assigns(:output_arg_nb) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + assert_nil flash[:error] + end + + def test_draw_bad_revision_format + post :regression, { + :bench_id => 1, + :revision => { :range => "-42---10" } + } + assert_response :success + assert_template 'regression' + + assert_equal 1, assigns(:project).id + assert_equal 'determinize', assigns(:bench).name + assert(flash.has_key?(:error)) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + assert_not_nil flash[:error] + end + end Index: web/ranch/app/controllers/benches_controller.rb --- web/ranch/app/controllers/benches_controller.rb (revision 48) +++ web/ranch/app/controllers/benches_controller.rb (working copy) @@ -2,8 +2,12 @@ layout 'benches' + helper :graph, :graph_form + before_filter :list + DEFAULT_REVISION_RANGE = 100 + def index redirect_to :action => 'show', :bench_id => @benches.first.id end @@ -11,6 +15,28 @@ def show end + def regression + flash[:error] = nil + @inputs = @bench.input + @input_set_num = params[:input_set_num].to_i + @output_arg_num = params[:output_arg_num].to_i + if @output_arg_num.zero? + @output_arg_nb = Output.find_by_sql "SELECT outputs.arg_num " + + "FROM outputs " + + "WHERE outputs.bench_id = #{(a)bench.id} " + + "AND outputs.set_num = #@input_set_num " + + "GROUP BY outputs.arg_num " + + "ORDER BY outputs.arg_num " + @output_arg_nb = @output_arg_nb.size + end + if params[:revision].nil? or params[:revision][:range].nil? + @revision = {} + @revision[:stop], @revision[:start] = default_revision + else + @revision = get_revision_range(params[:revision][:range]) + end + end + protected def list @@ -23,4 +49,30 @@ @benches = @project.bench_ordered_by_name end + def get_revision_range(revision, head_rev=(a)project.head_revision) + stop_rev, start_rev = default_revision(head_rev) + result = { :stop => stop_rev, :start => start_rev } + if revision =~ /^(-?\d+)-(-?\d+)$/ + result[:start] = $1 + result[:stop] = $2 + result[:stop] = result[:stop].to_i + result[:stop] = head_rev if result[:stop] > head_rev + result[:start] = result[:start].to_i + result[:start] = 1 if result[:start] < 1 + if result[:start] > result[:stop] + flash[:error] = 'Start revision greater than stop revision.' + end + else + flash[:error] = "Bad revision range format." + end + result + end + + def default_revision(head_rev=(a)project.head_revision) + stop_rev = head_rev + start_rev = stop_rev - DEFAULT_REVISION_RANGE + start_rev = 1 if start_rev < 1 + [ stop_rev, start_rev ] + end + end Index: web/ranch/app/views/benches/_list.rhtml --- web/ranch/app/views/benches/_list.rhtml (revision 48) +++ web/ranch/app/views/benches/_list.rhtml (working copy) @@ -3,7 +3,7 @@ <tr> <td> <%= link_to @project.name, :controller => "projects", - :action => "index", + :action => "show", :project_id => @project.id %> </td> </tr> Index: web/ranch/app/views/benches/regression.rhtml --- web/ranch/app/views/benches/regression.rhtml (revision 48) +++ web/ranch/app/views/benches/regression.rhtml (working copy) @@ -1,6 +1,6 @@  <%= content_tag "h3", "#{(a)project.name}: #{(a)bench.name}" %> -<%= start_form_tag :action => "draw", +<%= start_form_tag :action => "regression", :bench_id => @bench.id %> <table cellspacing=10> @@ -74,7 +74,9 @@  <p> -<% if @draw_on %> +<% if flash[:error] %> + <p style="color: red;"><%= flash[:error] %></p> +<% else %> <% if @output_arg_num.zero? %> <% 1.upto(@output_arg_nb) do |i| %> <p> @@ -88,11 +90,5 @@ @revision[:start], @revision[:stop], @output_arg_num, @input_set_num %> <% end %> -<% else %> - <% if flash[:error] %> - <p style="color: red;"><%= flash[:error] %></p> - <% else %> - <%= content_tag "p", "No chart to display - click on Draw" %> - <% end %> <% end %> Index: web/ranch/app/views/benches/_menubar.rhtml --- web/ranch/app/views/benches/_menubar.rhtml (revision 48) +++ web/ranch/app/views/benches/_menubar.rhtml (working copy) @@ -7,6 +7,11 @@ :action => "show", :bench_id => @bench.id %> </td> + <td> + <%= link_to "regression", :controller => "benches", + :action => "regression", + :bench_id => @bench.id %> + </td> </tr> </table> <hr>

1 0

[ranch] 48: Add the benches controller.
by Nicolas Despr�s 19 Nov '05

19 Nov '05

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Add the benches controller. * web/ranch/test/functional/benches_controller_test.rb: New. Test it. * web/ranch/app/helpers/benches_helper.rb: New. Nothing by now but generated by Rails. * web/ranch/app/models/project.rb: Select only id and name fields. * web/ranch/app/controllers/benches_controller.rb: New. Handle index and show request. * web/ranch/app/views/layouts/benches.rhtml: New. Layout of the controller. * web/ranch/app/views/benches: New. * web/ranch/app/views/benches/_list.rhtml: New. The left margin part of the layout. * web/ranch/app/views/benches/show.rhtml: New. Template for the show request. * web/ranch/app/views/benches/_menubar.rhtml: New. The menu bar of the controller. * web/ranch/app/views/projects/_menubar.rhtml: Add a link in the menu bar to see go to the benchmarks of a project. app/controllers/benches_controller.rb | 26 +++++++++++++++++++ app/helpers/benches_helper.rb | 2 + app/models/project.rb | 5 ++- app/views/benches/_list.rhtml | 30 ++++++++++++++++++++++ app/views/benches/_menubar.rhtml | 12 ++++++++ app/views/benches/show.rhtml | 10 +++++++ app/views/layouts/benches.rhtml | 39 +++++++++++++++++++++++++++++ app/views/projects/_menubar.rhtml | 5 +++ test/functional/benches_controller_test.rb | 33 ++++++++++++++++++++++++ 9 files changed, 161 insertions(+), 1 deletion(-) Index: web/ranch/test/functional/benches_controller_test.rb --- web/ranch/test/functional/benches_controller_test.rb (revision 0) +++ web/ranch/test/functional/benches_controller_test.rb (revision 0) @@ -0,0 +1,33 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'benches_controller' + +# Re-raise errors caught by the controller. +class BenchesController; def rescue_action(e) raise e end; end + +class BenchesControllerTest < Test::Unit::TestCase + def setup + @controller = BenchesController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end + + def test_index + get :index, { :project_id => 2 } + assert_response :redirect + assert_redirected_to(:controller => 'benches', + :action => 'show', + :bench_id => 4) + assert_not_nil assigns(:project) + assert_not_nil assigns(:benches) + end + + def test_show + get :show, { :bench_id => 1 } + assert_response :success + assert_template 'show' + assert_not_nil assigns(:project) + assert_not_nil assigns(:benches) + assert_not_nil assigns(:bench) + end + +end Index: web/ranch/app/helpers/benches_helper.rb --- web/ranch/app/helpers/benches_helper.rb (revision 0) +++ web/ranch/app/helpers/benches_helper.rb (revision 0) @@ -0,0 +1,2 @@ +module BenchesHelper +end Index: web/ranch/app/models/project.rb --- web/ranch/app/models/project.rb (revision 47) +++ web/ranch/app/models/project.rb (working copy) @@ -8,7 +8,10 @@ validates_length_of :name, :maximum => 255 def bench_ordered_by_name - Bench.find :all, :conditions => [ "project_id = ?", id ], :order => "name" + Bench.find(:all, + :select => "id, name", + :conditions => [ "project_id = ?", id ], + :order => "name") end protected Index: web/ranch/app/controllers/benches_controller.rb --- web/ranch/app/controllers/benches_controller.rb (revision 0) +++ web/ranch/app/controllers/benches_controller.rb (revision 0) @@ -0,0 +1,26 @@ +class BenchesController < ApplicationController + + layout 'benches' + + before_filter :list + + def index + redirect_to :action => 'show', :bench_id => @benches.first.id + end + + def show + end + + protected + + def list + if params[:project_id] + @project = Project.find_by_id params[:project_id] + elsif params[:bench_id] + @bench = Bench.find_by_id params[:bench_id] + @project = @bench.project + end + @benches = @project.bench_ordered_by_name + end + +end Index: web/ranch/app/views/layouts/benches.rhtml --- web/ranch/app/views/layouts/benches.rhtml (revision 0) +++ web/ranch/app/views/layouts/benches.rhtml (revision 0) @@ -0,0 +1,39 @@ +  + +<html> + <%= render :partial => "layouts/head" %> + <body> + <%= render :partial => "layouts/top_banner" %> + <%= render :partial => "layouts/menubar" %> + + <p> + <table cellspacing=0 cellpadding=0 border=0 width="100%" height="80%" cols=2> + <tr> + <td class=left_margin valign=top width="15%"> + <%= render :partial => "benches/list" %> + </td> + <td class=content align=left valign=top width="80%"> + + <% if @bench.nil? %> + No benchmark + <% else %> + <table width="100%"> + <tr><td> + <%= render :partial => "benches/menubar" %> + </td></tr> + <tr><td> + <%= @content_for_layout %> + </td></tr> + </table> + <% end %> + + </td> + </tr> + </table> + </p> + + <%= render :partial => "layouts/bottom_banner" %> + </body> +</html> + + Index: web/ranch/app/views/benches/_list.rhtml --- web/ranch/app/views/benches/_list.rhtml (revision 0) +++ web/ranch/app/views/benches/_list.rhtml (revision 0) @@ -0,0 +1,30 @@ +  +<table> + <tr> + <td> + <%= link_to @project.name, :controller => "projects", + :action => "index", + :project_id => @project.id %> + </td> + </tr> + <% if @benches.nil? or @benches.empty? %> + No benchmarks available. + <% else %> + <tr> + <td> + <table> + <% for bench in @benches %> + <tr> + <td width=10></td> + <td> + <%= link_to bench.name, :controller => "benches", + :action => "show", + :bench_id => bench.id %> + </td> + </tr> + <% end %> + </table> + </td> + </tr> + <% end %> +</table> Index: web/ranch/app/views/benches/show.rhtml --- web/ranch/app/views/benches/show.rhtml (revision 0) +++ web/ranch/app/views/benches/show.rhtml (revision 0) @@ -0,0 +1,10 @@ +  + +<p> +<table> + <tr> + <td>Name:</td> + <td><%= @bench.name %></td> + </tr> +</table> +</p> Index: web/ranch/app/views/benches/_menubar.rhtml --- web/ranch/app/views/benches/_menubar.rhtml (revision 0) +++ web/ranch/app/views/benches/_menubar.rhtml (revision 0) @@ -0,0 +1,12 @@ +  +<table> + <tr> + <td><%= content_tag "h3", @bench.name %></td> + <td> + <%= link_to "show", :controller => "benches", + :action => "show", + :bench_id => @bench.id %> + </td> + </tr> +</table> +<hr> Index: web/ranch/app/views/projects/_menubar.rhtml --- web/ranch/app/views/projects/_menubar.rhtml (revision 47) +++ web/ranch/app/views/projects/_menubar.rhtml (working copy) @@ -7,6 +7,11 @@ :action => "show", :project_id => @project.id %> </td> + <td> + <%= link_to "benchmarks", :controller => "benches", + :action => "index", + :project_id => @project.id %> + </td> </tr> </table> <hr>

1 0

[ranch] 47: Add project menu bar.
by Nicolas Despr�s 19 Nov '05

19 Nov '05

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Add project menu bar. * web/ranch/app/views/layouts/projects.rhtml: Include the menu bar in the page. * web/ranch/app/views/projects/_menubar.rhtml: New. Menu bar for the project controller. * web/ranch/app/views/projects/show.rhtml: No longer display the name of the project since it's displayed in the menu bar. layouts/projects.rhtml | 13 ++++++++++++- projects/_menubar.rhtml | 12 ++++++++++++ projects/show.rhtml | 8 -------- 3 files changed, 24 insertions(+), 9 deletions(-) Index: web/ranch/app/views/layouts/projects.rhtml --- web/ranch/app/views/layouts/projects.rhtml (revision 46) +++ web/ranch/app/views/layouts/projects.rhtml (working copy) @@ -7,14 +7,25 @@ <%= render :partial => "layouts/menubar" %> <p> - <table cellspacing=0 cellpadding=0 border=0 width='100%' height="80%" cols=2> + <table cellspacing=0 cellpadding=0 border=0 width="100%" height="80%" cols=2> <tr> <td class=left_margin valign=top width="15%"> <%= render :partial => "projects/list" %> </td> <td class=content align=left valign=top width="80%"> + <% if @project.nil? %> + No project + <% else %> + <table width="100%"> + <tr><td> + <%= render :partial => "projects/menubar" %> + </td></tr> + <tr><td> <%= @content_for_layout %> + </td></tr> + </table> + <% end %> </td> </tr> Index: web/ranch/app/views/projects/_menubar.rhtml --- web/ranch/app/views/projects/_menubar.rhtml (revision 0) +++ web/ranch/app/views/projects/_menubar.rhtml (revision 0) @@ -0,0 +1,12 @@ +  +<table> + <tr> + <td><%= content_tag "h3", @project.name %></td> + <td> + <%= link_to "show", :controller => "projects", + :action => "show", + :project_id => @project.id %> + </td> + </tr> +</table> +<hr> Index: web/ranch/app/views/projects/show.rhtml --- web/ranch/app/views/projects/show.rhtml (revision 46) +++ web/ranch/app/views/projects/show.rhtml (working copy) @@ -1,11 +1,5 @@  -<% if @project.nil? %> - No project to show -<% else %> - -<%= content_tag "h3", "#{(a)project.name}" %> - <p> <table> <tr> @@ -14,5 +8,3 @@ </tr> </table> </p> - -<% end %> \ No newline at end of file

1 0

[ranch] 46: Start to change the main layout.
by Nicolas Despr�s 19 Nov '05

19 Nov '05

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Start to change the main layout. * web/ranch/test/functional/projects_controller_test.rb: Test the index request. * web/ranch/app/controllers/ranch_controller.rb, * web/ranch/app/controllers/projects_controller.rb: Change the layout. * web/ranch/app/views/layouts/_menubar.rhtml: Add the projects item. * web/ranch/app/views/layouts/projects.rhtml: New. Layout for the projects controller. * web/ranch/app/views/projects/_list.rhtml: New. Left margin of project layout that list all the project. * web/ranch/app/views/projects/show.rhtml: Test whether there is a project to show. app/controllers/projects_controller.rb | 14 ++++++++++++-- app/controllers/ranch_controller.rb | 4 +--- app/views/layouts/_menubar.rhtml | 5 ++--- app/views/layouts/projects.rhtml | 28 ++++++++++++++++++++++++++++ app/views/projects/_list.rhtml | 16 ++++++++++++++++ app/views/projects/show.rhtml | 6 ++++++ test/functional/projects_controller_test.rb | 10 ++++++++++ 7 files changed, 75 insertions(+), 8 deletions(-) Index: web/ranch/test/functional/projects_controller_test.rb --- web/ranch/test/functional/projects_controller_test.rb (revision 45) +++ web/ranch/test/functional/projects_controller_test.rb (working copy) @@ -13,11 +13,21 @@ @response = ActionController::TestResponse.new end + def test_index + get :index + assert_response :redirect + assert_redirected_to(:controller => 'projects', + :action => 'show', + :project_id => 2) + assert_not_nil assigns(:projects) + end + def test_show get :show, { :project_id => 1 } assert_response :success assert_template 'show' assert_not_nil assigns(:project) + assert_not_nil assigns(:projects) end end Index: web/ranch/app/controllers/ranch_controller.rb --- web/ranch/app/controllers/ranch_controller.rb (revision 45) +++ web/ranch/app/controllers/ranch_controller.rb (working copy) @@ -1,8 +1,6 @@ class RanchController < ApplicationController - layout 'ranch_benches_list' - - before_filter LoadProjectsFilter + layout 'ranch' def index end Index: web/ranch/app/controllers/projects_controller.rb --- web/ranch/app/controllers/projects_controller.rb (revision 45) +++ web/ranch/app/controllers/projects_controller.rb (working copy) @@ -1,11 +1,21 @@ class ProjectsController < ApplicationController - layout 'ranch_benches_list' + layout 'projects' - before_filter LoadProjectsFilter + before_filter :list + + def index + redirect_to :action => 'show', :project_id => @projects.first.id + end def show @project = Project.find_by_id params[:project_id] end + protected + + def list + @projects = Project.find :all, :select => 'id, name', :order => 'name' + end + end Index: web/ranch/app/views/layouts/_menubar.rhtml --- web/ranch/app/views/layouts/_menubar.rhtml (revision 45) +++ web/ranch/app/views/layouts/_menubar.rhtml (working copy) @@ -3,9 +3,8 @@ <div style="text-align: center;"> <table class=menubar align=center valign=top> <tr> - <td> - <%= link_to "Home", :controller => "ranch", :action => "index" %> - </td> + <td><%= link_to "Home", :controller => "ranch" %></td> + <td><%= link_to "Projects", :controller => "projects" %></td> </tr> </table> <hr> Index: web/ranch/app/views/layouts/projects.rhtml --- web/ranch/app/views/layouts/projects.rhtml (revision 0) +++ web/ranch/app/views/layouts/projects.rhtml (revision 0) @@ -0,0 +1,28 @@ +  + +<html> + <%= render :partial => "layouts/head" %> + <body> + <%= render :partial => "layouts/top_banner" %> + <%= render :partial => "layouts/menubar" %> + + <p> + <table cellspacing=0 cellpadding=0 border=0 width='100%' height="80%" cols=2> + <tr> + <td class=left_margin valign=top width="15%"> + <%= render :partial => "projects/list" %> + </td> + <td class=content align=left valign=top width="80%"> + + <%= @content_for_layout %> + + </td> + </tr> + </table> + </p> + + <%= render :partial => "layouts/bottom_banner" %> + </body> +</html> + + Index: web/ranch/app/views/projects/_list.rhtml --- web/ranch/app/views/projects/_list.rhtml (revision 0) +++ web/ranch/app/views/projects/_list.rhtml (revision 0) @@ -0,0 +1,16 @@ +  +<table> + <% if @projects.nil? or @projects.empty? %> + No projects available. + <% else %> + <% for project in @projects %> + <tr> + <td> + <%= link_to project.name, :controller => "projects", + :action => "show", + :project_id => project.id %> + </td> + </tr> + <% end %> + <% end %> +</table> Index: web/ranch/app/views/projects/show.rhtml --- web/ranch/app/views/projects/show.rhtml (revision 45) +++ web/ranch/app/views/projects/show.rhtml (working copy) @@ -1,5 +1,9 @@  +<% if @project.nil? %> + No project to show +<% else %> + <%= content_tag "h3", "#{(a)project.name}" %> <p> @@ -10,3 +14,5 @@ </tr> </table> </p> + +<% end %> \ No newline at end of file

1 0

[ranch] 45: Remove useless file.
by Nicolas Despr�s 19 Nov '05

19 Nov '05

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Remove useless file. * web/ranch/app/views/layouts/_banner.rhtml: Remove. 0 files changed

1 0

[ranch] 44: Change error messages position.
by Nicolas Despr�s 19 Nov '05

19 Nov '05

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Change error messages position. * web/ranch/app/views/graph_form/draw.rhtml: Display error messages at the same place that the graph. draw.rhtml | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) Index: web/ranch/app/views/graph_form/draw.rhtml --- web/ranch/app/views/graph_form/draw.rhtml (revision 43) +++ web/ranch/app/views/graph_form/draw.rhtml (working copy) @@ -67,7 +67,6 @@ </table> </p> -<p style="color: red;"><%= flash[:error] %></p> <p><%= submit_tag "Draw" %></p> <%= end_form_tag %> @@ -90,6 +89,10 @@ @output_arg_num, @input_set_num %> <% end %> <% else %> + <% if flash[:error] %> + <p style="color: red;"><%= flash[:error] %></p> + <% else %> <%= content_tag "p", "No chart to display - click on Draw" %> <% end %> +<% end %>

1 0

[ranch] 43: Update test case.
by Nicolas Despr�s 19 Nov '05

19 Nov '05

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Update test case. * web/ranch/test/functional/graph_form_controller_test.rb: Update the test cases to fit to the view new name. Test the bad revision format issue. graph_form_controller_test.rb | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) Index: web/ranch/test/functional/graph_form_controller_test.rb --- web/ranch/test/functional/graph_form_controller_test.rb (revision 42) +++ web/ranch/test/functional/graph_form_controller_test.rb (working copy) @@ -16,7 +16,7 @@ def test_index get :index, { :bench_id => 1 } assert_response :success - assert_template 'index' + assert_template 'draw' assert_not_nil assigns(:project) assert_not_nil assigns(:bench) @@ -31,10 +31,10 @@ def test_draw_regular_revision_range post :draw, { :bench_id => 1, - :revision => { :start => 2, :stop => 8 } + :revision => { :range => "2-8" } } assert_response :success - assert_template 'index' + assert_template 'draw' assert_not_nil assigns(:project) assert_not_nil assigns(:bench) @@ -50,10 +50,10 @@ def test_draw_bad_revision_range post :draw, { :bench_id => 1, - :revision => { :start => -42, :stop => 500 } + :revision => { :range => "-42-500" } } assert_response :success - assert_template 'index' + assert_template 'draw' assert_not_nil assigns(:project) assert_not_nil assigns(:bench) @@ -69,7 +69,7 @@ def test_draw_start_sup_stop post :draw, { :bench_id => 1, - :revision => { :start => 42, :stop => 10 } + :revision => { :range => "42-10" } } assert_response :redirect assert_redirected_to :action => 'index' @@ -85,11 +85,11 @@ def test_draw_output_arg_num post :draw, { :bench_id => 1, - :revision => { :start => 1, :stop => 10 }, + :revision => { :range => "1-10" }, :output_arg_num => 0, } assert_response :success - assert_template 'index' + assert_template 'draw' assert_equal 1, assigns(:project).id assert_equal 'determinize', assigns(:bench).name @@ -99,4 +99,20 @@ assert_not_nil assigns(:input_set_num) end + def test_draw_bad_revision_format + post :draw, { + :bench_id => 1, + :revision => { :range => "-42---10" } + } + assert_response :redirect + assert_redirected_to :action => 'index' + + assert_equal 1, assigns(:project).id + assert_equal 'determinize', assigns(:bench).name + assert(flash.has_key?(:error)) + assert_not_nil assigns(:output_arg_num) + assert_not_nil assigns(:inputs) + assert_not_nil assigns(:input_set_num) + end + end

1 0

[ranch] 42: Rename index to draw.
by Nicolas Despr�s 19 Nov '05

19 Nov '05

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Rename index to draw. * web/ranch/app/controllers/graph_form_controller.rb: The index request use the draw template. * web/ranch/app/views/graph_form/draw.rhtml: Rename to ... * web/ranch/app/views/graph_form/index.rhtml: ...that. graph_form_controller.rb | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: web/ranch/app/controllers/graph_form_controller.rb --- web/ranch/app/controllers/graph_form_controller.rb (revision 41) +++ web/ranch/app/controllers/graph_form_controller.rb (working copy) @@ -19,6 +19,7 @@ @revision[:stop] = @project.head_revision @revision[:start] = @revision[:stop] - DEFAULT_REVISION_RANGE @revision[:start] = 1 if @revision[:start] < 1 + render :action => 'draw' end def draw @@ -40,7 +41,6 @@ @revision = get_revision_range(params[:revision][:range]) if flash[:error].nil? @draw_on = true - render :action => 'index' else redirect_to(:action => 'index', :bench_id => @bench.id) end

1 0

[ranch] 41: Check revision input format.
by Nicolas Despr�s 19 Nov '05

19 Nov '05

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Check revision input format. * web/ranch/app/controllers/graph_form_controller.rb: Extract the start revision and the stop revision from the input field using a regular expression. * web/ranch/app/views/graph_form/index.rhtml: Only one text field is needed now (the new format is start_rev-stop_rev). controllers/graph_form_controller.rb | 31 ++++++++++++++++++++++--------- views/graph_form/index.rhtml | 10 ++++------ 2 files changed, 26 insertions(+), 15 deletions(-) Index: web/ranch/app/controllers/graph_form_controller.rb --- web/ranch/app/controllers/graph_form_controller.rb (revision 40) +++ web/ranch/app/controllers/graph_form_controller.rb (working copy) @@ -37,20 +37,33 @@ "ORDER BY outputs.arg_num " @output_arg_nb = @output_arg_nb.size end - @revision = params[:revision] - head_rev = @project.head_revision - @revision[:stop] = @revision[:stop].to_i - @revision[:stop] = head_rev if @revision[:stop] > head_rev - @revision[:start] = @revision[:start].to_i - @revision[:start] = 1 if @revision[:start] < 1 - if @revision[:start] < @revision[:stop] + @revision = get_revision_range(params[:revision][:range]) + if flash[:error].nil? @draw_on = true render :action => 'index' else - flash[:error] = 'The start revision must be lesser than ' + - 'the stop revision.' redirect_to(:action => 'index', :bench_id => @bench.id) end end + protected + + def get_revision_range(revision, head_rev=(a)project.head_revision) + result = {} + if revision =~ /^(-?\d+)-(-?\d+)$/ + result[:start] = $1 + result[:stop] = $2 + result[:stop] = result[:stop].to_i + result[:stop] = head_rev if result[:stop] > head_rev + result[:start] = result[:start].to_i + result[:start] = 1 if result[:start] < 1 + if result[:start] > result[:stop] + flash[:error] = 'Start revision greater than stop revision.' + end + else + flash[:error] = "Bad revision range format." + end + result + end + end Index: web/ranch/app/views/graph_form/index.rhtml --- web/ranch/app/views/graph_form/index.rhtml (revision 40) +++ web/ranch/app/views/graph_form/index.rhtml (working copy) @@ -12,12 +12,10 @@ <td> <table> <tr> - <td>from</td> - <td><%= text_field "revision", "start", "size" => 8, - "value" => @revision[:start] %></td> - <td>to</td> - <td><%= text_field "revision", "stop", "size" => 8, - "value" => @revision[:stop] %></td> + <td> + <%= text_field "revision", "range", "size" => 16, + "value" => "#{@revision[:start]}-#{@revision[:stop]}" %> + </td> </tr> </table> </td>

1 0

[ranch] 40: Move the revision field from benches to outputs.
by Nicolas Despr�s 18 Nov '05

18 Nov '05

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Move the revision field from benches to outputs. * web/ranch/test/fixtures/outputs.yml: The bench_id is now always equal to one. * web/ranch/test/fixtures/benches.yml: No longer iteration over revision. * web/ranch/app/models/bench.rb: Overload input request to force to order by set_num and arg_num. * web/ranch/app/controllers/graph_form_controller.rb, * web/ranch/app/controllers/graph_controller.rb: Only takes the bench id as parameter. Query only on the outputs table. * web/ranch/app/views/layouts/_left_margin.rhtml: Only gives the bench id as parameter. * web/ranch/test/functional/graph_form_controller_test.rb, * web/ranch/app/helpers/graph_helper.rb, * web/ranch/app/views/graph_form/index.rhtml: Update to the new parameter signature. app/controllers/graph_controller.rb | 23 +++++++---------- app/controllers/graph_form_controller.rb | 34 ++++++-------------------- app/helpers/graph_helper.rb | 6 +--- app/models/bench.rb | 6 ++++ app/views/graph_form/index.rhtml | 11 +++----- app/views/layouts/_left_margin.rhtml | 3 -- test/fixtures/benches.yml | 4 --- test/fixtures/outputs.yml | 4 ++- test/functional/graph_form_controller_test.rb | 24 +++++++----------- 9 files changed, 47 insertions(+), 68 deletions(-) Index: web/ranch/test/functional/graph_form_controller_test.rb --- web/ranch/test/functional/graph_form_controller_test.rb (revision 39) +++ web/ranch/test/functional/graph_form_controller_test.rb (working copy) @@ -14,12 +14,12 @@ end def test_index - get :index, { :project_id => 1, :bench_name => 'determinize' } + get :index, { :bench_id => 1 } assert_response :success assert_template 'index' assert_not_nil assigns(:project) - assert_not_nil assigns(:bench_name) + assert_not_nil assigns(:bench) assert_not_nil assigns(:output_arg_num) assert_not_nil assigns(:inputs) assert !assigns(:draw_on) @@ -30,15 +30,14 @@ def test_draw_regular_revision_range post :draw, { - :project_id => 1, - :bench_name => 'determinize', + :bench_id => 1, :revision => { :start => 2, :stop => 8 } } assert_response :success assert_template 'index' assert_not_nil assigns(:project) - assert_not_nil assigns(:bench_name) + assert_not_nil assigns(:bench) assert_not_nil assigns(:output_arg_num) assert_not_nil assigns(:inputs) assert_not_nil assigns(:input_set_num) @@ -50,15 +49,14 @@ def test_draw_bad_revision_range post :draw, { - :project_id => 1, - :bench_name => 'determinize', + :bench_id => 1, :revision => { :start => -42, :stop => 500 } } assert_response :success assert_template 'index' assert_not_nil assigns(:project) - assert_not_nil assigns(:bench_name) + assert_not_nil assigns(:bench) assert_not_nil assigns(:output_arg_num) assert_not_nil assigns(:inputs) assert_not_nil assigns(:input_set_num) @@ -70,15 +68,14 @@ def test_draw_start_sup_stop post :draw, { - :project_id => 1, - :bench_name => 'determinize', + :bench_id => 1, :revision => { :start => 42, :stop => 10 } } assert_response :redirect assert_redirected_to :action => 'index' assert_equal 1, assigns(:project).id - assert_equal 'determinize', assigns(:bench_name) + assert_equal 'determinize', assigns(:bench).name assert(flash.has_key?(:error)) assert_not_nil assigns(:output_arg_num) assert_not_nil assigns(:inputs) @@ -87,8 +84,7 @@ def test_draw_output_arg_num post :draw, { - :project_id => 1, - :bench_name => 'determinize', + :bench_id => 1, :revision => { :start => 1, :stop => 10 }, :output_arg_num => 0, } @@ -96,7 +92,7 @@ assert_template 'index' assert_equal 1, assigns(:project).id - assert_equal 'determinize', assigns(:bench_name) + assert_equal 'determinize', assigns(:bench).name assert_equal 0, assigns(:output_arg_num) assert_equal 3, assigns(:output_arg_nb) assert_not_nil assigns(:inputs) Index: web/ranch/test/fixtures/outputs.yml --- web/ranch/test/fixtures/outputs.yml (revision 39) +++ web/ranch/test/fixtures/outputs.yml (working copy) @@ -1,5 +1,7 @@ <% id = 0 %> +# Ouputs for the determinize (id = 1) bench. + <% outputs = { 'utime' => { :unit => 'sec', :val => 20, :inc => -1 }, 'memory' => { :unit => 'KB', :val => 50000, :inc => -1000 }, @@ -18,7 +20,7 @@ name: <%= name %> unit: <%= desc[:unit].inspect %> value: <%= desc[:val] += desc[:inc] + set_num * 10%> - bench_id: <%= rev %> + bench_id: <%= 1 %> arg_num: <%= arg_num += 1 %> set_num: <%= set_num %> system_id: 0 Index: web/ranch/test/fixtures/benches.yml --- web/ranch/test/fixtures/benches.yml (revision 39) +++ web/ranch/test/fixtures/benches.yml (working copy) @@ -1,11 +1,9 @@ <% id = 0 %> -<% (1..10).each do |rev| %> -<%= "determinize_r#{rev}:" %> +determinize: id: <%= id += 1 %> project_id: 1 name: determinize -<% end %> quotient: id: <%= id += 1 %> Index: web/ranch/app/helpers/graph_helper.rb --- web/ranch/app/helpers/graph_helper.rb (revision 39) +++ web/ranch/app/helpers/graph_helper.rb (working copy) @@ -1,7 +1,6 @@ module GraphHelper - def graph_reg_tag(project_id, - bench_name, + def graph_reg_tag(bench_id, rev_start, rev_stop, arg_num, @@ -10,8 +9,7 @@ url = { :controller => 'graph', :action => 'regression', - :project_id => project_id, - :bench_name => bench_name, + :bench_id => bench_id, :rev_start => rev_start, :rev_stop => rev_stop, :arg_num => arg_num, Index: web/ranch/app/models/bench.rb --- web/ranch/app/models/bench.rb (revision 39) +++ web/ranch/app/models/bench.rb (working copy) @@ -6,4 +6,10 @@ validates_presence_of :name validates_length_of :name, :maximum => 255 + def input + Input.find(:all, + :conditions => [ "bench_id = ?", id ], + :order => "set_num, arg_num") + end + end Index: web/ranch/app/controllers/graph_controller.rb --- web/ranch/app/controllers/graph_controller.rb (revision 39) +++ web/ranch/app/controllers/graph_controller.rb (working copy) @@ -3,20 +3,17 @@ load 'grapher.rb' def regression - @project = Project.find params[:project_id] - @bench_name = params[:bench_name] + @bench = Bench.find_by_id params[:bench_id] + @project = @bench.project - results = Bench.find_by_sql "SELECT outputs.value, outputs.name, " + - "outputs.unit, benches.revision " + - "FROM outputs, benches " + - "WHERE benches.project_id = #{(a)project.id} " + - "AND benches.name = '#@bench_name' " + - "AND outputs.bench_id = benches.id " + - "AND outputs.arg_num = #{params[:arg_num]} " + - "AND outputs.set_num = #{params[:input_set_num]} " + - "AND #{params[:rev_start]} <= benches.revision " + - "AND benches.revision <= #{params[:rev_stop]} " + - "ORDER BY benches.revision" + results = Bench.find_by_sql "SELECT value, name, unit, revision " + + "FROM outputs " + + "WHERE bench_id = #{(a)bench.id} " + + "AND arg_num = #{params[:arg_num]} " + + "AND set_num = #{params[:input_set_num]} " + + "AND #{params[:rev_start]} <= revision " + + "AND revision <= #{params[:rev_stop]} " + + "ORDER BY revision" data = results.collect { |v| v.value.to_f } labels = results.collect { |v| "r#{v.revision}" } Index: web/ranch/app/controllers/graph_form_controller.rb --- web/ranch/app/controllers/graph_form_controller.rb (revision 39) +++ web/ranch/app/controllers/graph_form_controller.rb (working copy) @@ -9,9 +9,9 @@ DEFAULT_REVISION_RANGE = 100 def index - @bench_name = params[:bench_name] - @project = Project.find params[:project_id] - select_inputs + @bench = Bench.find_by_id params[:bench_id] + @project = @bench.project + @inputs = @bench.input @intput_set_num = 0 @output_arg_num = 0 @draw_on = false @@ -22,18 +22,16 @@ end def draw - @bench_name = params[:bench_name] - @project = Project.find params[:project_id] + @bench = Bench.find_by_id params[:bench_id] + @project = @bench.project @draw_on = true - select_inputs + @inputs = @bench.input @input_set_num = params[:input_set_num].to_i @output_arg_num = params[:output_arg_num].to_i if @output_arg_num.zero? @output_arg_nb = Output.find_by_sql "SELECT outputs.arg_num " + - "FROM outputs, benches " + - "WHERE benches.project_id = #{(a)project.id} " + - "AND benches.name = '#@bench_name' " + - "AND outputs.bench_id = benches.id " + + "FROM outputs " + + "WHERE outputs.bench_id = #{(a)bench.id} " + "AND outputs.set_num = #@input_set_num " + "GROUP BY outputs.arg_num " + "ORDER BY outputs.arg_num " @@ -51,22 +49,8 @@ else flash[:error] = 'The start revision must be lesser than ' + 'the stop revision.' - redirect_to(:action => 'index', - :project_id => @project.id, - :bench_name => @bench_name) + redirect_to(:action => 'index', :bench_id => @bench.id) end end - protected - - def select_inputs - @inputs = Input.find_by_sql "SELECT inputs.name, inputs.unit, " + - "inputs.value, inputs.arg_num, inputs.set_num " + - "FROM inputs, benches " + - "WHERE benches.id = #{(a)project.id} " + - "AND benches.name = '#@bench_name' " + - "AND benches.id = inputs.bench_id " + - "ORDER BY inputs.set_num, inputs.arg_num" - end - end Index: web/ranch/app/views/layouts/_left_margin.rhtml --- web/ranch/app/views/layouts/_left_margin.rhtml (revision 39) +++ web/ranch/app/views/layouts/_left_margin.rhtml (working copy) @@ -19,8 +19,7 @@ <td> <%= link_to bench.name, :controller => "graph_form", :action => "index", - :project_id => project.id, - :bench_name => bench.name %> + :bench_id => bench.id %> </td> </tr> <% end %> Index: web/ranch/app/views/graph_form/index.rhtml --- web/ranch/app/views/graph_form/index.rhtml (revision 39) +++ web/ranch/app/views/graph_form/index.rhtml (working copy) @@ -1,8 +1,7 @@  -<%= content_tag "h3", "#{(a)project.name}: #{@bench_name}" %> +<%= content_tag "h3", "#{(a)project.name}: #{(a)bench.name}" %> <%= start_form_tag :action => "draw", - :project_id => @project.id, - :bench_name => @bench_name %> + :bench_id => @bench.id %> <table cellspacing=10> @@ -60,7 +59,7 @@ <td> <table> <tr> - <td><%= outputs_tag "output_arg_num", @bench_name, @output_arg_num %></td> + <td><%= outputs_tag "output_arg_num", @bench.name, @output_arg_num %></td> </tr> </td> </table> @@ -82,13 +81,13 @@ <% if @output_arg_num.zero? %> <% 1.upto(@output_arg_nb) do |i| %> <p> - <%= graph_reg_tag @project.id, @bench_name, + <%= graph_reg_tag @bench.id, @revision[:start], @revision[:stop], i, @input_set_num %> </p> <% end %> <% else %> - <%= graph_reg_tag @project.id, @bench_name, + <%= graph_reg_tag @bench.id, @revision[:start], @revision[:stop], @output_arg_num, @input_set_num %> <% end %>

1 0