Changeset 1189

Show
Ignore:
Timestamp:
01/06/08 16:20:56 (11 months ago)
Author:
sethrasmuss..@gmail.com
Message:

upload_handler logs info about failed requests instead of puts-ing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/upload_handler.rb

    r692 r1189  
    5757    return unless upload_id = valid_upload?(params) 
    5858    Mongrel::Uploads.finish(upload_id) 
    59     puts "request aborted!" 
     59    MERB_LOGGER.info "#{self.class.name} - request aborted for " << 
     60      "id: #{upload_id.inspect}, params: #{params.inspect}" 
    6061  end 
    6162 

  • trunk/spec/merb/upload_handler_spec.rb

    r692 r1189  
    6565  end 
    6666   
     67  it 'should log info about aborted requests' do 
     68    @handler.stub!(:valid_upload?).and_return(@upload_id) 
     69    Mongrel::Uploads.should_receive(:finish).with(@upload_id) 
     70    MERB_LOGGER.should_receive :info 
     71    @handler.request_aborted(@params) 
     72  end 
     73   
    6774  it "should not send Mongrel::Uploads :finish unless the request is a valid upload" do 
    6875    Mongrel::Uploads.should_not_receive(:finish)