Isolate internal class logic

Paulo Meireles
1 parent f3f87611
Showing 6 changed files with 32 additions and 13 deletions Show diff stats
plugins/mezuro/lib/kalibro/client/kalibro_client.rb
plugins/mezuro/lib/kalibro/client/project_client.rb
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/test/unit/kalibro/client/kalibro_client_test.rb
plugins/mezuro/test/unit/kalibro/client/project_client_test.rb
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
@@ -12,4 +12,8 @@ class Kalibro::Client::KalibroClient
     @port.request(:process_project, {:project_name => project_name})
   end
-end
 \ No newline at end of file
+  def self.process_project(project_name)
+    new.process_project(project_name)
+  end
+
+end
@@ -8,6 +8,10 @@ class Kalibro::Client::ProjectClient
     @port.request(:save_project, {:project => project.to_hash})
   end
+  def self.save(project)
+    new.save(project)
+  end
+
   def project_names
     @port.request(:get_project_names)[:project_name].to_a
   end
@@ -21,4 +25,4 @@ class Kalibro::Client::ProjectClient
     @port.request(:remove_project, {:project_name => project_name})
   end
-end
 \ No newline at end of file
+end
@@ -22,8 +22,8 @@ class MezuroPlugin::ProjectContent &lt; Article
   private
   def send_project_to_service
-    Kalibro::Client::ProjectClient.new.save(project)
-    Kalibro::Client::KalibroClient.new.process_project(title)
+    Kalibro::Client::ProjectClient.save(project)
+    Kalibro::Client::KalibroClient.process_project(title)
   end
   def project
@@ -18,5 +18,12 @@ class KalibroClientTest &lt; Test::Unit::TestCase
     @port.expects(:request).with(:process_project, {:project_name => name})
     @client.process_project(name)
   end
+
+  should 'instantiate for processing project' do
+    instance = mock
+    Kalibro::Client::KalibroClient.expects(:new).returns(instance)
+    instance.expects(:process_project).with('myproject')
+    Kalibro::Client::KalibroClient.process_project('myproject')
+  end
-end
 \ No newline at end of file
+end
@@ -44,4 +44,12 @@ class ProjectClientTest &lt; Test::Unit::TestCase
     @client.remove(name)
   end
-end
 \ No newline at end of file
+  should 'instantiate for saving a project' do
+    project = mock
+    instance = mock
+    Kalibro::Client::ProjectClient.expects(:new).returns(instance)
+    instance.expects(:save).with(project)
+    Kalibro::Client::ProjectClient.save(project)
+  end
+
+end
@@ -34,13 +34,9 @@ class ProjectContentTest &lt; Test::Unit::TestCase
   end
   should 'send correct project to service' do
-    project_client = mock
-    kalibro_client = mock
-    Kalibro::Client::ProjectClient.expects(:new).returns(project_client)
-    project_client.expects(:save).with(@project)
-    Kalibro::Client::KalibroClient.expects(:new).returns(kalibro_client)
-    kalibro_client.expects(:process_project).with(@project.name)
+    Kalibro::Client::ProjectClient.expects(:save).with(@project)
+    Kalibro::Client::KalibroClient.expects(:process_project).with(@project.name)
     @content.send :send_project_to_service
   end
-end
 \ No newline at end of file
+end
	@@ -12,4 +12,8 @@ class Kalibro::Client::KalibroClient		@@ -12,4 +12,8 @@ class Kalibro::Client::KalibroClient
12	@port.request(:process_project, {:project_name => project_name})	12	@port.request(:process_project, {:project_name => project_name})
13	end	13	end
14		14
15	-end
16	\ No newline at end of file	15	\ No newline at end of file
		16	+ def self.process_project(project_name)
		17	+ new.process_project(project_name)
		18	+ end
		19	+
		20	+end
	@@ -18,5 +18,12 @@ class KalibroClientTest < Test::Unit::TestCase		@@ -18,5 +18,12 @@ class KalibroClientTest < Test::Unit::TestCase
18	@port.expects(:request).with(:process_project, {:project_name => name})	18	@port.expects(:request).with(:process_project, {:project_name => name})
19	@client.process_project(name)	19	@client.process_project(name)
20	end	20	end
		21	+
		22	+ should 'instantiate for processing project' do
		23	+ instance = mock
		24	+ Kalibro::Client::KalibroClient.expects(:new).returns(instance)
		25	+ instance.expects(:process_project).with('myproject')
		26	+ Kalibro::Client::KalibroClient.process_project('myproject')
		27	+ end
21		28
22	-end
23	\ No newline at end of file	29	\ No newline at end of file
		30	+end
	@@ -44,4 +44,12 @@ class ProjectClientTest < Test::Unit::TestCase		@@ -44,4 +44,12 @@ class ProjectClientTest < Test::Unit::TestCase
44	@client.remove(name)	44	@client.remove(name)
45	end	45	end
46		46
47	-end
48	\ No newline at end of file	47	\ No newline at end of file
		48	+ should 'instantiate for saving a project' do
		49	+ project = mock
		50	+ instance = mock
		51	+ Kalibro::Client::ProjectClient.expects(:new).returns(instance)
		52	+ instance.expects(:save).with(project)
		53	+ Kalibro::Client::ProjectClient.save(project)
		54	+ end
		55	+
		56	+end