Changeset 10089

Timestamp:

07/03/08 15:34:47 (5 months ago)

Author:

KRavEN

Message:

• Moved cache generation/management into the filter
  
• Removed .htaccess modification requirements
  
• added compress_js and compress_css options to the filter
  
• added client side caching for the packed files and improved the request name so it will cache properly
  
• added routing rules to route to the sfCombineFilter module
  
• added non-harmfull css compressor as JSMin can mess up the css for some javascript libraries
  
• fixed a bug where the Asset helper was not being initialized
  

Files:

• plugins/sfCombineFilterPlugin/branches/kraven/README (modified) (5 diffs)
• plugins/sfCombineFilterPlugin/branches/kraven/lib/JSMin.class.php (added)
• plugins/sfCombineFilterPlugin/branches/kraven/lib/sfCombineFilter.class.php (modified) (9 diffs)
• plugins/sfCombineFilterPlugin/branches/kraven/modules (added)
• plugins/sfCombineFilterPlugin/branches/kraven/modules/sfCombineFilter (added)
• plugins/sfCombineFilterPlugin/branches/kraven/modules/sfCombineFilter/actions (added)
• plugins/sfCombineFilterPlugin/branches/kraven/modules/sfCombineFilter/actions/actions.class.php (added)
• plugins/sfCombineFilterPlugin/branches/kraven/modules/sfCombineFilter/config (added)
• plugins/sfCombineFilterPlugin/branches/kraven/modules/sfCombineFilter/config/filters.yml (added)
• plugins/sfCombineFilterPlugin/branches/kraven/modules/sfCombineFilter/lib (added)
• plugins/sfCombineFilterPlugin/branches/kraven/modules/sfCombineFilter/lib/BasesfCombineFilterActions.class.php (added)
• plugins/sfCombineFilterPlugin/branches/kraven/web (deleted)

plugins/sfCombineFilterPlugin/branches/kraven/README

@@ -3 +3 @@
-The `sfCombineFilter` is an implementation of the [http://rakaz.nl/extra/code/combine CSS and Javascript Combiner] by Niels Leenheer. It makes your pages load faster by combining and compressing javascript and css files.
-
- 
+
-
-The symfony filter looks at all of the javascripts and stylesheets resources specified in the current response, and automatically creates a string that combines all of the names together. When your visitors request this special file, they will get one large file, gzipped and ready to go.
@@ -37 +37 @@
-
- * In your app/config/filters.yml, add the sfCombineFilter. This must come AFTER "common":
-
+
-{{{
-rendering: ~
@@ -53 +53 @@
-    javascripts:    true
-    stylesheets:    true
+    compress_js:    true
+    compress_css:   true
-    root_js_only:   false
-    root_css_only:  true
@@ -59 +61 @@
-}}}
-
-
-
-
-
+
-{{{
-
-
+
+
+
-}}}
-
-
+
+
+
+
+
-
-== Changelog ==
@@ -82 +86 @@
- - Fixes issues when included files outside of root css and js directories.
- - New: Option to minify the js using JSMin.
+
+ === 2008-07-03 | 0.1.2 beta ===
+Changes by Benjamin Runnels:
+ - Moved cache generation/management into the filter
+ - Removed .htaccess modification requirements
+ - added compress_js and compress_css options to the filter
+ - added client side caching for the packed files and improved the request name so it will cache properly
+ - added routing rules to route to the sfCombineFilter module
+ - added non-harmfull css compressor as JSMin can mess up the css for some javascript libraries

plugins/sfCombineFilterPlugin/branches/kraven/lib/sfCombineFilter.class.php

@@ -4 +4 @@
- *
- * sfCombineFilter.class.php (c) 2007 Scott Meves.
-Combine.php Copyright (c) 2006 by Niels Leenheer
+sfCombineFilter.class.php modifications (c) 2008 by Benjamin Runnels *
- *
- * For the full copyright and license information, please view the LICENSE
@@ -20 +20 @@
-class sfCombineFilter extends sfFilter
-{
+  private $response,$sf_relative_url_root,$type,$files,$lastmodified;
-
-  public function execute ($filterChain)
@@ -25 +26 @@
-    $filterChain->execute();
-
-
+
+
+
+
+
+
+
+
+
-      $this->getCombinedJavascripts();
-    }
-
-
+
+
+
+
+
-      $this->getCombinedStylesheets();
-    }
@@ -36 +49 @@
-  protected function getCombinedJavascripts()
-  {
-    $response = $this->getContext()->getResponse();
-    $sf_relative_url_root = $this->getContext()->getRequest()->getRelativeUrlRoot();
-    $root_js_only = $this->getParameter('root_js_only', true);
-
@@ -45 +56 @@
-    foreach (array('first', '', 'last') as $position)
-    {
-
+this->
-      {
-        if (!is_array($files))
@@ -65 +76 @@
-          $path = _compute_public_path($file, 'js', 'js');
-
-
-
-
+
+
+
+
+
+
+
+
-          }
-        }
@@ -74 +90 @@
-
-    if (count($combined_sources)) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
-  protected function getCombinedStylesheets()
-  {
-    $response = $this->getContext()->getResponse();
-    $sf_relative_url_root = $this->getContext()->getRequest()->getRelativeUrlRoot();
-    $root_css_only = $this->getParameter('root_css_only', true);
-
-    $already_seen = array();
-    $combined_sources = array();
@@ -91 +241 @@
-    foreach (array('first', '', 'last') as $position)
-    {
-
+this->
-      {
-        if (!is_array($files))
@@ -111 +261 @@
-          $path = _compute_public_path($file, 'css', 'css');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return isset($options['media']) && !in_array($options['media'], array('', 'all', 'screen'));
-  }
-
-
+
+
-    return isset($options['absolute']) && $options['absolute'] == true;
-  }