[Mezuro] Fixing clone configuration feature and some refactoring

João M. M. da Silva + Diego Araújo · João M. M. da Silva
1 parent 7ad294ee
Showing 10 changed files with 96 additions and 93 deletions Show diff stats
plugins/mezuro/lib/kalibro/configuration.rb
plugins/mezuro/lib/kalibro/model.rb
plugins/mezuro/lib/kalibro/project.rb
plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/test/fixtures/configuration_fixtures.rb
plugins/mezuro/test/unit/kalibro/configuration_test.rb
plugins/mezuro/test/unit/kalibro/project_test.rb
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
@@ -19,24 +19,19 @@ class Kalibro::Configuration &lt; Kalibro::Model
   end
   def self.find_by_name(configuration_name)
-    new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration]
-  end
-
-  def self.create(content, configuration)
-    attributes = {
-      :name => content.name,
-      :description => content.description,
-      :metric_configuration => configuration.to_hash[:metric_configuration]
-  	}
-  	super attributes
+    begin
+      new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration]
+    rescue Exception => error
+      nil
+    end
   end
   def self.all_names
-    request("Configuration", :get_configuration_names)[:configuration_name]
-  end
-
-  def destroy
-    self.class.request("Configuration", :remove_configuration, {:configuration_name => name})
+    begin
+      request("Configuration", :get_configuration_names)[:configuration_name]
+    rescue Exception
+      []
+    end
   end
   def update_attributes(attributes={})
@@ -44,4 +39,7 @@ class Kalibro::Configuration &lt; Kalibro::Model
     save
   end
+  def metric_configurations_hash
+    self.to_hash[:metric_configuration]
+  end
 end
@@ -37,7 +37,9 @@ class Kalibro::Model
   end 
   def self.create(attributes={})
-    new(attributes).save
+    new_model = new attributes
+    new_model.save
+    new_model
   end
   def save
@@ -49,6 +51,13 @@ class Kalibro::Model
 	  end
   end
+  def destroy
+    begin
+      self.class.request(destroy_endpoint, destroy_action, destroy_params)
+    rescue Exception
+    end
+  end
+
   protected
   def fields
@@ -101,4 +110,17 @@ class Kalibro::Model
   def save_params
     {class_name.underscore.to_sym => self.to_hash}
   end
+  
+  def destroy_endpoint
+    class_name
+  end
+  
+  def destroy_action
+    "remove_#{class_name.underscore}".to_sym
+  end
+  
+  def destroy_params
+    {"#{class_name.underscore}_name".to_sym => self.name}
+  end
+
 end
@@ -10,24 +10,6 @@ class Kalibro::Project &lt; Kalibro::Model
     new request("Project", :get_project, :project_name => project_name)[:project]
   end
-  def self.create(content)
-    attributes = {
-      :name => content.name,
-      :license => content.license,
-      :description => content.description,
-      :repository => {
-        :type => content.repository_type,
-        :address => content.repository_url
-      },
-      :configuration_name => content.configuration_name
-    }
-    super attributes
-  end
-
-  def destroy
-    self.class.request("Project", :remove_project, {:project_name => name})
-  end
-
   def repository=(value)
     @repository = Kalibro::Repository.to_object value
   end
@@ -19,12 +19,11 @@ class MezuroPlugin::ConfigurationContent &lt; Article
   end
   def configuration
-    begin
-      @configuration ||= Kalibro::Configuration.find_by_name(self.name)
-    rescue Exception => error
-      errors.add_to_base(error.message)
-      nil
+    @configuration ||= Kalibro::Configuration.find_by_name(self.name)
+    if @configuration.nil? 
+      errors.add_to_base("Kalibro Configuration not found")
     end
+    @configuration
   end
   def metric_configurations
@@ -49,24 +48,35 @@ class MezuroPlugin::ConfigurationContent &lt; Article
   end
   def send_configuration_to_service
-    if configuration.nil?
-      begin
-        clone_configuration = Kalibro::Configuration.find_by_name(self.clone_configuration_name)
-      rescue Exception => error
-        clone_configuration = nil
-      end
-      Kalibro::Configuration.create(self, clone_configuration)
-    else
+    if editing_configuration?
       configuration.update_attributes({:description => description})
+    else
+      create_kalibro_configuration
     end
   end
   def remove_configuration_from_service
-    begin
-      configuration.destroy
-    rescue Exception => error
-      errors.add_to_base(error.message)
+    configuration.destroy
+  end
+
+  def create_kalibro_configuration
+    attributes = {:name => name, :description => description}
+    if cloning_configuration?
+      attributes[:metric_configuration] = configuration_to_clone.metric_configurations_hash
     end
+    Kalibro::Configuration.create attributes
+  end
+  
+  def editing_configuration?
+    !configuration.nil?
+  end
+  
+  def configuration_to_clone
+    @configuration_to_clone ||= Kalibro::Configuration.find_by_name(self.clone_configuration_name)
+  end
+  
+  def cloning_configuration?
+    configuration_to_clone.nil?
   end
 end
@@ -87,20 +87,25 @@ Kalibro::ProjectResult.first_result_after(name, date)
   end
   def send_project_to_service
-    begin
-      Kalibro::Project.create(self)
-      project.process_project(periodicity_in_days)
-    rescue Exception => error
-      errors.add_to_base(error.message)
-    end
+    created_project = create_kalibro_project
+    created_project.process_project(periodicity_in_days)
+  end
+
+  def create_kalibro_project
+   Kalibro::Project.create(
+      :name => name,
+      :license => license,
+      :description => description,
+      :repository => {
+        :type => repository_type,
+        :address => repository_url
+      },
+      :configuration_name => configuration_name
+    )
   end
   def destroy_project_from_service
-    begin
-      project.destroy
-    rescue Exception => error
-      errors.add_to_base(error.message)
-    end
+    project.destroy
   end
 end
@@ -16,5 +16,13 @@ class ConfigurationFixtures
       ]
     }
   end
+  
+  def self.configuration_content(clone_configuration)
+    MezuroPlugin::ConfigurationContent.new({
+      :name => 'Sample Configuration',
+      :description => 'Kalibro configuration for Java projects.',
+      :clone_configuration_name => clone_configuration
+    })
+  end
 end
@@ -7,6 +7,7 @@ class ConfigurationTest &lt; ActiveSupport::TestCase
   def setup
     @hash = ConfigurationFixtures.configuration_hash
     @configuration = ConfigurationFixtures.configuration
+    @configuration_content = ConfigurationFixtures.configuration_content([])
   end
   should 'initialize configuration' do
@@ -26,7 +27,7 @@ class ConfigurationTest &lt; ActiveSupport::TestCase
     Kalibro::Configuration.expects(:request).with("Configuration", :save_configuration, {:configuration => @configuration.to_hash}).raises(Exception.new)
     assert !(@configuration.save)
   end
-
+  
   should 'get all configuration names' do
     names = ['Kalibro for Java', 'ConfigurationClientTest configuration']
     Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration_names).returns({:configuration_name => names})
@@ -40,19 +41,14 @@ class ConfigurationTest &lt; ActiveSupport::TestCase
     assert_equal @configuration.name, Kalibro::Configuration.find_by_name(@configuration.name).name
   end
-  should 'raise error when configuration doesnt exist' do
+  should 'return nil when configuration doesnt exist' do
     request_body = {:configuration_name => @configuration.name}
     Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, request_body).raises(Exception.new)
-    assert_raise Exception do Kalibro::Configuration.find_by_name(@configuration.name) end
+    assert_nil Kalibro::Configuration.find_by_name(@configuration.name)
   end
   should 'destroy configuration by name' do
     Kalibro::Configuration.expects(:request).with("Configuration", :remove_configuration, {:configuration_name => @configuration.name})
     @configuration.destroy
   end
-  
-  should 'raise error when try to destroy inexistent configuration from service' do
-    Kalibro::Configuration.expects(:request).with("Configuration", :remove_configuration, {:configuration_name => @configuration.name}).raises(Exception.new)
-    assert_raise Exception do @configuration.destroy end
-  end
 end
@@ -44,11 +44,6 @@ class ProjectTest &lt; ActiveSupport::TestCase
     Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name})
     @project.destroy
   end
-
-  should 'raise error when try to remove inexistent project from service' do
-    Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name}).raises(Exception.new)
-    assert_raise Exception do @project.destroy end
-  end
   should 'initialize new project from hash' do
     project = Kalibro::Project.new @hash
@@ -56,21 +51,6 @@ class ProjectTest &lt; ActiveSupport::TestCase
     assert_equal @project.repository.type, project.repository.type
   end
-  should 'create project' do
-    project_hash = Kalibro::Project.new({
-      :name => @project_content.name,
-      :license => @project_content.license,
-      :description => @project_content.description,
-      :repository => {
-        :type => @project_content.repository_type,
-        :address => @project_content.repository_url
-      },
-      :configuration_name => @project_content.configuration_name
-    }).to_hash
-    Kalibro::Project.expects(:request).with("Project", :save_project, {:project => project_hash})
-    Kalibro::Project.create @project_content
-  end
-
   should 'convert project to hash' do
     hash = @project.to_hash
     assert_equal @hash[:name], hash[:name]
@@ -98,8 +98,10 @@ class ProjectContentTest &lt; ActiveSupport::TestCase
   end
   should 'send correct project to service' do
-    Kalibro::Project.expects(:create).with(@content).returns(true)
-    Kalibro::Project.expects(:find_by_name).with(@content.name).returns(@project)
+    hash = ProjectFixtures.project_hash
+    hash.delete(:attributes!)
+    hash.delete(:state)
+    Kalibro::Project.expects(:create).with(hash).returns(@project)
     @project.expects(:process_project).with(@content.periodicity_in_days)
     @content.send :send_project_to_service
   end
@@ -15,7 +15,7 @@
 <% configuration_names = @article.configuration_names %>
-<% selected = (configuration.nil? ? configuration_names[0] : @article.clone_configuration_name) %>
+<% selected = (configuration.nil? ? "None" : @article.clone_configuration_name) %>
 <%= required_fields_message %>
	@@ -37,7 +37,9 @@ class Kalibro::Model		@@ -37,7 +37,9 @@ class Kalibro::Model
37	end	37	end
38		38
39	def self.create(attributes={})	39	def self.create(attributes={})
40	- new(attributes).save	40	+ new_model = new attributes
		41	+ new_model.save
		42	+ new_model
41	end	43	end
42		44
43	def save	45	def save
	@@ -49,6 +51,13 @@ class Kalibro::Model		@@ -49,6 +51,13 @@ class Kalibro::Model
49	end	51	end
50	end	52	end
51		53
		54	+ def destroy
		55	+ begin
		56	+ self.class.request(destroy_endpoint, destroy_action, destroy_params)
		57	+ rescue Exception
		58	+ end
		59	+ end
		60	+
52	protected	61	protected
53		62
54	def fields	63	def fields
	@@ -101,4 +110,17 @@ class Kalibro::Model		@@ -101,4 +110,17 @@ class Kalibro::Model
101	def save_params	110	def save_params
102	{class_name.underscore.to_sym => self.to_hash}	111	{class_name.underscore.to_sym => self.to_hash}
103	end	112	end
		113	+
		114	+ def destroy_endpoint
		115	+ class_name
		116	+ end
		117	+
		118	+ def destroy_action
		119	+ "remove_#{class_name.underscore}".to_sym
		120	+ end
		121	+
		122	+ def destroy_params
		123	+ {"#{class_name.underscore}_name".to_sym => self.name}
		124	+ end
		125	+
104	end	126	end
	@@ -10,24 +10,6 @@ class Kalibro::Project < Kalibro::Model		@@ -10,24 +10,6 @@ class Kalibro::Project < Kalibro::Model
10	new request("Project", :get_project, :project_name => project_name)[:project]	10	new request("Project", :get_project, :project_name => project_name)[:project]
11	end	11	end
12		12
13	- def self.create(content)
14	- attributes = {
15	- :name => content.name,
16	- :license => content.license,
17	- :description => content.description,
18	- :repository => {
19	- :type => content.repository_type,
20	- :address => content.repository_url
21	- },
22	- :configuration_name => content.configuration_name
23	- }
24	- super attributes
25	- end
26	-
27	- def destroy
28	- self.class.request("Project", :remove_project, {:project_name => name})
29	- end
30	-
31	def repository=(value)	13	def repository=(value)
32	@repository = Kalibro::Repository.to_object value	14	@repository = Kalibro::Repository.to_object value
33	end	15	end
	@@ -16,5 +16,13 @@ class ConfigurationFixtures		@@ -16,5 +16,13 @@ class ConfigurationFixtures
16	]	16	]
17	}	17	}
18	end	18	end
		19	+
		20	+ def self.configuration_content(clone_configuration)
		21	+ MezuroPlugin::ConfigurationContent.new({
		22	+ :name => 'Sample Configuration',
		23	+ :description => 'Kalibro configuration for Java projects.',
		24	+ :clone_configuration_name => clone_configuration
		25	+ })
		26	+ end
19		27
20	end	28	end
	@@ -44,11 +44,6 @@ class ProjectTest < ActiveSupport::TestCase		@@ -44,11 +44,6 @@ class ProjectTest < ActiveSupport::TestCase
44	Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name})	44	Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name})
45	@project.destroy	45	@project.destroy
46	end	46	end
47	-
48	- should 'raise error when try to remove inexistent project from service' do
49	- Kalibro::Project.expects(:request).with("Project", :remove_project, {:project_name => @project.name}).raises(Exception.new)
50	- assert_raise Exception do @project.destroy end
51	- end
52		47
53	should 'initialize new project from hash' do	48	should 'initialize new project from hash' do
54	project = Kalibro::Project.new @hash	49	project = Kalibro::Project.new @hash
	@@ -56,21 +51,6 @@ class ProjectTest < ActiveSupport::TestCase		@@ -56,21 +51,6 @@ class ProjectTest < ActiveSupport::TestCase
56	assert_equal @project.repository.type, project.repository.type	51	assert_equal @project.repository.type, project.repository.type
57	end	52	end
58		53
59	- should 'create project' do
60	- project_hash = Kalibro::Project.new({
61	- :name => @project_content.name,
62	- :license => @project_content.license,
63	- :description => @project_content.description,
64	- :repository => {
65	- :type => @project_content.repository_type,
66	- :address => @project_content.repository_url
67	- },
68	- :configuration_name => @project_content.configuration_name
69	- }).to_hash
70	- Kalibro::Project.expects(:request).with("Project", :save_project, {:project => project_hash})
71	- Kalibro::Project.create @project_content
72	- end
73	-
74	should 'convert project to hash' do	54	should 'convert project to hash' do
75	hash = @project.to_hash	55	hash = @project.to_hash
76	assert_equal @hash[:name], hash[:name]	56	assert_equal @hash[:name], hash[:name]
	@@ -15,7 +15,7 @@		@@ -15,7 +15,7 @@
15		15
16	<% configuration_names = @article.configuration_names %>	16	<% configuration_names = @article.configuration_names %>
17		17
18	-<% selected = (configuration.nil? ? configuration_names[0] : @article.clone_configuration_name) %>	18	+<% selected = (configuration.nil? ? "None" : @article.clone_configuration_name) %>
19		19
20	<%= required_fields_message %>	20	<%= required_fields_message %>
21		21