[Mezuro] Refactoring Kalibro Client to Kalibro Model

Diego Camarinha · Paulo Meireles
1 parent d0564075
Showing 9 changed files with 79 additions and 108 deletions Show diff stats
plugins/mezuro/lib/kalibro/client/kalibro_client.rb
plugins/mezuro/lib/kalibro/kalibro.rb
plugins/mezuro/lib/kalibro/model.rb
plugins/mezuro/lib/kalibro/project.rb
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/test/unit/kalibro/client/kalibro_client_test.rb
plugins/mezuro/test/unit/kalibro/kalibro_test.rb
plugins/mezuro/test/unit/kalibro/project_test.rb
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
@@ -1,39 +0,0 @@
-class Kalibro::Client::KalibroClient
-
-  def self.process_project(project_name)
-    new.process_project(project_name)
-  end
-  
-  def initialize
-    @port = Kalibro::Client::Port.new('Kalibro')
-  end
-
-  def supported_repository_types
-    @port.request(:get_supported_repository_types)[:repository_type].to_a
-  end
-
-  def process_project(project_name)
-    @port.request(:process_project, {:project_name => project_name})
-  end
-
-  def self.process_project(project_name, days)
-    if days.to_i.zero?
-    	new.process_project(project_name)
-  	else
-  		new.process_periodically(project_name, days)
-  	end
-  end
-
-	def process_periodically(project_name, period_in_days)
-    @port.request(:process_periodically, {:project_name => project_name, :period_in_days => period_in_days})
-  end
-
-	def process_period(project_name)
-    @port.request(:get_process_period, {:project_name => project_name})[:period]
-  end
-
-	def cancel_periodic_process(project_name)
-    @port.request(:cancel_periodic_process, {:project_name => project_name})
-  end
-
-end
@@ -0,0 +1,22 @@
+class Kalibro::Kalibro < Kalibro::Model
+
+  def self.repository_types
+    request("Kalibro", :get_supported_repository_types)[:repository_type].to_a
+  end
+
+  def self.process_project(project_name, days = '0')
+    if days.to_i.zero?
+      request("Kalibro", :process_project, {:project_name => project_name})
+  	else
+      request("Kalibro", :process_periodically, {:project_name => project_name, :period_in_days => days})
+  	end
+  end
+
+	def self.process_period(project_name)
+    request("Kalibro", :get_process_period, {:project_name => project_name})[:period]
+  end
+
+	def self.cancel_periodic_process(project_name)
+    request("Kalibro", :cancel_periodic_process, {:project_name => project_name})
+  end
+end
@@ -38,4 +38,14 @@ class Kalibro::Model
     xml_name + "Xml"
   end
+  def self.client(endpoint)
+    service_address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yaml")
+    Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
+  end
+
+  def self.request(endpoint, action, request_body = nil)
+    response = client(endpoint).request(:kalibro, action) { soap.body = request_body }
+    response.to_hash["#{action}_response".to_sym]
+  end
+
 end
@@ -3,12 +3,12 @@ class Kalibro::Project &lt; Kalibro::Model
   attr_accessor :name, :license, :description, :repository, :configuration_name, :state, :error
   def self.all_names
-    request(:get_project_names)[:project_name]
+    request("Project", :get_project_names)[:project_name]
   end
   def self.find_by_name(project_name)
     begin
-      attributes = request(:get_project, :project_name => project_name)[:project]
+      attributes = request("Project", :get_project, :project_name => project_name)[:project]
       new attributes
     rescue Exception => error
       nil
@@ -16,7 +16,7 @@ class Kalibro::Project &lt; Kalibro::Model
   end
   def self.destroy(project_name)
-    request(:remove_project, {:project_name => project_name})
+    request("Project", :remove_project, {:project_name => project_name})
   end
   def self.create (content)
@@ -34,7 +34,7 @@ class Kalibro::Project &lt; Kalibro::Model
   def save
     begin
-      self.class.request(:save_project, {:project => to_hash})
+      self.class.request("Project", :save_project, {:project => to_hash})
       true
     rescue Exception => error
       false
@@ -45,18 +45,5 @@ class Kalibro::Project &lt; Kalibro::Model
     @repository = (value.kind_of?(Hash)) ? Kalibro::Repository.new(value) : value
   end
-  private
-  
-  def self.client
-    endpoint = "Project"
-    service_address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yaml")
-    Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
-  end
-
-  def self.request(action, request_body = nil)
-    response = client.request(:kalibro, action) { soap.body = request_body }
-    response.to_hash["#{action}_response".to_sym]
-  end
-  
 end
@@ -80,7 +80,7 @@ client.first_result_after(name, date)
   def send_project_to_service
     begin
       Kalibro::Project.create(self).save
-      Kalibro::Client::KalibroClient.process_project(name, periodicity_in_days)
+      Kalibro::Kalibro.process_project(name, periodicity_in_days)
     rescue Exception => error
       errors.add_to_base(error.message)
     end
@@ -1,43 +0,0 @@
-require "test_helper"
-
-class KalibroClientTest < ActiveSupport::TestCase
-
-  def setup
-    @port = mock
-    Kalibro::Client::Port.expects(:new).with('Kalibro').returns(@port)
-    @client = Kalibro::Client::KalibroClient.new
-  end
-
-  should 'get supported repository types' do
-    types = ['BAZAAR', 'GIT', 'SUBVERSION']
-    @port.expects(:request).with(:get_supported_repository_types).returns({:repository_type => types})
-    assert_equal types, @client.supported_repository_types
-  end
-
-  should 'process project' do
-    name = 'KalibroClientTest'
-    @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', 0)
-  end
-  
-  should 'process project with periodicity' do
-  	name = 'KalibroClientTest'
-    @port.expects(:request).with(:process_periodically, {:project_name => name, :period_in_days => 30})
-    @client.process_periodically(name, 30)
-  end
-  
-  should 'instantiate for processing project periodically' do
-    instance = mock
-    Kalibro::Client::KalibroClient.expects(:new).returns(instance)
-    instance.expects(:process_periodically).with('myproject', 30)
-    Kalibro::Client::KalibroClient.process_project('myproject', 30)
-  end
-  
-end
@@ -0,0 +1,34 @@
+require "test_helper"
+
+class KalibroClientTest < ActiveSupport::TestCase
+
+  def setup
+    @name = 'KalibroTest'
+  end   
+  
+  should 'get supported repository types' do
+    types = ['BAZAAR', 'GIT', 'SUBVERSION']
+    Kalibro::Kalibro.expects(:request).with('Kalibro', :get_supported_repository_types).returns({:repository_type => types})
+    assert_equal types, Kalibro::Kalibro.repository_types
+  end
+
+  should 'process project without days' do
+    Kalibro::Kalibro.expects(:request).with('Kalibro', :process_project, {:project_name => @name})
+    Kalibro::Kalibro.process_project(@name)
+  end
+
+  should 'process project with days' do
+    Kalibro::Kalibro.expects(:request).with('Kalibro', :process_periodically, {:project_name => @name, :period_in_days => "1"})
+    Kalibro::Kalibro.process_project(@name, "1")
+  end
+
+  should 'process period' do
+    Kalibro::Kalibro.expects(:request).with('Kalibro', :get_process_period,  {:project_name => @name}).returns({:period => "1"})
+    assert_equal "1", Kalibro::Kalibro.process_period(@name)
+  end
+  
+  should 'cancel periodic process' do
+    Kalibro::Kalibro.expects(:request).with("Kalibro", :cancel_periodic_process, {:project_name => @name})
+    Kalibro::Kalibro.cancel_periodic_process(@name)
+  end
+end
@@ -12,7 +12,7 @@ class ProjectTest &lt; ActiveSupport::TestCase
   should 'get all project names' do
     response_hash = {:project_name => [@project.name]}
-    Kalibro::Project.expects(:request).with(:get_project_names).returns(response_hash)
+    Kalibro::Project.expects(:request).with("Project", :get_project_names).returns(response_hash)
     assert_equal response_hash[:project_name], Kalibro::Project.all_names
   end
@@ -20,33 +20,33 @@ class ProjectTest &lt; ActiveSupport::TestCase
     request_body = {:project_name => @project.name}
     response_hash = {:project => @hash}
     Kalibro::Project.expects(:new).with(@hash).returns(@project)
-    Kalibro::Project.expects(:request).with(:get_project, request_body).returns(response_hash)
+    Kalibro::Project.expects(:request).with("Project", :get_project, request_body).returns(response_hash)
     assert_equal @project, Kalibro::Project.find_by_name(@project.name)
   end
   should 'raise error when project doesnt exist' do
     request_body = {:project_name => @project.name}
-    Kalibro::Project.expects(:request).with(:get_project, request_body).raises(Exception.new("(S:Server) There is no project named " + @project.name))
+    Kalibro::Project.expects(:request).with("Project", :get_project, request_body).raises(Exception.new("(S:Server) There is no project named " + @project.name))
     assert_nil Kalibro::Project.find_by_name(@project.name)
   end
   should 'return true when project is saved successfully' do
-    Kalibro::Project.expects(:request).with(:save_project, {:project => @project.to_hash})
+    Kalibro::Project.expects(:request).with("Project", :save_project, {:project => @project.to_hash})
     assert @project.save
   end
   should 'return false when project is not saved successfully' do
-    Kalibro::Project.expects(:request).with(:save_project, {:project => @project.to_hash}).raises(Exception.new)
+    Kalibro::Project.expects(:request).with("Project", :save_project, {:project => @project.to_hash}).raises(Exception.new)
     assert !(@project.save)
   end
   should 'remove existent project from service' do
-    Kalibro::Project.expects(:request).with(:remove_project, {:project_name => @project.name})
+    Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name})
     Kalibro::Project.destroy(@project.name)
   end
   should 'raise error when try to remove inexistent project from service' do
-    Kalibro::Project.expects(:request).with(:remove_project, {:project_name => @project.name}).raises(Exception.new)
+    Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name}).raises(Exception.new)
     assert_raise Exception do Kalibro::Project.destroy(@project.name) end
   end
@@ -96,7 +96,7 @@ returns(module_result)
     project = mock
     Kalibro::Project.expects(:create).with(@content).returns(project)
     project.expects(:save).returns(true)
-    Kalibro::Client::KalibroClient.expects(:process_project).with(@content.name, @content.periodicity_in_days)
+    Kalibro::Kalibro.expects(:process_project).with(@content.name, @content.periodicity_in_days)
     @content.send :send_project_to_service
   end
	@@ -1,39 +0,0 @@	@@ -1,39 +0,0 @@
1	-class Kalibro::Client::KalibroClient
2	-
3	- def self.process_project(project_name)
4	- new.process_project(project_name)
5	- end
6	-
7	- def initialize
8	- @port = Kalibro::Client::Port.new('Kalibro')
9	- end
10	-
11	- def supported_repository_types
12	- @port.request(:get_supported_repository_types)[:repository_type].to_a
13	- end
14	-
15	- def process_project(project_name)
16	- @port.request(:process_project, {:project_name => project_name})
17	- end
18	-
19	- def self.process_project(project_name, days)
20	- if days.to_i.zero?
21	- new.process_project(project_name)
22	- else
23	- new.process_periodically(project_name, days)
24	- end
25	- end
26	-
27	- def process_periodically(project_name, period_in_days)
28	- @port.request(:process_periodically, {:project_name => project_name, :period_in_days => period_in_days})
29	- end
30	-
31	- def process_period(project_name)
32	- @port.request(:get_process_period, {:project_name => project_name})[:period]
33	- end
34	-
35	- def cancel_periodic_process(project_name)
36	- @port.request(:cancel_periodic_process, {:project_name => project_name})
37	- end
38	-
39	-end
@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
	1	+class Kalibro::Kalibro < Kalibro::Model
	2	+
	3	+ def self.repository_types
	4	+ request("Kalibro", :get_supported_repository_types)[:repository_type].to_a
	5	+ end
	6	+
	7	+ def self.process_project(project_name, days = '0')
	8	+ if days.to_i.zero?
	9	+ request("Kalibro", :process_project, {:project_name => project_name})
	10	+ else
	11	+ request("Kalibro", :process_periodically, {:project_name => project_name, :period_in_days => days})
	12	+ end
	13	+ end
	14	+
	15	+ def self.process_period(project_name)
	16	+ request("Kalibro", :get_process_period, {:project_name => project_name})[:period]
	17	+ end
	18	+
	19	+ def self.cancel_periodic_process(project_name)
	20	+ request("Kalibro", :cancel_periodic_process, {:project_name => project_name})
	21	+ end
	22	+end
	@@ -38,4 +38,14 @@ class Kalibro::Model		@@ -38,4 +38,14 @@ class Kalibro::Model
38	xml_name + "Xml"	38	xml_name + "Xml"
39	end	39	end
40		40
		41	+ def self.client(endpoint)
		42	+ service_address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yaml")
		43	+ Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
		44	+ end
		45	+
		46	+ def self.request(endpoint, action, request_body = nil)
		47	+ response = client(endpoint).request(:kalibro, action) { soap.body = request_body }
		48	+ response.to_hash["#{action}_response".to_sym]
		49	+ end
		50	+
41	end	51	end
	@@ -80,7 +80,7 @@ client.first_result_after(name, date)		@@ -80,7 +80,7 @@ client.first_result_after(name, date)
80	def send_project_to_service	80	def send_project_to_service
81	begin	81	begin
82	Kalibro::Project.create(self).save	82	Kalibro::Project.create(self).save
83	- Kalibro::Client::KalibroClient.process_project(name, periodicity_in_days)	83	+ Kalibro::Kalibro.process_project(name, periodicity_in_days)
84	rescue Exception => error	84	rescue Exception => error
85	errors.add_to_base(error.message)	85	errors.add_to_base(error.message)
86	end	86	end
	@@ -1,43 +0,0 @@	@@ -1,43 +0,0 @@
1	-require "test_helper"
2	-
3	-class KalibroClientTest < ActiveSupport::TestCase
4	-
5	- def setup
6	- @port = mock
7	- Kalibro::Client::Port.expects(:new).with('Kalibro').returns(@port)
8	- @client = Kalibro::Client::KalibroClient.new
9	- end
10	-
11	- should 'get supported repository types' do
12	- types = ['BAZAAR', 'GIT', 'SUBVERSION']
13	- @port.expects(:request).with(:get_supported_repository_types).returns({:repository_type => types})
14	- assert_equal types, @client.supported_repository_types
15	- end
16	-
17	- should 'process project' do
18	- name = 'KalibroClientTest'
19	- @port.expects(:request).with(:process_project, {:project_name => name})
20	- @client.process_project(name)
21	- end
22	-
23	- should 'instantiate for processing project' do
24	- instance = mock
25	- Kalibro::Client::KalibroClient.expects(:new).returns(instance)
26	- instance.expects(:process_project).with('myproject')
27	- Kalibro::Client::KalibroClient.process_project('myproject', 0)
28	- end
29	-
30	- should 'process project with periodicity' do
31	- name = 'KalibroClientTest'
32	- @port.expects(:request).with(:process_periodically, {:project_name => name, :period_in_days => 30})
33	- @client.process_periodically(name, 30)
34	- end
35	-
36	- should 'instantiate for processing project periodically' do
37	- instance = mock
38	- Kalibro::Client::KalibroClient.expects(:new).returns(instance)
39	- instance.expects(:process_periodically).with('myproject', 30)
40	- Kalibro::Client::KalibroClient.process_project('myproject', 30)
41	- end
42	-
43	-end
@@ -0,0 +1,34 @@		@@ -0,0 +1,34 @@
	1	+require "test_helper"
	2	+
	3	+class KalibroClientTest < ActiveSupport::TestCase
	4	+
	5	+ def setup
	6	+ @name = 'KalibroTest'
	7	+ end
	8	+
	9	+ should 'get supported repository types' do
	10	+ types = ['BAZAAR', 'GIT', 'SUBVERSION']
	11	+ Kalibro::Kalibro.expects(:request).with('Kalibro', :get_supported_repository_types).returns({:repository_type => types})
	12	+ assert_equal types, Kalibro::Kalibro.repository_types
	13	+ end
	14	+
	15	+ should 'process project without days' do
	16	+ Kalibro::Kalibro.expects(:request).with('Kalibro', :process_project, {:project_name => @name})
	17	+ Kalibro::Kalibro.process_project(@name)
	18	+ end
	19	+
	20	+ should 'process project with days' do
	21	+ Kalibro::Kalibro.expects(:request).with('Kalibro', :process_periodically, {:project_name => @name, :period_in_days => "1"})
	22	+ Kalibro::Kalibro.process_project(@name, "1")
	23	+ end
	24	+
	25	+ should 'process period' do
	26	+ Kalibro::Kalibro.expects(:request).with('Kalibro', :get_process_period, {:project_name => @name}).returns({:period => "1"})
	27	+ assert_equal "1", Kalibro::Kalibro.process_period(@name)
	28	+ end
	29	+
	30	+ should 'cancel periodic process' do
	31	+ Kalibro::Kalibro.expects(:request).with("Kalibro", :cancel_periodic_process, {:project_name => @name})
	32	+ Kalibro::Kalibro.cancel_periodic_process(@name)
	33	+ end
	34	+end
	@@ -12,7 +12,7 @@ class ProjectTest < ActiveSupport::TestCase		@@ -12,7 +12,7 @@ class ProjectTest < ActiveSupport::TestCase
12		12
13	should 'get all project names' do	13	should 'get all project names' do
14	response_hash = {:project_name => [@project.name]}	14	response_hash = {:project_name => [@project.name]}
15	- Kalibro::Project.expects(:request).with(:get_project_names).returns(response_hash)	15	+ Kalibro::Project.expects(:request).with("Project", :get_project_names).returns(response_hash)
16	assert_equal response_hash[:project_name], Kalibro::Project.all_names	16	assert_equal response_hash[:project_name], Kalibro::Project.all_names
17	end	17	end
18		18
	@@ -20,33 +20,33 @@ class ProjectTest < ActiveSupport::TestCase		@@ -20,33 +20,33 @@ class ProjectTest < ActiveSupport::TestCase
20	request_body = {:project_name => @project.name}	20	request_body = {:project_name => @project.name}
21	response_hash = {:project => @hash}	21	response_hash = {:project => @hash}
22	Kalibro::Project.expects(:new).with(@hash).returns(@project)	22	Kalibro::Project.expects(:new).with(@hash).returns(@project)
23	- Kalibro::Project.expects(:request).with(:get_project, request_body).returns(response_hash)	23	+ Kalibro::Project.expects(:request).with("Project", :get_project, request_body).returns(response_hash)
24	assert_equal @project, Kalibro::Project.find_by_name(@project.name)	24	assert_equal @project, Kalibro::Project.find_by_name(@project.name)
25	end	25	end
26		26
27	should 'raise error when project doesnt exist' do	27	should 'raise error when project doesnt exist' do
28	request_body = {:project_name => @project.name}	28	request_body = {:project_name => @project.name}
29	- Kalibro::Project.expects(:request).with(:get_project, request_body).raises(Exception.new("(S:Server) There is no project named " + @project.name))	29	+ Kalibro::Project.expects(:request).with("Project", :get_project, request_body).raises(Exception.new("(S:Server) There is no project named " + @project.name))
30	assert_nil Kalibro::Project.find_by_name(@project.name)	30	assert_nil Kalibro::Project.find_by_name(@project.name)
31	end	31	end
32		32
33	should 'return true when project is saved successfully' do	33	should 'return true when project is saved successfully' do
34	- Kalibro::Project.expects(:request).with(:save_project, {:project => @project.to_hash})	34	+ Kalibro::Project.expects(:request).with("Project", :save_project, {:project => @project.to_hash})
35	assert @project.save	35	assert @project.save
36	end	36	end
37		37
38	should 'return false when project is not saved successfully' do	38	should 'return false when project is not saved successfully' do
39	- Kalibro::Project.expects(:request).with(:save_project, {:project => @project.to_hash}).raises(Exception.new)	39	+ Kalibro::Project.expects(:request).with("Project", :save_project, {:project => @project.to_hash}).raises(Exception.new)
40	assert !(@project.save)	40	assert !(@project.save)
41	end	41	end
42		42
43	should 'remove existent project from service' do	43	should 'remove existent project from service' do
44	- Kalibro::Project.expects(:request).with(:remove_project, {:project_name => @project.name})	44	+ Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name})
45	Kalibro::Project.destroy(@project.name)	45	Kalibro::Project.destroy(@project.name)
46	end	46	end
47		47
48	should 'raise error when try to remove inexistent project from service' do	48	should 'raise error when try to remove inexistent project from service' do
49	- Kalibro::Project.expects(:request).with(:remove_project, {:project_name => @project.name}).raises(Exception.new)	49	+ Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name}).raises(Exception.new)
50	assert_raise Exception do Kalibro::Project.destroy(@project.name) end	50	assert_raise Exception do Kalibro::Project.destroy(@project.name) end
51	end	51	end
52		52
	@@ -96,7 +96,7 @@ returns(module_result)		@@ -96,7 +96,7 @@ returns(module_result)
96	project = mock	96	project = mock
97	Kalibro::Project.expects(:create).with(@content).returns(project)	97	Kalibro::Project.expects(:create).with(@content).returns(project)
98	project.expects(:save).returns(true)	98	project.expects(:save).returns(true)
99	- Kalibro::Client::KalibroClient.expects(:process_project).with(@content.name, @content.periodicity_in_days)	99	+ Kalibro::Kalibro.expects(:process_project).with(@content.name, @content.periodicity_in_days)
100	@content.send :send_project_to_service	100	@content.send :send_project_to_service
101	end	101	end
102		102