rest-client 1.7.2 → 2.1.0

data/spec/unit/utils_spec.rb

@@ -0,0 +1,147 @@
+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'}
+      expect(RestClient::Utils.get_encoding_from_headers(headers)).
+        to eq nil
+    end
+
+    it 'returns nil on failures' do
+      expect(RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'blah'})).to eq nil
+      expect(RestClient::Utils.get_encoding_from_headers(
+        {})).to eq nil
+      expect(RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'foo; bar=baz'})).to eq nil
+    end
+
+    it 'handles various charsets' do
+      expect(RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'text/plain; charset=UTF-8'})).to eq 'UTF-8'
+      expect(RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'application/json; charset=ISO-8859-1'})).
+        to eq 'ISO-8859-1'
+      expect(RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'text/html; charset=windows-1251'})).
+        to eq 'windows-1251'
+
+      expect(RestClient::Utils.get_encoding_from_headers(
+        {:content_type => 'text/html; charset="UTF-16"'})).
+        to eq 'UTF-16'
+    end
+  end
+
+  describe '.cgi_parse_header' do
+    it 'parses headers', :unless => RUBY_VERSION.start_with?('2.0') do
+      expect(RestClient::Utils.cgi_parse_header('text/plain')).
+        to eq ['text/plain', {}]
+
+      expect(RestClient::Utils.cgi_parse_header('text/vnd.just.made.this.up')).
+        to eq ['text/vnd.just.made.this.up', {}]
+
+      expect(RestClient::Utils.cgi_parse_header('text/plain;charset=us-ascii')).
+        to eq ['text/plain', {'charset' => 'us-ascii'}]
+
+      expect(RestClient::Utils.cgi_parse_header('text/plain ; charset="us-ascii"')).
+        to eq ['text/plain', {'charset' => 'us-ascii'}]
+
+      expect(RestClient::Utils.cgi_parse_header(
+        'text/plain ; charset="us-ascii"; another=opt')).
+        to eq ['text/plain', {'charset' => 'us-ascii', 'another' => 'opt'}]
+
+      expect(RestClient::Utils.cgi_parse_header(
+        'foo/bar; filename="silly.txt"')).
+        to eq ['foo/bar', {'filename' => 'silly.txt'}]
+
+      expect(RestClient::Utils.cgi_parse_header(
+        'foo/bar; filename="strange;name"')).
+        to eq ['foo/bar', {'filename' => 'strange;name'}]
+
+      expect(RestClient::Utils.cgi_parse_header(
+        'foo/bar; filename="strange;name";size=123')).to eq \
+        ['foo/bar', {'filename' => 'strange;name', 'size' => '123'}]
+
+      expect(RestClient::Utils.cgi_parse_header(
+        'foo/bar; name="files"; filename="fo\\"o;bar"')).to eq \
+        ['foo/bar', {'name' => 'files', 'filename' => 'fo"o;bar'}]
+    end
+  end
+
+  describe '.encode_query_string' do
+    it 'handles simple hashes' do
+      {
+        {foo: 123, bar: 456} => 'foo=123&bar=456',
+        {'foo' => 123, 'bar' => 456} => 'foo=123&bar=456',
+        {foo: 'abc', bar: 'one two'} => 'foo=abc&bar=one+two',
+        {escaped: '1+2=3'} => 'escaped=1%2B2%3D3',
+        {'escaped + key' => 'foo'} => 'escaped+%2B+key=foo',
+      }.each_pair do |input, expected|
+        expect(RestClient::Utils.encode_query_string(input)).to eq expected
+      end
+    end
+
+    it 'handles simple arrays' do
+      {
+        {foo: [1, 2, 3]} => 'foo[]=1&foo[]=2&foo[]=3',
+        {foo: %w{a b c}, bar: [1, 2, 3]} => 'foo[]=a&foo[]=b&foo[]=c&bar[]=1&bar[]=2&bar[]=3',
+        {foo: ['one two', 3]} => 'foo[]=one+two&foo[]=3',
+        {'a+b' => [1,2,3]} => 'a%2Bb[]=1&a%2Bb[]=2&a%2Bb[]=3',
+      }.each_pair do |input, expected|
+        expect(RestClient::Utils.encode_query_string(input)).to eq expected
+      end
+    end
+
+    it 'handles nested hashes' do
+      {
+        {outer: {foo: 123, bar: 456}} => 'outer[foo]=123&outer[bar]=456',
+        {outer: {foo: [1, 2, 3], bar: 'baz'}} => 'outer[foo][]=1&outer[foo][]=2&outer[foo][]=3&outer[bar]=baz',
+      }.each_pair do |input, expected|
+        expect(RestClient::Utils.encode_query_string(input)).to eq expected
+      end
+    end
+
+    it 'handles null and empty values' do
+      {
+        {string: '', empty: nil, list: [], hash: {}, falsey: false } =>
+          'string=&empty&list&hash&falsey=false',
+      }.each_pair do |input, expected|
+        expect(RestClient::Utils.encode_query_string(input)).to eq expected
+      end
+    end
+
+    it 'handles nested nulls' do
+      {
+        {foo: {string: '', empty: nil}} => 'foo[string]=&foo[empty]',
+      }.each_pair do |input, expected|
+        expect(RestClient::Utils.encode_query_string(input)).to eq expected
+      end
+    end
+
+    it 'handles deep nesting' do
+      {
+        {coords: [{x: 1, y: 0}, {x: 2}, {x: 3}]} => 'coords[][x]=1&coords[][y]=0&coords[][x]=2&coords[][x]=3',
+      }.each_pair do |input, expected|
+        expect(RestClient::Utils.encode_query_string(input)).to eq expected
+      end
+    end
+
+    it 'handles multiple fields with the same name using ParamsArray' do
+      {
+        RestClient::ParamsArray.new([[:foo, 1], [:foo, 2], [:foo, 3]]) => 'foo=1&foo=2&foo=3',
+      }.each_pair do |input, expected|
+        expect(RestClient::Utils.encode_query_string(input)).to eq expected
+      end
+    end
+
+    it 'handles nested ParamsArrays' do
+      {
+        {foo: RestClient::ParamsArray.new([[:a, 1], [:a, 2]])} => 'foo[a]=1&foo[a]=2',
+        RestClient::ParamsArray.new([[:foo, {a: 1}], [:foo, {a: 2}]]) => 'foo[a]=1&foo[a]=2',
+      }.each_pair do |input, expected|
+        expect(RestClient::Utils.encode_query_string(input)).to eq expected
+      end
+    end
+  end
+end

data/spec/unit/windows/root_certs_spec.rb

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require_relative '../_lib'
 
 describe 'RestClient::Windows::RootCerts',
          :if => RestClient::Platform.windows? do
   let(:x509_store) { RestClient::Windows::RootCerts.instance.to_a }
 
   it 'should return at least one X509 certificate' do
-    expect(x509_store.to_a).to have_at_least(1).items
+    expect(x509_store.to_a.size).to be >= 1
   end
 
   it 'should return an X509 certificate with a subject' do
@@ -16,7 +16,7 @@ describe 'RestClient::Windows::RootCerts',
 
   it 'should return X509 certificate objects' do
     x509_store.each do |cert|
-      cert.should be_a(OpenSSL::X509::Certificate)
+      expect(cert).to be_a(OpenSSL::X509::Certificate)
     end
   end
 end

metadata

@@ -1,157 +1,200 @@
 --- !ruby/object:Gem::Specification
 name: rest-client
 version: !ruby/object:Gem::Version
-  version: 1.7.2
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - REST Client Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.2
-    - - <
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.49'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0.49'
+- !ruby/object:Gem::Dependency
+  name: http-accept
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: http-cookie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-description: ! 'A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework
+        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
+email: discuss@rest-client.groups.io
 executables:
 - restclient
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 - history.md
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".mailmap"
+- ".rspec"
+- ".rubocop"
+- ".rubocop-disables.yml"
+- ".rubocop.yml"
+- ".travis.yml"
 - AUTHORS
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - bin/restclient
 - history.md
@@ -160,19 +203,24 @@ files:
 - lib/restclient.rb
 - lib/restclient/abstract_response.rb
 - lib/restclient/exceptions.rb
+- lib/restclient/params_array.rb
 - lib/restclient/payload.rb
 - lib/restclient/platform.rb
 - lib/restclient/raw_response.rb
 - 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/integration/capath_digicert/244b5494.0
-- spec/integration/capath_digicert/81b9768f.0
+- spec/ISS.jpg
+- spec/helpers.rb
+- spec/integration/_lib.rb
+- spec/integration/capath_digicert/3513523f.0
+- spec/integration/capath_digicert/399e7759.0
 - spec/integration/capath_digicert/README
 - spec/integration/capath_digicert/digicert.crt
 - spec/integration/capath_verisign/415660c1.0
@@ -181,12 +229,14 @@ 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
+- spec/unit/params_array_spec.rb
 - spec/unit/payload_spec.rb
 - spec/unit/raw_response_spec.rb
 - spec/unit/request2_spec.rb
@@ -194,39 +244,38 @@ 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:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1102817666116175326
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple HTTP and REST client for Ruby, inspired by microframework syntax for
   specifying actions.
 test_files:
-- spec/integration/capath_digicert/244b5494.0
-- spec/integration/capath_digicert/81b9768f.0
+- spec/ISS.jpg
+- spec/helpers.rb
+- spec/integration/_lib.rb
+- spec/integration/capath_digicert/3513523f.0
+- spec/integration/capath_digicert/399e7759.0
 - spec/integration/capath_digicert/README
 - spec/integration/capath_digicert/digicert.crt
 - spec/integration/capath_verisign/415660c1.0
@@ -235,12 +284,14 @@ 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
+- spec/unit/params_array_spec.rb
 - spec/unit/payload_spec.rb
 - spec/unit/raw_response_spec.rb
 - spec/unit/request2_spec.rb
@@ -248,5 +299,5 @@ 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: