rest-client-next 1.1.0 → 1.3.0

data/spec/resource_spec.rb

@@ -1,75 +1,99 @@
 require File.dirname(__FILE__) + '/base'
 
+require 'webmock/rspec'
+include WebMock
+
 describe RestClient::Resource do
-	before do
-		@resource = RestClient::Resource.new('http://some/resource', :user => 'jane', :password => 'mypass', :headers => { 'X-Something' => '1'})
-	end
-
-	context "Resource delegation" do
-		it "GET" do
-			RestClient::Request.should_receive(:execute).with(:method => :get, :url => 'http://some/resource', :headers => { 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
-			@resource.get
-		end
-
-		it "POST" do
-			RestClient::Request.should_receive(:execute).with(:method => :post, :url => 'http://some/resource', :payload => 'abc', :headers => { :content_type => 'image/jpg', 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
-			@resource.post 'abc', :content_type => 'image/jpg'
-		end
-
-		it "PUT" do
-			RestClient::Request.should_receive(:execute).with(:method => :put, :url => 'http://some/resource', :payload => 'abc', :headers => { :content_type => 'image/jpg', 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
-			@resource.put 'abc', :content_type => 'image/jpg'
-		end
-
-		it "DELETE" do
-			RestClient::Request.should_receive(:execute).with(:method => :delete, :url => 'http://some/resource', :headers => { 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
-			@resource.delete
-		end
-
-		it "overrides resource headers" do
-			RestClient::Request.should_receive(:execute).with(:method => :get, :url => 'http://some/resource', :headers => { 'X-Something' => '2'}, :user => 'jane', :password => 'mypass')
-			@resource.get 'X-Something' => '2'
-		end
-	end
-
-	it "can instantiate with no user/password" do
-		@resource = RestClient::Resource.new('http://some/resource')
-	end
-
-	it "is backwards compatible with previous constructor" do
-		@resource = RestClient::Resource.new('http://some/resource', 'user', 'pass')
-		@resource.user.should == 'user'
-		@resource.password.should == 'pass'
-	end
-
-	it "concatenates urls, inserting a slash when it needs one" do
-		@resource.concat_urls('http://example.com', 'resource').should == 'http://example.com/resource'
-	end
-
-	it "concatenates urls, using no slash if the first url ends with a slash" do
-		@resource.concat_urls('http://example.com/', 'resource').should == 'http://example.com/resource'
-	end
-
-	it "concatenates urls, using no slash if the second url starts with a slash" do
-		@resource.concat_urls('http://example.com', '/resource').should == 'http://example.com/resource'
-	end
-
-	it "concatenates even non-string urls, :posts + 1 => 'posts/1'" do
-		@resource.concat_urls(:posts, 1).should == 'posts/1'
-	end
-
-	it "offers subresources via []" do
-		parent = RestClient::Resource.new('http://example.com')
-		parent['posts'].url.should == 'http://example.com/posts'
-	end
-
-	it "transports options to subresources" do
-		parent = RestClient::Resource.new('http://example.com', :user => 'user', :password => 'password')
-		parent['posts'].user.should == 'user'
-		parent['posts'].password.should == 'password'
-	end
-
-	it "prints its url with to_s" do
-		RestClient::Resource.new('x').to_s.should == 'x'
-	end
+  before do
+    @resource = RestClient::Resource.new('http://some/resource', :user => 'jane', :password => 'mypass', :headers => { 'X-Something' => '1'})
+  end
+
+  context "Resource delegation" do
+    it "GET" do
+      RestClient::Request.should_receive(:execute).with(:method => :get, :url => 'http://some/resource', :headers => { 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
+      @resource.get
+    end
+
+    it "POST" do
+      RestClient::Request.should_receive(:execute).with(:method => :post, :url => 'http://some/resource', :payload => 'abc', :headers => { :content_type => 'image/jpg', 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
+      @resource.post 'abc', :content_type => 'image/jpg'
+    end
+
+    it "PUT" do
+      RestClient::Request.should_receive(:execute).with(:method => :put, :url => 'http://some/resource', :payload => 'abc', :headers => { :content_type => 'image/jpg', 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
+      @resource.put 'abc', :content_type => 'image/jpg'
+    end
+
+    it "DELETE" do
+      RestClient::Request.should_receive(:execute).with(:method => :delete, :url => 'http://some/resource', :headers => { 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
+      @resource.delete
+    end
+
+    it "overrides resource headers" do
+      RestClient::Request.should_receive(:execute).with(:method => :get, :url => 'http://some/resource', :headers => { 'X-Something' => '2'}, :user => 'jane', :password => 'mypass')
+      @resource.get 'X-Something' => '2'
+    end
+  end
+
+  it "can instantiate with no user/password" do
+    @resource = RestClient::Resource.new('http://some/resource')
+  end
+
+  it "is backwards compatible with previous constructor" do
+    @resource = RestClient::Resource.new('http://some/resource', 'user', 'pass')
+    @resource.user.should == 'user'
+    @resource.password.should == 'pass'
+  end
+
+  it "concatenates urls, inserting a slash when it needs one" do
+    @resource.concat_urls('http://example.com', 'resource').should == 'http://example.com/resource'
+  end
+
+  it "concatenates urls, using no slash if the first url ends with a slash" do
+    @resource.concat_urls('http://example.com/', 'resource').should == 'http://example.com/resource'
+  end
+
+  it "concatenates urls, using no slash if the second url starts with a slash" do
+    @resource.concat_urls('http://example.com', '/resource').should == 'http://example.com/resource'
+  end
+
+  it "concatenates even non-string urls, :posts + 1 => 'posts/1'" do
+    @resource.concat_urls(:posts, 1).should == 'posts/1'
+  end
+
+  it "offers subresources via []" do
+    parent = RestClient::Resource.new('http://example.com')
+    parent['posts'].url.should == 'http://example.com/posts'
+  end
+
+  it "transports options to subresources" do
+    parent = RestClient::Resource.new('http://example.com', :user => 'user', :password => 'password')
+    parent['posts'].user.should == 'user'
+    parent['posts'].password.should == 'password'
+  end
+
+  it "prints its url with to_s" do
+    RestClient::Resource.new('x').to_s.should == 'x'
+  end
+
+  describe 'block' do
+    it 'can use block when creating the resource' do
+      stub_request(:get, 'www.example.com').to_return(:body => '', :status => 404)
+      resource = RestClient::Resource.new('www.example.com'){|response| 'foo'}
+      resource.get.should == 'foo'
+    end
+
+    it 'can use block when executing the resource' do
+      stub_request(:get, 'www.example.com').to_return(:body => '', :status => 404)
+      resource = RestClient::Resource.new('www.example.com')
+      resource.get{|response| 'foo'}.should == 'foo'
+    end
+
+    it 'execution block override resource block' do
+      stub_request(:get, 'www.example.com').to_return(:body => '', :status => 404)
+      resource = RestClient::Resource.new('www.example.com'){|response| 'foo'}
+      resource.get{|response| 'bar'}.should == 'bar'
+    end
+
+  end
 end

data/spec/response_spec.rb

@@ -1,21 +1,72 @@
 require File.dirname(__FILE__) + '/base'
 
 describe RestClient::Response do
-	before do
-		@net_http_res = mock('net http response', :to_hash => {"Status" => ["200 OK"]})
-		@response = RestClient::Response.new('abc', @net_http_res)
-	end
-
-	it "behaves like string" do
-		@response.should == 'abc'
-	end
-
-	it "accepts nil strings and sets it to empty for the case of HEAD" do
-		RestClient::Response.new(nil, @net_http_res).should == ""
-	end
-	
-	it "test headers and raw headers" do
-		@response.raw_headers["Status"][0].should == "200 OK"
-		@response.headers[:status].should == "200 OK"
-	end
+  before do
+    @net_http_res = mock('net http response', :to_hash => {"Status" => ["200 OK"]})
+    @response = RestClient::Response.new('abc', @net_http_res)
+  end
+
+  it "behaves like string" do
+    @response.should == 'abc'
+  end
+
+  it "accepts nil strings and sets it to empty for the case of HEAD" do
+    RestClient::Response.new(nil, @net_http_res).should == ""
+  end
+
+  it "test headers and raw headers" do
+    @response.raw_headers["Status"][0].should == "200 OK"
+    @response.headers[:status].should == "200 OK"
+  end
+
+  describe "cookie processing" do
+    it "should correctly deal with one Set-Cookie header with one cookie inside" do
+      net_http_res = mock('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT"]})
+      response = RestClient::Response.new('abc', net_http_res)
+      response.headers[:set_cookie].should == ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT"]
+      response.cookies.should == { "main_page" => "main_page_no_rewrite" }
+    end
+
+    it "should correctly deal with multiple cookies [multiple Set-Cookie headers]" do
+      net_http_res = mock('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT", "remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT", "user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]})
+      response = RestClient::Response.new('abc', net_http_res)
+      response.headers[:set_cookie].should == ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT", "remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT", "user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]
+      response.cookies.should == {
+              "main_page" => "main_page_no_rewrite",
+              "remember_me" => "",
+              "user" => "somebody"
+      }
+    end
+
+    it "should correctly deal with multiple cookies [one Set-Cookie header with multiple cookies]" do
+      net_http_res = mock('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT, remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT, user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]})
+      response = RestClient::Response.new('abc', net_http_res)
+      response.cookies.should == {
+              "main_page" => "main_page_no_rewrite",
+              "remember_me" => "",
+              "user" => "somebody"
+      }
+    end
+  end
+
+  describe "exceptions processing" do
+    it "should return itself for normal codes" do
+      (200..206).each do |code|
+        net_http_res = mock('net http response', :code => '200')
+        response = RestClient::Response.new('abc', net_http_res)
+        response.return!
+      end
+    end
+
+    it "should throw an exception for other codes" do
+      RestClient::Exceptions::EXCEPTIONS_MAP.each_key do |code|
+        net_http_res = mock('net http response', :code => code.to_i)
+        response = RestClient::Response.new('abc', net_http_res)
+        lambda { response.return!}.should raise_error
+      end
+    end
+
+  end
+
+
 end

data/spec/restclient_spec.rb

@@ -1,53 +1,63 @@
 require File.dirname(__FILE__) + '/base'
 
 describe RestClient do
-	describe "API" do
-		it "GET" do
-			RestClient::Request.should_receive(:execute).with(:method => :get, :url => 'http://some/resource', :headers => {})
-			RestClient.get('http://some/resource')
-		end
-
-		it "POST" do
-			RestClient::Request.should_receive(:execute).with(:method => :post, :url => 'http://some/resource', :payload => 'payload', :headers => {})
-			RestClient.post('http://some/resource', 'payload')
-		end
-
-		it "PUT" do
-			RestClient::Request.should_receive(:execute).with(:method => :put, :url => 'http://some/resource', :payload => 'payload', :headers => {})
-			RestClient.put('http://some/resource', 'payload')
-		end
-
-		it "DELETE" do
-			RestClient::Request.should_receive(:execute).with(:method => :delete, :url => 'http://some/resource', :headers => {})
-			RestClient.delete('http://some/resource')
-		end
-
-		it "HEAD" do
-			RestClient::Request.should_receive(:execute).with(:method => :head, :url => 'http://some/resource', :headers => {})
-			RestClient.head('http://some/resource')
-		end
-	end
-
-	describe "logging" do
-		after do
-			RestClient.log = nil
-		end
-
-		it "gets the log source from the RESTCLIENT_LOG environment variable" do
-			ENV.stub!(:[]).with('RESTCLIENT_LOG').and_return('from env')
-			RestClient.log = 'from class method'
-			RestClient.log.should == 'from env'
-		end
-
-		it "sets a destination for log output, used if no environment variable is set" do
-			ENV.stub!(:[]).with('RESTCLIENT_LOG').and_return(nil)
-			RestClient.log = 'from class method'
-			RestClient.log.should == 'from class method'
-		end
-
-		it "returns nil (no logging) if neither are set (default)" do
-			ENV.stub!(:[]).with('RESTCLIENT_LOG').and_return(nil)
-			RestClient.log.should == nil
-		end
-	end
+  describe "API" do
+    it "GET" do
+      RestClient::Request.should_receive(:execute).with(:method => :get, :url => 'http://some/resource', :headers => {})
+      RestClient.get('http://some/resource')
+    end
+
+    it "POST" do
+      RestClient::Request.should_receive(:execute).with(:method => :post, :url => 'http://some/resource', :payload => 'payload', :headers => {})
+      RestClient.post('http://some/resource', 'payload')
+    end
+
+    it "PUT" do
+      RestClient::Request.should_receive(:execute).with(:method => :put, :url => 'http://some/resource', :payload => 'payload', :headers => {})
+      RestClient.put('http://some/resource', 'payload')
+    end
+
+    it "DELETE" do
+      RestClient::Request.should_receive(:execute).with(:method => :delete, :url => 'http://some/resource', :headers => {})
+      RestClient.delete('http://some/resource')
+    end
+
+    it "HEAD" do
+      RestClient::Request.should_receive(:execute).with(:method => :head, :url => 'http://some/resource', :headers => {})
+      RestClient.head('http://some/resource')
+    end
+  end
+
+  describe "logging" do
+    after do
+      RestClient.log = nil
+    end
+
+    it "uses << if the log is not a string" do
+      log = RestClient.log = []
+      log.should_receive(:<<).with('xyz')
+      RestClient.log << 'xyz'
+    end
+
+    it "displays the log to stdout" do
+      RestClient.log = 'stdout'
+      STDOUT.should_receive(:puts).with('xyz')
+      RestClient.log << 'xyz'
+    end
+
+    it "displays the log to stderr" do
+      RestClient.log = 'stderr'
+      STDERR.should_receive(:puts).with('xyz')
+      RestClient.log << 'xyz'
+    end
+
+    it "append the log to the requested filename" do
+      RestClient.log = '/tmp/restclient.log'
+      f = mock('file handle')
+      File.should_receive(:open).with('/tmp/restclient.log', 'a').and_yield(f)
+      f.should_receive(:puts).with('xyz')
+      RestClient.log << 'xyz'
+    end
+  end
+
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: rest-client-next
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Adam Wiggins
-- Archiloque
+- Julien Kirch
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 +01:00
+date: 2010-01-25 00:00:00 +01:00
 default_executable: restclient
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.16"
     version: 
-description: "A simple REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete."
+description: "A simple Simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete."
 email: rest.client@librelist.com
 executables: 
 - restclient
@@ -31,6 +31,7 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
+- history.md
 files: 
 - README.rdoc
 - Rakefile
@@ -48,6 +49,7 @@ files:
 - lib/restclient/response.rb
 - spec/base.rb
 - spec/exceptions_spec.rb
+- spec/integration_spec.rb
 - spec/master_shake.jpg
 - spec/mixin/response_spec.rb
 - spec/payload_spec.rb
@@ -56,6 +58,7 @@ files:
 - spec/resource_spec.rb
 - spec/response_spec.rb
 - spec/restclient_spec.rb
+- history.md
 has_rdoc: true
 homepage: http://github.com/archiloque/rest-client
 licenses: []
@@ -79,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: rest-client-multipart
+rubyforge_project: rest-client
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
@@ -87,6 +90,7 @@ summary: Simple REST client for Ruby, inspired by microframework syntax for spec
 test_files: 
 - spec/base.rb
 - spec/exceptions_spec.rb
+- spec/integration_spec.rb
 - spec/mixin/response_spec.rb
 - spec/payload_spec.rb
 - spec/raw_response_spec.rb