[Jifty-commit] r4431 - jifty/trunk/lib/Jifty/Plugin

[jifty-commit at lists.jifty.org]

Author: ruz
Date: Wed Nov 14 10:17:30 2007
New Revision: 4431

Modified:
   jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm

Log:
* use object calls instead of instance calls
* use better handling of roots so server relative paths
  work as expected unless you're bind to a location

Modified: jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm	Wed Nov 14 10:17:30 2007
@@ -145,19 +145,19 @@
 
 =cut
 
-            
 sub generate_css {
     my $self = shift;
             
     if (not defined $self->cached_css_digest or Jifty->config->framework('DevelMode')) {
         Jifty->log->debug("Generating CSS...");
-        
-        my @roots = map { Jifty::Util->absolute_path( File::Spec->catdir( $_, 'css' ) ) }
-                        Jifty->handler->view('Jifty::View::Static::Handler')->roots;
+
+        my @roots = map { Jifty::Util->absolute_path( $_ ) }
+            Jifty->handler->view('Jifty::View::Static::Handler')->roots;
     
-        CSS::Squish->roots( @roots );
-        
-        my $css = CSS::Squish->concatenate( @{ Jifty->web->css_files } );
+        my $css = CSS::Squish->new( roots => \@roots )->concatenate(
+            map { File::Spec->catfile('css', $_ ) }
+                @{ Jifty->web->css_files }
+        );
 
         $self->cached_css( $css );
         $self->cached_css_digest( md5_hex( $css ) );