@@ -123,7 +123,7 @@ module Rack # The union of GET and POST data. def params - self.put? ? self.GET : self.GET.update(self.POST) + self.GET.merge(self.POST) rescue EOFError => e self.GET end lib/gems/rack-0.9.1/lib/rack/request.rb @@ -142,7 +142,7 @@ module Mack options - [:controller, :action, :redirect_to, :method, :status, :format] url = url_for_pattern(url, options) self.response.status = status - self.response[:location] = url + self.response['Location'] = url self.response.write(redirect_html(self.request.path_info, url, status)) end lib/mack/application.rb @@ -8,7 +8,6 @@ module Mack alias_instance_method :params, :original_parameters # :nodoc: def initialize(env) # :nodoc: - puts "env: #{env.inspect}" super(env) end lib/mack/controller/request.rb @@ -195,7 +195,7 @@ module Mack [res].flatten.each do |r| strip_cookies_from_response(r) end - res = request.get(res[:location]) + res = request.get(res['Location']) @responses << res end end lib/mack/testing/helpers.rb @@ -41,7 +41,7 @@ module Mack end def location - self.responses.first.headers[:location] + self.responses.first.location end end # Response lib/mack/testing/response.rb @@ -25,6 +25,7 @@ Mack::Routes.build do |r| map.kill_kenny_no_meth "/tst_another/kill_kenny", :action => :kill_kenny map.kill_kenny_bad "/tst_another/kill_kenny_bad", :action => :kill_kenny_bad map.upload_file "/tst_another/do_upload", :action => :do_upload, :method => :post + map.upload_file_as_put "/tst_another/do_upload_as_put", :action => :do_upload, :method => :put map.upload_multiple "/tst_another/upload_multiple", :action => :upload_multiple map.xss "/tst_another/xss", :action => :xss map.xss2 "/tst/another/xss2", :action => :xss2 test/fake_application/config/routes.rb @@ -8,7 +8,7 @@ ENV['MACK_ROOT'] = File.join(File.dirname(__FILE__), "fake_application") if $genosaurus_output_directory.nil? $genosaurus_output_directory = ENV['MACK_ROOT'] - puts "$genosaurus_output_directory: #{$genosaurus_output_directory}" + # puts "$genosaurus_output_directory: #{$genosaurus_output_directory}" end # load the mack framework: test/spec_helper.rb @@ -27,4 +27,12 @@ describe "File Upload Request" do assigns(:user)[:username].should == "mark" end + it 'should work with put' do + put upload_file_as_put_url, :multipart => true, :file0 => file_for_upload(File.join(File.dirname(__FILE__), 'images', "homer_brain.jpg")), :album => 'simpsons' + assigns(:saved_file_name).should_not be_nil + assigns(:saved_file_name).should == "homer_brain.jpg" + assigns(:album).should_not be_nil + assigns(:album).should == "simpsons" + end + end \ No newline at end of file test/unit/controller/file_upload_spec.rb @@ -47,10 +47,10 @@ describe Mack::Request::Parameters do end it 'should return hashed nested parameters' do - [:get, :post, :delete, :put].each do |meth| - puts "#{meth.to_s.upcase}: ----------------------------" + [:get, :post, :put, :delete].each do |meth| + # puts "#{meth.to_s.upcase}: ----------------------------" send(meth, '/parameter_test', {:foo => :bar, :user => {:name => 'Mark Bates'}}) - puts "request.params: #{request.params.inspect}" + # puts "request.params: #{request.params.inspect}" response.should be_successful request.params[:method].should == meth.to_s request.params.should be_kind_of(Hash) test/unit/controller/parameters_spec.rb 5435a1a8250dc8f13a856e89a00c6b170b93e7f6 Mark Bates mark@mackframework.com http://github.com/markbates/mack/commit/e4ba70c8bd90eb99abad3e68d474dd61a200b2e5 e4ba70c8bd90eb99abad3e68d474dd61a200b2e5 2009-01-17T07:10:31-08:00 2009-01-17T07:10:31-08:00 Upgraded to Rack 0.9.1 [#243 state:resolved] 8c3df2bde8098b5836e38c386422f700fe3cd56d Mark Bates mark@mackframework.com