Changeset 14409 for plugins/sfSmartyPlugin/trunk

Timestamp:

01/01/09 02:12:27 (4 years ago)

Author:

insaini

Message:

Updated compiler process and optimized parsing methods. Updated documentation.

Files:

• plugins/sfSmartyPlugin/trunk/LICENSE (modified) (1 diff)
• plugins/sfSmartyPlugin/trunk/README (modified) (3 diffs)
• plugins/sfSmartyPlugin/trunk/lib/helper/AppUrlHelper.php (modified) (1 diff)
• plugins/sfSmartyPlugin/trunk/lib/sfSmarty.class.php (modified) (11 diffs)
• plugins/sfSmartyPlugin/trunk/lib/sfSmartyView.class.php (modified) (5 diffs)
• plugins/sfSmartyPlugin/trunk/package.xml (modified) (3 diffs)

plugins/sfSmartyPlugin/trunk/LICENSE

@@ -1 +1 @@
-Copyright (c) 2006 Georg Gell
+Copyright (c) 2008 Jesse Badwal
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+

plugins/sfSmartyPlugin/trunk/README

@@ -126 +126 @@
-Refer to the Smarty documentation. 
-
+### Symfony Helpers ###
-The Javascript helper tag is also available and must be used as such:
-
@@ -142 +143 @@
-The {use} tag does not accept an array of values currently.
-
+All other helpers are used as compiler methods in Smarty. That is you would use the function name after the opening brace.
+  {include_component moduleName='default' componentName'test'}
+
+As well all symfony helper methods are also modifiers meaning they can be used within compiler function calls like so
+  {url_for internal_uri="foo/bar"|cat:"?command=new"}
+This will concatenate 'command=new' to 'foo/bar' and of course the modifier can be a variable.
+
+Another example would be link_to with an image:
+  {link_to name="foo_icon.gif"|image_tag routeName='@foobar'}
+And if you need image_tag to take additional parameters
+  {link_to name="foo_icon.gif"|image_tag:par2:par3 routeName='@foobar'}
+where par1 to image_tag is of course "foo_icon.gif"
+
+### Symfony Actions ###
-Smarty can also be utilized within actions via static calls. In an action:
-
@@ -149 +164 @@
-$foobar will then be available as an object reference in your template.
-
+
-## Final Notes ##
-
-
+
+
-
-Helpers that are used are cached and will also be loaded from the cache after that. Smarty also compiles the templates and once compiled are always loaded until modified.

plugins/sfSmartyPlugin/trunk/lib/helper/AppUrlHelper.php

@@ -2 +2 @@
-use_helper('Url');
-/**
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-function link_to_app($app, $name = '', $internal_uri = '', $options = array(), $subdomain = true, $path = '/') {
-  $current_app = sfConfig::get('sf_app');

plugins/sfSmartyPlugin/trunk/lib/sfSmarty.class.php

@@ -1 +1 @@
-<?php
+/*
+ * This file is part of the sfSmarty Plugin
+ * (c) 2008 Jesse Badwal <jesse@insaini.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
-/**
- * sfSmarty
- *
-
-
-
-
-
+
+
+
+
- **/
-class sfSmarty {
@@ -103 +110 @@
-    
-    /**
-
-
+
-     *
-     * @param sfSmartyView $view
@@ -113 +119 @@
-    {
-      $current_sf_data = self::$smarty->get_template_vars('sf_data');
-Holder()->get
+
-      if (isset($current_sf_data['sf_content'])) {
-        $view->getAttributeHolder()->set('sf_content',$current_sf_data['sf_content']);
@@ -137 +143 @@
-    $sf_user = $sf_context->getUser();
-    
-
+
+
+
+
+
-    
-    $this->loadCoreAndStandardHelpers();
@@ -150 +160 @@
-        self::$smarty->assign_by_ref($key, $value);
-      }
-      //self::$smarty->assign($view->getAttributeHolder()->getAll());
-    } 
-    
@@ -183 +192 @@
-    $helpers = array_unique(array_merge($core_helpers, $standard_helpers));
-    foreach ($helpers as $helperName) {
-
-
-
+
-    }
-    $smarty_helpers = sfConfig::get('sf_smarty_helpers');
@@ -200 +207 @@
-  protected function loadHelper($helperName)
-  {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-      
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-  }
-  
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    $code = '';
-    $lines = file($path);
@@ -249 +251 @@
-        }
-        $code .= ";\nself::registerCompilerFunction('$name', array(\$this, '{$name}_CompilerFunction'));";
+        $code .= ";\nself::registerModifier('$name', array(\$this, '{$name}_Modifier'));";        
-      }
-    }
@@ -258 +261 @@
-   *
-   * @param mixed $argumentString
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    $args = array();
-
-
-
-
-
-
-
+
+
+
+
+
-        continue;
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-    return $args;
@@ -377 +309 @@
-  {
-    $helpers = '';
-
-
-
-
+
+
-      $helpers = "<?php $helpers ?>";
-    }
-    return $helpers . $content;
-  }
-  
-  /**
-   * sfSmarty::__call()
-   * generic compiler function for all new tags
-   *
-   * @param mixed $functionName
-   * @param mixed $argsArray
-   * @return
-   **/
-  public function __call($functionName, $argsArray)
-  {
-    if (!trim($argsArray[0])) {
-      $args = array();
-    } else {
-      $args = $this->parseArguments($argsArray[0], true);
-    }
-    $functionName = str_replace('_CompilerFunction', '', $functionName);
-    $argsOrder = $allArgs = (array)self::$knownFunctions[$functionName];
-    $helperWithVarArgs = count($allArgs) == 0;
-    $cacheArgs = array();
-    foreach($args as $name => $value) {
-      $name = '$' . trim($name);
-      $value = trim($value);
-      if (!isset($allArgs[$name]) && !$helperWithVarArgs) {
-        throw new Exception('sfSmartyView: Cannot compile template. Unknown field found: "' . substr($name, 1) . '" near tag ' . $functionName);
-      }
-      $cacheArgs[$name] = $value;
-      unset($allArgs[$name]);
-    }
-    foreach($allArgs as $name => $default) {
-      if (!isset($default['default'])) {
-        throw new Exception('sfSmartyView: Cannot compile template. Required field "' . substr($name, 1) . '" not found near tag ' . $functionName);
-      }
-      $cacheArgs[$name] = $default['default'];
-    }
-    $code = '';
-    if (!$helperWithVarArgs) {
-      foreach($argsOrder as $name => $value) {
-        $code .= $code?',':'';
-        if (is_bool($value)) {
-          $code .= $cacheArgs[$name]?'true':'false';
-        } else {
-          $code .= $cacheArgs[$name];
-        }
-      }
-    } else {
-      foreach($cacheArgs as $name => $value) {
-        $code .= $code?',':'';
-        if (is_bool($value)) {
-          $code .= $value?'true':'false';
-        } else {
-          $code .= $value;
-        }
-      }
-    }
-    $code = "echo $functionName($code);\n";
-    return $code;
-  }
-
@@ -498 +370 @@
-  {
-    self::$smarty->register_modifier($tag, $function);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}

plugins/sfSmartyPlugin/trunk/lib/sfSmartyView.class.php

@@ -1 +1 @@
-<?php
+/*
+ * This file is part of the sfSmarty Plugin
+ * (c) 2008 Jesse Badwal <jesse@insaini.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
-/**
- * sfSmartyView
- *
-
-
-
-
-
+
+
+
+
- **/
-class sfSmartyView extends sfPHPView {
-
+  /**
+   * SfSmarty Instance
+   *
+   * @var sfSmarty
+   */
-  protected static $smarty = null;
-  
@@ -37 +49 @@
-  /**
-   * sfSmartyView::getEngine()
-
+fS
-   *
-
+fS
-   */
-  public function getEngine()
@@ -50 +62 @@
-   *
-   * Does some logic to allow the use of both
-@$this->template_extension files as action view
+smarty template file
-   *
-   * @see sfView::preRenderCheck()
@@ -62 +74 @@
-      $this->setTemplate(str_replace($this->getExtension(), '.php', $this->getTemplate()));
-      $this->setExtension('.php');
-parent::configure();   
+//parent::configure();
-      parent::preRenderCheck();
-    }
@@ -76 +88 @@
-   **/
-  protected function renderFile($file)
-
-
-
-
-
+
-    if ($this->getExtension() == '.php' && $this->getAttribute('sf_type') != 'layout') {
-      return parent::renderFile($file);
-    }
-    
+    if (sfConfig::get('sf_logging_enabled')) {
+      $this->dispatcher->notify(new sfEvent($this, 'application.log', array('{sfSmartyView} renderFile '.$file)));
+    }
-    return $this->getEngine()->renderFile($this, $file);
-  }

plugins/sfSmartyPlugin/trunk/package.xml

@@ -11 +11 @@
-  <active>yes</active>
- </lead>
-25
-06
+31
+17
- <version>
-2.3
+3.0
-  <api>1.0.0</api>
- </version>
@@ -68 +68 @@
-      <release>
-        <version>
-2.3
+3.0
-          <api>1.0.0</api>
-        </version>
@@ -78 +78 @@
-          MIT license
-        </license>
-25
+31
-        <license>MIT</license>
-        <notes>
-
-
-
+
-        </notes>
-      </release>