adamwiggins-rest-client 1.0 → 1.0.1

data/README.rdoc

@@ -141,7 +141,7 @@ Patches contributed by: Chris Anderson, Greg Borenstein, Ardekantur, Pedro
 Belo, Rafael Souza, Rick Olson, Aman Gupta, Blake Mizerany, Brian Donovan, Ivan
 Makfinsky, Marc-André Cournoyer, Coda Hale, Tetsuo Watanabe, Dusty Doris,
 Lennon Day-Reynolds, James Edward Gray II, Cyril Rohr, Juan Alvarez, and Adam
-Jacob
+Jacob, and Paul Dlug
 
 Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
 

data/Rakefile

@@ -31,7 +31,7 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'fileutils'
 
-version = "1.0"
+version = "1.0.1"
 name = "rest-client"
 
 spec = Gem::Specification.new do |s|

data/lib/restclient/mixin/response.rb

@@ -0,0 +1,43 @@
+module RestClient
+	module Mixin
+		module Response
+			attr_reader :net_http_res
+
+			# HTTP status code, always 200 since RestClient throws exceptions for
+			# other codes.
+			def code
+				@code ||= @net_http_res.code.to_i
+			end
+
+			# A hash of the headers, beautified with symbols and underscores.
+			# e.g. "Content-type" will become :content_type.
+			def headers
+				@headers ||= self.class.beautify_headers(@net_http_res.to_hash)
+			end
+
+			# Hash of cookies extracted from response headers
+			def cookies
+				@cookies ||= (self.headers[:set_cookie] || "").split('; ').inject({}) do |out, raw_c|
+					key, val = raw_c.split('=')
+					unless %w(expires domain path secure).member?(key)
+						out[key] = val
+					end
+					out
+				end
+			end
+
+			def self.included(receiver)
+				receiver.extend(RestClient::Mixin::Response::ClassMethods)
+			end
+
+			module ClassMethods
+				def beautify_headers(headers)
+					headers.inject({}) do |out, (key, value)|
+						out[key.gsub(/-/, '_').to_sym] = value.first
+					out
+					end
+				end
+			end
+		end
+	end
+end

data/lib/restclient/request.rb

@@ -213,7 +213,7 @@ module RestClient
 		end
 
 		def response_log(res)
-			size = @raw_response ? File.size(@tf.path) : res.body.size
+			size = @raw_response ? File.size(@tf.path) : (res.body.nil? ? 0 : res.body.size)
 			"# => #{res.code} #{res.class.to_s.gsub(/^Net::HTTP/, '')} | #{(res['Content-type'] || '').gsub(/;.*$/, '')} #{size} bytes"
 		end
 

data/rest-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name = "rest-client"
-    s.version = "1.0"
+    s.version = "1.0.1"
     s.summary = "Simple REST client for Ruby, inspired by microframework syntax for specifying actions."
     s.description = "A simple REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete."
     s.author = "Adam Wiggins"
@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
                  lib/rest_client.rb lib/restclient.rb
                  lib/restclient/request.rb lib/restclient/response.rb
                  lib/restclient/exceptions.rb lib/restclient/resource.rb
+                 lib/restclient/mixin/response.rb
                  spec/base.rb spec/request_spec.rb spec/response_spec.rb
                  spec/exceptions_spec.rb spec/resource_spec.rb spec/restclient_spec.rb
                  bin/restclient)

data/spec/request_spec.rb

@@ -278,6 +278,12 @@ describe RestClient::Request do
 		@request.response_log(res).should == "# => 200 OK |  4 bytes"
 	end
 
+	it "logs a response with a nil body" do
+		res = mock('result', :code => '200', :class => Net::HTTPOK, :body => nil)
+		res.stub!(:[]).with('Content-type').and_return('text/html; charset=utf-8')
+		@request.response_log(res).should == "# => 200 OK | text/html 0 bytes"
+	end
+
 	it "strips the charset from the response content type" do
 		res = mock('result', :code => '200', :class => Net::HTTPOK, :body => 'abcd')
 		res.stub!(:[]).with('Content-type').and_return('text/html; charset=utf-8')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adamwiggins-rest-client
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: 1.0.1
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -31,6 +31,7 @@ files:
 - lib/restclient/response.rb
 - lib/restclient/exceptions.rb
 - lib/restclient/resource.rb
+- lib/restclient/mixin/response.rb
 - spec/base.rb
 - spec/request_spec.rb
 - spec/response_spec.rb