Assets build

.travis.yml

@@ -4,6 +4,8 @@ php:
 before_script:
   - echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - npm install uglify-js
+  - git clone https://github.com/nsams/libsass.git; cd libsass; make; git clone https://github.com/hcatlin/sassc.git ; cd sassc; SASS_LIBSASS_PATH=.. make; cd ../..
   - printf "\n" | pecl install imagick
   - echo "short_open_tag = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - git clone git://github.com/vivid-planet/library.git
@@ -13,6 +15,8 @@ before_script:
   - echo "[production]" > tests/config.local.ini
   - echo "server.domain = localhost" >> tests/config.local.ini
   - echo "libraryPath = `pwd`/library" >> tests/config.local.ini
+  - echo "server.uglifyjs = `pwd`/node_modules/.bin/uglifyjs" >> tests/config.local.ini
+  - echo "server.sassc = `pwd`/libsass/sassc/bin/sassc" >> tests/config.local.ini
   - chmod a+w tests/cache/*
   - chmod a+w tests/temp
 services:

Kwc/Basic/Text/StylesModel.php

@@ -46,7 +46,7 @@ public static function getMasterStyles()
         $ret = array();
         foreach ($package->getDependency()->getFilteredUniqueDependencies('text/css') as $dep) {
             if ($dep instanceof Kwf_Assets_Dependency_File) {
-                $ret = array_merge($ret, self::parseMasterStyles(file_get_contents($dep->getFileName())));
+                $ret = array_merge($ret, self::parseMasterStyles(file_get_contents($dep->getAbsoluteFileName())));
             }
         }
         Kwf_Cache_SimpleStatic::add($cacheId, $ret);

Kwc/Newsletter/Detail/StartNewsletterPanel.scss

@@ -44,7 +44,7 @@
                     border: 1px solid #5B992B;
                     border-bottom: 1px solid #538C27;
                     @include box-shadow-pie(#548c29 0px 0px 8px 4px inset);
-                },
+                }
 
                 &[disabled=disabled], &[disabled] {
                     @include opacity(0.6);

Kwc/Root/LanguageRoot/Component.php

@@ -11,9 +11,16 @@ public static function getSettings()
                 'en'=>'Kwc_Root_LanguageRoot_Language_Component'
             )
         );
+        $ret['flags']['hasAvailableLanguages'] = true;
         return $ret;
     }
 
+    public static function getAvailableLanguages($componentClass)
+    {
+        $g = Kwc_Abstract::getSetting($componentClass, 'generators');
+        return array_keys($g['language']['component']);
+    }
+
     public function getPageByUrl($path, $acceptLangauge)
     {
         if ($path == '') {

Kwc/Root/TrlRoot/Component.php

@@ -17,6 +17,17 @@ public static function getSettings()
             'uniqueFilename' => true,
         );
         $ret['childModel'] = new Kwc_Root_TrlRoot_Model(array('de' => 'Deutsch'));
+        $ret['flags']['hasAvailableLanguages'] = true;
+        return $ret;
+    }
+
+    public static function getAvailableLanguages($componentClass)
+    {
+        $ret = array();
+        $rows = Kwf_Model_Abstract::getInstance(Kwc_Abstract::getSetting($componentClass, 'childModel'))->getRows();
+        foreach ($rows as $row) {
+            $ret[] = $row->id;
+        }
         return $ret;
     }
 

Kwf/Acl.php

@@ -291,6 +291,8 @@ public function getRoles()
      */
     public function loadKwcResources()
     {
+        if (!Kwf_Registry::get('db')) return; //if we don't have a db configured yet skip kwc resources. required to be able to build assets without db
+
         if ($this->_kwcResourcesLoaded) return;
         $this->_kwcResourcesLoaded = true;
 

Kwf/Assets/BuildCache.php

@@ -0,0 +1,71 @@
+<?php
+class Kwf_Assets_BuildCache
+{
+    static private $_buildDir = "build/assets";
+    public $building = false;
+    public static function getInstance()
+    {
+        static $cache;
+        if (!isset($cache)) {
+            $cache = new self();
+        }
+        return $cache;
+    }
+
+    public function load($cacheId)
+    {
+        $ret = Kwf_Cache_SimpleStatic::fetch('as-'.$cacheId);
+        if ($ret === false) {
+            $fileName = self::$_buildDir.'/'.$cacheId;
+            if (!file_exists($fileName)) {
+                return false;
+            }
+            $ret = unserialize(file_get_contents($fileName));
+            if ($ret !== false) {
+                Kwf_Cache_SimpleStatic::add('as-'.$cacheId, $ret);
+            }
+        }
+        return $ret;
+    }
+
+
+    public function save($cacheData, $cacheId)
+    {
+        Kwf_Cache_SimpleStatic::add('as-'.$cacheId, $cacheData);
+        $fileName = self::$_buildDir.'/'.$cacheId;
+        return file_put_contents($fileName, serialize($cacheData));
+    }
+/*
+    public function test($cacheId)
+    {
+        $ret = Kwf_Cache_SimpleStatic::fetch('as-mtime-'.$cacheId);
+        if ($ret === false) {
+            $ret = self::_getSlowCache()->test($cacheId);
+            if ($ret !== false) {
+                Kwf_Cache_SimpleStatic::add('as-mtime-'.$cacheId, $ret);
+            }
+        }
+        return $ret;
+    }
+*/
+    public function clean()
+    {
+        if (!$this->building) {
+            throw new Kwf_Exception("Can't clear out of build");
+        }
+        Kwf_Cache_SimpleStatic::clear('as-');
+        foreach (glob(self::$_buildDir.'/*') as $f) {
+            unlink($f);
+        }
+    }
+
+    public function remove($cacheId)
+    {
+        Kwf_Cache_SimpleStatic::_delete('as-'.$cacheId);
+        $fileName = self::$_buildDir.'/'.$cacheId;
+        if (file_exists($fileName)) {
+            unlink($fileName);
+            return true;
+        }
+    }
+}

Kwf/Assets/Dependency/Abstract.php

@@ -16,6 +16,11 @@ public function getContentsPacked($language)
         return $this->getContents($language);
     }
 
+    public function getContentsPackedSourceMap($language)
+    {
+        return false;
+    }
+
     public function setDependencies($type, $deps)
     {
         $this->_dependencies[$type] = $deps;
@@ -54,6 +59,10 @@ public function getMTime()
         return null;
     }
 
+    public function warmupCaches()
+    {
+    }
+
     public function __toString()
     {
         return get_class($this);
@@ -64,6 +73,19 @@ public function toDebug()
         return get_class($this).': '.$this->__toString()."\n";
     }
 
+    public function getRecursiveDependencies()
+    {
+        $it = new RecursiveIteratorIterator(new Kwf_Assets_Dependency_Iterator_UniqueFilter(new Kwf_Assets_Dependency_Iterator_Recursive($this, Kwf_Assets_Dependency_Abstract::DEPENDENCY_TYPE_ALL)), RecursiveIteratorIterator::CHILD_FIRST);
+        $array = array();
+        $array[] = $this;
+        foreach ($it as $i) {
+            if ($i !== $this) {
+                $array[] = $i;
+            }
+        }
+        return $array;
+    }
+
     public function getRecursiveFiles()
     {
         $it = new RecursiveIteratorIterator(new Kwf_Assets_Dependency_Iterator_UniqueFilter(new Kwf_Assets_Dependency_Iterator_Recursive($this, Kwf_Assets_Dependency_Abstract::DEPENDENCY_TYPE_ALL)), RecursiveIteratorIterator::CHILD_FIRST);
@@ -143,5 +165,4 @@ private function _getFilteredUniqueDependenciesProcessDep($dep, $mimeType, &$pro
         }
         return $ret;
     }
-
 }

Kwf/Assets/Dependency/Dynamic/GoogleMapsApiKeys.php

@@ -1,11 +1,6 @@
 <?php
-class Kwf_Assets_Dependency_Dynamic_GoogleMapsApiKeys extends Kwf_Assets_Dependency_File
+class Kwf_Assets_Dependency_Dynamic_GoogleMapsApiKeys extends Kwf_Assets_Dependency_Abstract
 {
-    public function __construct()
-    {
-        parent::__construct(null);
-    }
-
     public function getMimeType()
     {
         return 'text/javascript';
@@ -14,12 +9,6 @@ public function getMimeType()
     public function getContents($language)
     {
         $json = json_encode(Kwf_Config::getValueArray('googleMapsApiKeys'));
-        return "Ext.namespace('Kwf.GoogleMap');\nKwf.GoogleMap.apiKeys = $json;\n";
+        return "Ext.namespace('Kwf.GoogleMap');Kwf.GoogleMap.apiKeys = $json;";
     }
-
-    public function getFileName()
-    {
-        return null;
-    }
-
 }

Kwf/Assets/Dependency/Dynamic/LoaderConfig.php

@@ -1,12 +1,11 @@
 <?php
-class Kwf_Assets_Dependency_Dynamic_LoaderConfig extends Kwf_Assets_Dependency_File
+class Kwf_Assets_Dependency_Dynamic_LoaderConfig extends Kwf_Assets_Dependency_Abstract
 {
     protected $_providerList;
 
     public function __construct(Kwf_Assets_ProviderList_Abstract $providerList)
     {
         $this->_providerList = $providerList;
-        parent::__construct(null);
     }
 
     public function getMimeType()
@@ -25,10 +24,4 @@ public function getContents($language)
         $ret .= "window.Kwf.Loader.config = ".json_encode($config).";\n";
         return $ret;
     }
-
-    public function getFileName()
-    {
-        return null;
-    }
-
 }

Kwf/Assets/Dependency/Dynamic/RavenJsDsn.php

@@ -14,6 +14,6 @@ public function getContents($language)
         $data = array(
             'dsn' => Kwf_Config::getValue('ravenJs.dsn')
         );
-        return "Kwf.RavenJsConfig = ".json_encode($data).";\n";
+        return "Kwf.RavenJsConfig = ".json_encode($data).";";
     }
 }

Kwf/Assets/Dependency/File.php

@@ -5,23 +5,39 @@ class Kwf_Assets_Dependency_File extends Kwf_Assets_Dependency_Abstract
     private $_mtimeCache;
     private $_fileNameCache;
 
-    public function __construct($fileName)
+    public function __construct($fileNameWithType)
     {
-        $this->_fileName = $fileName;
+        if (substr($fileNameWithType, 0, 1) == '/') {
+            throw new Kwf_Exception('Don\'t use absolute file names');
+        }
+        if (!$fileNameWithType) {
+            throw new Kwf_Exception("Invalid filename");
+        }
+        $this->_fileName = $fileNameWithType;
     }
 
     public function getContents($language)
     {
-        return file_get_contents($this->getFileName());
+        return file_get_contents($this->getAbsoluteFileName());
     }
 
-    public function getFileName()
+    public function getType()
+    {
+        return substr($this->_fileName, 0, strpos($this->_fileName, '/'));
+    }
+
+    public function getFileNameWithType()
+    {
+        return $this->_fileName;
+    }
+
+    public function getAbsoluteFileName()
     {
         if (isset($this->_fileNameCache)) return $this->_fileNameCache;
         static $paths;
         if (!isset($paths)) $paths = Kwf_Config::getValueArray('path');
 
-        $pathType = substr($this->_fileName, 0, strpos($this->_fileName, '/'));
+        $pathType = $this->getType();
         $f = substr($this->_fileName, strpos($this->_fileName, '/'));
         if (isset($paths[$pathType])) {
             $f = $paths[$pathType].$f;
@@ -37,7 +53,7 @@ public function getFileName()
     public function getMTime()
     {
         if (!isset($this->_mtimeCache)) {
-            $f = $this->getFileName();
+            $f = $this->getAbsoluteFileName();
             if ($f) {
                 $this->_mtimeCache = filemtime($f);
             }
@@ -88,16 +104,12 @@ public static function createDependency($fileName, Kwf_Assets_ProviderList_Abstr
 
     public function __toString()
     {
-        $ret = $this->_fileName;
-        if (!$ret) {
-            $ret = parent::__toString();
-        }
-        return $ret;
+        return $this->_fileName;
     }
 
     protected function _getComponentCssClass()
     {
-        $cssClass = realpath($this->getFileName());
+        $cssClass = realpath($this->getAbsoluteFileName());
 
         static $paths;
         if (!isset($paths)) {
@@ -141,4 +153,39 @@ protected function _getComponentCssClass()
         }
         return null;
     }
+
+    private static function _getAbsolutePath($path)
+    {
+        if (substr($path, 0, 1)=='.') $path = getcwd().'/'.$path;
+        $parts = array_filter(explode(DIRECTORY_SEPARATOR, $path), 'strlen');
+        $absolutes = array();
+        foreach ($parts as $part) {
+            if ('.' == $part) continue;
+            if ('..' == $part) {
+                array_pop($absolutes);
+            } else {
+                $absolutes[] = $part;
+            }
+        }
+        return DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $absolutes);
+    }
+
+    public static function getPathWithTypeByFileName($fileName)
+    {
+        static $paths;
+        if (!isset($paths)) {
+            $paths = Kwf_Config::getValueArray('path');
+            foreach ($paths as $k=>$p) {
+                $paths[$k] = self::_getAbsolutePath($p);
+            }
+            $paths = array_reverse($paths);
+        }
+        $fileName = self::_getAbsolutePath($fileName);
+        foreach ($paths as $k=>$p) {
+            if (substr($fileName, 0, strlen($p)) == $p) {
+                return $k.substr($fileName, strlen($p));
+            }
+        }
+        return false;
+    }
 }