Merge branch 'new_source_tree' into mezuro

Paulo Meireles
2 parents 21fcc5c2 bbeb3b9e
Showing 15 changed files with 158 additions and 72 deletions Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
plugins/mezuro/lib/kalibro/entities/entity.rb
plugins/mezuro/lib/kalibro/entities/module.rb
plugins/mezuro/lib/kalibro/entities/native_metric.rb
plugins/mezuro/lib/kalibro/entities/project_result.rb
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/public/javascripts/project_content.js
plugins/mezuro/test/fixtures/module_node_fixtures.rb
plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb
plugins/mezuro/test/unit/kalibro/entities/module_test.rb
plugins/mezuro/test/unit/kalibro/entities/project_result_test.rb
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
plugins/mezuro/views/content_viewer/_project_result.rhtml
plugins/mezuro/views/content_viewer/_source_tree.rhtml
plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -18,6 +18,7 @@ class MezuroPluginProfileController &lt; ProfileController
   def project_result
     content = profile.articles.find(params[:id])
     project_result = content.project_result
+    project = content.project
     render :partial => 'content_viewer/project_result', :locals => { :project_result => project_result }
   end
@@ -27,4 +28,11 @@ class MezuroPluginProfileController &lt; ProfileController
     render :partial => 'content_viewer/module_result', :locals => { :module_result =>  module_result}
   end
+  def project_tree
+    content = profile.articles.find(params[:id])
+    project_result = content.project_result
+    source_tree = project_result.node_of(params[:module_name])
+    render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name}
+  end
+
 end
@@ -7,7 +7,7 @@ class Kalibro::Entities::Entity
   end
   def set(field, value)
-    send("#{field}=", value)
+    send("#{field}=", value) if not field.to_s.start_with? '@'
   end
   def to_entity_array(value, entity_class = nil)
@@ -50,4 +50,4 @@ class Kalibro::Entities::Entity
     send("#{field}")
   end
-end
 \ No newline at end of file
+end
@@ -2,4 +2,17 @@ class Kalibro::Entities::Module &lt; Kalibro::Entities::Entity
   attr_accessor :name, :granularity
-end
 \ No newline at end of file
+  def self.parent_names(name)
+    path = []
+    ancestors = []
+    name.split(".").each do |token|
+       path << token
+       ancestors << path.join(".")
+     end
+     ancestors
+  end
+
+  def ancestor_names
+    Kalibro::Entities::Module.parent_names(@name)
+  end
+end
@@ -2,4 +2,4 @@ class Kalibro::Entities::NativeMetric &lt; Kalibro::Entities::Metric
   attr_accessor :origin, :language
-end
 \ No newline at end of file
+end
@@ -31,4 +31,29 @@ class Kalibro::Entities::ProjectResult &lt; Kalibro::Entities::Entity
     ('%2d' % amount).sub(/\s/, '0')
   end
-end
 \ No newline at end of file
+  def node_of(module_name)
+    if module_name.nil? or module_name == project.name
+      node = source_tree
+    else
+      node = get_node(module_name)
+    end
+  end
+
+  def get_node(module_name)
+    path = Kalibro::Entities::Module.parent_names(module_name)
+    parent = @source_tree
+    path.each do |node_name|
+      parent = get_leaf_from(parent, node_name)
+    end
+    return parent
+  end
+
+  private
+  def get_leaf_from(node, module_name) 
+    node.children.each do |child_node|
+      return child_node if child_node.module.name == module_name
+    end
+    nil
+  end
+
+end
@@ -26,6 +26,7 @@ class MezuroPlugin::ProjectContent &lt; Article
   end
   def module_result(module_name)
+    module_name = project.name if module_name.nil?      
     @module_client ||= Kalibro::Client::ModuleResultClient.module_result(self, module_name)
   end
-jQuery(showProjectContent);
+jQuery(function (){
+  jQuery('.source-tree-link').live("click", reloadModule);
+  showProjectContent();
+});
 function showProjectContent() {
   callAction('project_state', {}, showProjectContentFor);
 }
+function reloadModule(){
+  var module_name = jQuery(this).attr('data-module-name');
+  callAction('project_tree', {module_name: module_name }, showProjectTree);
+  callAction('module_result', {module_name: module_name}, showModuleResult);
+  return false;
+}
+
 function showProjectContentFor(state){
   if (state == 'ERROR')
-    callAction('project_error', {}, setProjectContent);
-  else if (state == 'READY')
-    callAction('project_result', {}, setProjectContent);
+    callAction('project_error', {}, showProjectResult);
+  else if (state == 'READY') {
+    callAction('project_result', {}, showProjectResult);
+    callAction('project_tree', {}, showProjectTree);
+    callAction('module_result', {}, showModuleResult);
+  }
   else if (state.endsWith("ING"))
     showProjectContentAfter(20);
 }
@@ -23,19 +36,15 @@ function showProjectContentAfter(seconds){
   }
 }
-function setProjectContent(content){
-  jQuery('#project-content').html(content);
-  jQuery('.module-result-link').click(showModuleResult);
+function showProjectResult(content) {
+  jQuery('#project-result').html(content);
 }
-function showModuleResult(){
-  var module_name = jQuery(this).attr('data-module-name');
-  setModuleResult("Loading results for " + module_name + "...");
-  callAction('module_result', {module_name: module_name}, setModuleResult);
-  return false;
+function showProjectTree(content){ 
+  jQuery('#project-tree').html(content);
 }
-function setModuleResult(content){
+function showModuleResult(content){
   jQuery('#module-result').html(content);
 }
@@ -47,11 +56,5 @@ function callAction(action, params, callback){
 }
 function projectContentData(data){
-  return jQuery('#project-content').attr('data-' + data);
+  return jQuery('#project-result').attr('data-' + data);
 }
-
-function sourceNodeToggle(id){
-  var suffixes = ['_hidden', '_plus', '_minus'];
-  for (var i in suffixes)
-    jQuery('#' + id + suffixes[i]).toggle();
-}
 \ No newline at end of file
@@ -3,7 +3,9 @@ class ModuleNodeFixtures
   def self.qt_calculator_tree
     node = Kalibro::Entities::ModuleNode.new
     node.module = ModuleFixtures.qt_calculator
-    node.children = [new_node('Dialog', 'CLASS'), new_node('main', 'CLASS')]
+    org_node = new_node('org', 'PACKAGE')
+    org_node.children = [new_node('org.Window', 'CLASS')]
+    node.children = [new_node('Dialog', 'CLASS'), new_node('main', 'CLASS'), org_node]
     node
   end
@@ -11,7 +13,9 @@ class ModuleNodeFixtures
     {:module => ModuleFixtures.qt_calculator_hash,
       :child => [
         {:module => {:name => 'Dialog', :granularity => 'CLASS'}},
-        {:module => {:name => 'main', :granularity => 'CLASS'}}
+        {:module => {:name => 'main', :granularity => 'CLASS'}},
+        {:module => {:name => 'org', :granularity => 'PACKAGE'},
+         :child => [{:module => {:name => 'org.Window', :granularity => 'CLASS'}}]}
       ]
     }
   end
@@ -54,10 +54,10 @@ class MezuroPluginProfileControllerTest &lt; ActionController::TestCase
     Kalibro::Client::ProjectResultClient.expects(:last_result).with(@name).returns(@project_result)
     get :project_result, :profile => @profile.identifier, :id => @content.id
     assert_response 200
-    assert_select('h3', 'LAST RESULT')
+    assert_select('h4', 'Last Result')
   end
-  should 'get metric results for a module' do
+  should 'get module result' do
     create_project_content
     Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @name).returns(@module_result)
     get :module_result, :profile => @profile.identifier, :id => @content.id, :module_name => @name
@@ -17,4 +17,14 @@ class ModuleTest &lt; ActiveSupport::TestCase
     assert_equal @hash, @module.to_hash
   end
-end
 \ No newline at end of file
+  should 'list ancestor names' do
+    @module.name = "org.kalibro.core"
+    assert_equal ["org", "org.kalibro", "org.kalibro.core"], @module.ancestor_names
+  end
+
+  should 'list ancestor with one name' do
+    @module.name = "org"
+    assert_equal ["org"], @module.ancestor_names
+  end
+ 
+end
@@ -24,5 +24,26 @@ class ProjectResultTest &lt; ActiveSupport::TestCase
   should 'retrieve formatted analysis time' do
     assert_equal '00:00:01', @result.formatted_analysis_time
   end
+
+  should 'retrieve module node' do
+    node = @result.get_node("main")
+    assert_equal @hash[:source_tree][:child][1], node.to_hash
+  end
+
+  should 'retrive complex module' do
+    node = @result.get_node("org.Window")
+    assert_equal @hash[:source_tree][:child][2][:child].first, node.to_hash
+  end
+
+  should 'return source tree node when nil is given' do
+    assert_equal @hash[:source_tree], @result.node_of(nil).to_hash 
+  end
-end
 \ No newline at end of file
+  should 'return source tree node when project name is given' do
+    assert_equal @hash[:source_tree], @result.node_of(@result.project.name).to_hash 
+  end
+
+  should 'return correct node when module name is given' do
+    assert_equal @hash[:source_tree][:child][1], @result.node_of("main").to_hash 
+  end
+end
@@ -50,6 +50,20 @@ class ProjectContentTest &lt; ActiveSupport::TestCase
     assert_equal module_result, @content.module_result(module_name)
   end
+  should 'get module result root when nil is given' do
+    module_result = mock
+    Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @project.name).
+      returns(module_result)
+    assert_equal module_result, @content.module_result(nil)
+  end
+
+  should 'get module result root when project name is give' do
+    module_result = mock
+    Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @project.name).
+      returns(module_result)
+    assert_equal module_result, @content.module_result(@project.name)
+  end  
+
   should 'send project to service after saving' do
     @content.expects :send_project_to_service
     @content.run_callbacks :after_save
-<h3><%= _('LAST RESULT') %></h3>
+<h4><%= _('Last Result') %></h4>
 <table>
   <tr>
@@ -14,9 +14,3 @@
     <td><%= project_result.formatted_analysis_time %></td>
   </tr>
 </table>
-
-<h4><%= _('Source tree') %></h4>
-<%= render :partial => 'content_viewer/source_tree', :locals => { :source_tree => project_result.source_tree } %>
-
-<div id='module-result'>
-</div>
+<h4><%= _('Source tree') %></h4>
 <% module_name = source_tree.module.name %>
 <% module_label = "#{module_name} (#{source_tree.module.granularity})" %>
+
+<% if module_name != project_name %>
+  <a href="#" class="source-tree-link" data-module-name="<%= project_name %>">
+    <%= project_name %>
+  </a>
+<% end %>
+
+  <% split_link = source_tree.module.ancestor_names %>
+  <% split_link.each do |link| %>
+    <a href="#" class="source-tree-link" data-module-name="<%= link %>">
+      <%= link.split(".").last %>
+    </a>
+<% end %>
+
 <% if source_tree.children %>
   <table>
-    <tr>
-      <td width="10%">
-        <img alt="+" src="/plugins/mezuro/images/plus.png" class="link"
-	id="<%= module_name %>_plus" onclick="sourceNodeToggle('<%= module_name %>')"/>
-        <img alt="-" src="/plugins/mezuro/images/minus.png" class="link" style="display: none"
-          id="<%= module_name %>_minus" onclick="sourceNodeToggle('<%= module_name %>')"/>
-      </td>
-      <td>
-        <a href="#" class="module-result-link" data-module-name="<%= module_name %>">
-          <%= module_label %>
-        </a>
-      </td>
-    </tr> 
-    <tr id="<%= module_name %>_hidden" style="display: none">
-      <td></td> 
-      <td style="text-align: left">
-        <% source_tree.children.each do |child| %>
-          <%= render :partial => 'content_viewer/source_tree', :locals => { :source_tree => child } %>
-        <% end %>
-      </td> 
-    </tr> 
-  </table>
-<% else %>
-  <table>
-    <tr>
-      <td width="1"></td>
-      <td>
-        <a href="#" class="module-result-link" data-module-name="<%= module_name %>">
-          <%= module_label %>
-        </a>
-      </td>
-    </tr>
+    <% source_tree.children.each do |child| %>
+      <tr>
+        <td>
+          <a href='#' class="source-tree-link" data-module-name="<%= child.module.name %>">
+	  <%= "#{child.module.name} (#{child.module.granularity})" %>
+        </td>
+      </tr>
+    <% end %>  
   </table>
 <% end %>
@@ -30,6 +30,8 @@
 <br />
-<div id="project-content" data-profile="<%= @page.profile.identifier %>" data-content="<%= @page.id %>">
+<div id="project-result" data-profile="<%= @page.profile.identifier %>" data-content="<%= @page.id %>">
   <h3><%= _('Processing ') + @project.name + '...' %></h3>
-</div>
 \ No newline at end of file
+</div>
+<div id="project-tree"></div>
+<div id="module-result"></div>
	@@ -2,4 +2,17 @@ class Kalibro::Entities::Module < Kalibro::Entities::Entity		@@ -2,4 +2,17 @@ class Kalibro::Entities::Module < Kalibro::Entities::Entity
2		2
3	attr_accessor :name, :granularity	3	attr_accessor :name, :granularity
4		4
5	-end
6	\ No newline at end of file	5	\ No newline at end of file
		6	+ def self.parent_names(name)
		7	+ path = []
		8	+ ancestors = []
		9	+ name.split(".").each do \|token\|
		10	+ path << token
		11	+ ancestors << path.join(".")
		12	+ end
		13	+ ancestors
		14	+ end
		15	+
		16	+ def ancestor_names
		17	+ Kalibro::Entities::Module.parent_names(@name)
		18	+ end
		19	+end
	@@ -2,4 +2,4 @@ class Kalibro::Entities::NativeMetric < Kalibro::Entities::Metric		@@ -2,4 +2,4 @@ class Kalibro::Entities::NativeMetric < Kalibro::Entities::Metric
2		2
3	attr_accessor :origin, :language	3	attr_accessor :origin, :language
4		4
5	-end
6	\ No newline at end of file	5	\ No newline at end of file
		6	+end
	@@ -31,4 +31,29 @@ class Kalibro::Entities::ProjectResult < Kalibro::Entities::Entity		@@ -31,4 +31,29 @@ class Kalibro::Entities::ProjectResult < Kalibro::Entities::Entity
31	('%2d' % amount).sub(/\s/, '0')	31	('%2d' % amount).sub(/\s/, '0')
32	end	32	end
33		33
34	-end
35	\ No newline at end of file	34	\ No newline at end of file
		35	+ def node_of(module_name)
		36	+ if module_name.nil? or module_name == project.name
		37	+ node = source_tree
		38	+ else
		39	+ node = get_node(module_name)
		40	+ end
		41	+ end
		42	+
		43	+ def get_node(module_name)
		44	+ path = Kalibro::Entities::Module.parent_names(module_name)
		45	+ parent = @source_tree
		46	+ path.each do \|node_name\|
		47	+ parent = get_leaf_from(parent, node_name)
		48	+ end
		49	+ return parent
		50	+ end
		51	+
		52	+ private
		53	+ def get_leaf_from(node, module_name)
		54	+ node.children.each do \|child_node\|
		55	+ return child_node if child_node.module.name == module_name
		56	+ end
		57	+ nil
		58	+ end
		59	+
		60	+end
	@@ -26,6 +26,7 @@ class MezuroPlugin::ProjectContent < Article		@@ -26,6 +26,7 @@ class MezuroPlugin::ProjectContent < Article
26	end	26	end
27		27
28	def module_result(module_name)	28	def module_result(module_name)
		29	+ module_name = project.name if module_name.nil?
29	@module_client \|\|= Kalibro::Client::ModuleResultClient.module_result(self, module_name)	30	@module_client \|\|= Kalibro::Client::ModuleResultClient.module_result(self, module_name)
30	end	31	end
31		32
	@@ -54,10 +54,10 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase		@@ -54,10 +54,10 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase
54	Kalibro::Client::ProjectResultClient.expects(:last_result).with(@name).returns(@project_result)	54	Kalibro::Client::ProjectResultClient.expects(:last_result).with(@name).returns(@project_result)
55	get :project_result, :profile => @profile.identifier, :id => @content.id	55	get :project_result, :profile => @profile.identifier, :id => @content.id
56	assert_response 200	56	assert_response 200
57	- assert_select('h3', 'LAST RESULT')	57	+ assert_select('h4', 'Last Result')
58	end	58	end
59		59
60	- should 'get metric results for a module' do	60	+ should 'get module result' do
61	create_project_content	61	create_project_content
62	Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @name).returns(@module_result)	62	Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @name).returns(@module_result)
63	get :module_result, :profile => @profile.identifier, :id => @content.id, :module_name => @name	63	get :module_result, :profile => @profile.identifier, :id => @content.id, :module_name => @name
	@@ -17,4 +17,14 @@ class ModuleTest < ActiveSupport::TestCase		@@ -17,4 +17,14 @@ class ModuleTest < ActiveSupport::TestCase
17	assert_equal @hash, @module.to_hash	17	assert_equal @hash, @module.to_hash
18	end	18	end
19		19
20	-end
21	\ No newline at end of file	20	\ No newline at end of file
		21	+ should 'list ancestor names' do
		22	+ @module.name = "org.kalibro.core"
		23	+ assert_equal ["org", "org.kalibro", "org.kalibro.core"], @module.ancestor_names
		24	+ end
		25	+
		26	+ should 'list ancestor with one name' do
		27	+ @module.name = "org"
		28	+ assert_equal ["org"], @module.ancestor_names
		29	+ end
		30	+
		31	+end
	@@ -24,5 +24,26 @@ class ProjectResultTest < ActiveSupport::TestCase		@@ -24,5 +24,26 @@ class ProjectResultTest < ActiveSupport::TestCase
24	should 'retrieve formatted analysis time' do	24	should 'retrieve formatted analysis time' do
25	assert_equal '00:00:01', @result.formatted_analysis_time	25	assert_equal '00:00:01', @result.formatted_analysis_time
26	end	26	end
		27	+
		28	+ should 'retrieve module node' do
		29	+ node = @result.get_node("main")
		30	+ assert_equal @hash[:source_tree][:child][1], node.to_hash
		31	+ end
		32	+
		33	+ should 'retrive complex module' do
		34	+ node = @result.get_node("org.Window")
		35	+ assert_equal @hash[:source_tree][:child][2][:child].first, node.to_hash
		36	+ end
		37	+
		38	+ should 'return source tree node when nil is given' do
		39	+ assert_equal @hash[:source_tree], @result.node_of(nil).to_hash
		40	+ end
27		41
28	-end
29	\ No newline at end of file	42	\ No newline at end of file
		43	+ should 'return source tree node when project name is given' do
		44	+ assert_equal @hash[:source_tree], @result.node_of(@result.project.name).to_hash
		45	+ end
		46	+
		47	+ should 'return correct node when module name is given' do
		48	+ assert_equal @hash[:source_tree][:child][1], @result.node_of("main").to_hash
		49	+ end
		50	+end
	@@ -50,6 +50,20 @@ class ProjectContentTest < ActiveSupport::TestCase		@@ -50,6 +50,20 @@ class ProjectContentTest < ActiveSupport::TestCase
50	assert_equal module_result, @content.module_result(module_name)	50	assert_equal module_result, @content.module_result(module_name)
51	end	51	end
52		52
		53	+ should 'get module result root when nil is given' do
		54	+ module_result = mock
		55	+ Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @project.name).
		56	+ returns(module_result)
		57	+ assert_equal module_result, @content.module_result(nil)
		58	+ end
		59	+
		60	+ should 'get module result root when project name is give' do
		61	+ module_result = mock
		62	+ Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @project.name).
		63	+ returns(module_result)
		64	+ assert_equal module_result, @content.module_result(@project.name)
		65	+ end
		66	+
53	should 'send project to service after saving' do	67	should 'send project to service after saving' do
54	@content.expects :send_project_to_service	68	@content.expects :send_project_to_service
55	@content.run_callbacks :after_save	69	@content.run_callbacks :after_save
		1	+<h4><%= _('Source tree') %></h4>
1	<% module_name = source_tree.module.name %>	2	<% module_name = source_tree.module.name %>
2	<% module_label = "#{module_name} (#{source_tree.module.granularity})" %>	3	<% module_label = "#{module_name} (#{source_tree.module.granularity})" %>
		4	+
		5	+<% if module_name != project_name %>
		6	+ <a href="#" class="source-tree-link" data-module-name="<%= project_name %>">
		7	+ <%= project_name %>
		8	+ </a>
		9	+<% end %>
		10	+
		11	+ <% split_link = source_tree.module.ancestor_names %>
		12	+ <% split_link.each do \|link\| %>
		13	+ <a href="#" class="source-tree-link" data-module-name="<%= link %>">
		14	+ <%= link.split(".").last %>
		15	+ </a>
		16	+<% end %>
		17	+
3	<% if source_tree.children %>	18	<% if source_tree.children %>
4	<table>	19	<table>
5	- <tr>
6	- <td width="10%">
7	- <img alt="+" src="/plugins/mezuro/images/plus.png" class="link"
8	- id="<%= module_name %>_plus" onclick="sourceNodeToggle('<%= module_name %>')"/>
9	- <img alt="-" src="/plugins/mezuro/images/minus.png" class="link" style="display: none"
10	- id="<%= module_name %>_minus" onclick="sourceNodeToggle('<%= module_name %>')"/>
11	- </td>
12	- <td>
13	- <a href="#" class="module-result-link" data-module-name="<%= module_name %>">
14	- <%= module_label %>
15	- </a>
16	- </td>
17	- </tr>
18	- <tr id="<%= module_name %>_hidden" style="display: none">
19	- <td></td>
20	- <td style="text-align: left">
21	- <% source_tree.children.each do \|child\| %>
22	- <%= render :partial => 'content_viewer/source_tree', :locals => { :source_tree => child } %>
23	- <% end %>
24	- </td>
25	- </tr>
26	- </table>
27	-<% else %>
28	- <table>
29	- <tr>
30	- <td width="1"></td>
31	- <td>
32	- <a href="#" class="module-result-link" data-module-name="<%= module_name %>">
33	- <%= module_label %>
34	- </a>
35	- </td>
36	- </tr>	20	+ <% source_tree.children.each do \|child\| %>
		21	+ <tr>
		22	+ <td>
		23	+ <a href='#' class="source-tree-link" data-module-name="<%= child.module.name %>">
		24	+ <%= "#{child.module.name} (#{child.module.granularity})" %>
		25	+ </td>
		26	+ </tr>
		27	+ <% end %>
37	</table>	28	</table>
38	<% end %>	29	<% end %>