Skip to content
Browse files

Optimistic locking: raise ActiveResource::ResourceConflict on 409 Con…

…flict response.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5078 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 2c6747f commit 0a84624bd78643f2161d162f68669de03fe2bac8 @jeremy jeremy committed Sep 9, 2006
View
9 activeresource/CHANGELOG
@@ -1,5 +1,14 @@
*SVN*
+* Optimistic locking: raise ActiveResource::ResourceConflict on 409 Conflict response. [Jeremy Kemper]
+
+ # Example controller action
+ def update
+ @person.save!
+ rescue ActiveRecord::StaleObjectError
+ render :xml => @person.reload.to_xml, :status => '409 Conflict'
+ end
+
* Basic validation support [Rick Olson]
Parses the xml response of ActiveRecord::Errors#to_xml with a similar interface to ActiveRecord::Errors.
View
12 activeresource/lib/active_resource/connection.rb
@@ -17,14 +17,12 @@ def to_s
end
end
- class ClientError < ConnectionError
- end
+ class ClientError < ConnectionError; end # 4xx Client Error
+ class ResourceNotFound < ClientError; end # 404 Not Found
+ class ResourceConflict < ClientError; end # 409 Conflict
- class ServerError < ConnectionError
- end
+ class ServerError < ConnectionError; end # 5xx Server Error
- class ResourceNotFound < ClientError
- end
class Connection
attr_accessor :site
@@ -73,6 +71,8 @@ def handle_response(response)
raise(ResourceNotFound.new(response))
when 400
raise(ResourceInvalid.new(response))
+ when 409
+ raise(ResourceConflict.new(response))
when 401...500
raise(ClientError.new(response))
when 500...600
View
8 activeresource/test/base_test.rb
@@ -133,6 +133,14 @@ def test_update_with_custom_prefix
addy.save
end
+ def test_update_conflict
+ ActiveResource::HttpMock.respond_to do |mock|
+ mock.get "/people/2.xml", @david
+ mock.put "/people/2", nil, 409
+ end
+ assert_raises(ActiveResource::ResourceConflict) { Person.find(2).save }
+ end
+
def test_destroy
assert Person.find(1).destroy
ActiveResource::HttpMock.respond_to do |mock|
View
3 activeresource/test/connection_test.rb
@@ -20,6 +20,9 @@ def test_handle_response
# 400 is a validation error
assert_response_raises ActiveResource::ResourceInvalid, 400
+ # 409 is an optimistic locking error
+ assert_response_raises ActiveResource::ResourceConflict, 409
+
# 4xx are client errors.
[401, 499].each do |code|
assert_response_raises ActiveResource::ClientError, code

0 comments on commit 0a84624

Please sign in to comment.
Something went wrong with that request. Please try again.