esod-client 0.2.1 → 0.3.0

data/lib/{rest-client-1.2.0 → rest-client-1.4.2}/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/lib/rest-client-1.4.2/spec/response_spec.rb

@@ -0,0 +1,130 @@
+require File.dirname(__FILE__) + '/base'
+
+require 'webmock/rspec'
+include WebMock
+
+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.to_s == '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.to_s == ""
+  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|
+        unless (200..206).include? 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
+
+  describe "redirection" do
+    
+    it "follows a redirection when the request is a get" do
+      stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://new/resource'})
+      stub_request(:get, 'http://new/resource').to_return(:body => 'Foo')
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should == 'Foo'
+    end
+
+    it "doesn't follow a redirection when the request is a post" do
+      net_http_res = mock('net http response', :code => 301)
+      response = RestClient::Response.new('abc', net_http_res, {:method => :post})
+      lambda { response.return!}.should raise_error(RestClient::MovedPermanently)
+    end
+
+    it "doesn't follow a redirection when the request is a put" do
+      net_http_res = mock('net http response', :code => 301)
+      response = RestClient::Response.new('abc', net_http_res, {:method => :put})
+      lambda { response.return!}.should raise_error(RestClient::MovedPermanently)
+    end
+
+    it "follows a redirection when the request is a post and result is a 303" do
+      stub_request(:put, 'http://some/resource').to_return(:body => '', :status => 303, :headers => {'Location' => 'http://new/resource'})
+      stub_request(:get, 'http://new/resource').to_return(:body => 'Foo')
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :put).body.should == 'Foo'
+    end
+
+    it "follows a redirection when the request is a head" do
+      stub_request(:head, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://new/resource'})
+      stub_request(:head, 'http://new/resource').to_return(:body => 'Foo')
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :head).body.should == 'Foo'
+    end
+
+    it "handles redirects with relative paths" do
+      stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Location' => 'index'})
+      stub_request(:get, 'http://some/index').to_return(:body => 'Foo')
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should == 'Foo'
+    end
+
+    it "handles redirects with relative path and query string" do
+      stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Location' => 'index?q=1'})
+      stub_request(:get, 'http://some/index?q=1').to_return(:body => 'Foo')
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should == 'Foo'
+    end
+
+    it "follow a redirection when the request is a get and the response is in the 30x range" do
+      stub_request(:get, 'http://some/resource').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://new/resource'})
+      stub_request(:get, 'http://new/resource').to_return(:body => 'Foo')
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should == 'Foo'
+    end
+
+    
+  end
+
+
+end

data/lib/{rest-client-1.2.0 → rest-client-1.4.2}/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,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: esod-client
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Yan Pritzker
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -08:00
+date: 2010-10-06 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -85,30 +90,32 @@ files:
 - lib/mime-types-1.16/setup.rb
 - lib/mime-types-1.16/test/test_mime_type.rb
 - lib/mime-types-1.16/test/test_mime_types.rb
-- lib/rest-client-1.2.0/README.rdoc
-- lib/rest-client-1.2.0/Rakefile
-- lib/rest-client-1.2.0/VERSION
-- lib/rest-client-1.2.0/bin/restclient
-- lib/rest-client-1.2.0/lib/rest_client.rb
-- lib/rest-client-1.2.0/lib/restclient.rb
-- lib/rest-client-1.2.0/lib/restclient/exceptions.rb
-- lib/rest-client-1.2.0/lib/restclient/mixin/response.rb
-- lib/rest-client-1.2.0/lib/restclient/net_http_ext.rb
-- lib/rest-client-1.2.0/lib/restclient/payload.rb
-- lib/rest-client-1.2.0/lib/restclient/raw_response.rb
-- lib/rest-client-1.2.0/lib/restclient/request.rb
-- lib/rest-client-1.2.0/lib/restclient/resource.rb
-- lib/rest-client-1.2.0/lib/restclient/response.rb
-- lib/rest-client-1.2.0/spec/base.rb
-- lib/rest-client-1.2.0/spec/exceptions_spec.rb
-- lib/rest-client-1.2.0/spec/master_shake.jpg
-- lib/rest-client-1.2.0/spec/mixin/response_spec.rb
-- lib/rest-client-1.2.0/spec/payload_spec.rb
-- lib/rest-client-1.2.0/spec/raw_response_spec.rb
-- lib/rest-client-1.2.0/spec/request_spec.rb
-- lib/rest-client-1.2.0/spec/resource_spec.rb
-- lib/rest-client-1.2.0/spec/response_spec.rb
-- lib/rest-client-1.2.0/spec/restclient_spec.rb
+- lib/rest-client-1.4.2/README.rdoc
+- lib/rest-client-1.4.2/Rakefile
+- lib/rest-client-1.4.2/VERSION
+- lib/rest-client-1.4.2/bin/restclient
+- lib/rest-client-1.4.2/history.md
+- lib/rest-client-1.4.2/lib/rest_client.rb
+- lib/rest-client-1.4.2/lib/restclient.rb
+- lib/rest-client-1.4.2/lib/restclient/abstract_response.rb
+- lib/rest-client-1.4.2/lib/restclient/exceptions.rb
+- lib/rest-client-1.4.2/lib/restclient/net_http_ext.rb
+- lib/rest-client-1.4.2/lib/restclient/payload.rb
+- lib/rest-client-1.4.2/lib/restclient/raw_response.rb
+- lib/rest-client-1.4.2/lib/restclient/request.rb
+- lib/rest-client-1.4.2/lib/restclient/resource.rb
+- lib/rest-client-1.4.2/lib/restclient/response.rb
+- lib/rest-client-1.4.2/spec/abstract_response_spec.rb
+- lib/rest-client-1.4.2/spec/base.rb
+- lib/rest-client-1.4.2/spec/exceptions_spec.rb
+- lib/rest-client-1.4.2/spec/integration_spec.rb
+- lib/rest-client-1.4.2/spec/master_shake.jpg
+- lib/rest-client-1.4.2/spec/payload_spec.rb
+- lib/rest-client-1.4.2/spec/raw_response_spec.rb
+- lib/rest-client-1.4.2/spec/request_spec.rb
+- lib/rest-client-1.4.2/spec/resource_spec.rb
+- lib/rest-client-1.4.2/spec/response_spec.rb
+- lib/rest-client-1.4.2/spec/restclient_spec.rb
 - lib/trollop.rb
 has_rdoc: true
 homepage: http://github.com/cohesive/esod-client
@@ -123,18 +130,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ESOD REST Client

data/lib/rest-client-1.2.0/README.rdoc

@@ -1,102 +0,0 @@
-= REST Client -- simple DSL for accessing REST resources
-
-A simple REST client for Ruby, inspired by the Sinatra's microframework style
-of specifying actions: get, put, post, delete.
-
-== Usage: Raw URL
-
-  require 'rest_client'
-
-  RestClient.get 'http://example.com/resource'
-  
-  RestClient.get 'https://user:password@example.com/private/resource'
-
-  RestClient.post 'http://example.com/resource', :param1 => 'one', :nested => { :param2 => 'two' }
-
-  RestClient.post "http://example.com/resource", { 'x' => 1 }.to_json, :content_type => :json, :accept => :json
-
-  RestClient.delete 'http://example.com/resource'
-
-== Multipart
-
-Yeah, that's right!  This does multipart sends for you!
-
-  RestClient.post '/data', :myfile => File.new("/path/to/image.jpg")
-
-This does two things for you:
-
-* Auto-detects that you have a File value sends it as multipart
-* Auto-detects the mime of the file and sets it in the HEAD of the payload for each entry
-
-If you are sending params that do not contain a File object but the payload needs to be multipart then:
-
-  RestClient.post '/data', :foo => 'bar', :multipart => true
-
-== Usage: ActiveResource-Style
-
-  resource = RestClient::Resource.new 'http://example.com/resource'
-  resource.get
-
-  private_resource = RestClient::Resource.new 'https://example.com/private/resource', 'user', 'pass'
-  private_resource.put File.read('pic.jpg'), :content_type => 'image/jpg'
-
-See RestClient::Resource module docs for details.
-
-== Usage: Resource Nesting
-
-  site = RestClient::Resource.new('http://example.com')
-  site['posts/1/comments'].post 'Good article.', :content_type => 'text/plain'
-
-See RestClient::Resource docs for details.
-
-== Lower-level access
-
-For cases not covered by the general API, you can use the RestClient::Resource class which provide a lower-level API, see the class' rdoc for more information.
-
-== Shell
-
-The restclient shell command gives an IRB session with RestClient already loaded:
-
-  $ restclient
-  >> RestClient.get 'http://example.com'
-
-Specify a URL argument for get/post/put/delete on that resource:
-
-  $ restclient http://example.com
-  >> put '/resource', 'data'
-
-Add a user and password for authenticated resources:
-
-  $ restclient https://example.com user pass
-  >> delete '/private/resource'
-
-Create ~/.restclient for named sessions:
-
-  sinatra:
-    url: http://localhost:4567
-  rack:
-    url: http://localhost:9292
-  private_site:
-    url: http://example.com
-    username: user
-    password: pass
-
-Then invoke:
-
-  $ restclient private_site
-
-== Meta
-
-Written by Adam Wiggins, major modifications by Blake Mizerany, maintained by Archiloque
-
-Patches contributed by: Chris Anderson, Greg Borenstein, Ardekantur, Pedro Belo, Rafael Souza, Rick Olson, Aman Gupta, François Beausoleil and Nick Plante.
-
-Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
-
-Main page: http://github.com/archiloque/rest-client
-
-Rdoc: http://rdoc.info/projects/archiloque/rest-client
-
-Mailing list: rest.client@librelist.com (send a mail to subscribe).
-
-IRC: #rest-client at freenode

data/lib/rest-client-1.2.0/Rakefile

@@ -1,57 +0,0 @@
-require 'rake'
-
-require 'jeweler'
-
-Jeweler::Tasks.new do |s|
-	s.name = "rest-client"
-	s.description = "A simple REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete."
-	s.summary = "Simple REST client for Ruby, inspired by microframework syntax for specifying actions."
-	s.author = "Adam Wiggins"
-	s.email = "rest.client@librelist.com"
-	s.homepage = "http://github.com/archiloque/rest-client"
-	s.rubyforge_project = "rest-client"
-	s.has_rdoc = true
-	s.files = FileList["[A-Z]*", "{bin,lib,spec}/**/*"]
-	s.executables = %w(restclient)
-end
-
-Jeweler::RubyforgeTasks.new
-
-############################
-
-require 'spec/rake/spectask'
-
-desc "Run all specs"
-Spec::Rake::SpecTask.new('spec') do |t|
-	t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
-	t.spec_files = FileList['spec/*_spec.rb']
-end
-
-desc "Print specdocs"
-Spec::Rake::SpecTask.new(:doc) do |t|
-	t.spec_opts = ["--format", "specdoc", "--dry-run"]
-	t.spec_files = FileList['spec/*_spec.rb']
-end
-
-desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('rcov') do |t|
-	t.spec_files = FileList['spec/*_spec.rb']
-	t.rcov = true
-	t.rcov_opts = ['--exclude', 'examples']
-end
-
-task :default => :spec
-
-############################
-
-require 'rake/rdoctask'
-
-Rake::RDocTask.new do |t|
-	t.rdoc_dir = 'rdoc'
-	t.title    = "rest-client, fetch RESTful resources effortlessly"
-	t.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
-	t.options << '--charset' << 'utf-8'
-	t.rdoc_files.include('README.rdoc')
-	t.rdoc_files.include('lib/*.rb')
-end
-