patron 0.4.0 → 0.4.1

data/ext/patron/session_ext.c

@@ -27,6 +27,7 @@
 
 static VALUE mPatron = Qnil;
 static VALUE cSession = Qnil;
+static VALUE cRequest = Qnil;
 static VALUE ePatronError = Qnil;
 static VALUE eUnsupportedProtocol = Qnil;
 static VALUE eURLFormatError = Qnil;
@@ -270,7 +271,7 @@ static void set_options_from_request(VALUE self, VALUE request) {
 
   VALUE credentials = rb_funcall(request, rb_intern("credentials"), 0);
   if (!NIL_P(credentials)) {
-    curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+    curl_easy_setopt(curl, CURLOPT_HTTPAUTH, rb_iv_get(request, "@auth_type"));
     curl_easy_setopt(curl, CURLOPT_USERPWD, StringValuePtr(credentials));
   }
 }
@@ -398,14 +399,21 @@ 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);
   rb_define_alloc_func(cSession, session_alloc);
 
   rb_define_method(cSession, "ext_initialize", session_ext_initialize, 0);
   rb_define_method(cSession, "escape",         session_escape,         1);
   rb_define_method(cSession, "unescape",       session_unescape,       1);
   rb_define_method(cSession, "handle_request", session_handle_request, 1);
+
+	rb_define_const(cRequest, "AuthBasic", 	CURLAUTH_BASIC);
+	rb_define_const(cRequest, "AuthDigest", CURLAUTH_DIGEST);
+	rb_define_const(cRequest, "AuthAny",		CURLAUTH_ANY);
+	
 }

data/lib/patron/request.rb

@@ -40,8 +40,44 @@ module Patron
       @max_redirects = -1
     end
 
-    attr_accessor :url, :username, :password, :upload_data, :file_name, :proxy
+    attr_accessor :url, :username, :password, :file_name, :proxy, :auth_type
     attr_reader :action, :timeout, :connect_timeout, :max_redirects, :headers
+    attr_reader :auth_type
+    
+      # Set the type of authentication to use for this request. 
+      # 
+      # @param [String, Symbol] type - The type of authentication to use for this request, can be one of
+      #   :basic, :digest, or :any
+      #
+      # @example
+      #   sess.username = "foo"
+      #   sess.password = "sekrit"
+      #   sess.auth_type = :digest
+      def auth_type=(type=:basic)
+        @auth_type = case type
+        when :basic, "basic"
+          Request::AuthBasic
+        when :digest, "digest"
+          Request::AuthDigest
+        when :any, "any"
+          Request::AuthAny
+        else
+          raise "#{type.inspect} is an unknown authentication type"
+        end
+      end
+
+    def upload_data=(data)
+      @upload_data = case data
+      when Hash:
+        hash_to_string(data)
+      else
+        data
+      end
+    end
+    
+    def upload_data
+      @upload_data
+    end
 
     def action=(new_action)
       if !VALID_ACTIONS.include?(new_action)
@@ -92,5 +128,20 @@ module Patron
       "#{username}:#{password}"
     end
 
+    private
+    
+    # serialize hash for Rails-style params
+    def hash_to_string(hash)
+      pairs = []
+      recursive = Proc.new do |h, prefix| 
+        h.each_pair do |k,v|
+          key = prefix == '' ? k : "#{prefix}[#{k}]"
+          v.is_a?(Hash) ? recursive.call(v, key) : pairs << "#{key}=#{v}"
+        end
+      end
+      recursive.call(hash, '')
+      return pairs.join('&')
+    end
+    
   end
 end

data/lib/patron/session.rb

@@ -55,6 +55,10 @@ module Patron
 
     # Standard set of headers that are used in all requests.
     attr_reader :headers
+    
+    # Set the authentication type for the request.
+    # @see Patron::Request#auth_type
+    attr_accessor :auth_type
 
     private :ext_initialize, :handle_request
 
@@ -65,6 +69,7 @@ module Patron
       @timeout = 5
       @connect_timeout = 1000
       @max_redirects = -1
+      @auth_type = :basic
     end
 
     ###################################################################
@@ -116,7 +121,7 @@ module Patron
     # Uploads the contents of a file to the specified +url+ using HTTP POST.
     def post_file(url, filename, headers = {})
       request(:post, url, headers, :file => filename)
-    end
+    end     
 
     ###################################################################
     ### WebDAV methods
@@ -145,6 +150,7 @@ module Patron
       req.upload_data = options[:data]
       req.file_name = options[:file]
       req.proxy = proxy
+      req.auth_type = auth_type
 
       req.url = self.base_url.to_s + url.to_s
       raise ArgumentError, "Empty URL" if req.url.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: patron
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Phillip Toland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -05:00
+date: 2009-08-10 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: patron
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Patron HTTP client