rest-client 1.6.3 → 1.6.5

data/VERSION

@@ -1 +1 @@
-1.6.3
+1.6.5

data/bin/restclient

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
 
 $:.unshift File.dirname(__FILE__) + "/../lib"
-require 'restclient'
 
-require "yaml"
+require 'rubygems'
+require 'restclient'
+require 'yaml'
 
 def usage(why = nil)
   puts "failed for reason: #{why}" if why
@@ -56,8 +57,8 @@ end
 
 POSSIBLE_VERBS.each do |m|
   eval <<-end_eval
-def  #{m} (path, *args, &b)
-	r[path]. #{m} (*args, &b)
+def  #{m}(path, *args, &b)
+	r[path].#{m}(*args, &b)
 end
   end_eval
 end

data/history.md

@@ -1,4 +1,16 @@
+# 1.6.5
+
+- RFC6265 requires single SP after ';' for separating parameters pairs in the 'Cookie:' header (patch provided by Hiroshi Nakamura)
+- enable url parameters for all actions
+- detect file parameters in arrays
+- allow disabling the timeouts by passing -1 (patch provided by Sven Böhm)
+
+# 1.6.4
+
+- fix restclient script compatibility with 1.9.2
+
 # 1.6.3
+
 - 1.6.2 was yanked
 
 # 1.6.2

data/lib/restclient/payload.rb

@@ -27,12 +27,27 @@ module RestClient
         case v
           when Hash
             has_file?(v)
+          when Array
+            has_file_array?(v)
           else
             v.respond_to?(:path) && v.respond_to?(:read)
         end
       end
     end
 
+    def has_file_array?(params)
+      params.any? do |v|
+        case v
+          when Hash
+            has_file?(v)
+          when Array
+            has_file_array?(v)
+          else
+            v.respond_to?(:path) && v.respond_to?(:read)
+          end
+      end
+    end
+
     class Base
       def initialize(params)
         build_stream(params)
@@ -70,7 +85,7 @@ module RestClient
         result = []
         value.each do |elem|
           if elem.is_a? Hash
-            result +=  flatten_params(elem, calculated_key)
+            result += flatten_params(elem, calculated_key)
           elsif elem.is_a? Array
             result += flatten_params_array(elem, calculated_key)
           else

data/lib/restclient/request.rb

@@ -20,7 +20,7 @@ module RestClient
   # * :raw_response return a low-level RawResponse instead of a Response
   # * :max_redirects maximum number of redirections (default to 10)
   # * :verify_ssl enable ssl verification, possible values are constants from OpenSSL::SSL
-  # * :timeout and :open_timeout
+  # * :timeout and :open_timeout passing in -1 will disable the timeout by setting the corresponding net timeout values to nil
   # * :ssl_client_cert, :ssl_client_key, :ssl_ca_file
   class Request
 
@@ -37,7 +37,7 @@ module RestClient
       @method = args[:method] or raise ArgumentError, "must pass :method"
       @headers = args[:headers] || {}
       if args[:url]
-        @url = process_get_params(args[:url], headers)
+        @url = process_url_params(args[:url], headers)
       else
         raise ArgumentError, "must pass :url"
       end
@@ -64,24 +64,20 @@ module RestClient
       transmit uri, net_http_request_class(method).new(uri.request_uri, processed_headers), payload, & block
     end
 
-    # Extract the query parameters for get request and append them to the url
-    def process_get_params url, headers
-      if [:get, :head, :delete].include? method
-        get_params = {}
-        headers.delete_if do |key, value|
-          if 'params' == key.to_s.downcase && value.is_a?(Hash)
-            get_params.merge! value
-            true
-          else
-            false
-          end
-        end
-        unless get_params.empty?
-          query_string = get_params.collect { |k, v| "#{k.to_s}=#{CGI::escape(v.to_s)}" }.join('&')
-          url + "?#{query_string}"
+    # Extract the query parameters and append them to the url
+    def process_url_params url, headers
+      url_params = {}
+      headers.delete_if do |key, value|
+        if 'params' == key.to_s.downcase && value.is_a?(Hash)
+          url_params.merge! value
+          true
         else
-          url
+          false
         end
+      end
+      unless url_params.empty?
+        query_string = url_params.collect { |k, v| "#{k.to_s}=#{CGI::escape(v.to_s)}" }.join('&')
+        url + "?#{query_string}"
       else
         url
       end
@@ -89,7 +85,7 @@ module RestClient
 
     def make_headers user_headers
       unless @cookies.empty?
-        user_headers[:cookie] = @cookies.map { |(key, val)| "#{key.to_s}=#{CGI::unescape(val)}" }.sort.join(';')
+        user_headers[:cookie] = @cookies.map { |(key, val)| "#{key.to_s}=#{CGI::unescape(val)}" }.sort.join('; ')
       end
       headers = stringify_headers(default_headers).merge(stringify_headers(user_headers))
       headers.merge!(@payload.headers) if @payload
@@ -161,6 +157,10 @@ module RestClient
       net.read_timeout = @timeout if @timeout
       net.open_timeout = @open_timeout if @open_timeout
 
+      # disable the timeout if the timeout value is -1
+      net.read_timeout = nil if @timeout == -1
+      net.out_timeout = nil if @open_timeout == -1
+
       RestClient.before_execution_procs.each do |before_proc|
         before_proc.call(req, args)
       end

data/spec/integration/request_spec.rb

@@ -5,9 +5,9 @@ describe RestClient::Request do
     it "is successful with the correct ca_file" do
       request = RestClient::Request.new(
         :method => :get,
-        :url => 'https://www.google.com',
+        :url => 'https://www.mozilla.com',
         :verify_ssl => OpenSSL::SSL::VERIFY_PEER,
-        :ssl_ca_file => File.join(File.dirname(__FILE__), "certs", "verisign.crt")
+        :ssl_ca_file => File.join(File.dirname(__FILE__), "certs", "equifax.crt")
       )
       expect { request.execute }.to_not raise_error
     end
@@ -15,9 +15,9 @@ describe RestClient::Request do
     it "is unsuccessful with an incorrect ca_file" do
       request = RestClient::Request.new(
         :method => :get,
-        :url => 'https://www.google.com',
+        :url => 'https://www.mozilla.com',
         :verify_ssl => OpenSSL::SSL::VERIFY_PEER,
-        :ssl_ca_file => File.join(File.dirname(__FILE__), "certs", "equifax.crt")
+        :ssl_ca_file => File.join(File.dirname(__FILE__), "certs", "verisign.crt")
       )
       expect { request.execute }.to raise_error(RestClient::SSLCertificateNotVerified)
     end

data/spec/payload_spec.rb

@@ -1,29 +1,29 @@
-require File.join( File.dirname(File.expand_path(__FILE__)), 'base')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'base')
 
 describe RestClient::Payload do
   context "A regular Payload" do
     it "should use standard enctype as default content-type" do
       RestClient::Payload::UrlEncoded.new({}).headers['Content-Type'].
-              should == 'application/x-www-form-urlencoded'
+          should == 'application/x-www-form-urlencoded'
     end
 
     it "should form properly encoded params" do
       RestClient::Payload::UrlEncoded.new({:foo => 'bar'}).to_s.
-              should == "foo=bar"
+          should == "foo=bar"
       ["foo=bar&baz=qux", "baz=qux&foo=bar"].should include(
-              RestClient::Payload::UrlEncoded.new({:foo => 'bar', :baz => 'qux'}).to_s)
+                                                        RestClient::Payload::UrlEncoded.new({:foo => 'bar', :baz => 'qux'}).to_s)
     end
 
     it "should escape parameters" do
       RestClient::Payload::UrlEncoded.new({'foo ' => 'bar'}).to_s.
-              should == "foo%20=bar"
+          should == "foo%20=bar"
     end
 
     it "should properly handle hashes as parameter" do
-      RestClient::Payload::UrlEncoded.new({:foo => {:bar => 'baz' }}).to_s.
-              should == "foo[bar]=baz"
-      RestClient::Payload::UrlEncoded.new({:foo => {:bar => {:baz => 'qux' }}}).to_s.
-              should == "foo[bar][baz]=qux"
+      RestClient::Payload::UrlEncoded.new({:foo => {:bar => 'baz'}}).to_s.
+          should == "foo[bar]=baz"
+      RestClient::Payload::UrlEncoded.new({:foo => {:bar => {:baz => 'qux'}}}).to_s.
+          should == "foo[bar][baz]=qux"
     end
 
     it "should handle many attributes inside a hash" do
@@ -37,22 +37,22 @@ describe RestClient::Payload do
     end
 
     it "should handle attributes inside a an array inside an array inside an hash" do
-      parameters = RestClient::Payload::UrlEncoded.new({"foo" => [ [{"bar" => 'baz'}, {"bar" => 'qux'}]]}).to_s
+      parameters = RestClient::Payload::UrlEncoded.new({"foo" => [[{"bar" => 'baz'}, {"bar" => 'qux'}]]}).to_s
       parameters.should include("foo[bar]=baz", "foo[bar]=qux")
     end
 
     it "should form properly use symbols as parameters" do
       RestClient::Payload::UrlEncoded.new({:foo => :bar}).to_s.
-              should == "foo=bar"
-      RestClient::Payload::UrlEncoded.new({:foo => {:bar => :baz }}).to_s.
-              should == "foo[bar]=baz"
+          should == "foo=bar"
+      RestClient::Payload::UrlEncoded.new({:foo => {:bar => :baz}}).to_s.
+          should == "foo[bar]=baz"
     end
 
     it "should properly handle arrays as repeated parameters" do
       RestClient::Payload::UrlEncoded.new({:foo => ['bar']}).to_s.
-              should == "foo[]=bar"
+          should == "foo[]=bar"
       RestClient::Payload::UrlEncoded.new({:foo => ['bar', 'baz']}).to_s.
-              should == "foo[]=bar&foo[]=baz"
+          should == "foo[]=bar&foo[]=baz"
     end
 
   end
@@ -202,11 +202,16 @@ Content-Type: text/plain\r
       RestClient::Payload.generate("data").should be_kind_of(RestClient::Payload::Base)
     end
 
-    it "should recognize nested multipart payloads" do
+    it "should recognize nested multipart payloads in hashes" do
       f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
       RestClient::Payload.generate({"foo" => {"file" => f}}).should be_kind_of(RestClient::Payload::Multipart)
     end
 
+    it "should recognize nested multipart payloads in arrays" do
+      f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
+      RestClient::Payload.generate({"foo" => [f]}).should be_kind_of(RestClient::Payload::Multipart)
+    end
+
     it "should recognize file payloads that can be streamed" do
       f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
       RestClient::Payload.generate(f).should be_kind_of(RestClient::Payload::Streamed)

data/spec/request_spec.rb

@@ -106,7 +106,7 @@ describe RestClient::Request do
     URI.stub!(:parse).and_return(mock('uri', :user => nil, :password => nil))
     @request = RestClient::Request.new(:method => 'get', :url => 'example.com', :cookies => {:session_id => '1', :user_id => "someone" })
     @request.should_receive(:default_headers).and_return({'Foo' => 'bar'})
-    @request.make_headers({}).should == { 'Foo' => 'bar', 'Cookie' => 'session_id=1;user_id=someone'}
+    @request.make_headers({}).should == { 'Foo' => 'bar', 'Cookie' => 'session_id=1; user_id=someone'}
   end
 
   it "determines the Net::HTTP class to instantiate by the method name" do

metadata

@@ -1,78 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rest-client
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 1.6.5
   prerelease: 
-  segments: 
-  - 1
-  - 6
-  - 3
-  version: 1.6.3
 platform: ruby
-authors: 
+authors:
 - Adam Wiggins
 - Julien Kirch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mime-types
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156612920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
-        version: "1.16"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156612920
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &2156612280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 9
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156612280
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156611740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: "A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete."
+  prerelease: false
+  version_requirements: *2156611740
+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
-executables: 
+executables:
 - restclient
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - history.md
-files: 
+files:
 - README.rdoc
 - Rakefile
 - VERSION
@@ -106,38 +88,30 @@ files:
 - history.md
 homepage: http://github.com/archiloque/rest-client
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
-summary: Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.
-test_files: 
+summary: Simple HTTP and REST client for Ruby, inspired by microframework syntax for
+  specifying actions.
+test_files:
 - spec/abstract_response_spec.rb
 - spec/base.rb
 - spec/exceptions_spec.rb