From 67ed0208d95caf0de4c1a80b9fb6bfe9c3310b60 Mon Sep 17 00:00:00 2001
From: Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
Date: Fri, 3 Feb 2012 16:42:39 +0300
Subject: [PATCH] Rename KalibroConfiguration->ConfigurationContent

---
 plugins/mezuro/lib/mezuro_plugin.rb                                    |  2 +-
 plugins/mezuro/lib/mezuro_plugin/configuration_content.rb              | 44 ++++++++++++++++++++++++++++++++++++++++++++
 plugins/mezuro/lib/mezuro_plugin/kalibro_configuration.rb              | 44 --------------------------------------------
 plugins/mezuro/test/unit/mezuro_plugin_test.rb                         |  8 ++++++--
 plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb | 20 ++++++++++++++++++++
 plugins/mezuro/views/cms/mezuro_plugin/_kalibro_configuration.html.erb | 20 --------------------
 6 files changed, 71 insertions(+), 67 deletions(-)
 create mode 100644 plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
 delete mode 100644 plugins/mezuro/lib/mezuro_plugin/kalibro_configuration.rb
 create mode 100644 plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
 delete mode 100644 plugins/mezuro/views/cms/mezuro_plugin/_kalibro_configuration.html.erb

diff --git a/plugins/mezuro/lib/mezuro_plugin.rb b/plugins/mezuro/lib/mezuro_plugin.rb
index 8b36374..8ff47e3 100644
--- a/plugins/mezuro/lib/mezuro_plugin.rb
+++ b/plugins/mezuro/lib/mezuro_plugin.rb
@@ -10,7 +10,7 @@ class MezuroPlugin < Noosfero::Plugin
 
   def content_types
     [MezuroPlugin::ProjectContent,
-     MezuroPlugin::KalibroConfiguration]
+     MezuroPlugin::ConfigurationContent]
   end
 
   def stylesheet?
diff --git a/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb b/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
new file mode 100644
index 0000000..c109441
--- /dev/null
+++ b/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
@@ -0,0 +1,44 @@
+class MezuroPlugin::ConfigurationContent < Article
+
+  def self.short_description
+    'Kalibro configuration'
+  end
+
+  def self.description
+    'Kalibro configuration for some project'
+  end
+
+  settings_items :description
+
+  include ActionView::Helpers::TagHelper
+  def to_html(options = {})
+    lambda do
+      render :file => 'content_viewer/show_configuration.rhtml'
+    end
+  end
+
+  def configuration
+    Kalibro::Client::ConfigurationClient.new.configuration(title)
+  end
+
+  after_save :send_configuration_to_service
+  after_destroy :remove_configuration_from_service
+
+  private
+
+  def send_configuration_to_service
+    Kalibro::Client::ConfigurationClient.save(create_configuration)
+  end
+
+  def remove_configuration_from_service
+    Kalibro::Client::ConfigurationClient.remove(title)
+  end
+
+  def create_configuration
+    configuration = Kalibro::Entities::Configuration.new
+    configuration.name = title
+    configuration.description = description
+    configuration
+  end
+
+end
diff --git a/plugins/mezuro/lib/mezuro_plugin/kalibro_configuration.rb b/plugins/mezuro/lib/mezuro_plugin/kalibro_configuration.rb
deleted file mode 100644
index 730f513..0000000
--- a/plugins/mezuro/lib/mezuro_plugin/kalibro_configuration.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-class MezuroPlugin::KalibroConfiguration < Article
-
-  def self.short_description
-    'Kalibro configuration'
-  end
-
-  def self.description
-    'Kalibro configuration for some project'
-  end
-
-  settings_items :description
-
-  include ActionView::Helpers::TagHelper
-  def to_html(options = {})
-    lambda do
-      render :file => 'content_viewer/show_configuration.rhtml'
-    end
-  end
-
-  def configuration
-    Kalibro::Client::ConfigurationClient.new.configuration(title)
-  end
-
-  after_save :send_configuration_to_service
-  after_destroy :remove_configuration_from_service
-
-  private
-
-  def send_configuration_to_service
-    Kalibro::Client::ConfigurationClient.save(create_configuration)
-  end
-
-  def remove_configuration_from_service
-    Kalibro::Client::ConfigurationClient.remove(title)
-  end
-
-  def create_configuration
-    configuration = Kalibro::Entities::Configuration.new
-    configuration.name = title
-    configuration.description = description
-    configuration
-  end
-
-end
diff --git a/plugins/mezuro/test/unit/mezuro_plugin_test.rb b/plugins/mezuro/test/unit/mezuro_plugin_test.rb
index 61a9cd8..2521bc3 100644
--- a/plugins/mezuro/test/unit/mezuro_plugin_test.rb
+++ b/plugins/mezuro/test/unit/mezuro_plugin_test.rb
@@ -17,8 +17,12 @@ class MezuroPluginTest < Test::Unit::TestCase
     assert_equal _('A metric analizer plugin.'), MezuroPlugin.plugin_description
   end
 
+  should 'have configuration content type' do
+    assert_includes @plugin.content_types, MezuroPlugin::ConfigurationContent
+  end
+
   should 'have project content type' do
-    assert_equal MezuroPlugin::ProjectContent, @plugin.content_types
+    assert_includes @plugin.content_types, MezuroPlugin::ProjectContent
   end
 
   should 'have stylesheet' do
@@ -29,4 +33,4 @@ class MezuroPluginTest < Test::Unit::TestCase
     assert_equal ['javascripts/results.js', 'javascripts/toogle.js'], @plugin.js_files
   end
 
-end
\ No newline at end of file
+end
diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
new file mode 100644
index 0000000..3b00fd8
--- /dev/null
+++ b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
@@ -0,0 +1,20 @@
+<h1> <%= _(MezuroPlugin::ConfigurationContent.short_description) %> </h1>
+
+<%
+  begin
+    @configuration = @article.title.nil? ? nil : Kalibro::Client::ConfigurationClient.new.configuration(@article.title)
+  rescue
+    @configuration = nil
+  end
+%>
+
+<%= error_messages_for 'kalibro_configuration' %>
+
+<%= hidden_field_tag 'kalibro_configuration[profile_id]', profile.id %>
+<%= hidden_field_tag 'id', @article.id %>
+
+<%= required_fields_message %>
+
+<%= required f.text_field(:name) %>
+
+<%= f.text_field :description %><br/>
diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_kalibro_configuration.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_kalibro_configuration.html.erb
deleted file mode 100644
index e8eb944..0000000
--- a/plugins/mezuro/views/cms/mezuro_plugin/_kalibro_configuration.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<h1> <%= _(MezuroPlugin::KalibroConfiguration.short_description) %> </h1>
-
-<%
-  begin
-    @configuration = @article.title.nil? ? nil : Kalibro::Client::ConfigurationClient.new.configuration(@article.title)
-  rescue
-    @configuration = nil
-  end
-%>
-
-<%= error_messages_for 'kalibro_configuration' %>
-
-<%= hidden_field_tag 'kalibro_configuration[profile_id]', profile.id %>
-<%= hidden_field_tag 'id', @article.id %>
-
-<%= required_fields_message %>
-
-<%= required f.text_field(:name) %>
-
-<%= f.text_field :description %><br/>
--
libgit2 0.21.2