Merge with upstream

Author: cenan

README.markdown

@@ -36,7 +36,7 @@ To learn how to write your own custom View class, visit the [Slim Framework docu
     require_once 'SmartyView.php';
 
     //Init Slim app with the custom View
-    Slim::init(array(
+    $app = new Slim(array(
         'view' => new SmartyView()
     ));
 

Views/Extension/README.markdown

@@ -0,0 +1,50 @@
+# View Extensions
+This is where you can define all you custom functions in the template parser method of choice, I have currently included
+Twig and Smarty to allow Slim's urlFor() funtion in the template(view). You can add additional functions, filters, plugins to
+the Extension directory under the template parser directory of choice.
+
+## Twig
+### How to use
+To use this in Twig just include the code below at the top of your Slim index.php file after including TwigView.
+
+	TwigView::$twigExtensions = array(
+	    'Extension_Twig_Slim',
+	);
+
+Inside your Smarty template you would write:
+
+	{{ urlFor('hello', {"name": "Josh", "age": "19"}) }}
+
+You can easily pass variables that are objects or arrays by doing:
+
+	<a href="{{ urlFor('hello', {"name": person.name, "age": person.age}) }}">Hello {{ name }}</a>
+
+If you need to specify the appname for the getInstance method in the urlFor functions, set it as the third parameter of the function
+in your template:
+
+	<a href="{{ urlFor('hello', {"name": person.name, "age": person.age}, 'admin') }}">Hello {{ name }}</a>
+
+The $twigExtensions take an array of extension class name which need to follow the naming convention starting with __Extension_Twig__,
+this might seem like a overkill to add Slim's urlFor but it makes organising your project easier as your project becomes larger.
+
+## Smarty
+### How to use
+To use this in Smarty just include the code below at the top of your Slim index.php after including SmartyView.
+
+	SmartyView::$smartyExtensions = array(
+		dirname(__FILE__) . '/Views/Extension/Smarty',
+	);
+
+Inside your Smarty template you would write:
+
+	{urlFor name="hello" options="name.Josh|age.26"}
+
+You can easily pass variables that are arrays using the (.) or object using the (->) by doing:
+
+	<a href="{urlFor name="hello" options="name.{$person.name}|age.{$person.age}"}">Hello {$name}</a>
+
+If you need to specify the appname for the getInstance method in the urlFor functions, set the appname parameter in your function:
+
+	<a href="{urlFor name="hello" appname="admin" options="name.{$person.name}|age.{$person.age}"}">Hello {$name}</a>
+
+The $smartyExtensions take an array of extension directories, this follows the Smarty naming convention provided in the Smarty docs.

Views/Extension/Smarty/function.urlFor.php

@@ -0,0 +1,30 @@
+<?php
+/*
+ * Smarty plugin
+ * -------------------------------------------------------------
+ * File:     function.urlFor.php
+ * Type:     function
+ * Name:     urlFor
+ * Purpose:  outputs url for a function with the defined name method
+ * -------------------------------------------------------------
+ */
+function smarty_function_urlFor($params, $template)
+{
+	$name = isset($params['name']) ? $params['name'] : '';
+    $appName = isset($params['appname']) ? $params['appname'] : 'default';
+
+	$url = Slim::getInstance($appName)->urlFor($name);
+
+	if (isset($params['options']))
+	{
+		$options = explode('|', $params['options']);
+		foreach ($options as $option) {
+			list($key, $value) = explode('.', $option);
+			$opts[$key] = $value;
+		}
+
+		$url = Slim::getInstance($appName)->urlFor($name, $opts);
+	}
+
+	return $url;
+}

Views/Extension/Twig/Slim.php

@@ -0,0 +1,21 @@
+<?php
+
+class Extension_Twig_Slim extends Twig_Extension
+{
+    public function getName()
+    {
+        return 'slim';
+    }
+
+    public function getFunctions()
+    {
+        return array(
+            'urlFor' => new Twig_Function_Method($this, 'urlFor'),
+        );
+    }
+
+    public function urlFor($name, $params = array(), $appName = 'default')
+    {
+        return Slim::getInstance($appName)->urlFor($name, $params);
+    }
+}

Views/Extension/TwigAutoloader.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Autoloads Twig Extensions classes.
+ *
+ * @package    twig
+ * @author     Fabien Potencier <[email protected]>
+ */
+class Twig_Extensions_Autoloader
+{
+    /**
+     * Registers Twig_Extensions_Autoloader as an SPL autoloader.
+     */
+    static public function register()
+    {
+        ini_set('unserialize_callback_func', 'spl_autoload_call');
+        spl_autoload_register(array(new self, 'autoload'));
+    }
+
+    /**
+     * Handles autoloading of classes.
+     *
+     * @param  string  $class  A class name.
+     *
+     * @return boolean Returns true if the class has been loaded
+     */
+    static public function autoload($class)
+    {
+        if (0 !== strpos($class, 'Extension_Twig')) {
+            return;
+        }
+
+        if (file_exists($file = dirname(dirname(__FILE__)) . '/' . str_replace('_', '/', $class).'.php')) {
+            require $file;
+        }
+    }
+}

Views/README.markdown

@@ -4,14 +4,16 @@ The Slim Framework provides a default View class that uses PHP template files by
 
 ## TwigView
 
-The `TwigView` custom View class provides support for the [Twig](http://www.twig-project.org/) template library. You can use the TwigView custom View in your Slim application like this:
+The `TwigView` custom View class provides support for the [Twig](http://twig.sensiolabs.org/) template library. You can use the TwigView custom View in your Slim application like this:
 
 	<?php
 	require 'slim/Slim.php';
 	require 'views/TwigView.php';
-	Slim::init('TwigView');
+	$app = new Slim(array(
+		'view' => 'TwigView'
+	));
 	//Insert your application routes here
-	Slim::run();
+	$app->run();
 	?>
 
 You will need to configure the `TwigView::$twigOptions` and `TwigView::$twigDirectory` class variables before using the TwigView class in your application. These variables can be found at the top of the `views/TwigView.php` class definition.
@@ -24,9 +26,11 @@ The `MustacheView` custom View class provides support for the [Mustache template
 	require 'slim/Slim.php';
 	require 'views/MustacheView.php';
 	MustacheView::$mustacheDirectory = 'path/to/mustacheDirectory/';
-	Slim::init('MustacheView');
+	$app = new Slim(array(
+		'view' => 'MustacheView'
+	));
 	//Insert your application routes here
-	Slim::run();
+	$app->run();
 	?>
 
 Before you can use the MustacheView class, you will need to set `MustacheView::$mustacheDirectory`. This property should be the relative or absolute path to the directory containing the `Mustache.php` library.
@@ -38,9 +42,11 @@ The `SmartyView` custom View class provides support for the [Smarty](http://www.
 	<?php
 	require 'slim/Slim.php';
 	require 'views/SmartyView.php';
-	Slim::init('SmartyView');
+	$app = new Slim(array(
+		'view' => 'SmartyView'
+	));
 	//Insert your application routes here
-	Slim::run();
+	$app->run();
 	?>
 
 You will need to configure the `SmartyView::$smartyDirectory`,  `SmartyView::$smartyCompileDirectory` , `SmartyView::$smartyCacheDirectory` and optionally `SmartyView::$smartyTemplatesDirectory`, class variables before using the SmartyView class in your application. These variables can be found at the top of the `views/SmartyView.php` class definition.
@@ -52,11 +58,13 @@ The `BlitzView` custom View class provides support for the Blitz templating syst
 	<?php
 	require 'slim/Slim.php';
 	require 'views/BlitzView.php';
-	Slim::init('BlitzView');
+	$app = new Slim(array(
+		'view' => 'BlitzView'
+	));
 	//Insert your application routes here
-	Slim::run();
+	$app->run();
 	?>
-	
+
 Place your Blitz template files in the designated templates directory.
 
 ## HaangaView
@@ -66,11 +74,11 @@ The `HaangaView` custom View class provides support for the Haanga templating sy
     <?php
 	require 'slim/Slim.php';
 	require_once 'views/HaangaView.php';
-	Slim::init(array(
+	$app = new Slim(array(
         'view' => new HaangaView('/path/to/Haanga/dir', '/path/to/templates/dir', '/path/to/compiled/dir')
     ));
 	//Insert your application routes here
-	Slim::run();
+	$app->run();
 	?>
 
 ## H2oView

Views/SmartyView.php

@@ -65,6 +65,11 @@ class SmartyView extends Slim_View {
      */
     public static $smartyTemplatesDirectory = 'templates';
 
+    /**
+     * @var SmartyExtensions The Smarty extensions directory you want to load plugins from
+     */
+    public static $smartyExtensions = array();
+
     /**
      * @var persistent instance of the Smarty object
      */
@@ -99,6 +104,9 @@ public static function getInstance() {
             require_once self::$smartyDirectory . '/Smarty.class.php';
             self::$smartyInstance = new Smarty();
             self::$smartyInstance->template_dir = is_null(self::$smartyTemplatesDirectory) ? $this->getTemplatesDirectory() : self::$smartyTemplatesDirectory;
+            if ( self::$smartyExtensions ) {
+                self::$smartyInstance->setPluginsDir(self::$smartyExtensions);
+            }
             if ( self::$smartyCompileDirectory ) {
                 self::$smartyInstance->compile_dir  = self::$smartyCompileDirectory;
             }
@@ -110,4 +118,4 @@ public static function getInstance() {
     }
 }
 
-?>
+?>

Views/TwigView.php

@@ -73,7 +73,7 @@ public function render( $template ) {
     /**
      * Creates new TwigEnvironment if it doesn't already exist, and returns it.
      *
-     * @return TwigEnvironment
+     * @return Twig_Environment
      */
     public function getEnvironment() {
         if ( !$this->twigEnvironment ) {
@@ -84,6 +84,13 @@ public function getEnvironment() {
                 $loader,
                 self::$twigOptions
             );
+
+            require_once dirname(__FILE__) . '/Extension/TwigAutoloader.php';
+            Twig_Extensions_Autoloader::register();
+
+            foreach (self::$twigExtensions as $ext) {
+                $this->twigEnvironment->addExtension(new $ext);
+            }
         }
         return $this->twigEnvironment;
     }