rest-client 1.2.0 → 1.3.0

data/spec/resource_spec.rb

@@ -1,5 +1,8 @@
 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'})
@@ -72,4 +75,25 @@ describe RestClient::Resource do
   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

@@ -18,4 +18,55 @@ describe RestClient::Response 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

@@ -33,21 +33,31 @@ describe RestClient 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'
+    it "uses << if the log is not a string" do
+      log = RestClient.log = []
+      log.should_receive(:<<).with('xyz')
+      RestClient.log << 'xyz'
     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'
+    it "displays the log to stdout" do
+      RestClient.log = 'stdout'
+      STDOUT.should_receive(:puts).with('xyz')
+      RestClient.log << 'xyz'
     end
 
-    it "returns nil (no logging) if neither are set (default)" do
-      ENV.stub!(:[]).with('RESTCLIENT_LOG').and_return(nil)
-      RestClient.log.should == nil
+    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
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Adam Wiggins
-- Archiloque
+- Julien Kirch
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 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: []
@@ -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