Merge branch 'release/0.9.17'

getgrav · Feb 6, 2015 · ab358dd · ab358dd
2 parents 846a0ba + 50785c2
commit ab358dd
Show file tree

Hide file tree

Showing 19 changed files with 128 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# v0.9.17
+## 02/05/2015
+
+1. [](#new)
+    * Added **full HHVM support!** Get your speed on with Facebook's crazy fast PHP JIT compiler
+2. [](#improved)
+    * More flexible page summary control
+    * Support **CamelCase** plugin and theme class names. Replaces dashes and underscores
+    * Moved summary delimiter into `site.yaml` so it can be configurable
+    * Various PSR fixes
+3. [](#bugfix)
+     * Fix for `mergeConfig()` not falling back to defaults
+     * Fix for `addInlineCss()` and `addInlineJs()` Assets not working between Twig tags
+     * Fix for Markdown adding HTML tags into inline CSS and JS
+
 # v0.9.16
 ## 01/30/2015
 

diff --git a/system/config/site.yaml b/system/config/site.yaml
@@ -6,9 +6,12 @@ taxonomies: [category,tag]                  # Arbitrary list of taxonomy types
 blog:
   route: '/blog'                            # Route to blog
 metadata:
-    description: 'My Grav Site'             # Site description
+  description: 'My Grav Site'               # Site description
 summary:
+  enabled: true                             # enable or disable summary of page
+  format: short                             # long = summary delimiter will be ignored; short = use the first occurence of delimter or size
   size: 300                                 # Maximum length of summary (characters)
+  delimiter: ===                            # The summary delimiter
 routes:
   /something/else: '/blog/sample-3'         # Alias for /blog/sample-3
   /another/one/here: '/blog/sample-3'       # Another alias for /blog/sample-3

diff --git a/system/defines.php b/system/defines.php
@@ -2,7 +2,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '0.9.16');
+define('GRAV_VERSION', '0.9.17');
 define('DS', '/');
 
 // Directories and Paths
@@ -40,6 +40,3 @@
 define('TWIG_CONTENT', 2);
 define('TWIG_CONTENT_LIST', 3);
 define('TWIG_TEMPLATES', 4);
-
-// Misc Defines
-define('SUMMARY_DELIMITER', '===');
diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php
@@ -163,8 +163,8 @@ public function config(array $config)
     public function init()
     {
         /** @var Config $config */
-        $config = self::$grav['config'];
-        $base_url = self::$grav['base_url'];
+        $config = self::getGrav()['config'];
+        $base_url = self::getGrav()['base_url'];
         $asset_config = (array)$config->get('system.assets');
 
         $this->config($asset_config);
@@ -301,6 +301,9 @@ public function addJs($asset, $priority = 10, $pipeline = true)
      */
     public function addInlineCss($asset, $priority = 10)
     {
+        if (is_a($asset, 'Twig_Markup')) {
+            $asset = strip_tags((string)$asset);
+        }
         $key = md5($asset);
         if (is_string($asset) && !array_key_exists($key, $this->inline_css)) {
             $this->inline_css[$key] = [
@@ -326,6 +329,9 @@ public function addInlineCss($asset, $priority = 10)
      */
     public function addInlineJs($asset, $priority = 10)
     {
+        if (is_a($asset, 'Twig_Markup')) {
+            $asset = strip_tags((string)$asset);
+        }
         $key = md5($asset);
         if (is_string($asset) && !array_key_exists($key, $this->inline_js)) {
             $this->inline_js[$key] = [
@@ -352,7 +358,7 @@ public function css($attributes = [])
         }
 
         // Sort array by priorities (larger priority first)
-        if (self::$grav) {
+        if (self::getGrav()) {
             usort($this->css, function ($a, $b) {
                 if ($a['priority'] == $b['priority']) {
                     return $b['order'] - $a['order'];
@@ -465,7 +471,7 @@ public function js($attributes = [])
     protected function pipeline($css = true)
     {
         /** @var Cache $cache */
-        $cache = self::$grav['cache'];
+        $cache = self::getGrav()['cache'];
         $key = '?' . $cache->getKey();
 
         if ($css) {
@@ -681,7 +687,7 @@ protected function isRemoteLink($link)
     protected function buildLocalLink($asset)
     {
         try {
-            $asset = self::$grav['locator']->findResource($asset, false);
+            $asset = self::getGrav()['locator']->findResource($asset, false);
         } catch (\Exception $e) {
         }
 

diff --git a/system/src/Grav/Common/GPM/Local/Plugins.php b/system/src/Grav/Common/GPM/Local/Plugins.php
@@ -17,7 +17,7 @@ class Plugins extends Collection
      */
     public function __construct()
     {
-        $grav = self::$grav;
+        $grav = self::getGrav();
 
         foreach ($grav['plugins']->all() as $name => $data) {
             $this->items[$name] = new Package($data, $this->type);

diff --git a/system/src/Grav/Common/GPM/Local/Themes.php b/system/src/Grav/Common/GPM/Local/Themes.php
@@ -6,7 +6,7 @@ class Themes extends Collection
     private $type = 'themes';
     public function __construct()
     {
-        $grav = self::$grav;
+        $grav = self::getGrav();
 
         foreach ($grav['themes']->all() as $name => $data) {
             $this->items[$name] = new Package($data, $this->type);

diff --git a/system/src/Grav/Common/GPM/Remote/Collection.php b/system/src/Grav/Common/GPM/Remote/Collection.php
@@ -31,7 +31,7 @@ public function __construct($repository = null) {
             throw new \RuntimeException("A repository is required for storing the cache");
         }
 
-        $cache_dir = self::$grav['locator']->findResource('cache://gpm', true, true);
+        $cache_dir = self::getGrav()['locator']->findResource('cache://gpm', true, true);
         $this->cache = new FilesystemCache($cache_dir);
 
         $this->repository = $repository;

diff --git a/system/src/Grav/Common/GravTrait.php b/system/src/Grav/Common/GravTrait.php
@@ -13,6 +13,9 @@ trait GravTrait
      */
     public function getGrav()
     {
+        if (!self::$grav) {
+            self::$grav = Grav::instance();
+        }
         return self::$grav;
     }
 

diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -29,10 +29,10 @@ trait ParsedownGravTrait
     protected function init($page)
     {
         $this->page = $page;
-        $this->pages = self::$grav['pages'];
+        $this->pages = self::getGrav()['pages'];
         $this->BlockTypes['{'] [] = "TwigTag";
-        $this->base_url = rtrim(self::$grav['base_url'] . self::$grav['pages']->base(), '/');
-        $this->pages_dir = self::$grav['locator']->findResource('page://');
+        $this->base_url = rtrim(self::getGrav()['base_url'] . self::getGrav()['pages']->base(), '/');
+        $this->pages_dir = self::getGrav()['locator']->findResource('page://');
         $this->special_chars = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
     }
 
@@ -159,7 +159,7 @@ protected function inlineImage($excerpt)
 
                     } else {
                         // Create the custom lightbox element
-                        
+
                         $attributes = $data['a_attributes'];
                         $attributes['href'] = $data['a_href'];
 

diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
@@ -55,7 +55,7 @@ public function __construct($path)
             $medium = $this->get("{$basename}.{$ext}");
 
             if (!$alternative) {
-                
+
                 $medium = $medium ? $medium : $this->createMedium($info->getPathname());
 
                 if (!$medium) {
@@ -70,7 +70,7 @@ public function __construct($path)
             } else {
 
                 $altMedium = $this->createMedium($info->getPathname());
-                
+
                 if (!$altMedium) {
                     continue;
                 }
@@ -86,7 +86,7 @@ public function __construct($path)
                 }
 
                 $medium = $medium ? $medium : $this->scaleMedium($altMedium, $alternative, 1);
-                
+
                 $medium->addAlternative($this->parseRatio($alternative), $altMedium);
             }
 
@@ -186,7 +186,7 @@ public function files()
      * Create a Medium object from a file
      *
      * @param string $file
-     * 
+     *
      * @return Medium|null
      */
     protected function createMedium($file)
@@ -202,7 +202,7 @@ protected function createMedium($file)
         $basename = implode('.', $parts);
 
         /** @var Config $config */
-        $config = self::$grav['config'];
+        $config = self::getGrav()['config'];
 
         // Check if medium type has been configured.
         $params = $config->get("media.".strtolower($ext));
@@ -224,7 +224,7 @@ protected function createMedium($file)
             'modified' => filemtime($file),
         );
 
-        $locator = self::$grav['locator'];
+        $locator = self::getGrav()['locator'];
 
         $lookup = $locator->findResources('image://');
         foreach ($lookup as $lookupPath) {
@@ -257,7 +257,7 @@ protected function scaleMedium($medium, $from, $to)
         $medium->set('debug', false);
 
         $file = $medium->resize($width, $height)->setPrettyName($basename)->url();
-        $file = preg_replace('|'. preg_quote(self::$grav['base_url_relative']) .'$|', '', GRAV_ROOT) . $file;
+        $file = preg_replace('|'. preg_quote(self::getGrav()['base_url_relative']) .'$|', '', GRAV_ROOT) . $file;
 
         $medium->set('debug', $debug);
 

diff --git a/system/src/Grav/Common/Page/Medium.php b/system/src/Grav/Common/Page/Medium.php
@@ -120,16 +120,7 @@ public function __construct($items = array(), Blueprint $blueprint = null)
             $this->def('mime', 'application/octet-stream');
         }
 
-        $debug = self::$grav['config']->get('system.images.debug');
-        // try to override with page setting if possible
-        $page = self::$grav['page'];
-        if (!is_null($page)) {
-            if (isset($page->header()->images['debug'])) {
-                $debug =  $page->header()->images['debug'];
-            }
-        }
-
-        $this->set('debug', $debug);
+        $this->set('debug', self::getGrav()['config']->get('system.images.debug'));
     }
 
     /**
@@ -177,7 +168,7 @@ public function url($reset = true)
             $output = preg_replace('|^' . GRAV_ROOT . '|', '', $this->get('path')) . '/' . $this->get('filename');
         }
 
-        return self::$grav['base_url'] . $output;
+        return self::getGrav()['base_url'] . $output;
     }
 
 
@@ -341,7 +332,7 @@ public function link($width = null, $height = null)
             }
         } else {
             // TODO: we need to find out URI in a bit better way.
-            $this->linkTarget = self::$grav['base_url'] . preg_replace('|^' . GRAV_ROOT . '|', '', $this->get('path')) . '/' . $this->get('filename');
+            $this->linkTarget = self::getGrav()['base_url'] . preg_replace('|^' . GRAV_ROOT . '|', '', $this->get('path')) . '/' . $this->get('filename');
         }
 
         return $this;
@@ -431,7 +422,7 @@ public function __call($method, $args)
      */
     public function image($variable = 'thumb')
     {
-        $locator = self::$grav['locator'];
+        $locator = self::getGrav()['locator'];
 
         // TODO: add default file
         $file = $this->get($variable);
@@ -462,7 +453,7 @@ protected function saveImage()
                 $ratio = 1;
             }
 
-            $locator = self::$grav['locator'];
+            $locator = self::getGrav()['locator'];
             $overlay = $locator->findResource("system://assets/responsive-overlays/{$ratio}x.png") ?: $locator->findResource('system://assets/responsive-overlays/unknown.png');
             $this->image->merge(ImageFile::open($overlay));
         }