patron 0.4.4 → 0.4.5

data/Rakefile

@@ -61,6 +61,7 @@ Jeweler::Tasks.new do |s|
   s.require_paths << 'ext'
 
   s.files = FileList['README.txt',
+                     'VERSION.yml',
                      'LICENSE',
                      'Rakefile',
                      'lib/**/*',

data/VERSION.yml

@@ -0,0 +1,5 @@
+--- 
+:major: 0
+:minor: 4
+:patch: 5
+:build: 

data/ext/patron/extconf.rb

@@ -21,6 +21,11 @@
 ## THE SOFTWARE.
 ##
 ## -------------------------------------------------------------------
+
+if RUBY_PLATFORM =~ /darwin10\.0/
+  ENV['ARCHFLAGS'] = '-arch x86_64'
+end
+
 require 'mkmf'
 require 'rbconfig'
 

data/ext/patron/session_ext.c

@@ -70,7 +70,7 @@ static size_t session_read_handler(char* stream, size_t size, size_t nmemb, char
 
   return result;
 }
- 
+
 //------------------------------------------------------------------------------
 // Object allocation
 //
@@ -256,7 +256,7 @@ static void set_options_from_request(VALUE self, VALUE request) {
 
   timeout = rb_iv_get(request, "@connect_timeout");
   if (!NIL_P(timeout)) {
-    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, FIX2INT(timeout));
+    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, FIX2INT(timeout));
   }
 
   VALUE redirects = rb_iv_get(request, "@max_redirects");
@@ -342,11 +342,12 @@ static VALUE perform_request(VALUE self) {
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, body_buffer);
   }
 
-  #ifdef HAVE_TBR
+  #if defined(HAVE_TBR) && defined(USE_TBR)
   CURLcode ret = rb_thread_blocking_region(curl_easy_perform, curl, RUBY_UBF_IO, 0);
   #else
   CURLcode ret = curl_easy_perform(curl);
   #endif
+
   if (CURLE_OK == ret) {
     VALUE response = create_response(curl);
     if (!NIL_P(body_buffer)) {
@@ -423,12 +424,12 @@ void Init_session_ext() {
   ePartialFileError = rb_const_get(mPatron, rb_intern("PartialFileError"));
   eTimeoutError = rb_const_get(mPatron, rb_intern("TimeoutError"));
   eTooManyRedirects = rb_const_get(mPatron, rb_intern("TooManyRedirects"));
-	
+
 
   rb_define_module_function(mPatron, "libcurl_version", libcurl_version, 0);
 
   cSession = rb_define_class_under(mPatron, "Session", rb_cObject);
-	cRequest = rb_define_class_under(mPatron, "Request", rb_cObject);
+  cRequest = rb_define_class_under(mPatron, "Request", rb_cObject);
   rb_define_alloc_func(cSession, session_alloc);
 
   rb_define_method(cSession, "ext_initialize", session_ext_initialize, 0);
@@ -437,8 +438,8 @@ void Init_session_ext() {
   rb_define_method(cSession, "handle_request", session_handle_request, 1);
   rb_define_method(cSession, "enable_cookie_session", enable_cookie_session, 1);
 
-	rb_define_const(cRequest, "AuthBasic", 	CURLAUTH_BASIC);
-	rb_define_const(cRequest, "AuthDigest", CURLAUTH_DIGEST);
-	rb_define_const(cRequest, "AuthAny",		CURLAUTH_ANY);
-	
+  rb_define_const(cRequest, "AuthBasic",   CURLAUTH_BASIC);
+  rb_define_const(cRequest, "AuthDigest", CURLAUTH_DIGEST);
+  rb_define_const(cRequest, "AuthAny",    CURLAUTH_ANY);
+
 }

data/lib/patron/response.rb

@@ -49,7 +49,11 @@ module Patron
         else
           parts = header.split(':', 2)
           parts[1].strip! unless parts[1].nil?
-          @headers[parts[0]] = parts[1]
+          if @headers.has_key?(parts[0])
+            @headers[parts[0]] << ",#{parts[1]}"
+          else
+            @headers[parts[0]] = parts[1]
+          end
         end
       end
     end

data/lib/patron/session.rb

@@ -34,14 +34,14 @@ module Patron
   # server. This is the primary API for Patron.
   class Session
 
-    # HTTP connection timeout in milliseconds. Defaults to 1 second (1000 ms).
+    # HTTP connection timeout in seconds. Defaults to 1 second.
     attr_accessor :connect_timeout
 
     # HTTP transaction timeout in seconds. Defaults to 5 seconds.
     attr_accessor :timeout
 
     # Maximum number of times to follow redirects.
-    # Set to 0 to disable and -1 to follow all redirects (the default).
+    # Set to 0 to disable and -1 to follow all redirects. Defaults to 5.
     attr_accessor :max_redirects
 
     # Prepended to the URL in all requests.
@@ -70,8 +70,8 @@ module Patron
       ext_initialize
       @headers = {}
       @timeout = 5
-      @connect_timeout = 1000
-      @max_redirects = -1
+      @connect_timeout = 1
+      @max_redirects = 5
       @auth_type = :basic
     end
 

data/spec/response_spec.rb

@@ -37,4 +37,9 @@ describe Patron::Response do
     # All digits, no spaces
     response.headers['Content-Length'].should match(/^\d+$/)
   end
+
+  it "should combine header values sent in different fields with same name" do
+    response = @session.get("/repetitiveheader")
+    response.headers['Set-Cookie'].should == "a=1,b=2"
+  end
 end

data/spec/session_spec.rb

@@ -207,7 +207,19 @@ describe Patron::Session do
   it "should raise exception if cookie store is not writable or readable" do
     lambda { @session.handle_cookies("/trash/clash/foo") }.should raise_error(ArgumentError)
   end
-  
+
+  it "should work with multiple threads" do
+    threads = []
+    3.times do
+      threads << Thread.new do
+        session = Patron::Session.new
+        session.base_url = "http://localhost:9001"
+        session.post_file("/test", "VERSION.yml")
+      end
+    end
+    threads.each {|t| t.join }
+  end
+
   def encode_authz(user, passwd)
     "Basic " + Base64.encode64("#{user}:#{passwd}").strip
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: patron
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Phillip Toland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-04 00:00:00 -05:00
+date: 2010-01-28 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -19,12 +19,14 @@ executables: []
 
 extensions: 
 - ext/patron/extconf.rb
+- ext/patron/extconf.rb
 extra_rdoc_files: 
 - README.txt
 files: 
 - LICENSE
 - README.txt
 - Rakefile
+- VERSION.yml
 - ext/patron/extconf.rb
 - ext/patron/session_ext.c
 - lib/patron.rb
@@ -56,6 +58,7 @@ rdoc_options:
 require_paths: 
 - lib
 - ext
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="