From 5396b0f3b0c2f6a2afc4ab1af114123bc410cc4d Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Sat, 9 Feb 2008 22:21:55 +0000 Subject: [PATCH] Use HEAD instead of GET inside exists? Closes #11062 [bscofield] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8827 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activeresource/CHANGELOG | 2 ++ activeresource/lib/active_resource/base.rb | 8 +++++++- activeresource/lib/active_resource/connection.rb | 6 ++++++ activeresource/lib/active_resource/http_mock.rb | 4 ++-- activeresource/test/base_test.rb | 5 +++++ activeresource/test/connection_test.rb | 7 +++++++ 6 files changed, 29 insertions(+), 3 deletions(-) diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index 89878aa214..cbb56c5609 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Use HEAD instead of GET in exists? [bscofield] + * Fix small documentation typo. Closes #10670 [l.guidi] * find_or_create_resource_for handles module nesting. #10646 [xavier] diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index eea6259a64..97baa46682 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -436,7 +436,13 @@ def delete(id, options = {}) # Note.exists(1349) # # => false def exists?(id, options = {}) - id && !find_single(id, options).nil? + if id + prefix_options, query_options = split_options(options[:params]) + path = element_path(id, prefix_options, query_options) + response = connection.head(path, headers) + response.code == 200 + end + # id && !find_single(id, options).nil? rescue ActiveResource::ResourceNotFound false end diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb index 2bf83b1615..e4e6da50c9 100644 --- a/activeresource/lib/active_resource/connection.rb +++ b/activeresource/lib/active_resource/connection.rb @@ -101,6 +101,12 @@ def post(path, body = '', headers = {}) request(:post, path, body.to_s, build_request_headers(headers)) end + # Execute a HEAD request. + # Used to ... + def head(path, headers= {}) + request(:head, path, build_request_headers(headers)) + end + private # Makes request to remote service. diff --git a/activeresource/lib/active_resource/http_mock.rb b/activeresource/lib/active_resource/http_mock.rb index d70364c5eb..d1c1412575 100644 --- a/activeresource/lib/active_resource/http_mock.rb +++ b/activeresource/lib/active_resource/http_mock.rb @@ -9,7 +9,7 @@ def initialize(responses) @responses = responses end - for method in [ :post, :put, :get, :delete ] + for method in [ :post, :put, :get, :delete, :head ] module_eval <<-EOE, __FILE__, __LINE__ def #{method}(path, request_headers = {}, body = nil, status = 200, response_headers = {}) @responses[Request.new(:#{method}, path, nil, request_headers)] = Response.new(body || "", status, response_headers) @@ -56,7 +56,7 @@ def #{method}(path, body, headers) EOE end - for method in [ :get, :delete ] + for method in [ :get, :delete, :head ] module_eval <<-EOE, __FILE__, __LINE__ def #{method}(path, headers) request = ActiveResource::Request.new(:#{method}, path, nil, headers) diff --git a/activeresource/test/base_test.rb b/activeresource/test/base_test.rb index 3808209f79..7606c56bcf 100644 --- a/activeresource/test/base_test.rb +++ b/activeresource/test/base_test.rb @@ -36,6 +36,11 @@ def setup mock.put "/people//addresses/1.xml", {}, nil, 404 mock.delete "/people//addresses/1.xml", {}, nil, 404 mock.post "/people//addresses.xml", {}, nil, 404 + mock.head "/people/1.xml", {}, nil, 200 + mock.head "/people/99.xml", {}, nil, 404 + mock.head "/people/1/addresses/1.xml", {}, nil, 200 + mock.head "/people/1/addresses/2.xml", {}, nil, 404 + mock.head "/people/2/addresses/1.xml", {}, nil, 404 end end diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb index 8ffc4dfbb2..38fdbd3b2f 100644 --- a/activeresource/test/connection_test.rb +++ b/activeresource/test/connection_test.rb @@ -27,6 +27,7 @@ def setup mock.delete "/people/2.xml", @header, nil, 200 mock.post "/people.xml", {}, nil, 201, 'Location' => '/people/5.xml' mock.post "/members.xml", {}, @header, 201, 'Location' => '/people/6.xml' + mock.head "/people/1.xml", {}, nil, 200 end end @@ -105,6 +106,12 @@ def test_get assert_equal "Matz", matz["name"] end + def test_head + response = @conn.head("/people/1.xml") + assert response.body.blank? + assert_equal 200, response.code + end + def test_get_with_header david = @conn.get("/people/2.xml", @header) assert_equal "David", david["name"] -- GitLab