[Rt-commit] rt branch, squish-refactor, updated. rt-3.9.7-883-ge6b03ea

[? sunnavy]

The branch, squish-refactor has been updated
       via  e6b03ead8284f491aa01d7976f46220e0411708f (commit)
      from  5625618302034d63819ea8e640e9e7f26742f623 (commit)

Summary of changes:
 lib/RT/Squish/CSS.pm |    8 ++++----
 lib/RT/Squish/JS.pm  |   11 ++++++-----
 t/web/squish.t       |    6 +++---
 3 files changed, 13 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit e6b03ead8284f491aa01d7976f46220e0411708f
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Dec 17 13:10:39 2010 +0800

    UpdateFilesMap => AddFiles

diff --git a/lib/RT/Squish/CSS.pm b/lib/RT/Squish/CSS.pm
index e559f22..957f827 100644
--- a/lib/RT/Squish/CSS.pm
+++ b/lib/RT/Squish/CSS.pm
@@ -79,9 +79,9 @@ sub SquishFiles {
     return $self->concatenate( @{ $self->Files } );
 }
 
-=head2 UpdateFilesMap
+=head2 AddFiles name => [...]
 
-name => files map
+add files to name
 
 this is mainly for plugins, e.g.
 
@@ -89,13 +89,13 @@ to add extra css files for style 'aileron', you can add the following line
 in the plugin's main file:
 
     require RT::Squish::CSS;
-    RT::Squish::CSS->UpdateFilesMap( aileron => ['/NoAuth/css/foo.css'] ); 
+    RT::Squish::CSS->AddFiles( aileron => ['/NoAuth/css/foo.css'] ); 
 
 =cut
 
 my %FILES_MAP;
 
-sub UpdateFilesMap {
+sub AddFiles {
     my $self = shift;
     my %args = @_;
 
diff --git a/lib/RT/Squish/JS.pm b/lib/RT/Squish/JS.pm
index 423ea2b..00c4f2f 100644
--- a/lib/RT/Squish/JS.pm
+++ b/lib/RT/Squish/JS.pm
@@ -86,23 +86,24 @@ sub SquishFiles {
     return $self->Filter($content);
 }
 
-=head2 UpdateFilesMap
+=head2 AddFiles
 
-name => files map
+add files to name
 
 this is mainly for plugins, e.g.
 
-to add extra css files for style 'aileron', you can add the following line
+to add extra js files in 'head', you can add the following line
 in the plugin's main file:
 
     require RT::Squish::JS;
-    RT::Squish::JS->UpdateFilesMap( aileron => ['/NoAuth/js/foo.js'] ); 
+
+    RT::Squish::JS->AddFiles( head => ['/NoAuth/js/foo.js'] ); 
 
 =cut
 
 my %FILES_MAP;
 
-sub UpdateFilesMap {
+sub AddFiles {
     my $self = shift;
     my %args = @_;
 
diff --git a/t/web/squish.t b/t/web/squish.t
index 14dcc03..5fbe139 100644
--- a/t/web/squish.t
+++ b/t/web/squish.t
@@ -32,11 +32,11 @@ diag "test squished files with customized files and devel mode disabled";
 SKIP:
 {
     skip 'need actual server to reinitialize', 6
-      if $ENV{RT_TEST_WEB_HANDLER} eq 'inline';
+      if $ENV{RT_TEST_WEB_HANDLER} && $ENV{RT_TEST_WEB_HANDLER} eq 'inline';
     require RT::Squish::JS;
-    RT::Squish::JS->UpdateFilesMap( head => ['/NoAuth/js/IE7/IE7.js'] );
+    RT::Squish::JS->AddFiles( head => ['/NoAuth/js/IE7/IE7.js'] );
     require RT::Squish::CSS;
-    RT::Squish::CSS->UpdateFilesMap( aileron => ['/NoAuth/css/print.css'] );
+    RT::Squish::CSS->AddFiles( aileron => ['/NoAuth/css/print.css'] );
     ( $url, $m ) = RT::Test->started_ok;
 
     $m->login;

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