Merge branch 'refactoring_repository' into refactoring_processing

João M. M. da Silva
2 parents 8d632aba 63ab22be
Showing 5 changed files with 81 additions and 70 deletions Show diff stats
plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
plugins/mezuro/public/javascripts/processing.js
plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb
plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
plugins/mezuro/views/mezuro_plugin_repository/new.html.erb
-#TODO terminar esse controler e seus testes funcionais
 class MezuroPluginRepositoryController < MezuroPluginProfileController
  
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
@@ -55,18 +54,18 @@ class MezuroPluginRepositoryController &lt; MezuroPluginProfileController
     end
   end
  
-  def show #TODO verificar data_content e data_profile
+  def show 
     project_content = profile.articles.find(params[:id])
     @project_name = project_content.name
-    @repository = project_content.repositories.select{ |repository| repository.id == params[:repository_id].to_s }.first
+    @repository = project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
     @configuration_name = Kalibro::Configuration.configuration_of(@repository.id).name
     @data_profile = project_content.profile.identifier
     @data_content = project_content.id
   end
  
-  def destroy #TODO verificar se está correto
+  def destroy
     project_content = profile.articles.find(params[:id])
-    repository = project_content.repositories.select{ |repository| repository.id == params[:repository_id].to_s }.first
+    repository = project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
     repository.destroy
     if( repository.errors.empty? )
       redirect_to "/#{profile.identifier}/#{project_content.name.downcase.gsub(/\s/, '-')}"
@@ -2,17 +2,18 @@ var processingTree = false;
 var metricName;
 jQuery(function (){
   jQuery('.source-tree-link').live("click", reloadModule);
-  jQuery('[show-metric-history]').live("click", display_metric_history);
-  jQuery('[show-grade-history]').live("click", display_grade_history);
-  jQuery('#project_date_submit').live("click", reloadProjectWithDate);
+  jQuery('[show-metric-history]').live("click", display_metric_history); //TODO review for project history
+  jQuery('[show-grade-history]').live("click", display_grade_history); //TODO review for project history
+  jQuery('#project_date_submit').live("click", reloadProjectWithDate); //TODO review for project history
   showLoadingProcess(true);
   showProcessing();
 });
  
 function showProcessing() {
-  callAction('processing', 'processing_state', {}, showProcessingFor);
+  callAction('processing', 'processing', {}, showProcessingFor);
 }
  
+//TODO review for project history
 function display_metric_history() {
   var module_name = jQuery(this).attr('data-module-name');
   var metric_name = jQuery(this).attr('show-metric-history');
@@ -22,6 +23,7 @@ function display_metric_history() {
   return false;
 }
  
+//TODO review for project history
 function display_grade_history() {
   var module_name = jQuery(this).attr('data-module-name');
   toggle_mezuro("#historical-grade");
@@ -29,10 +31,12 @@ function display_grade_history() {
   return false;
 }
  
+//TODO review for project history
 function show_metrics(content) {
   jQuery('#historical-' + metricName).html(content);
 }
  
+//TODO review for project history
 function show_grades(content) {
   jQuery('#historical-grade').html(content);
 }
@@ -42,6 +46,7 @@ function toggle_mezuro(element){
   return false;
 }
  
+//TODO Waiting for ModuleResultController refactoring
 function reloadModule(){
   var results_root_id = jQuery(this).attr('results_root_id');
   showLoadingProcess(false);
@@ -51,11 +56,13 @@ function reloadModule(){
   return false;
 }
  
+//TODO review for project history
 function reloadProjectWithDate(date){
 	reloadProject(date + "T00:00:00+00:00");
   return false;
 }
  
+//TODO review for project history
 function reloadProject(date){
   showLoadingProcess(true);
  
@@ -73,9 +80,9 @@ function showProcessingFor(state){
     jQuery('#msg-time').html('');
     jQuery('#processing-state').html('<div style="color:Green">READY</div>');
     callAction('processing', 'processing', {}, showProcessing);
-    callAction('module_result','project_tree', {}, showProjectTree);
-    var module_result_id = jQuery("#processing").attr('results_root_id');
-    callAction('module_result', 'module_result', {module_result_id: module_result_id}, showModuleResult);
+    callAction('processing','project_tree', {}, showProjectTree);
+    //var module_result_id = jQuery("#processing").attr('results_root_id'); //TODO Waiting for ModuleResultController refactoring
+    //callAction('module_result', 'module_result', {module_result_id: module_result_id}, showModuleResult); //TODO Waiting for ModuleResultController refactoring
   } 
   else if (state.endsWith("ING")) {
     jQuery('#processing-state').html('<div style="color:DarkGoldenRod">'+ state +'</div>');
@@ -102,6 +109,7 @@ function showProjectTree(content){
 	return false;
 }
  
+//TODO Waiting for ModuleResultController refactoring
 function showModuleResult(content){
   if (processingTree != true){ 
     jQuery('#module-result').html(content);
@@ -6,7 +6,6 @@ require &quot;#{RAILS_ROOT}/plugins/mezuro/test/fixtures/repository_fixtures&quot;
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_content_fixtures"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/configuration_fixtures"
  
-#TODO terminar os testes
 class MezuroPluginRepositoryControllerTest < ActionController::TestCase
  
   def setup
@@ -87,14 +86,36 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
     assert_response :redirect
   end
  
-  should 'set variables to show a repository' do #TODO Terminar esse teste
+  should 'set variables to show a repository' do
     Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
     Kalibro::Configuration.expects(:configuration_of).with(@repository.id).returns(@configuration)
  
+    get :show, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
     assert_equal @content.name, assigns(:project_name)
     assert_equal @repository, assigns(:repository)
-#   @configuration_name = Kalibro::Configuration.find(@repository.configuration_id).name
-#   @processing = processing(@repository.id)
+    assert_equal @configuration.name, assigns(:configuration_name)
+    assert_equal @content.profile.identifier, assigns(:data_profile)
+    assert_equal @content.id, assigns(:data_content)
   end
  
+  should 'destroy a repository' do
+    @repository.expects(:destroy)    
+    Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
+
+    get :destroy, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
+
+    assert @repository.errors.empty?
+    assert_response :redirect
+  end
+
+  should 'not destroy a repository' do
+    @repository.errors = [Exception.new]
+    @repository.expects(:destroy)    
+    Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
+
+    get :destroy, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
+
+    assert !@repository.errors.empty?
+    assert_response :redirect
+  end
 end
@@ -4,39 +4,29 @@
   <%= hidden_field_tag :id, @project_content.id %>
  
   <%= f.hidden_field :id%>
-  <p>
-    <%= f.label :name, "Name:" %>
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :description, "Description:" %>
-    <%= f.text_field :description %>
-  </p>
+  <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
  
-  <p>
-    <%= required labelled_form_field _('License'),
-    f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %><br/>
-  </p>
+  <div class="formfieldline">
+    <%= f.label :description, "Description:", :class => 'formlabel' %>
+    <div class="formfield type-text">  
+      <%= f.text_field :description %>
+    </div>
+  </div>
  
-  <p>
-    <%= f.label :process_period, "Process Period:" %>
-    <%= f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options, :selected => @repository.process_period.to_i) %>
-  </p>
+  <%= required labelled_form_field _('License'),
+  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options, :selected => @repository.license) %>
  
-  <p>
-    <%= f.label :type, "Type:" %>
-    <%= f.select :type, @repository_types%>
-  </p>
+  <%= required labelled_form_field _('Process Period'),
+  f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options, :selected => @repository.process_period.to_i) %>
  
-  <p>
-    <%= f.label :address, "Address:" %>
-    <%= f.text_field :address%>
-  </p>
+  <%= required labelled_form_field _('Type'),
+  f.select(:type, @repository_types, :selected => @repository.type) %>
  
-  <p>
-    <%= f.label :configuration_id, "Configuration:" %>
-    <%= f.select :configuration_id, @configuration_select, :selected => @repository.configuration_id.to_i %>
-  </p>
+  <%= required labelled_form_field _('Address'),
+  f.text_field(:address) %>
+
+  <%= required labelled_form_field _('Configuration'),
+  f.select(:configuration_id, @configuration_select, :selected => @repository.configuration_id.to_i) %>
  
   <p>
     <%= f.submit "Add" %>
@@ -3,36 +3,29 @@
 <% form_for :repository, :url => {:action =>"create", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
   <%= hidden_field_tag :id, @project_content.id %>
  
-  <p>
-    <%= f.label :name, "Name:" %>
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :description, "Description:" %>
-    <%= f.text_field :description %>
-  </p>
+  <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
+
+  <div class="formfieldline">
+    <%= f.label :description, "Description:", :class => 'formlabel' %>
+    <div class="formfield type-text">  
+      <%= f.text_field :description %>
+    </div>
+  </div>
  
   <%= required labelled_form_field _('License'),
-  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %><br/>
-  <p>
-  
-  <p>
-    <%= f.label :process_period, "Process Period:" %>
-    <%= f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options ) %>
-  </p>
-    <%= f.label :type, "Type:" %>
-    <%= f.select :type, @repository_types %>
-  </p>
+  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %>
+
+  <%= required labelled_form_field _('Process Period'),
+  f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options ) %>
  
-  <p>
-    <%= f.label :address, "Address:" %>
-    <%= f.text_field :address %>
-  </p>
+  <%= required labelled_form_field _('Type'),
+  f.select(:type, @repository_types) %>
  
-  </p>
-    <%= f.label :configuration_id, "Configuration:" %>
-    <%= f.select :configuration_id, @configuration_select %>
-  </p>
+  <%= required labelled_form_field _('Address'),
+  f.text_field(:address) %>
+
+  <%= required labelled_form_field _('Configuration'),
+  f.select(:configuration_id, @configuration_select) %>
  
   <p>
     <%= f.submit "Add" %>
1		-#TODO terminar esse controler e seus testes funcionais
2	1	class MezuroPluginRepositoryController < MezuroPluginProfileController
3	2
4	3	append_view_path File.join(File.dirname(__FILE__) + '/../../views')
...	...	@@ -55,18 +54,18 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController
55	54	end
56	55	end
57	56
58		- def show #TODO verificar data_content e data_profile
	57	+ def show
59	58	project_content = profile.articles.find(params[:id])
60	59	@project_name = project_content.name
61		- @repository = project_content.repositories.select{ \|repository\| repository.id == params[:repository_id].to_s }.first
	60	+ @repository = project_content.repositories.select{ \|repository\| repository.id.to_s == params[:repository_id] }.first
62	61	@configuration_name = Kalibro::Configuration.configuration_of(@repository.id).name
63	62	@data_profile = project_content.profile.identifier
64	63	@data_content = project_content.id
65	64	end
66	65
67		- def destroy #TODO verificar se está correto
	66	+ def destroy
68	67	project_content = profile.articles.find(params[:id])
69		- repository = project_content.repositories.select{ \|repository\| repository.id == params[:repository_id].to_s }.first
	68	+ repository = project_content.repositories.select{ \|repository\| repository.id.to_s == params[:repository_id] }.first
70	69	repository.destroy
71	70	if( repository.errors.empty? )
72	71	redirect_to "/#{profile.identifier}/#{project_content.name.downcase.gsub(/\s/, '-')}"
...	...
...	...	@@ -2,17 +2,18 @@ var processingTree = false;
2	2	var metricName;
3	3	jQuery(function (){
4	4	jQuery('.source-tree-link').live("click", reloadModule);
5		- jQuery('[show-metric-history]').live("click", display_metric_history);
6		- jQuery('[show-grade-history]').live("click", display_grade_history);
7		- jQuery('#project_date_submit').live("click", reloadProjectWithDate);
	5	+ jQuery('[show-metric-history]').live("click", display_metric_history); //TODO review for project history
	6	+ jQuery('[show-grade-history]').live("click", display_grade_history); //TODO review for project history
	7	+ jQuery('#project_date_submit').live("click", reloadProjectWithDate); //TODO review for project history
8	8	showLoadingProcess(true);
9	9	showProcessing();
10	10	});
11	11
12	12	function showProcessing() {
13		- callAction('processing', 'processing_state', {}, showProcessingFor);
	13	+ callAction('processing', 'processing', {}, showProcessingFor);
14	14	}
15	15
	16	+//TODO review for project history
16	17	function display_metric_history() {
17	18	var module_name = jQuery(this).attr('data-module-name');
18	19	var metric_name = jQuery(this).attr('show-metric-history');
...	...	@@ -22,6 +23,7 @@ function display_metric_history() {
22	23	return false;
23	24	}
24	25
	26	+//TODO review for project history
25	27	function display_grade_history() {
26	28	var module_name = jQuery(this).attr('data-module-name');
27	29	toggle_mezuro("#historical-grade");
...	...	@@ -29,10 +31,12 @@ function display_grade_history() {
29	31	return false;
30	32	}
31	33
	34	+//TODO review for project history
32	35	function show_metrics(content) {
33	36	jQuery('#historical-' + metricName).html(content);
34	37	}
35	38
	39	+//TODO review for project history
36	40	function show_grades(content) {
37	41	jQuery('#historical-grade').html(content);
38	42	}
...	...	@@ -42,6 +46,7 @@ function toggle_mezuro(element){
42	46	return false;
43	47	}
44	48
	49	+//TODO Waiting for ModuleResultController refactoring
45	50	function reloadModule(){
46	51	var results_root_id = jQuery(this).attr('results_root_id');
47	52	showLoadingProcess(false);
...	...	@@ -51,11 +56,13 @@ function reloadModule(){
51	56	return false;
52	57	}
53	58
	59	+//TODO review for project history
54	60	function reloadProjectWithDate(date){
55	61	reloadProject(date + "T00:00:00+00:00");
56	62	return false;
57	63	}
58	64
	65	+//TODO review for project history
59	66	function reloadProject(date){
60	67	showLoadingProcess(true);
61	68
...	...	@@ -73,9 +80,9 @@ function showProcessingFor(state){
73	80	jQuery('#msg-time').html('');
74	81	jQuery('#processing-state').html('<div style="color:Green">READY</div>');
75	82	callAction('processing', 'processing', {}, showProcessing);
76		- callAction('module_result','project_tree', {}, showProjectTree);
77		- var module_result_id = jQuery("#processing").attr('results_root_id');
78		- callAction('module_result', 'module_result', {module_result_id: module_result_id}, showModuleResult);
	83	+ callAction('processing','project_tree', {}, showProjectTree);
	84	+ //var module_result_id = jQuery("#processing").attr('results_root_id'); //TODO Waiting for ModuleResultController refactoring
	85	+ //callAction('module_result', 'module_result', {module_result_id: module_result_id}, showModuleResult); //TODO Waiting for ModuleResultController refactoring
79	86	}
80	87	else if (state.endsWith("ING")) {
81	88	jQuery('#processing-state').html('<div style="color:DarkGoldenRod">'+ state +'</div>');
...	...	@@ -102,6 +109,7 @@ function showProjectTree(content){
102	109	return false;
103	110	}
104	111
	112	+//TODO Waiting for ModuleResultController refactoring
105	113	function showModuleResult(content){
106	114	if (processingTree != true){
107	115	jQuery('#module-result').html(content);
...	...
...	...	@@ -6,7 +6,6 @@ require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/repository_fixtures"
6	6	require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_content_fixtures"
7	7	require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/configuration_fixtures"
8	8
9		-#TODO terminar os testes
10	9	class MezuroPluginRepositoryControllerTest < ActionController::TestCase
11	10
12	11	def setup
...	...	@@ -87,14 +86,36 @@ class MezuroPluginRepositoryControllerTest < ActionController::TestCase
87	86	assert_response :redirect
88	87	end
89	88
90		- should 'set variables to show a repository' do #TODO Terminar esse teste
	89	+ should 'set variables to show a repository' do
91	90	Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
92	91	Kalibro::Configuration.expects(:configuration_of).with(@repository.id).returns(@configuration)
93	92
	93	+ get :show, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
94	94	assert_equal @content.name, assigns(:project_name)
95	95	assert_equal @repository, assigns(:repository)
96		-# @configuration_name = Kalibro::Configuration.find(@repository.configuration_id).name
97		-# @processing = processing(@repository.id)
	96	+ assert_equal @configuration.name, assigns(:configuration_name)
	97	+ assert_equal @content.profile.identifier, assigns(:data_profile)
	98	+ assert_equal @content.id, assigns(:data_content)
98	99	end
99	100
	101	+ should 'destroy a repository' do
	102	+ @repository.expects(:destroy)
	103	+ Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
	104	+
	105	+ get :destroy, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
	106	+
	107	+ assert @repository.errors.empty?
	108	+ assert_response :redirect
	109	+ end
	110	+
	111	+ should 'not destroy a repository' do
	112	+ @repository.errors = [Exception.new]
	113	+ @repository.expects(:destroy)
	114	+ Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
	115	+
	116	+ get :destroy, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
	117	+
	118	+ assert !@repository.errors.empty?
	119	+ assert_response :redirect
	120	+ end
100	121	end
...	...
...	...	@@ -4,39 +4,29 @@
4	4	<%= hidden_field_tag :id, @project_content.id %>
5	5
6	6	<%= f.hidden_field :id%>
7		- <p>
8		- <%= f.label :name, "Name:" %>
9		- <%= f.text_field :name %>
10		- </p>
11		- <p>
12		- <%= f.label :description, "Description:" %>
13		- <%= f.text_field :description %>
14		- </p>
	7	+ <%= required labelled_form_field _('Name:'), f.text_field(:name) %>
15	8
16		- <p>
17		- <%= required labelled_form_field _('License'),
18		- f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %><br/>
19		- </p>
	9	+ <div class="formfieldline">
	10	+ <%= f.label :description, "Description:", :class => 'formlabel' %>
	11	+ <div class="formfield type-text">
	12	+ <%= f.text_field :description %>
	13	+ </div>
	14	+ </div>
20	15
21		- <p>
22		- <%= f.label :process_period, "Process Period:" %>
23		- <%= f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options, :selected => @repository.process_period.to_i) %>
24		- </p>
	16	+ <%= required labelled_form_field _('License'),
	17	+ f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options, :selected => @repository.license) %>
25	18
26		- <p>
27		- <%= f.label :type, "Type:" %>
28		- <%= f.select :type, @repository_types%>
29		- </p>
	19	+ <%= required labelled_form_field _('Process Period'),
	20	+ f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options, :selected => @repository.process_period.to_i) %>
30	21
31		- <p>
32		- <%= f.label :address, "Address:" %>
33		- <%= f.text_field :address%>
34		- </p>
	22	+ <%= required labelled_form_field _('Type'),
	23	+ f.select(:type, @repository_types, :selected => @repository.type) %>
35	24
36		- <p>
37		- <%= f.label :configuration_id, "Configuration:" %>
38		- <%= f.select :configuration_id, @configuration_select, :selected => @repository.configuration_id.to_i %>
39		- </p>
	25	+ <%= required labelled_form_field _('Address'),
	26	+ f.text_field(:address) %>
	27	+
	28	+ <%= required labelled_form_field _('Configuration'),
	29	+ f.select(:configuration_id, @configuration_select, :selected => @repository.configuration_id.to_i) %>
40	30
41	31	<p>
42	32	<%= f.submit "Add" %>
...	...
...	...	@@ -3,36 +3,29 @@
3	3	<% form_for :repository, :url => {:action =>"create", :controller => "mezuro_plugin_repository"}, :method => :get do \|f\| %>
4	4	<%= hidden_field_tag :id, @project_content.id %>
5	5
6		- <p>
7		- <%= f.label :name, "Name:" %>
8		- <%= f.text_field :name %>
9		- </p>
10		- <p>
11		- <%= f.label :description, "Description:" %>
12		- <%= f.text_field :description %>
13		- </p>
	6	+ <%= required labelled_form_field _('Name:'), f.text_field(:name) %>
	7	+
	8	+ <div class="formfieldline">
	9	+ <%= f.label :description, "Description:", :class => 'formlabel' %>
	10	+ <div class="formfield type-text">
	11	+ <%= f.text_field :description %>
	12	+ </div>
	13	+ </div>
14	14
15	15	<%= required labelled_form_field _('License'),
16		- f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %><br/>
17		- <p>
18		-
19		- <p>
20		- <%= f.label :process_period, "Process Period:" %>
21		- <%= f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options ) %>
22		- </p>
23		- <%= f.label :type, "Type:" %>
24		- <%= f.select :type, @repository_types %>
25		- </p>
	16	+ f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %>
	17	+
	18	+ <%= required labelled_form_field _('Process Period'),
	19	+ f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options ) %>
26	20
27		- <p>
28		- <%= f.label :address, "Address:" %>
29		- <%= f.text_field :address %>
30		- </p>
	21	+ <%= required labelled_form_field _('Type'),
	22	+ f.select(:type, @repository_types) %>
31	23
32		- </p>
33		- <%= f.label :configuration_id, "Configuration:" %>
34		- <%= f.select :configuration_id, @configuration_select %>
35		- </p>
	24	+ <%= required labelled_form_field _('Address'),
	25	+ f.text_field(:address) %>
	26	+
	27	+ <%= required labelled_form_field _('Configuration'),
	28	+ f.select(:configuration_id, @configuration_select) %>
36	29
37	30	<p>
38	31	<%= f.submit "Add" %>
...	...