diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
index e11515b..5025f95 100644
--- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
+++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
@@ -27,8 +27,7 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
 
   def edit_native
     @configuration_content = profile.articles.find(params[:id])
-    configuration_id = @configuration_content.configuration_id
-    metric_configurations = Kalibro::MetricConfiguration.metric_configurations_of(configuration_id)
+    metric_configurations = @configuration_content.metric_configurations
     @metric_configuration = find_metric_configuration(metric_configurations, params[:metric_configuration_id].to_i)
     @metric = @metric_configuration.metric
     @reading_group_names_and_ids = reading_group_names_and_ids
@@ -37,8 +36,7 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
 
   def update
     @configuration_content = profile.articles.find(params[:id])
-    configuration_id = @configuration_content.configuration_id
-    metric_configurations = Kalibro::MetricConfiguration.metric_configurations_of(configuration_id)
+    metric_configurations = @configuration_content.metric_configurations
     metric_configuration = find_metric_configuration(metric_configurations, params[:metric_configuration][:id].to_i)
     metric_configuration.update_attributes params[:metric_configuration]
     if metric_configuration_has_errors? metric_configuration
@@ -51,8 +49,7 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
   def remove
     configuration_content = profile.articles.find(params[:id])
     configuration_id = configuration_content.configuration_id
-    metric_configurations = Kalibro::MetricConfiguration.metric_configurations_of(configuration_id)
-    metric_configuration = find_metric_configuration(metric_configurations, params[:metric_configuration_id].to_i)
+    metric_configuration = Kalibro::MetricConfiguration.new({:id => params[:metric_configuration_id].to_i})
     metric_configuration.destroy
     if metric_configuration_has_errors? metric_configuration
       redirect_to_error_page metric_configuration.errors[0].message
@@ -64,15 +61,14 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
   def new_compound
     @configuration_content = profile.articles.find(params[:id])
     @metric_configurations = @configuration_content.metric_configurations
-    @reading_group_names_and_ids = reading_group_names_and_ids 
+    @reading_group_names_and_ids = reading_group_names_and_ids
     if configuration_content_has_errors?
       redirect_to_error_page @configuration_content.errors[:base]
     end
   end
 
   def create_compound
-    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
-    metric_configuration.save
+    metric_configuration = Kalibro::MetricConfiguration.create(params[:metric_configuration])
 
     if metric_configuration_has_errors? metric_configuration
       redirect_to_error_page metric_configuration.errors[0].message
@@ -84,12 +80,11 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
 
   def edit_compound    
     @configuration_content = profile.articles.find(params[:id])
-    configuration_id = @configuration_content.configuration_id
-    metric_configurations = Kalibro::MetricConfiguration.metric_configurations_of(configuration_id)
-    @metric_configuration = find_metric_configuration(metric_configurations, params[:metric_configuration_id].to_i)
+    @metric_configurations = @configuration_content.metric_configurations
+    @metric_configuration = find_metric_configuration(@metric_configurations, params[:metric_configuration_id].to_i)
     @metric = @metric_configuration.metric
     @reading_group_names_and_ids = reading_group_names_and_ids
-    @metric_configurations = metric_configurations
+    @ranges = Kalibro::Range.ranges_of(@metric_configuration.id)
   end
 
   private
diff --git a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb
index 31026d9..b4c471c 100644
--- a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb
+++ b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb
@@ -25,31 +25,23 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
     @configuration_content.expects(:validate_configuration_name).returns(true)
     @configuration_content.stubs(:solr_save)
     @configuration_content.save
-    
+
     @base_tool = BaseToolFixtures.base_tool
     @base_tool_hash = BaseToolFixtures.base_tool_hash
-    
+
     @metric = MetricFixtures.amloc
 
     @reading_group = ReadingGroupFixtures.reading_group
     @range = RangeFixtures.range
     @reading = ReadingFixtures.reading
 
-    @metric_configuration = MetricConfigurationFixtures.amloc_metric_configuration
-    @metric_configuration_hash = MetricConfigurationFixtures.amloc_metric_configuration_hash
+    @native_metric_configuration = MetricConfigurationFixtures.amloc_metric_configuration
+    @native_metric_configuration_hash = MetricConfigurationFixtures.amloc_metric_configuration_hash
     @created_metric_configuration = MetricConfigurationFixtures.created_metric_configuration
     @compound_metric_configuration = MetricConfigurationFixtures.sc_metric_configuration
-=begin
     @compound_metric_configuration_hash = MetricConfigurationFixtures.sc_metric_configuration_hash
-    
-    
-    @native_hash = @metric_configuration.to_hash.merge({:configuration_name => @metric_configuration.configuration_name})
-    @native_hash.delete :attributes!    
-    @compound_hash.delete :attributes!
-    @compound_hash = @compound_metric_configuration.to_hash.merge({:configuration_name => @compound_metric_configuration.configuration_name})
-=end
   end
-  
+
   should 'choose metric' do
     Kalibro::BaseTool.expects(:all).returns([@base_tool])
     get :choose_metric, :profile => @profile.identifier, :id => @configuration_content.id
@@ -68,27 +60,27 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
     assert_equal [[@reading_group.name,@reading_group.id]], assigns(:reading_group_names_and_ids)
     assert_response :success
   end
-  
+
   should 'create native' do
-    Kalibro::MetricConfiguration.expects(:create).returns(@created_metric_configuration) #FIXME need .with(some_hash), should it mock the request?.
-    get :create_native, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration => @metric_configuration_hash
+    Kalibro::MetricConfiguration.expects(:create).returns(@native_metric_configuration) #FIXME need .with(some_hash), should it mock the request?.
+    get :create_native, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration => @native_metric_configuration_hash
     assert_response :redirect
   end
-  
+
   should 'edit native' do
-    Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration.id).returns([@metric_configuration])
+    Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration.id).returns([@native_metric_configuration])
     Kalibro::ReadingGroup.expects(:all).returns([@reading_group])
-    Kalibro::Range.expects(:ranges_of).with(@metric_configuration.id).returns([@range])
+    Kalibro::Range.expects(:ranges_of).with(@native_metric_configuration.id).returns([@range])
     Kalibro::Reading.expects(:find).with(@range.reading_id).returns(@reading)    
-    get :edit_native, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id
+    get :edit_native, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration_id => @native_metric_configuration.id
     assert_equal @configuration_content, assigns(:configuration_content)
-    assert_equal @metric_configuration.code, assigns(:metric_configuration).code
-    assert_equal @metric_configuration.metric.name, assigns(:metric).name
+    assert_equal @native_metric_configuration.code, assigns(:metric_configuration).code
+    assert_equal @native_metric_configuration.metric.name, assigns(:metric).name
     assert_equal [[@reading_group.name,@reading_group.id]], assigns(:reading_group_names_and_ids)
     assert_equal [@range], assigns(:ranges)
     assert_response :success
   end
-  
+
   should 'initialize compound' do
     Kalibro::ReadingGroup.expects(:all).returns([@reading_group])
     Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration_content.configuration_id).returns([@compound_metric_configuration])
@@ -100,55 +92,39 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
   end
 
   should 'create compound' do
-=begin TODO ARRUMAR ESTE TESTE!!!
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-      :metric_configuration => @compound_metric_configuration.to_hash,
-      :configuration_name => @compound_metric_configuration.configuration_name})
-    get :create_compound_metric_configuration, :profile => @profile.identifier, :id => @configuration_content.id, 
-      :metric_configuration => @compound_hash
-    assert_response 302
-=end
+    Kalibro::MetricConfiguration.expects(:create).returns(@compound_metric_configuration) #FIXME need .with(some_hash), should it mock the request?.
+    get :create_compound, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration => @compound_metric_configuration_hash
+    assert_response :redirect
   end
 
   should 'edit compound' do
-=begin TODO ARRUMAR ESTE TESTE!!!
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @configuration_content.name,
-      :metric_name => @compound_metric_configuration.metric.name}).returns({:metric_configuration => @compound_metric_configuration_hash})
-    Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, {:configuration_name => @configuration_content.name}).returns({:configuration => @configuration_hash})
-    get :edit_compound_metric_configuration,
-        :profile => @profile.identifier,
-        :id => @configuration_content.id,
-        :metric_name => @compound_metric_configuration.metric.name
+    Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration.id).returns([@compound_metric_configuration])
+    Kalibro::ReadingGroup.expects(:all).returns([@reading_group])
+    Kalibro::Range.expects(:ranges_of).with(@compound_metric_configuration.id).returns([@range])
+    Kalibro::Reading.expects(:find).with(@range.reading_id).returns(@reading)    
+    get :edit_compound, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration_id => @compound_metric_configuration.id
     assert_equal @configuration_content, assigns(:configuration_content)
     assert_equal @compound_metric_configuration.code, assigns(:metric_configuration).code
     assert_equal @compound_metric_configuration.metric.name, assigns(:metric).name
-    assert_equal @configuration.metric_configuration[0].code, assigns(:metric_configurations)[0].code
-    assert_response 200
-=end
+    assert_equal [@compound_metric_configuration], assigns(:metric_configurations)
+    assert_equal [[@reading_group.name,@reading_group.id]], assigns(:reading_group_names_and_ids)
+    assert_equal [@range], assigns(:ranges)
+    assert_response :success
   end
-  
+
   should 'update' do
-=begin TODO ARRUMAR ESTE TESTE!!!
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @configuration_content.name,
-      :metric_name => @metric_configuration.metric.name}).returns({:metric_configuration => @metric_configuration_hash})
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-        :metric_configuration => @metric_configuration.to_hash,
-        :configuration_name => @metric_configuration.configuration_name})
-    get :update_metric_configuration, :profile => @profile.identifier, :id => @configuration_content.id, 
-      :metric_configuration => @native_hash
+    Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration_content.configuration_id).returns([@native_metric_configuration])
+    @native_metric_configuration.expects(:update_attributes).returns(true) #FIXME need .with(some_hash), should it mock the request?.
+    get :update, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration => @native_metric_configuration_hash
     assert_equal @configuration_content, assigns(:configuration_content)
     assert_response 302
-=end
   end
-  
+
   should 'remove' do
-    Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration.id).returns([@metric_configuration])
-    @metric_configuration.expects(:destroy).returns()
-    get :remove, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id
+    Kalibro::MetricConfiguration.expects(:new).with({:id => @native_metric_configuration.id}).returns(@native_metric_configuration)
+    @native_metric_configuration.expects(:destroy).returns()
+    get :remove, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration_id => @native_metric_configuration.id
     assert_response 302
   end
 
-
 end
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml
index 393bf06..1adf7a4 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml
@@ -1,9 +1,9 @@
 <% form_for :metric_configuration, :url => {:action =>"update", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
   <%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %>
-  <%= f.hidden_field :id, :value => @metric_configuration.id %>
+  <%= f.hidden_field :id %>
 
-  <%= labelled_form_field _('Collector Name:'), f.text_field(:base_tool_name, :value => @base_tool_name, :readonly => true) %>
+  <%= labelled_form_field _('Collector Name:'), f.text_field(:base_tool_name, :readonly => true) %>
 
   <% f.fields_for :metric do |m| %>
     <%= m.hidden_field :compound, :value => "false" %>
@@ -18,13 +18,12 @@
   <%= required labelled_form_field _('Code:'), f.text_field(:code) %>
 
   <%= required labelled_form_field _('Aggregation Form:'),
-  f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options,
-      :selected => @metric_configuration.aggregation_form ) %>
+  f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %>
 
   <%= required labelled_form_field _('Weight:'), f.text_field(:weight) %>
   
   <%= required labelled_form_field _('Reading Group:'),
-  f.select(:reading_group_id, @reading_group_names_and_ids, :selected => @metric_configuration.reading_group_id.to_i) %>
+  f.select(:reading_group_id, @reading_group_names_and_ids) %>
   
   <p>
     <%= f.submit "Save" %>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
index ee590a6..c64f2b5 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
@@ -4,10 +4,12 @@
 
 <h2><%= @configuration_content.name %> Configuration</h2>
 
+<% owner = (not user.nil?) && user.id == @profile.id %>
+
 <% form_for :metric_configuration, :url => {:action =>"update", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
   <%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %>
-  <%= f.hidden_field :id, :value => @metric_configuration.id %>
+  <%= f.hidden_field :id %>
   
   <% f.fields_for :metric do |m| %>
     <%= m.hidden_field :compound, :value => "true" %>
@@ -18,13 +20,11 @@
           m.select(:scope, MezuroPlugin::Helpers::ContentViewerHelper.scope_options, :selected => @metric.scope) %>
   <% end %>
   
-  <%= required labelled_form_field _('Code:'), f.text_field(:code), :value => @metric_configuration.code %>
+  <%= required labelled_form_field _('Code:'), f.text_field(:code) %>
   <%= required labelled_form_field _('Aggregation Form:'),
-      f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options,
-      :selected => @metric_configuration.aggregation_form ) %>
-  <%= required labelled_form_field _('Weight:'), f.text_field(:weight), :value => @metric_configuration.weight %>
-  <%= required labelled_form_field _('Reading Group:'), f.select(:reading_group_id, @reading_group_names_and_ids,
-      :selected => @metric_configuration.reading_group_id.to_i) %>
+      f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %>
+  <%= required labelled_form_field _('Weight:'), f.text_field(:weight) %>
+  <%= required labelled_form_field _('Reading Group:'), f.select(:reading_group_id, @reading_group_names_and_ids) %>
   
   <p><%= f.submit "Save" %></p>
   
--
libgit2 0.21.2