From: John Napiorkowski Date: Wed, 29 Apr 2015 14:02:26 +0000 (-0500) Subject: fixed basd test, prepped version info X-Git-Tag: 5.90091~2 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=42d0a52a587a2d6213ae04e0c41184c0e4afc9a2 fixed basd test, prepped version info --- diff --git a/Changes b/Changes index 77f6a16..3b38a32 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,12 @@ # This file documents the revision history for Perl extension Catalyst. +5.90090 - 2014-04-29 + - Updated some documention in Catalyst::Request::Upload to clarify behavior + that RT ticket reported as confusing or unexpected + - Merged all changes from 5.90089_XXX development cycle. + - removed a mistaken use of Test::Most, which is not a core Catalyst + dependency. Used Test::More instead. + 5.90089_004 - 2015-04-28 - Added swanky github badges. - Reverted a change to how the stats engine is setup that was incorrect. diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 6e6347b..1613589 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -157,7 +157,7 @@ sub composed_stats_class { __PACKAGE__->_encode_check(Encode::FB_CROAK | Encode::LEAVE_SRC); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.90089_004'; +our $VERSION = '5.90090'; $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases sub import { diff --git a/lib/Catalyst/Request/Upload.pm b/lib/Catalyst/Request/Upload.pm index 39bc4c0..bf9318f 100644 --- a/lib/Catalyst/Request/Upload.pm +++ b/lib/Catalyst/Request/Upload.pm @@ -99,6 +99,14 @@ false for failure. $upload->copy_to('/path/to/target'); +Please note the filename used for the copy target is the 'tempname' that +is the actual filename on the filesystem, NOT the 'filename' that was +part of the upload headers. This might seem counter intuitive but at this +point this behavior is so established that its not something we can change. + +You can always create your own copy routine that munges the target path +as you wish. + =cut sub copy_to { diff --git a/lib/Catalyst/Runtime.pm b/lib/Catalyst/Runtime.pm index b2ceb19..073d199 100644 --- a/lib/Catalyst/Runtime.pm +++ b/lib/Catalyst/Runtime.pm @@ -7,7 +7,7 @@ BEGIN { require 5.008003; } # Remember to update this in Catalyst as well! -our $VERSION = '5.90089_004'; +our $VERSION = '5.90090'; $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases =head1 NAME diff --git a/t/accept_context_regression.t b/t/accept_context_regression.t index 9e243d1..9828702 100644 --- a/t/accept_context_regression.t +++ b/t/accept_context_regression.t @@ -1,4 +1,6 @@ -use Test::Most; +use strict; +use warnings; +use Test::More; { package MyApp::Model::AcceptContext; @@ -6,7 +8,7 @@ use Test::Most; sub ACCEPT_CONTEXT { my ($self, $c, @args) = @_; - Test::Most::ok( ref $c); + Test::More::ok( ref $c); } $INC{'MyApp/Model/AcceptContext.pm'} = __FILE__;