[Mezuro] started error treatment when a project doesn't exist in kalibro

Caio
1 parent fccc9c74
Showing 5 changed files with 20 additions and 21 deletions Show diff stats
plugins/mezuro/lib/kalibro/client/project_client.rb
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/test/unit/kalibro/client/project_client_test.rb
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -46,7 +46,15 @@ class Kalibro::Client::ProjectClient
   end
   def project(project_name)
-    hash = @port.request(:get_project, {:project_name => project_name})[:project]
+    begin 
+      hash = @port.request(:get_project, {:project_name => project_name})[:project]
+    rescue Exception => error
+      if (error.to_s =~ /There is no project named/) != nil
+        return nil 
+      else
+        raise error
+      end
+    end
     Kalibro::Entities::Project.from_hash(hash)
   end
@@ -14,19 +14,10 @@ class MezuroPlugin::ProjectContent &lt; Article
   include ActionView::Helpers::TagHelper
   def to_html(options = {})
     lambda do
-      
-      render :file => 'content_viewer/show_project.rhtml', :locals => { :project => project_kalibro, :error_kalibro => error_kalibro }
+      render :file => 'content_viewer/show_project.rhtml'
     end
   end
-  def rescue_error_kalibro
-    error_kalibro = false
-    begin
-      project_kalibro = project
-    rescue
-      error_kalibro = true
-    end
-  end
   def project
     @project ||= Kalibro::Client::ProjectClient.project(name)
@@ -16,6 +16,13 @@ class ProjectClientTest &lt; ActiveSupport::TestCase
     @port.expects(:request).with(:get_project, request_body).returns(response_hash)
     assert_equal @project, Kalibro::Client::ProjectClient.project(@project.name)
   end
+  
+  should 'raise error when project doesnt exist' do
+    request_body = {:project_name => @project.name}
+    @port.expects(:request).with(:get_project, request_body)
+      .raises(Exception.new("(S:Server) There is no project named " + @project.name))
+    assert_nil Kalibro::Client::ProjectClient.project(@project.name)
+  end
   should 'save project' do
     create_project_content_mock
@@ -31,11 +31,6 @@ class ProjectContentTest &lt; ActiveSupport::TestCase
   should 'have an html view' do
     assert_not_nil @content.to_html
   end
-  
-  should 'rescue error when project doesnt exist in kalibro' do
-    MezuroPlugin::ProjectContent.expects(:project).returns(create_project_error)
-    assert_equal true, @content.rescue_error_kalibro
-  end
   should 'get project from service' do
     Kalibro::Client::ProjectClient.expects(:project).with(@content.name).returns(@project)
 <script src="/plugins/mezuro/javascripts/project_content.js" type="text/javascript"></script>
-<% if error_kalibro %>
-  Projeto nao existe TODO: Perguntar oa usuário se deseja excluir o projeto do Noosfero
-<% else %>
-<% @project = project %>
+
+<% @project = @page.project %>
 <table>
   <tr>
     <td><%= _('Name') %></td>
@@ -45,4 +43,4 @@
 <div id="project-tree"></div>
 <div id="module-result">
 </div>
-<% end %>
+
	@@ -46,7 +46,15 @@ class Kalibro::Client::ProjectClient		@@ -46,7 +46,15 @@ class Kalibro::Client::ProjectClient
46	end	46	end
47		47
48	def project(project_name)	48	def project(project_name)
49	- hash = @port.request(:get_project, {:project_name => project_name})[:project]	49	+ begin
		50	+ hash = @port.request(:get_project, {:project_name => project_name})[:project]
		51	+ rescue Exception => error
		52	+ if (error.to_s =~ /There is no project named/) != nil
		53	+ return nil
		54	+ else
		55	+ raise error
		56	+ end
		57	+ end
50	Kalibro::Entities::Project.from_hash(hash)	58	Kalibro::Entities::Project.from_hash(hash)
51	end	59	end
52		60
	@@ -16,6 +16,13 @@ class ProjectClientTest < ActiveSupport::TestCase		@@ -16,6 +16,13 @@ class ProjectClientTest < ActiveSupport::TestCase
16	@port.expects(:request).with(:get_project, request_body).returns(response_hash)	16	@port.expects(:request).with(:get_project, request_body).returns(response_hash)
17	assert_equal @project, Kalibro::Client::ProjectClient.project(@project.name)	17	assert_equal @project, Kalibro::Client::ProjectClient.project(@project.name)
18	end	18	end
		19	+
		20	+ should 'raise error when project doesnt exist' do
		21	+ request_body = {:project_name => @project.name}
		22	+ @port.expects(:request).with(:get_project, request_body)
		23	+ .raises(Exception.new("(S:Server) There is no project named " + @project.name))
		24	+ assert_nil Kalibro::Client::ProjectClient.project(@project.name)
		25	+ end
19		26
20	should 'save project' do	27	should 'save project' do
21	create_project_content_mock	28	create_project_content_mock