[Rt-commit] rt branch, 3.999-trunk, updated. 93cfd7c437c634880e4cf92093028229f9a886bb

[sunnavy at bestpractical.com]

The branch, 3.999-trunk has been updated
       via  93cfd7c437c634880e4cf92093028229f9a886bb (commit)
      from  160db9b9dbebc993b6da97397acc4da6119c0871 (commit)

Summary of changes:
 lib/RT/Shredder.pm                                 |   14 +++++++-------
 lib/RT/Shredder/Plugin/SQLDump.pm                  |    8 ++++----
 .../{RT--Attachment => RT--Model--Attachment}      |    0
 .../Object/{RT--Ticket => RT--Model--Ticket}       |    0
 .../Elements/Object/{RT--User => RT--Model--User}  |    0
 share/html/Admin/Tools/Shredder/index.html         |    4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)
 rename share/html/Admin/Tools/Shredder/Elements/Object/{RT--Attachment => RT--Model--Attachment} (100%)
 rename share/html/Admin/Tools/Shredder/Elements/Object/{RT--Ticket => RT--Model--Ticket} (100%)
 rename share/html/Admin/Tools/Shredder/Elements/Object/{RT--User => RT--Model--User} (100%)

- Log -----------------------------------------------------------------
commit 93cfd7c437c634880e4cf92093028229f9a886bb
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Nov 26 14:23:26 2009 +0800

    case fixes

diff --git a/lib/RT/Shredder.pm b/lib/RT/Shredder.pm
index 142fa89..2bc846e 100644
--- a/lib/RT/Shredder.pm
+++ b/lib/RT/Shredder.pm
@@ -607,7 +607,7 @@ sub _wipeout {
 
 =head3 Data storage and backups
 
-=head4 get_filename ( Filename => '<ISO DATETIME>-XXXX.sql', FromStorage => 1 )
+=head4 get_file_name ( Filename => '<ISO DATETIME>-XXXX.sql', FromStorage => 1 )
 
 Takes desired C<Filename> and flag C<FromStorage> then translate file name to absolute
 path by next rules:
@@ -640,26 +640,26 @@ Returns an absolute path of the file.
 
 Examples:
     # file from storage with default name format
-    my $fname = $shredder->get_filename;
+    my $fname = $shredder->get_file_name;
 
     # file from storage with custom name format
-    my $fname = $shredder->get_filename( Filename => 'shredder-XXXX.backup' );
+    my $fname = $shredder->get_file_name( Filename => 'shredder-XXXX.backup' );
 
     # file with path relative to the current dir
-    my $fname = $shredder->get_filename(
+    my $fname = $shredder->get_file_name(
         FromStorage => 0,
         Filename => 'backups/shredder.sql',
     );
 
     # file with absolute path
-    my $fname = $shredder->get_filename(
+    my $fname = $shredder->get_file_name(
         FromStorage => 0,
         Filename => '/var/backups/shredder-XXXX.sql'
     );
 
 =cut
 
-sub get_filename {
+sub get_file_name {
     my $self = shift;
     my %args = ( filename => '', from_storage => 1, @_ );
 
@@ -718,7 +718,7 @@ sub get_filename {
 Returns an absolute path to the storage dir.  See
 L<CONFIGURATION/$ShredderStoragePath>.
 
-See also description of the L</get_filename> method.
+See also description of the L</get_file_name> method.
 
 =cut
 
diff --git a/lib/RT/Shredder/Plugin/SQLDump.pm b/lib/RT/Shredder/Plugin/SQLDump.pm
index e1c5494..a0147c9 100644
--- a/lib/RT/Shredder/Plugin/SQLDump.pm
+++ b/lib/RT/Shredder/Plugin/SQLDump.pm
@@ -57,15 +57,15 @@ sub applies_to_states { return 'after wiping dependencies' }
 
 sub support_args {
     my $self = shift;
-    return $self->SUPER::support_args, qw(filename from_storage);
+    return $self->SUPER::support_args, qw(file_name from_storage);
 }
 
 sub test_args {
     my $self = shift;
     my %args = @_;
     $args{'from_storage'} = 1 unless defined $args{'from_storage'};
-    my $file = $args{'filename'} = RT::Shredder->get_filename(
-        filename     => $args{'filename'},
+    my $file = $args{'file_name'} = RT::Shredder->get_file_name(
+        file_name     => $args{'file_name'},
         from_storage => delete $args{'from_storage'},
     );
     open $args{'file_handle'}, ">:raw", $file
@@ -74,7 +74,7 @@ sub test_args {
     return $self->SUPER::test_args(%args);
 }
 
-sub filename    { return $_[0]->{'opt'}{'filename'} }
+sub file_name    { return $_[0]->{'opt'}{'file_name'} }
 sub file_handle { return $_[0]->{'opt'}{'file_handle'} }
 
 sub run {
diff --git a/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment b/share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--Attachment
similarity index 100%
rename from share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
rename to share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--Attachment
diff --git a/share/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket b/share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--Ticket
similarity index 100%
rename from share/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket
rename to share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--Ticket
diff --git a/share/html/Admin/Tools/Shredder/Elements/Object/RT--User b/share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--User
similarity index 100%
rename from share/html/Admin/Tools/Shredder/Elements/Object/RT--User
rename to share/html/Admin/Tools/Shredder/Elements/Object/RT--Model--User
diff --git a/share/html/Admin/Tools/Shredder/index.html b/share/html/Admin/Tools/Shredder/index.html
index a68b29a..22bab8b 100644
--- a/share/html/Admin/Tools/Shredder/index.html
+++ b/share/html/Admin/Tools/Shredder/index.html
@@ -69,7 +69,7 @@ $wipeout => ''
 </div>
 <br />
 % if( $search || $wipeout ) {
-<& Elements/Selectobjects, objects => \@objs &>
+<& Elements/SelectObjects, objects => \@objs &>
 % }
 </form>
 </&>
@@ -178,7 +178,7 @@ if( $plugin && ( $search || $wipeout ) ) { { # use additional block({}) to effec
 
     my $shredder = new RT::Shredder;
     foreach my $o( grep defined, splice @objs ) {
-        eval { push @objs, $shredder->cast_objectsToRecords( objects => $o ) };
+        eval { push @objs, $shredder->cast_objects_to_records( objects => $o ) };
           $catch_non_fatals->() && last if $@;
     }
     unless( @objs ) {

-----------------------------------------------------------------------