From 916b18adeb0a1ae09fdaff21dda8d0bc8ed4ffa9 Mon Sep 17 00:00:00 2001
From: Jordan Brough <jordan@animoto.com>
Date: Sun, 9 Aug 2009 22:53:04 +0100
Subject: Active Resource recognizes 410 as Resource Gone now [#2316
 state:resolved] [Jordan Brough, Jatinder Singh]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 activeresource/CHANGELOG                         |  2 ++
 activeresource/lib/active_resource/base.rb       |  3 ++-
 activeresource/lib/active_resource/connection.rb |  2 ++
 activeresource/lib/active_resource/exceptions.rb |  3 +++
 activeresource/test/base_test.rb                 | 24 ++++++++++++++++++++++++
 activeresource/test/connection_test.rb           |  3 +++
 6 files changed, 36 insertions(+), 1 deletion(-)

(limited to 'activeresource')

diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index 2b10fad4a5..aaa0eefe3c 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -1,5 +1,7 @@
 *Edge*
 
+* Recognizes 410 as Resource Gone. #2316 [Jordan Brough, Jatinder Singh]
+
 * More thorough SSL support.  #2370 [Roy Nicholson]
 
 * HTTP proxy support.  #2133 [Marshall Huss, Sébastien Dabet]
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index a66ce4c23f..0311419fd6 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -164,6 +164,7 @@ module ActiveResource
   # * 404 - ActiveResource::ResourceNotFound
   # * 405 - ActiveResource::MethodNotAllowed
   # * 409 - ActiveResource::ResourceConflict
+  # * 410 - ActiveResource::ResourceGone
   # * 422 - ActiveResource::ResourceInvalid (rescued by save as validation errors)
   # * 401..499 - ActiveResource::ClientError
   # * 500..599 - ActiveResource::ServerError
@@ -626,7 +627,7 @@ module ActiveResource
           response.code.to_i == 200
         end
         # id && !find_single(id, options).nil?
-      rescue ActiveResource::ResourceNotFound
+      rescue ActiveResource::ResourceNotFound, ActiveResource::ResourceGone
         false
       end
 
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index 884c425c1d..9d551f04e7 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -131,6 +131,8 @@ module ActiveResource
             raise(MethodNotAllowed.new(response))
           when 409
             raise(ResourceConflict.new(response))
+          when 410
+            raise(ResourceGone.new(response))
           when 422
             raise(ResourceInvalid.new(response))
           when 401...500
diff --git a/activeresource/lib/active_resource/exceptions.rb b/activeresource/lib/active_resource/exceptions.rb
index dd59146b1a..0631cdcf9f 100644
--- a/activeresource/lib/active_resource/exceptions.rb
+++ b/activeresource/lib/active_resource/exceptions.rb
@@ -51,6 +51,9 @@ module ActiveResource
   # 409 Conflict
   class ResourceConflict < ClientError; end # :nodoc:
 
+  # 410 Gone
+  class ResourceGone < ClientError; end # :nodoc:
+
   # 5xx Server Error
   class ServerError < ConnectionError; end # :nodoc:
 
diff --git a/activeresource/test/base_test.rb b/activeresource/test/base_test.rb
index cba675177a..9c236bc893 100644
--- a/activeresource/test/base_test.rb
+++ b/activeresource/test/base_test.rb
@@ -899,6 +899,14 @@ class BaseTest < Test::Unit::TestCase
     assert_raise(ActiveResource::ResourceNotFound) { StreetAddress.find(1, :params => { :person_id => 1 }) }
   end
 
+  def test_destroy_with_410_gone
+    assert Person.find(1).destroy
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.get "/people/1.xml", {}, nil, 410
+    end
+    assert_raise(ActiveResource::ResourceGone) { Person.find(1).destroy }
+  end
+
   def test_delete
     assert Person.delete(1)
     ActiveResource::HttpMock.respond_to do |mock|
@@ -914,6 +922,14 @@ class BaseTest < Test::Unit::TestCase
     end
     assert_raise(ActiveResource::ResourceNotFound) { StreetAddress.find(1, :params => { :person_id => 1 }) }
   end
+  
+  def test_delete_with_410_gone
+    assert Person.delete(1)
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.get "/people/1.xml", {}, nil, 410
+    end
+    assert_raise(ActiveResource::ResourceGone) { Person.find(1) }
+  end
 
   def test_exists
     # Class method.
@@ -974,6 +990,14 @@ class BaseTest < Test::Unit::TestCase
     assert Person.exists?('not-mocked')
   end
 
+  def test_exists_with_410_gone
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.head "/people/1.xml", {}, nil, 410
+    end
+
+    assert !Person.exists?(1)
+  end
+
   def test_to_xml
     matz = Person.find(1)
     xml = matz.encode
diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb
index b482f2dd0e..d7466c65b4 100644
--- a/activeresource/test/connection_test.rb
+++ b/activeresource/test/connection_test.rb
@@ -56,6 +56,9 @@ class ConnectionTest < Test::Unit::TestCase
     # 409 is an optimistic locking error
     assert_response_raises ActiveResource::ResourceConflict, 409
 
+    # 410 is a removed resource
+    assert_response_raises ActiveResource::ResourceGone, 410
+
     # 422 is a validation error
     assert_response_raises ActiveResource::ResourceInvalid, 422
 
-- 
cgit v1.2.3