Merge branch 'pipeline' into development

src/configs/defaults.ini

@@ -3,6 +3,9 @@ theme=beisel
 lastCodeVersion=0.0.0
 currentCodeVersion=1.3.1
 
+[site]
+mode=dev
+
 [epi]
 cache=EpiCache_File
 session=EpiSession_Php

src/html/assets/themes/beisel/templates/template.php

@@ -11,9 +11,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" href="<?php getTheme()->asset('image', 'favicon.png'); ?>">
     <link rel="apple-touch-icon" href="<?php getTheme()->asset('image', 'apple-touch-icon.png'); ?>">
-    <link rel="stylesheet" href="<?php getTheme()->asset('stylesheet', 'bootstrap.min.css'); ?>">
-    <link rel="stylesheet" href="<?php getTheme()->asset('stylesheet', 'main.css'); ?>">
-    <link rel="stylesheet" href="/assets/stylesheets/upload.css">
+    <link rel="stylesheet" href="<?php echo getAssetPipeline(true)->addCss(getTheme()->asset('stylesheet', 'bootstrap.min.css', false))->
+                                                               addCss(getTheme()->asset('stylesheet', 'main.css', false))->
+                                                               addCss("/assets/stylesheets/upload.css")->
+                                                               getUrl(AssetPipeline::css, 'a'); ?>">
+
     <?php getPlugin()->invoke('onHead', array('page' => $page)); ?>
 </head>
 
@@ -47,8 +49,8 @@
 
   </div>
   <div id="modal" class="modal hide fade"></div>
-  <script type="text/javascript" src="<?php getTheme()->asset(getConfig()->get('dependencies')->javascript); ?>"></script>
-  <script type="text/javascript" src="<?php getTheme()->asset('util'); ?>"></script>
+  <script type="text/javascript" src="<?php echo getAssetPipeline(true)->addJs(getTheme()->asset(getConfig()->get('dependencies')->javascript, null, false))->
+                                                                    addJs(getTheme()->asset('util', null, false))->getUrl(AssetPipeline::js, 'a'); ?>"></script>
   <script>
     OP.Util.init(jQuery, {
       eventMap: {
@@ -94,26 +96,27 @@
       js: {
         assets: [
           <?php if(isset($_GET['__route__']) && stristr($_GET['__route__'], 'upload')) { ?> 
-            <?php if(isset($_GET['debug'])) { ?>
+            <?php if(getConfig()->get('site')->mode === 'dev') { ?>
               '<?php getTheme()->asset('javascript', 'plupload.js'); ?>',
               '<?php getTheme()->asset('javascript', 'plupload.html5.js'); ?>',
               '<?php getTheme()->asset('javascript', 'jquery.plupload.queue.js'); ?>',
               '/assets/javascripts/openphoto-upload.js',
             <?php } else { ?>
-              '/assets/javascripts/openphoto-upload.min.js',
+              '<?php echo getAssetPipeline(true)->addJs('/assets/javascripts/openphoto-upload.min.js')->getUrl(AssetPipeline::js, 'a'); ?>',
             <?php } ?>
           <?php } ?>
 
-          <?php if(isset($_GET['debug'])) { ?>
+            <?php if(getConfig()->get('site')->mode === 'dev') { ?>
             '/assets/javascripts/openphoto-batch.js',
             '<?php getTheme()->asset('javascript', 'jquery.scrollTo-1.4.2-min.js'); ?>',
             '<?php getTheme()->asset('javascript', 'jquery.flexslider-min.js'); ?>',
             '<?php getTheme()->asset('javascript', 'jquery.tokeninput.js'); ?>',
             '<?php getTheme()->asset('javascript', 'bootstrap-modal.js'); ?>',
             '<?php getTheme()->asset('javascript', 'openphoto-theme.js'); ?>'
           <?php } else { ?>
-            '/assets/javascripts/openphoto-batch.min.js',
-            '<?php getTheme()->asset('javascript', 'openphoto-theme-full-min.js'); ?>'
+            '<?php echo getAssetPipeline(true)->addJs('/assets/javascripts/openphoto-batch.min.js')->
+                                                addJs(getTheme()->asset('javascript', 'openphoto-theme-full-min.js', false))->
+                                                getUrl(AssetPipeline::js, 'a'); ?>'
           <?php } ?>
         ],
         onComplete: function(){ 

src/libraries/controllers/AssetsController.php

@@ -0,0 +1,32 @@
+<?php
+/**
+  * Tag controller for API endpoints
+  *
+  * This controller does much of the dispatching to the Tag controller for all tag requests.
+  * @author Jaisen Mathai <jaisen@jmathai.com>
+  */
+class AssetsController extends BaseController
+{
+  public static function get($type, $compression, $files)
+  {
+    $files = (array)explode(',', $files);
+    $pipeline = getAssetPipeline();
+    foreach($files as $file)
+    {
+      if($type === 'css')
+        $pipeline->addCss($file);
+      elseif($type === 'js')
+        $pipeline->addJs($file);
+    }
+
+    if($type === 'css')
+      header('Content-type: text/css');
+    elseif($type === 'js')
+      header('Content-type: text/javascript');
+
+    if($compression === 'm')
+      echo $pipeline->getMinified('css');
+    elseif($compression === 'c')
+      echo $pipeline->getCombined('css');
+  }
+}

src/libraries/dependencies.php

@@ -6,6 +6,7 @@
 require getConfig()->get('paths')->controllers . '/BaseController.php';
 require getConfig()->get('paths')->controllers . '/ApiController.php';
 require getConfig()->get('paths')->controllers . '/GeneralController.php';
+require getConfig()->get('paths')->controllers . '/AssetsController.php';
 require getConfig()->get('paths')->controllers . '/ApiActionController.php';
 require getConfig()->get('paths')->controllers . '/ActionController.php';
 require getConfig()->get('paths')->controllers . '/ApiGroupController.php';
@@ -28,6 +29,8 @@
 require getConfig()->get('paths')->external . '/aws/sdk.class.php';
 require getConfig()->get('paths')->external . '/Dropbox/autoload.php';
 require getConfig()->get('paths')->external . '/Mobile_Detect/Mobile_Detect.php';
+require getConfig()->get('paths')->external . '/JSMin/JSMin.php';
+require getConfig()->get('paths')->external . '/CssMin/CssMin.php';
 require getConfig()->get('paths')->libraries . '/functions.php';
 
 // adapters
@@ -45,6 +48,7 @@
 require getConfig()->get('paths')->adapters . '/LoginFacebook.php';
 
 // models
+require getConfig()->get('paths')->models . '/AssetPipeline.php';
 require getConfig()->get('paths')->models . '/Utility.php';
 require getConfig()->get('paths')->models . '/Url.php';
 require getConfig()->get('paths')->models . '/Authentication.php';