patron 0.4.1 → 0.4.2

data/Rakefile

@@ -126,31 +126,6 @@ Spec::Rake::SpecTask.new('spec:rcov') do |t|
   t.rcov_opts << '--exclude /Library/Ruby/Gems'
 end
 
-# Rubyforge tasks
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/patron/"
-        local_dir = 'doc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end
+Jeweler::RubyforgeTasks.new
 
 task :default => :spec

data/ext/patron/session_ext.c

@@ -380,6 +380,17 @@ VALUE session_handle_request(VALUE self, VALUE request) {
   return rb_ensure(&perform_request, self, &cleanup, self);
 }
 
+VALUE enable_cookie_session(VALUE self, VALUE file) {
+	struct curl_state *state;
+	Data_Get_Struct(self, struct curl_state, state);
+	CURL* curl = state->handle;
+	char *file_path = RSTRING_PTR(file);
+	if (file_path != "")
+		curl_easy_setopt(curl, CURLOPT_COOKIEJAR, file_path);
+	curl_easy_setopt(curl, CURLOPT_COOKIEFILE, file_path);
+	return Qnil;
+}
+
 //------------------------------------------------------------------------------
 // Extension initialization
 //
@@ -411,6 +422,7 @@ void Init_session_ext() {
   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_method(cSession, "enable_cookie_session", enable_cookie_session, 1);
 
 	rb_define_const(cRequest, "AuthBasic", 	CURLAUTH_BASIC);
 	rb_define_const(cRequest, "AuthDigest", CURLAUTH_DIGEST);

data/lib/patron/request.rb

@@ -68,7 +68,7 @@ module Patron
 
     def upload_data=(data)
       @upload_data = case data
-      when Hash:
+      when Hash
         hash_to_string(data)
       else
         data

data/lib/patron/session.rb

@@ -60,7 +60,7 @@ module Patron
     # @see Patron::Request#auth_type
     attr_accessor :auth_type
 
-    private :ext_initialize, :handle_request
+    private :ext_initialize, :handle_request, :enable_cookie_session
 
     # Create a new Session object.
     def initialize
@@ -72,6 +72,23 @@ module Patron
       @auth_type = :basic
     end
 
+    # Makes this session handle cookies and store them in in +file+.
+    # If file is nil they will be stored in memory. Otherwise the +file+
+    # must be readable and writable. Calling multiple times will add more files.
+    def handle_cookies(file = nil)
+      if file
+        path = Pathname(file).expand_path
+        unless File.exists?(file) and File.writable?(path.dirname)
+          raise ArgumentError, "Can't create file #{path} (permission error)"
+        end
+        unless File.readable?(file) or File.writable?(path)
+          raise ArgumentError, "Cant read or write file #{path} (permission error)"
+        end
+      end
+      enable_cookie_session(path.to_s)
+      self
+    end
+
     ###################################################################
     ### Standard HTTP methods
     ###

data/spec/session_spec.rb

@@ -177,6 +177,21 @@ describe Patron::Session do
     body.header['authorization'].should == [encode_authz("foo", "bar")]
   end
 
+  it "should handle cookies if set" do
+    @session.handle_cookies
+    response = @session.get("/setcookie").body
+    YAML::load(response).header['cookie'].first.should == "session_id=foo123"
+  end
+
+  it "should not handle cookies by default" do
+    response = @session.get("/setcookie").body
+    YAML::load(response).header.should_not include('cookie')
+  end
+
+  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
+  
   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.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Phillip Toland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -05:00
+date: 2009-08-13 00:00:00 -05:00
 default_executable: 
 dependencies: []