rest-client 1.8.0 → 2.0.0.rc1

data/spec/unit/resource_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative '_lib'
 
 describe RestClient::Resource do
   before do

data/spec/unit/response_spec.rb

@@ -1,26 +1,40 @@
-require 'spec_helper'
+require_relative '_lib'
 
-describe RestClient::Response do
+describe RestClient::Response, :include_helpers do
   before do
     @net_http_res = double('net http response', :to_hash => {"Status" => ["200 OK"]}, :code => 200)
     @example_url = 'http://example.com'
-    @request = double('http request', :user => nil, :password => nil, :url => @example_url)
+    @request = double('http request', :user => nil, :password => nil, :url => @example_url, :redirection_history => nil)
     @response = RestClient::Response.create('abc', @net_http_res, {}, @request)
   end
 
   it "behaves like string" do
     @response.to_s.should eq 'abc'
     @response.to_str.should eq 'abc'
-    @response.to_i.should eq 200
+
+    @response.should_receive(:warn)
+    @response.to_i.should eq 0
   end
 
   it "accepts nil strings and sets it to empty for the case of HEAD" do
     RestClient::Response.create(nil, @net_http_res, {}, @request).to_s.should eq ""
   end
 
-  it "test headers and raw headers" do
-    @response.raw_headers["Status"][0].should eq "200 OK"
-    @response.headers[:status].should eq "200 OK"
+  describe 'header processing' do
+    it "test headers and raw headers" do
+      @response.raw_headers["Status"][0].should eq "200 OK"
+      @response.headers[:status].should eq "200 OK"
+    end
+
+    it 'handles multiple headers by joining with comma' do
+      @net_http_res = double('net http response', :to_hash => {'My-Header' => ['foo', 'bar']}, :code => 200)
+      @example_url = 'http://example.com'
+      @request = double('http request', :user => nil, :password => nil, :url => @example_url, :redirection_history => nil)
+      @response = RestClient::Response.create('abc', @net_http_res, {}, @request)
+
+      @response.raw_headers['My-Header'].should eq ['foo', 'bar']
+      @response.headers[:my_header].should eq 'foo, bar'
+    end
   end
 
   describe "cookie processing" do
@@ -58,18 +72,18 @@ describe RestClient::Response do
   describe "exceptions processing" do
     it "should return itself for normal codes" do
       (200..206).each do |code|
-        net_http_res = double('net http response', :code => '200')
-        response = RestClient::Response.create('abc', net_http_res, {}, @request)
-        response.return! @request
+        net_http_res = response_double(:code => '200')
+        resp = RestClient::Response.create('abc', net_http_res, {}, @request)
+        resp.return!
       end
     end
 
     it "should throw an exception for other codes" do
       RestClient::Exceptions::EXCEPTIONS_MAP.each_key do |code|
         unless (200..207).include? code
-          net_http_res = double('net http response', :code => code.to_i)
-          response = RestClient::Response.create('abc', net_http_res, {}, @request)
-          lambda { response.return!}.should raise_error
+          net_http_res = response_double(:code => code.to_i)
+          resp = RestClient::Response.create('abc', net_http_res, {}, @request)
+          lambda { resp.return! }.should raise_error
         end
       end
     end
@@ -84,6 +98,16 @@ describe RestClient::Response do
       RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should eq 'Foo'
     end
 
+    it "keeps redirection history" 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')
+      r = RestClient::Request.execute(url: 'http://some/resource', method: :get)
+      r.body.should eq 'Foo'
+      r.history.length.should eq 1
+      r.history.fetch(0).should be_a(RestClient::Response)
+      r.history.fetch(0).code.should be 301
+    end
+
     it "follows a redirection and keep the parameters" do
       stub_request(:get, 'http://foo:bar@some/resource').with(:headers => {'Accept' => 'application/json'}).to_return(:body => '', :status => 301, :headers => {'Location' => 'http://new/resource'})
       stub_request(:get, 'http://foo:bar@new/resource').with(:headers => {'Accept' => 'application/json'}).to_return(:body => 'Foo')
@@ -103,27 +127,39 @@ describe RestClient::Response do
     end
 
     it "doesn't follow a 301 when the request is a post" do
-      net_http_res = double('net http response', :code => 301)
-      response = RestClient::Response.create('abc', net_http_res, {:method => :post}, @request)
-      lambda { response.return!(@request)}.should raise_error(RestClient::MovedPermanently)
+      net_http_res = response_double(:code => 301)
+      response = RestClient::Response.create('abc', net_http_res,
+                                             {:method => :post}, @request)
+      lambda {
+        response.return!
+      }.should raise_error(RestClient::MovedPermanently)
     end
 
     it "doesn't follow a 302 when the request is a post" do
-      net_http_res = double('net http response', :code => 302)
-      response = RestClient::Response.create('abc', net_http_res, {:method => :post}, @request)
-      lambda { response.return!(@request)}.should raise_error(RestClient::Found)
+      net_http_res = response_double(:code => 302)
+      response = RestClient::Response.create('abc', net_http_res,
+                                             {:method => :post}, @request)
+      lambda {
+        response.return!
+      }.should raise_error(RestClient::Found)
     end
 
     it "doesn't follow a 307 when the request is a post" do
-      net_http_res = double('net http response', :code => 307)
-      response = RestClient::Response.create('abc', net_http_res, {:method => :post}, @request)
-      lambda { response.return!(@request)}.should raise_error(RestClient::TemporaryRedirect)
+      net_http_res = response_double(:code => 307)
+      response = RestClient::Response.create('abc', net_http_res,
+                                             {:method => :post}, @request)
+      lambda {
+        response.return!
+      }.should raise_error(RestClient::TemporaryRedirect)
     end
 
     it "doesn't follow a redirection when the request is a put" do
-      net_http_res = double('net http response', :code => 301)
-      response = RestClient::Response.create('abc', net_http_res, {:method => :put}, @request)
-      lambda { response.return!(@request)}.should raise_error(RestClient::MovedPermanently)
+      net_http_res = response_double(:code => 301)
+      response = RestClient::Response.create('abc', net_http_res,
+                                             {:method => :put}, @request)
+      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
@@ -159,17 +195,25 @@ describe RestClient::Response do
     it "follows no more than 10 redirections before raising error" do
       stub_request(:get, 'http://some/redirect-1').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://some/redirect-2'})
       stub_request(:get, 'http://some/redirect-2').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://some/redirect-2'})
-      lambda { RestClient::Request.execute(:url => 'http://some/redirect-1', :method => :get) }.should raise_error(RestClient::MaxRedirectsReached)
+      lambda {
+        RestClient::Request.execute(url: 'http://some/redirect-1', method: :get)
+      }.should raise_error(RestClient::MovedPermanently) { |ex|
+        ex.response.history.each {|r| r.should be_a(RestClient::Response) }
+        ex.response.history.length.should eq 10
+      }
       WebMock.should have_requested(:get, 'http://some/redirect-2').times(10)
     end
 
     it "follows no more than max_redirects redirections, if specified" do
       stub_request(:get, 'http://some/redirect-1').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://some/redirect-2'})
       stub_request(:get, 'http://some/redirect-2').to_return(:body => '', :status => 301, :headers => {'Location' => 'http://some/redirect-2'})
-      lambda { RestClient::Request.execute(:url => 'http://some/redirect-1', :method => :get, :max_redirects => 5) }.should raise_error(RestClient::MaxRedirectsReached)
+      lambda {
+        RestClient::Request.execute(url: 'http://some/redirect-1', method: :get, max_redirects: 5)
+      }.should raise_error(RestClient::MovedPermanently) { |ex|
+        ex.response.history.length.should eq 5
+      }
       WebMock.should have_requested(:get, 'http://some/redirect-2').times(5)
     end
   end
 
-
 end

data/spec/unit/restclient_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative '_lib'
 
 describe RestClient do
   describe "API" do
@@ -71,9 +71,9 @@ describe RestClient do
   end
 
   describe 'version' do
-    it 'has a version ~> 1.8.0.alpha' do
+    it 'has a version ~> 2.0.0.alpha' do
       ver = Gem::Version.new(RestClient.version)
-      Gem::Requirement.new('~> 1.8.0.alpha').should be_satisfied_by(ver)
+      Gem::Requirement.new('~> 2.0.0.alpha').should be_satisfied_by(ver)
     end
   end
 end

data/spec/unit/utils_spec.rb

@@ -0,0 +1,71 @@
+require_relative '_lib'
+
+describe RestClient::Utils do
+  describe '.get_encoding_from_headers' do
+    it 'assumes no encoding by default for text' do
+      headers = {:content_type => 'text/plain'}
+      RestClient::Utils.get_encoding_from_headers(headers).
+        should eq nil
+    end
+
+    it 'returns nil on failures' do
+      RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'blah'}).should eq nil
+      RestClient::Utils.get_encoding_from_headers(
+        {}).should eq nil
+      RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'foo; bar=baz'}).should eq nil
+    end
+
+    it 'handles various charsets' do
+      RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'text/plain; charset=UTF-8'}).should eq 'UTF-8'
+      RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'application/json; charset=ISO-8859-1'}).
+        should eq 'ISO-8859-1'
+      RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'text/html; charset=windows-1251'}).
+        should eq 'windows-1251'
+
+      RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'text/html; charset="UTF-16"'}).
+        should eq 'UTF-16'
+    end
+  end
+
+  describe '.cgi_parse_header' do
+    it 'parses headers' do
+      RestClient::Utils.cgi_parse_header('text/plain').
+        should eq ['text/plain', {}]
+
+      RestClient::Utils.cgi_parse_header('text/vnd.just.made.this.up ; ').
+        should eq ['text/vnd.just.made.this.up', {}]
+
+      RestClient::Utils.cgi_parse_header('text/plain;charset=us-ascii').
+        should eq ['text/plain', {'charset' => 'us-ascii'}]
+
+      RestClient::Utils.cgi_parse_header('text/plain ; charset="us-ascii"').
+        should eq ['text/plain', {'charset' => 'us-ascii'}]
+
+      RestClient::Utils.cgi_parse_header(
+        'text/plain ; charset="us-ascii"; another=opt').
+        should eq ['text/plain', {'charset' => 'us-ascii', 'another' => 'opt'}]
+
+      RestClient::Utils.cgi_parse_header(
+        'attachment; filename="silly.txt"').
+        should eq ['attachment', {'filename' => 'silly.txt'}]
+
+      RestClient::Utils.cgi_parse_header(
+        'attachment; filename="strange;name"').
+        should eq ['attachment', {'filename' => 'strange;name'}]
+
+      RestClient::Utils.cgi_parse_header(
+        'attachment; filename="strange;name";size=123;').should eq \
+        ['attachment', {'filename' => 'strange;name', 'size' => '123'}]
+
+      RestClient::Utils.cgi_parse_header(
+        'form-data; name="files"; filename="fo\\"o;bar"').should eq \
+        ['form-data', {'name' => 'files', 'filename' => 'fo"o;bar'}]
+    end
+  end
+end

data/spec/unit/windows/root_certs_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative '../_lib'
 
 describe 'RestClient::Windows::RootCerts',
          :if => RestClient::Platform.windows? do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-client
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - REST Client Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -30,40 +30,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -86,6 +86,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: http-cookie
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +146,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 description: 'A 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
@@ -152,6 +166,8 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop-disables.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - AUTHORS
 - Gemfile
@@ -171,11 +187,14 @@ files:
 - lib/restclient/request.rb
 - lib/restclient/resource.rb
 - lib/restclient/response.rb
+- lib/restclient/utils.rb
 - lib/restclient/version.rb
 - lib/restclient/windows.rb
 - lib/restclient/windows/root_certs.rb
 - rest-client.gemspec
 - rest-client.windows.gemspec
+- spec/helpers.rb
+- spec/integration/_lib.rb
 - spec/integration/capath_digicert/244b5494.0
 - spec/integration/capath_digicert/81b9768f.0
 - spec/integration/capath_digicert/README
@@ -186,9 +205,11 @@ files:
 - spec/integration/capath_verisign/verisign.crt
 - spec/integration/certs/digicert.crt
 - spec/integration/certs/verisign.crt
+- spec/integration/httpbin_spec.rb
 - spec/integration/integration_spec.rb
 - spec/integration/request_spec.rb
 - spec/spec_helper.rb
+- spec/unit/_lib.rb
 - spec/unit/abstract_response_spec.rb
 - spec/unit/exceptions_spec.rb
 - spec/unit/master_shake.jpg
@@ -199,6 +220,7 @@ files:
 - spec/unit/resource_spec.rb
 - spec/unit/response_spec.rb
 - spec/unit/restclient_spec.rb
+- spec/unit/utils_spec.rb
 - spec/unit/windows/root_certs_spec.rb
 homepage: https://github.com/rest-client/rest-client
 licenses:
@@ -212,20 +234,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Simple HTTP and REST client for Ruby, inspired by microframework syntax for
   specifying actions.
 test_files:
+- spec/helpers.rb
+- spec/integration/_lib.rb
 - spec/integration/capath_digicert/244b5494.0
 - spec/integration/capath_digicert/81b9768f.0
 - spec/integration/capath_digicert/README
@@ -236,9 +260,11 @@ test_files:
 - spec/integration/capath_verisign/verisign.crt
 - spec/integration/certs/digicert.crt
 - spec/integration/certs/verisign.crt
+- spec/integration/httpbin_spec.rb
 - spec/integration/integration_spec.rb
 - spec/integration/request_spec.rb
 - spec/spec_helper.rb
+- spec/unit/_lib.rb
 - spec/unit/abstract_response_spec.rb
 - spec/unit/exceptions_spec.rb
 - spec/unit/master_shake.jpg
@@ -249,5 +275,6 @@ test_files:
 - spec/unit/resource_spec.rb
 - spec/unit/response_spec.rb
 - spec/unit/restclient_spec.rb
+- spec/unit/utils_spec.rb
 - spec/unit/windows/root_certs_spec.rb
 has_rdoc: