From 661871170792598fdc164fd19d3f10e47e60e143 Mon Sep 17 00:00:00 2001
From: João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
Date: Wed, 7 Nov 2012 18:36:55 -0200
Subject: [PATCH] [Mezuro] fixed save action in model.rb.

---
 plugins/mezuro/lib/kalibro/model.rb                    | 4 ++--
 plugins/mezuro/test/unit/kalibro/project_test.rb       | 2 +-
 plugins/mezuro/test/unit/kalibro/reading_group_test.rb | 2 +-
 plugins/mezuro/test/unit/kalibro/reading_test.rb       | 2 +-
 plugins/mezuro/test/unit/kalibro/repository_test.rb    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/mezuro/lib/kalibro/model.rb b/plugins/mezuro/lib/kalibro/model.rb
index 1738d2f..00ec520 100644
--- a/plugins/mezuro/lib/kalibro/model.rb
+++ b/plugins/mezuro/lib/kalibro/model.rb
@@ -9,7 +9,7 @@ class Kalibro::Model
 
   def to_hash(options={})
     hash = Hash.new
-    excepts = !options[:except].nil? ? options[:except] : []
+    excepts = options[:except].nil? ? [] : options[:except]
     excepts << :errors
     fields.each do |field|
       if(!excepts.include?(field))
@@ -50,7 +50,7 @@ class Kalibro::Model
 
   def save
     begin
-      self.id = self.class.request(save_endpoint, save_action, save_params)
+      self.id = self.class.request(save_endpoint, save_action, save_params)["#{class_name.underscore}_id".to_sym]
 	    true
 	  rescue Exception => exception
 	    add_error exception
diff --git a/plugins/mezuro/test/unit/kalibro/project_test.rb b/plugins/mezuro/test/unit/kalibro/project_test.rb
index 9d6accf..8b7ddd1 100644
--- a/plugins/mezuro/test/unit/kalibro/project_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/project_test.rb
@@ -55,7 +55,7 @@ class ProjectTest < ActiveSupport::TestCase
 
   should 'return true when project is saved successfully' do
     id_from_kalibro = 1
-    Kalibro::Project.expects(:request).with("Project", :save_project, {:project => @created_project.to_hash}).returns(id_from_kalibro)
+    Kalibro::Project.expects(:request).with("Project", :save_project, {:project => @created_project.to_hash}).returns(:project_id => id_from_kalibro)
     assert @created_project.save
     assert_equal id_from_kalibro, @created_project.id
   end
diff --git a/plugins/mezuro/test/unit/kalibro/reading_group_test.rb b/plugins/mezuro/test/unit/kalibro/reading_group_test.rb
index 5b54805..e177802 100644
--- a/plugins/mezuro/test/unit/kalibro/reading_group_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/reading_group_test.rb
@@ -41,7 +41,7 @@ class ReadingGroupTest < ActiveSupport::TestCase
 
   should 'return true when reading group is saved successfully' do
     id_from_kalibro = 1
-    Kalibro::ReadingGroup.expects(:request).with("ReadingGroup", :save_reading_group, {:reading_group => @created_reading_group.to_hash}).returns(id_from_kalibro)
+    Kalibro::ReadingGroup.expects(:request).with("ReadingGroup", :save_reading_group, {:reading_group => @created_reading_group.to_hash}).returns(:reading_group_id => id_from_kalibro)
     assert @created_reading_group.save
     assert_equal id_from_kalibro, @created_reading_group.id
   end
diff --git a/plugins/mezuro/test/unit/kalibro/reading_test.rb b/plugins/mezuro/test/unit/kalibro/reading_test.rb
index c0bf696..acdecc8 100644
--- a/plugins/mezuro/test/unit/kalibro/reading_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/reading_test.rb
@@ -37,7 +37,7 @@ class ReadingTest < ActiveSupport::TestCase
 
   should 'return true when reading is saved successfully' do
     id_from_kalibro = 1
-    Kalibro::Reading.expects(:request).with("Reading", :save_reading, {:reading => @created_reading.to_hash}).returns(id_from_kalibro)
+    Kalibro::Reading.expects(:request).with("Reading", :save_reading, {:reading => @created_reading.to_hash}).returns(:reading_id => id_from_kalibro)
     assert @created_reading.save
     assert_equal id_from_kalibro, @created_reading.id
   end
diff --git a/plugins/mezuro/test/unit/kalibro/repository_test.rb b/plugins/mezuro/test/unit/kalibro/repository_test.rb
index f778125..867aab7 100644
--- a/plugins/mezuro/test/unit/kalibro/repository_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/repository_test.rb
@@ -38,7 +38,7 @@ class RepositoryTest < ActiveSupport::TestCase
 
   should 'return true when repository is saved successfully' do
     id_from_kalibro = 1
-    Kalibro::Repository.expects(:request).with("Repository", :save_repository, {:repository => @created_repository.to_hash}).returns(id_from_kalibro)
+    Kalibro::Repository.expects(:request).with("Repository", :save_repository, {:repository => @created_repository.to_hash}).returns(:repository_id => id_from_kalibro)
     assert @created_repository.save
     assert_equal id_from_kalibro, @created_repository.id
   end
--
libgit2 0.21.2