Merge branch 'release/0.9.30'

.travis.yml

@@ -44,7 +44,7 @@ before_install:
   - go get github.com/aktau/github-release
   - git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
   - if [ ! -z "$TRAVIS_TAG" ]; then
-      cd $RT_DEVTOOLS;
+      cd "${RT_DEVTOOLS}";
       ./build-grav.sh skeletons.txt;
     fi
 script:

CHANGELOG.md

@@ -1,3 +1,26 @@
+# v0.9.30
+## 07/08/2015
+
+1. [](#new)
+    * BIG NEWS! Extensive Multi-Language support is all new in 0.9.30!
+    * Translation support via Twig filter/function and PHP method
+    * Page specific default route
+    * Page specific route aliases
+    * Canonical URL route support
+    * Added built-in session support
+    * New `Page.rawRoute()` to get a consistent folder-based route to a page
+    * Added option to always redirect to default page on alias URL
+    * Added language safe redirect function for use in core and plugins
+2. [](#improved)
+    * Improved `Page.active()` and `Page.activeChild()` methods to support route aliases
+    * Various spelling corrections in `.php` comments, `.md` and `.yaml` files
+    * `Utils::startsWith()` and `Utils::endsWith()` now support needle arrays
+    * Added a new timer around `pageInitialized` event
+    * Updated jQuery library to v2.1.4
+3. [](#bugfix)
+    * In-page CSS and JS files are now handled properly
+    * Fix for `enable_media_timestamp` not working properly
+
 # v0.9.29
 ## 06/22/2015
 
@@ -35,7 +58,7 @@
     * Fix for `+` in image filenames
     * Fix for dot files causing issues with page processing
     * Fix for Uri path detection on Windows platform
-    * Fix for atlernative media resolutions
+    * Fix for alternative media resolutions
     * Fix for modularTypes key properties
 
 # v0.9.27
@@ -49,7 +72,7 @@
     * Added a new `parseLinks` method to Plugins class
     * Added `starts_with` and `ends_with` Twig filters
 2. [](#improved)
-    * Opitmized install of vendor libraries for speed improvement
+    * Optimized install of vendor libraries for speed improvement
     * Improved configuration handling in preparation for admin plugin
     * Cache optimization: Don't cache Twig templates when you pass dynamic params
     * Moved `Utils::rcopy` to `Folder::rcopy`
@@ -63,7 +86,7 @@
     * Fix for URLs with trailing slashes
     * Handle condition where certain errors resulted in blank page
     * Fix for issue with theme name equal to base_url and asset pipeline
-    * Fix to properly nomralize font rewrite path
+    * Fix to properly normalize font rewrite path
     * Fix for absolute URLs below the current page
     * Fix for `..` page references
 
@@ -81,7 +104,7 @@
 2. [](#improved)
     * Refactored media image handling to make it more flexible and support absolute paths
     * Refactored page modification check process to make it faster
-    * User account improvements in preparation for Admin plugin
+    * User account improvements in preparation for admin plugin
     * Protect against timing attacks
     * Reset default system expires time to 0 seconds (can override if you need to)
 3. [](#bugfix)
@@ -209,7 +232,7 @@
     * Improved the markdown Lightbox functionality to better mimic Twig version
     * Fullsize Lightbox can now have filters applied
     * Added a new `mergeConfig()` method to Plugin class to merge system + page header configuration
-    * Added a new `disable()` method to Plugin class to programatically disable a plugin
+    * Added a new `disable()` method to Plugin class to programmatically disable a plugin
     * Updated Parsedown and Parsedown Extra to address bugs
     * Various PSR fixes
 3. [](#bugfix)
@@ -262,7 +285,7 @@
     * Added `publish_date` in page headers to automatically publish page
     * Added `unpublish_date` in page headers to automatically unpublish page
     * Added `dateRange()` capability for collections
-    * Added ability to dynamically control Cache lifetime programatically
+    * Added ability to dynamically control Cache lifetime programmatically
     * Added ability to sort by anything in the page header. E.g. `sort: header.taxonomy.year`
     * Added various helper methods to collections: `copy, nonVisible, modular, nonModular, published, nonPublished, nonRoutable`
 2. [](#improved)
@@ -437,7 +460,7 @@
     * Broke cache types out into multiple directories in the cache folder
     * Removed vendor libs from github repository
     * Various PSR cleanup of code
-    * Various Blueprint updates to support upcoming Admin plugin
+    * Various Blueprint updates to support upcoming admin plugin
     * Added ability to filter page children for normal/modular/all
     * Added `sort_by_key` twig filter
     * Added `visible()` and `routable()` filters to page collections
@@ -510,7 +533,7 @@
     * Addition of Dependency Injection Container
     * Refactored plugins to use Symfony Event Dispatcher
     * New Asset Manager to provide unified management of JavaScript and CSS
-    * Asset Pipelining to provide unification, minify, and optimazation of JavaScript and CSS
+    * Asset Pipelining to provide unification, minify, and optimization of JavaScript and CSS
     * Grav Media support directly in Markdown syntax
     * Additional Grav Generator meta tag in default themes
     * Added support for PHP Stream Wrapper for resource location

system/config/site.yaml

@@ -6,22 +6,25 @@ author:
 
 taxonomies: [category,tag]                  # Arbitrary list of taxonomy types
 
-blog:
-  route: '/blog'                            # Route to blog (deprecated)
-
 metadata:
   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
+  format: short                             # long = summary delimiter will be ignored; short = use the first occurrence of delimiter or size
   size: 300                                 # Maximum length of summary (characters)
   delimiter: ===                            # The summary delimiter
 
+redirects:
+  /redirect-test: /                         # Redirect test goes to home page
+  /old/(.*): /new/$1                        # Would redirect /old/my-page to /new/my-page
+
 routes:
   /something/else: '/blog/sample-3'         # Alias for /blog/sample-3
-  /another/one/here: '/blog/sample-3'       # Another alias for /blog/sample-3
-  /new/*: '/blog/*'                         # Wildcard any /new/my-page URL to /blog/my-page Route
+  /new/(.*): '/blog/$1'                     # Regex any /new/my-page URL to /blog/my-page Route
+
+blog:
+  route: '/blog'                            # Custom value added (accessible via system.blog.route)
 
 #menu:                                      # Sample Menu Example
 #    - text: Source

system/config/system.yaml

@@ -31,9 +31,10 @@ pages:
       '>': 'gt'
       '<': 'lt'
   types: 'txt|xml|html|json|rss|atom'  # Pipe separated list of valid page types
-  expires: 0                           # Page expires time in seconds (604800 seconds = 7 days)
+  expires: 604800                      # Page expires time in seconds (604800 seconds = 7 days)
   last_modified: false                 # Set the last modified date header based on file modifcation timestamp
   etag: false                          # Set the etag header tag
+  redirect_default_route: false        # Automatically redirect to a page's default route
 
 cache:
   enabled: true                        # Set to true to enable caching
@@ -60,9 +61,9 @@ assets:                                # Configuration for Assets Manager (JS, C
   css_rewrite: true                    # Rewrite any CSS relative URLs during pipelining
   js_pipeline: false                   # The JS pipeline is the unification of multiple JS resources into one file
   js_minify: true                      # Minify the JS during pipelining
-  enable_asset_timestamp: false        # Enable asset timetsamps
+  enable_asset_timestamp: false        # Enable asset timestamps
   collections:
-    jquery: system://assets/jquery/jquery-2.1.3.min.js
+    jquery: system://assets/jquery/jquery-2.1.4.min.js
 
 errors:
   display: true                        # Display full backtrace-style error page
@@ -82,5 +83,10 @@ media:
   enable_media_timestamp: false        # Enable media timetsamps
   upload_limit: 0                      # Set maximum upload size in bytes (0 is unlimited)
 
+session:
+    enabled: true                      # Enable Session support
+    timeout: 1800                      # Timeout in seconds
+    name: grav-site                    # Name prefix of the session cookie
+
 security:
   default_hash: $2y$10$kwsyMVwM8/7j0K/6LHT.g.Fs49xOCTp2b8hh/S5.dPJuJcJB6T.UK

system/defines.php

@@ -2,7 +2,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '0.9.29');
+define('GRAV_VERSION', '0.9.30');
 define('DS', '/');
 
 // Directories and Paths

system/src/Grav/Common/Assets.php

@@ -47,7 +47,7 @@ class Assets
      * Closure used by the pipeline to fetch assets.
      *
      * Useful when file_get_contents() function is not available in your PHP
-     * instalation or when you want to apply any kind of preprocessing to
+     * installation or when you want to apply any kind of preprocessing to
      * your assets before they get pipelined.
      *
      * The closure will receive as the only parameter a string with the path/URL of the asset and
@@ -509,7 +509,7 @@ public function js($attributes = [])
 
 
     /**
-     * Minifiy and concatenate CSS / JS files.
+     * Minify and concatenate CSS / JS files.
      *
      * @return string
      */
@@ -741,7 +741,7 @@ public function addDir($directory, $pattern = self::DEFAULT_REGEX)
     /**
      * Determine whether a link is local or remote.
      *
-     * Undestands both "http://" and "https://" as well as protocol agnostic links "//"
+     * Understands both "http://" and "https://" as well as protocol agnostic links "//"
      *
      * @param  string $link
      *
@@ -920,7 +920,7 @@ function ($matches) {
      *
      * @param  string $directory
      * @param  string $pattern (regex)
-     * @param  string $ltrim   Will be trimed from the left of the file path
+     * @param  string $ltrim   Will be trimmed from the left of the file path
      *
      * @return array
      */

system/src/Grav/Common/Cache.php

@@ -271,7 +271,7 @@ public static function clearCache($remove = 'standard')
 
 
     /**
-     * Set the cache lifetime programatically
+     * Set the cache lifetime programmatically
      *
      * @param int $future timestamp
      */