@@ -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); ext/patron/session_ext.c @@ -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) spec/session_spec.rb 946019ac7b93be829a025c35865a7f757d6cd168 Phillip Toland phil.toland@gmail.com http://github.com/toland/patron/commit/22f387bede76c8c39bff6598abf75599fb4f78dd 22f387bede76c8c39bff6598abf75599fb4f78dd 2009-10-04T17:25:11-07:00 2009-10-04T17:25:11-07:00 Raise an ArgumentError if no data or filename is provided to PUT or POST. 620b51caedd27f9a2b9b1469ac09c7d533fc6d3d Phillip Toland phil.toland@gmail.com