Thu Oct 4 03:25:40 EDT 2007

Author: clkao
Date: Thu Oct  4 03:25:39 2007
New Revision: 4208

Added:
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/Makefile.PL
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/bin/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/bin/jifty   (contents, props changed)
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/doc/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/etc/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/etc/config.yml
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/lib/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/lib/TestApp/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/lib/TestApp/Plugin/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/lib/TestApp/Plugin/CompressedCSSandJS/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/log/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/share/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/share/po/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/share/web/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/share/web/static/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/share/web/templates/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/t/
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/t/css.t
   jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/var/
Modified:
   jifty/trunk/lib/Jifty/View/Static/Handler.pm

Log:
Fix a bug that after you access a static css file, it breaks the
compressed css by not actually squishing main.css, hence requests
static css files under __jifty/css.


Modified: jifty/trunk/lib/Jifty/View/Static/Handler.pm
==============================================================================

--- jifty/trunk/lib/Jifty/View/Static/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Static/Handler.pm	Thu Oct  4 03:25:39 2007
@@ -250,10 +250,10 @@
         $apache->send_http_header();
 
         if ($compression eq 'gzip') {
-        undef $/;
-        binmode STDOUT;
-        # XXX TODO: Cache this
-        print STDOUT Compress::Zlib::memGzip(<$fh>);
+            local $/;
+            binmode STDOUT;
+            # XXX TODO: Cache this
+            print STDOUT Compress::Zlib::memGzip(<$fh>);
         } else{
             $apache->send_fd($fh);
         }

Added: jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/Makefile.PL
==============================================================================
--- (empty file)
+++ jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/Makefile.PL	Thu Oct  4 03:25:39 2007
@@ -0,0 +1,7 @@
+use inc::Module::Install;
+
+name        'TestApp::Plugin::JQuery';
+version     '0.01';
+requires    'Jifty' => '0.70129';
+
+WriteAll;

Added: jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/bin/jifty
==============================================================================
--- (empty file)
+++ jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/bin/jifty	Thu Oct  4 03:25:39 2007
@@ -0,0 +1,11 @@
+#!/usr/bin/env perl
+use warnings;
+use strict;
+use File::Basename qw(dirname); 
+use UNIVERSAL::require;
+
+use Jifty;
+use Jifty::Script;
+
+local $SIG{INT} = sub { warn "Stopped\n"; exit; };
+Jifty::Script->dispatch();

Added: jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/etc/config.yml
==============================================================================
--- (empty file)
+++ jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/etc/config.yml	Thu Oct  4 03:25:39 2007
@@ -0,0 +1,55 @@
+--- 
+framework: 
+  AdminMode: 1
+  ApplicationClass: TestApp::Plugin::CompressedCSSandJS
+  ApplicationName: TestApp::Plugin::CompressedCSSandJS
+  ApplicationUUID: DC3B58E4-4F3C-11DC-9ECB-E5DB6F105773
+  ConfigFileVersion: 2
+  Database: 
+    CheckSchema: 1
+    Database: testapp_plugin_singlepage
+    Driver: SQLite
+    Host: localhost
+    Password: ''
+    RecordBaseClass: Jifty::DBI::Record::Cachable
+    RecordUUIDs: active
+    User: ''
+    Version: 0.0.1
+  DevelMode: 1
+  L10N: 
+    PoDir: share/po
+  LogLevel: DEBUG
+  Mailer: Sendmail
+  MailerArgs: []
+
+  Plugins: 
+    - LetMe: {}
+    - SkeletonApp: {}
+    - REST: {}
+    - Halo: {}
+    - ErrorTemplates: {}
+    - OnlineDocs: {}
+    - CompressedCSSandJS: {}
+    - AdminUI: {}
+    - User: {}
+    - CompressedCSSandJS: {}
+
+  PubSub: 
+    Backend: Memcached
+    Enable: ~
+  SkipAccessControl: 0
+  TemplateClass: TestApp::Plugin::CompressedCSSandJS::View
+  Web: 
+    BaseURL: http://localhost
+    DataDir: var/mason
+    Globals: []
+
+    MasonConfig: 
+      autoflush: 0
+      default_escape_flags: h
+      error_format: text
+      error_mode: fatal
+    Port: 8888
+    ServeStaticFiles: 1
+    StaticRoot: share/web/static
+    TemplateRoot: share/web/templates

Added: jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/t/css.t
==============================================================================
--- (empty file)
+++ jifty/trunk/t/TestApp-Plugin-CompressedCSSandJS/t/css.t	Thu Oct  4 03:25:39 2007
@@ -0,0 +1,20 @@
+use strict;
+use warnings;
+use lib 't/lib';
+use Jifty::SubTest;
+use Jifty::Test tests => 7;
+use Jifty::Test::WWW::Mechanize;
+
+my $server  = Jifty::Test->make_server;
+my $URL = $server->started_ok;
+my $mech = Jifty::Test::WWW::Mechanize->new();
+
+$mech->get_ok("$URL/static/css/main.css","Got main.css");
+$mech->content_contains('@import "combobox.css"');
+$mech->get_ok("$URL");
+ok($mech->content =~ m{<link rel="stylesheet" type="text/css" href="/__jifty/css/(.*)" /});
+my $css_file = $1;
+
+$mech->get_ok("$URL/__jifty/css/$css_file");
+$mech->content_contains('End of combobox.css', 'squished');
+
