Merge pull request #2 from UberGroupLimited/master

wqeqwewqwqeq

LICENSE

@@ -1,22 +1,20 @@
+The MIT License (MIT)
 Copyright (c) 2010 Justin Hileman
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.

src/Mustache/Engine.php

@@ -23,7 +23,7 @@
  */
 class Mustache_Engine
 {
-    const VERSION        = '2.3.0';
+    const VERSION        = '2.3.1';
     const SPEC_VERSION   = '1.1.2';
 
     const PRAGMA_FILTERS = 'FILTERS';
@@ -43,6 +43,8 @@ class Mustache_Engine
     private $logger;
     private $strictCallables = false;
 
+    var $dataPoints = 0;
+
     /**
      * Mustache class constructor.
      *
@@ -152,22 +154,36 @@ public function __construct(array $options = array())
         }
     }
 
+
+    public function add_data_point($inc=1)
+    {
+        $this->dataPoints += $inc;
+
+        return $this;
+    }
+
+
+    public function count_data_points()
+    {
+        return $this->dataPoints;
+    }
+
     /**
      * Shortcut 'render' invocation.
      *
-     * Equivalent to calling `$mustache->loadTemplate($template)->render($data);`
+     * Equivalent to calling `$mustache->loadTemplate($template)->render($context);`
      *
      * @see Mustache_Engine::loadTemplate
      * @see Mustache_Template::render
      *
      * @param string $template
-     * @param mixed  $data
+     * @param mixed  $context (default: array())
      *
      * @return string Rendered template
      */
-    public function render($template, $data)
+    public function render($template, $context = array())
     {
-        return $this->loadTemplate($template)->render($data);
+        return $this->loadTemplate($template)->render($context);
     }
 
     /**
@@ -504,6 +520,10 @@ public function loadTemplate($name)
      */
     public function loadPartial($name)
     {
+
+        //Warren's been hacking at it agian.
+       #$this->add_data_point(1);
+
         try {
             if (isset($this->partialsLoader)) {
                 $loader = $this->partialsLoader;

src/Mustache/Loader/FilesystemImageLoader.php

@@ -0,0 +1,30 @@
+<?php
+
+
+class Mustache_Loader_FilesystemImageLoader extends Mustache_Loader_FilesystemLoader implements Mustache_Loader
+{
+
+	var $map = array(
+		'png' => 'png',
+		'jpg' =>'jpeg',
+	);
+
+	function __construct($baseDir, array $options = array())
+	{
+		parent::__construct($baseDir, ($options));
+	}
+
+
+	public function load($name)
+	{
+		$type = substr($name, (strrpos($name, '-', -4)+1));
+
+		if(!isset($this->map[$type]))
+			throw new Mustache_Exception_InvalidArgumentException('Image type '.$type.' does not appear to be valid');
+
+		$x = parent::load($name);
+
+		return 'data:image/'.$this->map[$type].';base64,'.base64_encode($x);
+	}
+
+}

src/Mustache/Loader/FilesystemLoader.php

@@ -108,7 +108,8 @@ protected function loadFile($name)
      *
      * @return string Template file name
      */
-    protected function getFileName($name)
+    //protected - whoops..finger slipped.. 
+    function getFileName($name)
     {
         $fileName = $this->baseDir . '/' . $name;
         if (substr($fileName, 0 - strlen($this->extension)) !== $this->extension) {

src/Mustache/Template.php

@@ -166,6 +166,10 @@ protected function prepareContextStack($context = null)
      */
     protected function resolveValue($value, Mustache_Context $context, $indent = '')
     {
+
+        //We need to log the fact we're making a datapoint change;
+        $this->mustache->add_data_point(1);
+
         if (($this->strictCallables ? is_object($value) : !is_string($value)) && is_callable($value)) {
             return $this->mustache
                 ->loadLambda((string) call_user_func($value))

src/Mustache/Tokenizer.php

@@ -107,19 +107,21 @@ public function scan($text, $delimiters = null)
                         $this->flushBuffer();
                         $this->state = self::IN_TAG_TYPE;
                     } else {
-                        if ($text[$i] == "\n") {
+                        $char = substr($text, $i, 1);
+                        if ($char == "\n") {
                             $this->filterLine();
                         } else {
-                            $this->buffer .= $text[$i];
+                            $this->buffer .= $char;
                         }
                     }
                     break;
 
                 case self::IN_TAG_TYPE:
 
                     $i += strlen($this->otag) - 1;
-                    if (isset(self::$tagTypes[$text[$i + 1]])) {
-                        $tag = $text[$i + 1];
+                    $char = substr($text, $i + 1, 1);
+                    if (isset(self::$tagTypes[$char])) {
+                        $tag = $char;
                         $this->tagType = $tag;
                     } else {
                         $tag = null;
@@ -166,7 +168,7 @@ public function scan($text, $delimiters = null)
                             }
                         }
                     } else {
-                        $this->buffer .= $text[$i];
+                        $this->buffer .= substr($text, $i, 1);
                     }
                     break;
             }