Merge branch 'master' of git@github.com:lifo/docrails

3 files changed, 8 insertions, 1 deletions

diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index 74ca71f65a..114a63c415 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -1,3 +1,8 @@
+*2.2.1 [RC2 or 2.2 final]*
+
+* Fixed that ActiveResource#post would post an empty string when it shouldn't be posting anything #525 [Paolo Angelini]
+
+
 *2.2.0 [RC1] (October 24th, 2008)*
 
 * Add ActiveResource::Base#to_xml and ActiveResource::Base#to_json. #1011 [Rasik Pandey, Cody Fauser]
diff --git a/activeresource/lib/active_resource/custom_methods.rb b/activeresource/lib/active_resource/custom_methods.rb
index 24306f251d..4647e8342c 100644
--- a/activeresource/lib/active_resource/custom_methods.rb
+++ b/activeresource/lib/active_resource/custom_methods.rb
@@ -90,7 +90,7 @@ module ActiveResource
       end
 
       def post(method_name, options = {}, body = nil)
-        request_body = body.nil? ? encode : body
+        request_body = body.blank? ? encode : body
         if new?
           connection.post(custom_method_new_element_url(method_name, options), request_body, self.class.headers)
         else
diff --git a/activeresource/test/base/custom_methods_test.rb b/activeresource/test/base/custom_methods_test.rb
index ba5799edfb..61887f4ec7 100644
--- a/activeresource/test/base/custom_methods_test.rb
+++ b/activeresource/test/base/custom_methods_test.rb
@@ -81,6 +81,8 @@ class CustomMethodsTest < Test::Unit::TestCase
     # Test POST against a new element URL
     ryan = Person.new(:name => 'Ryan')
     assert_equal ActiveResource::Response.new(@ryan, 201, {'Location' => '/people/5.xml'}), ryan.post(:register)
+    expected_request = ActiveResource::Request.new(:post, '/people/new/register.xml', @ryan)
+    assert_equal expected_request.body, ActiveResource::HttpMock.requests.first.body
 
     # Test POST against a nested collection URL
     addy = StreetAddress.new(:street => '123 Test Dr.', :person_id => 1)