diff options
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/CHANGELOG | 2 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/base.rb | 11 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/connection.rb | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index 6048a6aafc..7becf4fc0c 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed response logging to use length instead of the entire thing (seangeo) [#27] + * Fixed that to_param should be used and honored instead of hardcoding the id #11406 [gspiers] * Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria, Sunny Ripert] diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index 4072b9494d..eff92c91de 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -457,13 +457,14 @@ module ActiveResource # The first argument is considered to be the scope of the query. That is, how many # resources are returned from the request. It can be one of the following. # - # +:one+:: Returns a single resource. - # +:first+:: Returns the first resource found. - # +:all+:: Returns every resource that matches the request. + # * <tt>:one</tt>: Returns a single resource. + # * <tt>:first</tt>: Returns the first resource found. + # * <tt>:all</tt>: Returns every resource that matches the request. # # ==== Options - # +from+:: Sets the path or custom method that resources will be fetched from. - # +params+:: Sets query and prefix (nested URL) parameters. + # + # * +from+: Sets the path or custom method that resources will be fetched from. + # * +params+: Sets query and prefix (nested URL) parameters. # # ==== Examples # Person.find(1) diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb index 98b3f87167..0c4ea432d7 100644 --- a/activeresource/lib/active_resource/connection.rb +++ b/activeresource/lib/active_resource/connection.rb @@ -128,8 +128,8 @@ module ActiveResource end # Execute a HEAD request. - # Used to ... - def head(path, headers= {}) + # Used to obtain meta-information about resources, such as whether they exist and their size (via response headers). + def head(path, headers = {}) request(:head, path, build_request_headers(headers)) end @@ -140,7 +140,7 @@ module ActiveResource logger.info "#{method.to_s.upcase} #{site.scheme}://#{site.host}:#{site.port}#{path}" if logger result = nil time = Benchmark.realtime { result = http.send(method, path, *arguments) } - logger.info "--> #{result.code} #{result.message} (#{result.body ? result.body : 0}b %.2fs)" % time if logger + logger.info "--> #{result.code} #{result.message} (#{result.body ? result.body.length : 0}b %.2fs)" % time if logger handle_response(result) rescue Timeout::Error => e raise TimeoutError.new(e.message) |