patron 0.4.3 → 0.4.4

data/ext/patron/session_ext.c

@@ -230,6 +230,8 @@ static void set_options_from_request(VALUE self, VALUE request) {
 
       state->upload_file = open_file(filename, "r");
       curl_easy_setopt(curl, CURLOPT_READDATA, state->upload_file);
+    } else {
+      rb_raise(rb_eArgError, "Must provide either data or a filename when doing a PUT or POST");
     }
   } else if (action == rb_intern("head")) {
     curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
@@ -391,14 +393,15 @@ VALUE session_handle_request(VALUE self, VALUE request) {
 }
 
 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;
+  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 != NULL && strlen(file_path) != 0) {
+    curl_easy_setopt(curl, CURLOPT_COOKIEJAR, file_path);
+  }
+  curl_easy_setopt(curl, CURLOPT_COOKIEFILE, file_path);
+  return Qnil;
 }
 
 //------------------------------------------------------------------------------

data/lib/patron.rb

@@ -26,15 +26,15 @@ require 'yaml'
 require 'pathname'
 
 cwd = Pathname(__FILE__).dirname
-$:.unshift(cwd) unless $:.include?(cwd) || $:.include?(cwd.expand_path)
+$:.unshift(cwd.to_s) unless $:.include?(cwd.to_s) || $:.include?(cwd.expand_path.to_s)
 
 require 'patron/session'
 
 module Patron #:nodoc:
   # Returns the version number of the Patron library as a string
   def self.version
-    cwd = Pathname(__FILE__).dirname
-    yaml = YAML.load_file(cwd.expand_path + '../VERSION.yml')
+    cwd = Pathname(__FILE__).dirname.expand_path.to_s
+    yaml = YAML.load_file(cwd + '/../VERSION.yml')
     major = (yaml['major'] || yaml[:major]).to_i
     minor = (yaml['minor'] || yaml[:minor]).to_i
     patch = (yaml['patch'] || yaml[:patch]).to_i

data/spec/session_spec.rb

@@ -137,12 +137,20 @@ describe Patron::Session do
     body.header['content-length'].should == [data.size.to_s]
   end
 
+  it "should raise when no data is provided to :put" do
+    lambda { @session.put("/test", nil) }.should raise_error(ArgumentError)
+  end
+
   it "should upload a file with :put" do
     response = @session.put_file("/test", "VERSION.yml")
     body = YAML::load(response.body)
     body.request_method.should == "PUT"
   end
 
+  it "should raise when no file is provided to :put" do
+    lambda { @session.put_file("/test", nil) }.should raise_error(ArgumentError)
+  end
+
   it "should use chunked encoding when uploading a file with :put" do
     response = @session.put_file("/test", "VERSION.yml")
     body = YAML::load(response.body)
@@ -157,12 +165,20 @@ describe Patron::Session do
     body.header['content-length'].should == [data.size.to_s]
   end
 
+  it "should raise when no data is provided to :post" do
+    lambda { @session.post("/test", nil) }.should raise_error(ArgumentError)
+  end
+
   it "should upload a file with :post" do
     response = @session.post_file("/test", "VERSION.yml")
     body = YAML::load(response.body)
     body.request_method.should == "POST"
   end
 
+  it "should raise when no file is provided to :post" do
+    lambda { @session.post_file("/test", nil) }.should raise_error(ArgumentError)
+  end
+
   it "should use chunked encoding when uploading a file with :post" do
     response = @session.post_file("/test", "VERSION.yml")
     body = YAML::load(response.body)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: patron
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Phillip Toland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-30 00:00:00 -05:00
+date: 2009-10-04 00:00:00 -05:00
 default_executable: 
 dependencies: []