@@ -58,8 +58,17 @@ Post a URL encoded form require 'resourceful' http = Resourceful::HttpAccessor.new - resp = http.resource('http://mysite.example/service'). - post('hostname=test&level=super', :content_type => 'application/x-www-form-urlencoded') + resp = http.resource('http://mysite.example/service'). + post(Resourceful::UrlencodedFormData.new(:hostname => 'test', :level => 'super')) + +Post a Mulitpart form with a file +----------------------- + + require 'resourceful' + http = Resourceful::HttpAccessor.new + form_data = Resourceful::MultipartFormData.new(:username => 'me') + form_data.add_file('avatar', '/tmp/my_avatar.png', 'image/png') + resp = http.resource('http://mysite.example/service').post(form_data) Put an XML document ------------------- README.markdown @@ -1,12 +1,15 @@ module Resourceful - module FormData - def initialize() + class AbstractFormData + def initialize(contents = {}) @form_data = [] - super + + contents.each do |k,v| + add(k, v) + end end def add(name, value) - form_data << [name, value] + form_data << [name.to_s, value] end protected lib/resourceful/abstract_form_data.rb @@ -1,8 +1,7 @@ -require 'resourceful/form_data' +require 'resourceful/abstract_form_data' module Resourceful - class MultipartFormData - include FormData + class MultipartFormData < AbstractFormData FileParamValue = Struct.new(:content, :file_name, :content_type) def add_file(name, file_name, content_type="application/octet-stream") lib/resourceful/multipart_form_data.rb @@ -1,9 +1,8 @@ -require 'resourceful/form_data' +require 'resourceful/abstract_form_data' require 'cgi' module Resourceful - class UrlencodedFormData - include FormData + class UrlencodedFormData < AbstractFormData def content_type "application/x-www-form-urlencoded" lib/resourceful/urlencoded_form_data.rb @@ -12,6 +12,12 @@ describe Resourceful::UrlencodedFormData do @form_data.content_type.should match(/^application\/x-www-form-urlencoded$/i) end + describe "instantiation" do + it "should be creatable with hash" do + Resourceful::UrlencodedFormData.new(:foo => 'testing').read.should eql("foo=testing") + end + end + describe "with simple parameters" do it "should all simple parameters to be added" do @form_data.add(:foo, "testing") @@ -34,6 +40,5 @@ describe Resourceful::UrlencodedFormData do @form_data.add('foo=bar', 'this') @form_data.read.should eql("foo%3Dbar=this") end - end end spec/resourceful/urlencoded_form_data_spec.rb 8d1819d2094e6ebe9b652f2e4f9204da2129cc7e Peter Williams pezra@youthful-indiscretion.local http://github.com/paul/resourceful/commit/925b83113036dcd8bbd4322ab2e96a79c2e6895a 925b83113036dcd8bbd4322ab2e96a79c2e6895a 2009-08-14T08:07:30-07:00 2009-08-14T08:07:30-07:00 Further improvments to form data handling 88a5ce6ce058b9c15f658513b7687dd2e49efb4a Peter Williams pezra@youthful-indiscretion.local