[Mezuro] Updated project_content and its views.

Alessandro Palmeira + Rafael Manzo · Alessandro Palmeira
1 parent caf44d7d
Showing 3 changed files with 2 additions and 118 deletions Show diff stats
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb
plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -3,8 +3,6 @@ class MezuroPlugin::ProjectContent &lt; Article
  
   settings_items :project_id
  
-  validate_on_create :validate_repository_address
-
   def self.short_description
     'Mezuro project'
   end
@@ -38,50 +36,6 @@ class MezuroPlugin::ProjectContent &lt; Article
     @repositories
   end
  
-  def processing(repository_id)
-    begin
-      if Kalibro::Processing.has_ready_processing(repository_id)
-        @processing ||= Kalibro::Processing.last_ready_processing_of(repository_id)
-      else
-        @processing = Kalibro::Processing.last_processing_of(repository_id)
-      end
-    rescue Exception => error
-      errors.add_to_base(error.message)
-    end
-    @processing
-  end
-
-  def processing_with_date(repository_id, date)
-    begin
-      if Kalibro::Processing.has_processing_after(repository_id, date)
-        @processing ||= Kalibro::Processing.first_processing_after(repository_id, date)
-      elsif Kalibro::Processing.has_processing_before(repository_id, date)
-        @processing ||= Kalibro::Processing.last_processing_before(repository_id, date)
-      end
-    rescue Exception => error
-      errors.add_to_base(error.message)
-    end
-    @processing
-  end
-
-  def module_result(repository_id, date = nil)
-    @processing ||= date.nil? ? processing(repository_id) : processing_with_date(repository_id, date)
-    begin
-      @module_result ||= Kalibro::ModuleResult.find(@processing.results_root_id)
-    rescue Exception => error
-      errors.add_to_base(error.message)
-    end
-    @module_result
-  end
-
-  def result_history(module_result_id)
-    begin
-      @result_history ||= Kalibro::MetricResult.history_of(module_result_id)
-    rescue Exception => error
-      errors.add_to_base(error.message)
-    end
-  end
-
   def description=(value)
     @description=value
   end
@@ -95,7 +49,7 @@ class MezuroPlugin::ProjectContent &lt; Article
     @repositories = @repositories.map { |element| to_repository(element) }
   end
  
-  after_save :send_project_to_service
+  before_save :send_project_to_service
   after_destroy :destroy_project_from_service
  
   private
@@ -119,13 +73,11 @@ class MezuroPlugin::ProjectContent &lt; Article
  
   def send_project_to_service
     created_project = create_kalibro_project
-    repositories = Kalibro::Repository.repositories_of(project_id)
-    repositories.each {|repository| repository.process_repository }
+    self.project_id = created_project.id
   end
  
   def create_kalibro_project
    Kalibro::Project.create(
-      :id => project_id,
       :name => name,
       :description => description
     )
@@ -2,14 +2,6 @@
  
 <%
   @project = @article.title.nil? ? nil : @article.project
-  begin
-    @repository_types = Kalibro::Repository.repository_types.sort
-    @configuration_names = Kalibro::Configuration.all_names.sort
-  rescue Exception => exception
-    @article.errors.add_to_base(exception.message)
-    @repository_types = []
-    @configuration_names = []
-  end
 %>
  
 <%= error_messages_for 'project_content' %>
@@ -24,28 +16,5 @@
   <%= required f.text_field(:name) %>
 <% end %>
  
-<% selected = (@project.nil? ? "" : @project.license) %>
-<%= required labelled_form_field _('License'),
-  f.select(:project_license, MezuroPlugin::Helpers::ContentViewerHelper.create_license_options ,{:selected => selected}) %><br/>
-
 <%= f.text_field :description %><br/>
  
-<% @selected = (@project.nil? ? @repository_types : @project.repository.type) %>
-<%= required labelled_form_field _('Repository type'),
-  f.select(:repository_type, @repository_types, {:selected => @selected}) %><br/>
-
-<%= required f.text_field(:repository_url) %><br/>
-
-<% @selected = (@project.nil? ? @configuration_names[0] : @project.configuration_name) %>
-
-<% if !@project.nil? && !@article.id.nil? %>
-  <%= required labelled_form_field _('Configuration') + " (Changing the configuration will erase your saved periodic avaliations)",
-    f.select(:configuration_name, @configuration_names, {:selected => @selected}) %>
-<% else %>
-  <%= required labelled_form_field _('Configuration'),
-    f.select(:configuration_name, @configuration_names, {:selected => @selected}) %><br/>
-<% end %>
-
-<% selected = (@project.nil? ? 0 : @project.process_period.to_i) %>
-<%= required labelled_form_field _('Periodic Avaliation'),
-  f.select(:periodicity_in_days, MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options ,{:selected => selected}) %><br/>
-<script src="/plugins/mezuro/javascripts/project_content.js" type="text/javascript"></script>
-
 <% @project = @page.project %>
 <% unless @page.errors[:base].nil? %>
   <% if @page.errors[:base] =~ /There is no project named/ %>
@@ -16,44 +14,9 @@
       <td><%= @project.name %></td>
     </tr>
     <tr>
-      <td><%= _('License') %></td>
-      <td><%= @project.license %></td>
-    </tr>
-    <tr>
       <td><%= _('Description') %></td>
       <td><%= @project.description %></td>
     </tr>
-    <tr>
-      <td><%= _('Repository type') %></td>
-      <td><%= @project.repository.type %></td>
-    </tr>
-    <tr>
-      <td><%= _('Repository address') %></td>
-      <td><%= @project.repository.address %></td>
-    </tr>
-    <tr>
-      <td><%= _('Configuration') %></td>
-      <td><%= @project.configuration_name %></td>
-    </tr>
-    <tr> 
-      <td><%= _('Periodicity') %></td>
-      <td><%= MezuroPlugin::Helpers::ContentViewerHelper.get_periodicity_option(@page.periodicity_in_days) %></td>
-    </tr>
-    <tr>
-      <td><%= _('Status')%></td>
-      <td>
-        <div id="project-state" style="color:DarkGoldenRod"><%= @project.state %></div>
-        <div id="msg-time"></div> 
-      </td>
-    </tr>
   </table>
  
-  <br />
-
-  <div id="project-result" data-profile="<%= @page.profile.identifier %>" data-content="<%= @page.id %>"
-       data-project-name="<%= @project.name %>">
-  </div>
-  <div id="project-tree"></div>
-  <div id="module-result">
-  </div>
 <% end %>
...	...	@@ -3,8 +3,6 @@ class MezuroPlugin::ProjectContent < Article
3	3
4	4	settings_items :project_id
5	5
6		- validate_on_create :validate_repository_address
7		-
8	6	def self.short_description
9	7	'Mezuro project'
10	8	end
...	...	@@ -38,50 +36,6 @@ class MezuroPlugin::ProjectContent < Article
38	36	@repositories
39	37	end
40	38
41		- def processing(repository_id)
42		- begin
43		- if Kalibro::Processing.has_ready_processing(repository_id)
44		- @processing \|\|= Kalibro::Processing.last_ready_processing_of(repository_id)
45		- else
46		- @processing = Kalibro::Processing.last_processing_of(repository_id)
47		- end
48		- rescue Exception => error
49		- errors.add_to_base(error.message)
50		- end
51		- @processing
52		- end
53		-
54		- def processing_with_date(repository_id, date)
55		- begin
56		- if Kalibro::Processing.has_processing_after(repository_id, date)
57		- @processing \|\|= Kalibro::Processing.first_processing_after(repository_id, date)
58		- elsif Kalibro::Processing.has_processing_before(repository_id, date)
59		- @processing \|\|= Kalibro::Processing.last_processing_before(repository_id, date)
60		- end
61		- rescue Exception => error
62		- errors.add_to_base(error.message)
63		- end
64		- @processing
65		- end
66		-
67		- def module_result(repository_id, date = nil)
68		- @processing \|\|= date.nil? ? processing(repository_id) : processing_with_date(repository_id, date)
69		- begin
70		- @module_result \|\|= Kalibro::ModuleResult.find(@processing.results_root_id)
71		- rescue Exception => error
72		- errors.add_to_base(error.message)
73		- end
74		- @module_result
75		- end
76		-
77		- def result_history(module_result_id)
78		- begin
79		- @result_history \|\|= Kalibro::MetricResult.history_of(module_result_id)
80		- rescue Exception => error
81		- errors.add_to_base(error.message)
82		- end
83		- end
84		-
85	39	def description=(value)
86	40	@description=value
87	41	end
...	...	@@ -95,7 +49,7 @@ class MezuroPlugin::ProjectContent < Article
95	49	@repositories = @repositories.map { \|element\| to_repository(element) }
96	50	end
97	51
98		- after_save :send_project_to_service
	52	+ before_save :send_project_to_service
99	53	after_destroy :destroy_project_from_service
100	54
101	55	private
...	...	@@ -119,13 +73,11 @@ class MezuroPlugin::ProjectContent < Article
119	73
120	74	def send_project_to_service
121	75	created_project = create_kalibro_project
122		- repositories = Kalibro::Repository.repositories_of(project_id)
123		- repositories.each {\|repository\| repository.process_repository }
	76	+ self.project_id = created_project.id
124	77	end
125	78
126	79	def create_kalibro_project
127	80	Kalibro::Project.create(
128		- :id => project_id,
129	81	:name => name,
130	82	:description => description
131	83	)
...	...
...	...	@@ -2,14 +2,6 @@
2	2
3	3	<%
4	4	@project = @article.title.nil? ? nil : @article.project
5		- begin
6		- @repository_types = Kalibro::Repository.repository_types.sort
7		- @configuration_names = Kalibro::Configuration.all_names.sort
8		- rescue Exception => exception
9		- @article.errors.add_to_base(exception.message)
10		- @repository_types = []
11		- @configuration_names = []
12		- end
13	5	%>
14	6
15	7	<%= error_messages_for 'project_content' %>
...	...	@@ -24,28 +16,5 @@
24	16	<%= required f.text_field(:name) %>
25	17	<% end %>
26	18
27		-<% selected = (@project.nil? ? "" : @project.license) %>
28		-<%= required labelled_form_field _('License'),
29		- f.select(:project_license, MezuroPlugin::Helpers::ContentViewerHelper.create_license_options ,{:selected => selected}) %><br/>
30		-
31	19	<%= f.text_field :description %><br/>
32	20
33		-<% @selected = (@project.nil? ? @repository_types : @project.repository.type) %>
34		-<%= required labelled_form_field _('Repository type'),
35		- f.select(:repository_type, @repository_types, {:selected => @selected}) %><br/>
36		-
37		-<%= required f.text_field(:repository_url) %><br/>
38		-
39		-<% @selected = (@project.nil? ? @configuration_names[0] : @project.configuration_name) %>
40		-
41		-<% if !@project.nil? && !@article.id.nil? %>
42		- <%= required labelled_form_field _('Configuration') + " (Changing the configuration will erase your saved periodic avaliations)",
43		- f.select(:configuration_name, @configuration_names, {:selected => @selected}) %>
44		-<% else %>
45		- <%= required labelled_form_field _('Configuration'),
46		- f.select(:configuration_name, @configuration_names, {:selected => @selected}) %><br/>
47		-<% end %>
48		-
49		-<% selected = (@project.nil? ? 0 : @project.process_period.to_i) %>
50		-<%= required labelled_form_field _('Periodic Avaliation'),
51		- f.select(:periodicity_in_days, MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options ,{:selected => selected}) %><br/>
...	...
1		-<script src="/plugins/mezuro/javascripts/project_content.js" type="text/javascript"></script>
2		-
3	1	<% @project = @page.project %>
4	2	<% unless @page.errors[:base].nil? %>
5	3	<% if @page.errors[:base] =~ /There is no project named/ %>
...	...	@@ -16,44 +14,9 @@
16	14	<td><%= @project.name %></td>
17	15	</tr>
18	16	<tr>
19		- <td><%= _('License') %></td>
20		- <td><%= @project.license %></td>
21		- </tr>
22		- <tr>
23	17	<td><%= _('Description') %></td>
24	18	<td><%= @project.description %></td>
25	19	</tr>
26		- <tr>
27		- <td><%= _('Repository type') %></td>
28		- <td><%= @project.repository.type %></td>
29		- </tr>
30		- <tr>
31		- <td><%= _('Repository address') %></td>
32		- <td><%= @project.repository.address %></td>
33		- </tr>
34		- <tr>
35		- <td><%= _('Configuration') %></td>
36		- <td><%= @project.configuration_name %></td>
37		- </tr>
38		- <tr>
39		- <td><%= _('Periodicity') %></td>
40		- <td><%= MezuroPlugin::Helpers::ContentViewerHelper.get_periodicity_option(@page.periodicity_in_days) %></td>
41		- </tr>
42		- <tr>
43		- <td><%= _('Status')%></td>
44		- <td>
45		- <div id="project-state" style="color:DarkGoldenRod"><%= @project.state %></div>
46		- <div id="msg-time"></div>
47		- </td>
48		- </tr>
49	20	</table>
50	21
51		- <br />
52		-
53		- <div id="project-result" data-profile="<%= @page.profile.identifier %>" data-content="<%= @page.id %>"
54		- data-project-name="<%= @project.name %>">
55		- </div>
56		- <div id="project-tree"></div>
57		- <div id="module-result">
58		- </div>
59	22	<% end %>
...	...