rest-client 1.1.0 → 1.6.3

data/lib/restclient/resource.rb

@@ -1,146 +1,169 @@
 module RestClient
-	# A class that can be instantiated for access to a RESTful resource,
-	# including authentication.
-	#
-	# Example:
-	#
-	#   resource = RestClient::Resource.new('http://some/resource')
-	#   jpg = resource.get(:accept => 'image/jpg')
-	#
-	# With HTTP basic authentication:
-	#
-	#   resource = RestClient::Resource.new('http://protected/resource', :user => 'user', :password => 'password')
-	#   resource.delete
-	#
-	# With a timeout (seconds):
-	#
-	#   RestClient::Resource.new('http://slow', :timeout => 10)
-	#
-	# With an open timeout (seconds):
-	#
-	#   RestClient::Resource.new('http://behindfirewall', :open_timeout => 10)
-	#
-	# You can also use resources to share common headers. For headers keys,
-	# symbols are converted to strings. Example:
-	#
-	#   resource = RestClient::Resource.new('http://some/resource', :headers => { :client_version => 1 })
-	#
-	# This header will be transported as X-Client-Version (notice the X prefix,
-	# capitalization and hyphens)
-	#
-	# Use the [] syntax to allocate subresources:
-	#
-	#   site = RestClient::Resource.new('http://example.com', :user => 'adam', :password => 'mypasswd')
-	#   site['posts/1/comments'].post 'Good article.', :content_type => 'text/plain'
-	#
-	class Resource
-		attr_reader :url, :options
+  # A class that can be instantiated for access to a RESTful resource,
+  # including authentication.
+  #
+  # Example:
+  #
+  #   resource = RestClient::Resource.new('http://some/resource')
+  #   jpg = resource.get(:accept => 'image/jpg')
+  #
+  # With HTTP basic authentication:
+  #
+  #   resource = RestClient::Resource.new('http://protected/resource', :user => 'user', :password => 'password')
+  #   resource.delete
+  #
+  # With a timeout (seconds):
+  #
+  #   RestClient::Resource.new('http://slow', :timeout => 10)
+  #
+  # With an open timeout (seconds):
+  #
+  #   RestClient::Resource.new('http://behindfirewall', :open_timeout => 10)
+  #
+  # You can also use resources to share common headers. For headers keys,
+  # symbols are converted to strings. Example:
+  #
+  #   resource = RestClient::Resource.new('http://some/resource', :headers => { :client_version => 1 })
+  #
+  # This header will be transported as X-Client-Version (notice the X prefix,
+  # capitalization and hyphens)
+  #
+  # Use the [] syntax to allocate subresources:
+  #
+  #   site = RestClient::Resource.new('http://example.com', :user => 'adam', :password => 'mypasswd')
+  #   site['posts/1/comments'].post 'Good article.', :content_type => 'text/plain'
+  #
+  class Resource
+    attr_reader :url, :options, :block
 
-		def initialize(url, options={}, backwards_compatibility=nil)
-			@url = url
-			if options.class == Hash
-				@options = options
-			else # compatibility with previous versions
-				@options = { :user => options, :password => backwards_compatibility }
-			end
-		end
+    def initialize(url, options={}, backwards_compatibility=nil, &block)
+      @url = url
+      @block = block
+      if options.class == Hash
+        @options = options
+      else # compatibility with previous versions
+        @options = { :user => options, :password => backwards_compatibility }
+      end
+    end
 
-		def get(additional_headers={}, &b)
-			headers = (options[:headers] || {}).merge(additional_headers)
-			Request.execute(options.merge(
-				:method => :get,
-				:url => url,
-				:headers => headers), &b)
-		end
+    def get(additional_headers={}, &block)
+      headers = (options[:headers] || {}).merge(additional_headers)
+      Request.execute(options.merge(
+              :method => :get,
+              :url => url,
+              :headers => headers), &(block || @block))
+    end
 
-		def post(payload, additional_headers={}, &b)
-			headers = (options[:headers] || {}).merge(additional_headers)
-			Request.execute(options.merge(
-				:method => :post,
-				:url => url,
-				:payload => payload,
-				:headers => headers), &b)
-		end
+    def head(additional_headers={}, &block)
+      headers = (options[:headers] || {}).merge(additional_headers)
+      Request.execute(options.merge(
+              :method => :head,
+              :url => url,
+              :headers => headers), &(block || @block))
+    end
 
-		def put(payload, additional_headers={}, &b)
-			headers = (options[:headers] || {}).merge(additional_headers)
-			Request.execute(options.merge(
-				:method => :put,
-				:url => url,
-				:payload => payload,
-				:headers => headers), &b)
-		end
+    def post(payload, additional_headers={}, &block)
+      headers = (options[:headers] || {}).merge(additional_headers)
+      Request.execute(options.merge(
+              :method => :post,
+              :url => url,
+              :payload => payload,
+              :headers => headers), &(block || @block))
+    end
 
-		def delete(additional_headers={}, &b)
-			headers = (options[:headers] || {}).merge(additional_headers)
-			Request.execute(options.merge(
-				:method => :delete,
-				:url => url,
-				:headers => headers), &b)
-		end
+    def put(payload, additional_headers={}, &block)
+      headers = (options[:headers] || {}).merge(additional_headers)
+      Request.execute(options.merge(
+              :method => :put,
+              :url => url,
+              :payload => payload,
+              :headers => headers), &(block || @block))
+    end
 
-		def to_s
-			url
-		end
+    def patch(payload, additional_headers={}, &block)
+      headers = (options[:headers] || {}).merge(additional_headers)
+      Request.execute(options.merge(
+              :method => :patch,
+              :url => url,
+              :payload => payload,
+              :headers => headers), &(block || @block))
+    end
 
-		def user
-			options[:user]
-		end
+    def delete(additional_headers={}, &block)
+      headers = (options[:headers] || {}).merge(additional_headers)
+      Request.execute(options.merge(
+              :method => :delete,
+              :url => url,
+              :headers => headers), &(block || @block))
+    end
 
-		def password
-			options[:password]
-		end
+    def to_s
+      url
+    end
 
-		def headers
-			options[:headers] || {}
-		end
+    def user
+      options[:user]
+    end
 
-		def timeout
-			options[:timeout]
-		end
-		
-		def open_timeout
-			options[:open_timeout]
-		end
+    def password
+      options[:password]
+    end
 
-		# Construct a subresource, preserving authentication.
-		#
-		# Example:
-		#
-		#   site = RestClient::Resource.new('http://example.com', 'adam', 'mypasswd')
-		#   site['posts/1/comments'].post 'Good article.', :content_type => 'text/plain'
-		#
-		# This is especially useful if you wish to define your site in one place and
-		# call it in multiple locations:
-		#
-		#   def orders
-		#     RestClient::Resource.new('http://example.com/orders', 'admin', 'mypasswd')
-		#   end
-		#
-		#   orders.get                     # GET http://example.com/orders
-		#   orders['1'].get                # GET http://example.com/orders/1
-		#   orders['1/items'].delete       # DELETE http://example.com/orders/1/items
-		#
-		# Nest resources as far as you want:
-		#
-		#   site = RestClient::Resource.new('http://example.com')
-		#   posts = site['posts']
-		#   first_post = posts['1']
-		#   comments = first_post['comments']
-		#   comments.post 'Hello', :content_type => 'text/plain'
-		#
-		def [](suburl)
-			self.class.new(concat_urls(url, suburl), options)
-		end
+    def headers
+      options[:headers] || {}
+    end
 
-		def concat_urls(url, suburl)   # :nodoc:
-			url = url.to_s
-			suburl = suburl.to_s
-			if url.slice(-1, 1) == '/' or suburl.slice(0, 1) == '/'
-				url + suburl
-			else
-				"#{url}/#{suburl}"
-			end
-		end
-	end
+    def timeout
+      options[:timeout]
+    end
+
+    def open_timeout
+      options[:open_timeout]
+    end
+
+    # Construct a subresource, preserving authentication.
+    #
+    # Example:
+    #
+    #   site = RestClient::Resource.new('http://example.com', 'adam', 'mypasswd')
+    #   site['posts/1/comments'].post 'Good article.', :content_type => 'text/plain'
+    #
+    # This is especially useful if you wish to define your site in one place and
+    # call it in multiple locations:
+    #
+    #   def orders
+    #     RestClient::Resource.new('http://example.com/orders', 'admin', 'mypasswd')
+    #   end
+    #
+    #   orders.get                     # GET http://example.com/orders
+    #   orders['1'].get                # GET http://example.com/orders/1
+    #   orders['1/items'].delete       # DELETE http://example.com/orders/1/items
+    #
+    # Nest resources as far as you want:
+    #
+    #   site = RestClient::Resource.new('http://example.com')
+    #   posts = site['posts']
+    #   first_post = posts['1']
+    #   comments = first_post['comments']
+    #   comments.post 'Hello', :content_type => 'text/plain'
+    #
+    def [](suburl, &new_block)
+      case
+        when block_given? then self.class.new(concat_urls(url, suburl), options, &new_block)
+        when block        then self.class.new(concat_urls(url, suburl), options, &block)
+      else
+        self.class.new(concat_urls(url, suburl), options)
+      end
+    end
+
+    def concat_urls(url, suburl) # :nodoc:
+      url = url.to_s
+      suburl = suburl.to_s
+      if url.slice(-1, 1) == '/' or suburl.slice(0, 1) == '/'
+        url + suburl
+      else
+        "#{url}/#{suburl}"
+      end
+    end
+  end
 end

data/lib/restclient/response.rb

@@ -1,20 +1,24 @@
-require File.dirname(__FILE__) + '/mixin/response'
-
 module RestClient
-	# The response from RestClient looks like a string, but is actually one of
-	# these.  99% of the time you're making a rest call all you care about is
-	# the body, but on the occassion you want to fetch the headers you can:
-	#
-	#   RestClient.get('http://example.com').headers[:content_type]
-	#
-	class Response < String
 
-		include RestClient::Mixin::Response
+  # A Response from RestClient, you can access the response body, the code or the headers.
+  #
+  module Response
+
+    include AbstractResponse
+
+    attr_accessor :args, :body, :net_http_res
+
+    def body
+      self
+    end
 
-		def initialize(string, net_http_res)
-			@net_http_res = net_http_res
-			super(string || "")
-		end
+    def Response.create body, net_http_res, args
+      result = body || ''
+      result.extend Response
+      result.net_http_res = net_http_res
+      result.args = args
+      result
+    end
 
-	end
+  end
 end

data/spec/abstract_response_spec.rb

@@ -0,0 +1,85 @@
+require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
+
+describe RestClient::AbstractResponse do
+
+  class MyAbstractResponse
+
+    include RestClient::AbstractResponse
+
+    attr_accessor :size
+
+    def initialize net_http_res, args
+      @net_http_res = net_http_res
+      @args = args
+    end
+
+  end
+
+  before do
+    @net_http_res = mock('net http response')
+    @response = MyAbstractResponse.new(@net_http_res, {})
+  end
+
+  it "fetches the numeric response code" do
+    @net_http_res.should_receive(:code).and_return('200')
+    @response.code.should == 200
+  end
+
+  it "has a nice description" do
+    @net_http_res.should_receive(:to_hash).and_return({'Content-Type' => ['application/pdf']})
+    @net_http_res.should_receive(:code).and_return('200')
+    @response.description == '200 OK | application/pdf  bytes\n'
+  end
+
+  it "beautifies the headers by turning the keys to symbols" do
+    h = RestClient::AbstractResponse.beautify_headers('content-type' => [ 'x' ])
+    h.keys.first.should == :content_type
+  end
+
+  it "beautifies the headers by turning the values to strings instead of one-element arrays" do
+    h = RestClient::AbstractResponse.beautify_headers('x' => [ 'text/html' ] )
+    h.values.first.should == 'text/html'
+  end
+
+  it "fetches the headers" do
+    @net_http_res.should_receive(:to_hash).and_return('content-type' => [ 'text/html' ])
+    @response.headers.should == { :content_type => 'text/html' }
+  end
+
+  it "extracts cookies from response headers" do
+    @net_http_res.should_receive(:to_hash).and_return('set-cookie' => ['session_id=1; path=/'])
+    @response.cookies.should == { 'session_id' => '1' }
+  end
+
+  it "extract strange cookies" do
+    @net_http_res.should_receive(:to_hash).and_return('set-cookie' => ['session_id=ZJ/HQVH6YE+rVkTpn0zvTQ==; path=/'])
+    @response.cookies.should == { 'session_id' => 'ZJ%2FHQVH6YE+rVkTpn0zvTQ%3D%3D' }
+  end
+
+  it "doesn't escape cookies" do
+    @net_http_res.should_receive(:to_hash).and_return('set-cookie' => ['session_id=BAh7BzoNYXBwX25hbWUiEGFwcGxpY2F0aW9uOgpsb2dpbiIKYWRtaW4%3D%0A--08114ba654f17c04d20dcc5228ec672508f738ca; path=/'])
+    @response.cookies.should == { 'session_id' => 'BAh7BzoNYXBwX25hbWUiEGFwcGxpY2F0aW9uOgpsb2dpbiIKYWRtaW4%3D%0A--08114ba654f17c04d20dcc5228ec672508f738ca' }
+  end
+
+  it "can access the net http result directly" do
+    @response.net_http_res.should == @net_http_res
+  end
+  
+  describe "#return!" do
+    it "should return the response itself on 200-codes" do
+      @net_http_res.should_receive(:code).and_return('200')
+      @response.return!.should be_equal(@response)
+    end
+
+    it "should raise RequestFailed on unknown codes" do
+      @net_http_res.should_receive(:code).and_return('1000')
+      lambda { @response.return! }.should raise_error RestClient::RequestFailed
+    end
+    
+    it "should raise an error on a redirection after non-GET/HEAD requests" do
+      @net_http_res.should_receive(:code).and_return('301')
+      @response.args.merge(:method => :put)
+      lambda { @response.return! }.should raise_error RestClient::RequestFailed
+    end
+  end
+end

data/spec/base.rb

@@ -1,3 +1,9 @@
+def is_ruby_19?
+  RUBY_VERSION == '1.9.1' or RUBY_VERSION == '1.9.2'
+end
+
+Encoding.default_internal = Encoding.default_external = "ASCII-8BIT" if is_ruby_19?
+
 require 'rubygems'
 require 'spec'
 

data/spec/exceptions_spec.rb

@@ -1,65 +1,98 @@
-require File.dirname(__FILE__) + '/base'
+require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
+
+require 'webmock/rspec'
+include WebMock
 
 describe RestClient::Exception do
-	it "sets the exception message to ErrorMessage" do
-		RestClient::ResourceNotFound.new.message.should == 'Resource not found'
-	end
+  it "returns a 'message' equal to the class name if the message is not set, because 'message' should not be nil" do
+    e = RestClient::Exception.new
+    e.message.should == "RestClient::Exception"
+  end
+  
+  it "returns the 'message' that was set" do
+    e = RestClient::Exception.new
+    message = "An explicitly set message"
+    e.message = message
+    e.message.should == message
+  end
+  
+  it "sets the exception message to ErrorMessage" do
+    RestClient::ResourceNotFound.new.message.should == 'Resource Not Found'
+  end
+
+  it "contains exceptions in RestClient" do
+    RestClient::Unauthorized.new.should be_a_kind_of(RestClient::Exception)
+    RestClient::ServerBrokeConnection.new.should be_a_kind_of(RestClient::Exception)
+  end
+end
 
-	it "contains exceptions in RestClient" do
-		RestClient::Unauthorized.new.should be_a_kind_of(RestClient::Exception)
-		RestClient::ServerBrokeConnection.new.should be_a_kind_of(RestClient::Exception)
-	end
+describe RestClient::ServerBrokeConnection do
+  it "should have a default message of 'Server broke connection'" do
+    e = RestClient::ServerBrokeConnection.new
+    e.message.should == 'Server broke connection'
+  end
 end
 
 describe RestClient::RequestFailed do
-	before do
-		@response = mock('HTTP Response', :code => '502')
-	end
+  before do
+    @response = mock('HTTP Response', :code => '502')
+  end
 
-	it "stores the http response on the exception" do
-		begin
-			raise RestClient::RequestFailed, :response
-		rescue RestClient::RequestFailed => e
-			e.response.should == :response
-		end
-	end
+  it "stores the http response on the exception" do
+    response = "response"
+    begin
+      raise RestClient::RequestFailed, response
+    rescue RestClient::RequestFailed => e
+      e.response.should == response
+    end
+  end
 
-	it "http_code convenience method for fetching the code as an integer" do
-		RestClient::RequestFailed.new(@response).http_code.should == 502
-	end
+  it "http_code convenience method for fetching the code as an integer" do
+    RestClient::RequestFailed.new(@response).http_code.should == 502
+  end
 
-	it "http_body convenience method for fetching the body (decoding when necessary)" do
-		@response.stub!(:[]).with('content-encoding').and_return('gzip')
-		@response.stub!(:body).and_return('compressed body')
-		RestClient::Request.should_receive(:decode).with('gzip', 'compressed body').and_return('plain body')
-		RestClient::RequestFailed.new(@response).http_body.should == 'plain body'
-	end
+  it "http_body convenience method for fetching the body (decoding when necessary)" do
+    RestClient::RequestFailed.new(@response).http_code.should == 502
+    RestClient::RequestFailed.new(@response).message.should == 'HTTP status code 502'
+  end
 
-	it "shows the status code in the message" do
-		RestClient::RequestFailed.new(@response).to_s.should match(/502/)
-	end
+  it "shows the status code in the message" do
+    RestClient::RequestFailed.new(@response).to_s.should match(/502/)
+  end
 end
 
 describe RestClient::ResourceNotFound do
-	it "also has the http response attached" do
-		begin
-			raise RestClient::ResourceNotFound, :response
-		rescue RestClient::ResourceNotFound => e
-			e.response.should == :response
-		end
-	end
+  it "also has the http response attached" do
+    response = "response"
+    begin
+      raise RestClient::ResourceNotFound, response
+    rescue RestClient::ResourceNotFound => e
+      e.response.should == response
+    end
+  end
 end
 
 describe "backwards compatibility" do
-	it "alias RestClient::Request::Redirect to RestClient::Redirect" do
-		RestClient::Request::Redirect.should == RestClient::Redirect
-	end
+  it "alias RestClient::Request::Redirect to RestClient::Redirect" do
+    RestClient::Request::Redirect.should == RestClient::Redirect
+  end
+
+  it "alias RestClient::Request::Unauthorized to RestClient::Unauthorized" do
+    RestClient::Request::Unauthorized.should == RestClient::Unauthorized
+  end
 
-	it "alias RestClient::Request::Unauthorized to RestClient::Unauthorized" do
-		RestClient::Request::Unauthorized.should == RestClient::Unauthorized
-	end
+  it "alias RestClient::Request::RequestFailed to RestClient::RequestFailed" do
+    RestClient::Request::RequestFailed.should == RestClient::RequestFailed
+  end
 
-	it "alias RestClient::Request::RequestFailed to RestClient::RequestFailed" do
-		RestClient::Request::RequestFailed.should == RestClient::RequestFailed
-	end
+  it "make the exception's response act like an Net::HTTPResponse" do
+    body = "body"
+    stub_request(:get, "www.example.com").to_return(:body => body, :status => 404)
+    begin
+      RestClient.get "www.example.com"
+      raise
+    rescue RestClient::ResourceNotFound => e
+      e.response.body.should == body
+    end
+  end
 end