Merge pull request #35 from Talesoft/dev-master

Space-separated attributes are allowed now

Compiler.php

@@ -21,7 +21,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Compiler.html
  * @since      File available since Release 1.0
  */
@@ -91,7 +91,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Compiler.html
  * @since      File available since Release 1.0
  */

Compiler/Exception.php

@@ -16,7 +16,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Compiler.Exception.html
  * @since      File available since Release 1.0
  */
@@ -35,7 +35,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Compiler.Exception.html
  * @since      File available since Release 1.0
  */

Compiler/functions.php

@@ -1,6 +1,8 @@
 <?php
 
 namespace Tale\Jade\Compiler {
+    //We use the bracket-style here to be able to compile
+    //this file into compiled jade templates for valid PHP
 
     if (!function_exists(__NAMESPACE__.'\\build_value')) {
 

Filter.php

@@ -20,7 +20,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Filter.html
  * @since      File available since Release 1.0
  */
@@ -53,7 +53,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Filter.html
  * @since      File available since Release 1.0
  */

Lexer.php

@@ -18,7 +18,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Lexer.html
  * @since      File available since Release 1.0
  */
@@ -60,7 +60,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Lexer.html
  * @since      File available since Release 1.0
  */
@@ -1684,14 +1684,18 @@ protected function scanAttributes()
                         $this->read('ctype_space');
                     }
 
-                    $token['value'] = $this->readBracketContents([',']);
+                    $token['value'] = $this->readBracketContents([',', ' ', "\r", "\n", "\t"]);
                 }
 
-                if ($this->peek() === ',') {
+                if ($this->peek() === ',' || ctype_space($this->peek())) {
 
                     $this->consume();
                     $this->read('ctype_space');
-                    $continue = true;
+
+                    if ($this->peek() !== ')')
+                        $continue = true;
+                    else
+                        $continue = false;
                 } else {
 
                     $continue = false;

Lexer/Exception.php

@@ -16,7 +16,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Lexer.Exception.html
  * @since      File available since Release 1.0
  */
@@ -34,7 +34,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Lexer.Exception.html
  * @since      File available since Release 1.0
  */

Parser.php

@@ -18,7 +18,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Parser.html
  * @since      File available since Release 1.0
  */
@@ -57,7 +57,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Parser.html
  * @since      File available since Release 1.0
  */

Parser/Exception.php

@@ -16,7 +16,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Parser.Exception.html
  * @since      File available since Release 1.0
  */
@@ -34,7 +34,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Parser.Exception.html
  * @since      File available since Release 1.0
  */

Parser/Node.php

@@ -20,7 +20,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Parser.Node.html
  * @since      File available since Release 1.0
  */
@@ -40,7 +40,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Parser.Node.html
  * @since      File available since Release 1.0
  */

README.md

@@ -83,7 +83,8 @@ echo $renderer->render('your-jade-file');
 ```
 
 This way, the renderer will search for `your-jade-file.jade` in your `get_include_path()`-paths.
-Notice that the path passed to `render` needs to be relative, *always*.
+Notice that the path passed to `render` should be relative. You can give it absolute paths, but it will make caching harder.
+Use absolute paths for testing only.
 We show you how to add alternative search paths further in the **Basic configuration** section below.
 
 When the Jade-file gets rendered, a `./cache/views`-directory is created automatically and the compiled PHTML will be stored in that directory.

Renderer.php

@@ -18,7 +18,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Renderer.html
  * @since      File available since Release 1.0
  */
@@ -51,7 +51,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Renderer.html
  * @since      File available since Release 1.0
  */

Renderer/Adapter/File.php

@@ -20,7 +20,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Renderer.Adapter.File.html
  * @since      File available since Release 1.0
  */
@@ -58,7 +58,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Renderer.Adapter.File.html
  * @since      File available since Release 1.0
  */

Renderer/Adapter/Stream.php

@@ -20,7 +20,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Renderer.Adapter.Stream.html
  * @since      File available since Release 1.0
  */
@@ -70,7 +70,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Renderer.Adapter.Stream.html
  * @since      File available since Release 1.0
  */

Renderer/Adapter/Stream/Wrapper.php

@@ -18,7 +18,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Renderer.Adapter.Stream.Wrapper.html
  * @since      File available since Release 1.0
  */
@@ -40,7 +40,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Renderer.Adapter.Stream.Wrapper.html
  * @since      File available since Release 1.0
  */

Renderer/AdapterBase.php

@@ -18,7 +18,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/Renderer.AdapterBase.html
  * @since      File available since Release 1.0
  */
@@ -40,7 +40,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/classes/Tale.Jade.Renderer.AdapterBase.html
  * @since      File available since Release 1.0
  */

Test/AttributeTest.php

@@ -4,6 +4,7 @@
 
 use Tale\Jade\Compiler;
 use Tale\Jade\Renderer;
+use Tale\Jade\Parser;
 
 class AttributeTest extends \PHPUnit_Framework_TestCase
 {
@@ -133,4 +134,33 @@ public function attributeValueProvider()
             [(object)['one', 'two', 'three'], '<a href="onetwothree"></a>']
         ];
     }
+
+    public function testUnnamedAttributed()
+    {
+
+        $this->setExpectedException(Parser\Exception::class);
+        $this->assertEquals('', $this->_renderer->compile('a(="some value")'));
+    }
+
+    public function testExpectedButNotGivenValue()
+    {
+
+        $this->assertEquals('<a href=""></a>', $this->_renderer->compile('a(href=)'));
+    }
+
+    public function testSpaceSeparated()
+    {
+
+        $this->assertEquals('<meta name="viewport" content="some viewport content"><a href="google.de" target="_blank" title="Some link title"></a>', $this->_renderer->render(
+            'space-separated'
+        ));
+    }
+
+    public function testIssue33()
+    {
+
+        $this->assertEquals('<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0"><meta http-equiv="X-UA-Compatible" content="chrome=1"><link rel="shortcut icon" href="/favicon.ico"><link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,600"><link rel="stylesheet" href="/style.css">', $this->_renderer->render(
+            'issue-33'
+        ));
+    }
 }

Test/MixinTest.php

@@ -7,7 +7,7 @@
 class MixinTest extends \PHPUnit_Framework_TestCase
 {
 
-    /** @var \Tale\Jade\Compiler */
+    /** @var \Tale\Jade\Renderer */
     private $_renderer;
 
     public function setUp()
@@ -52,4 +52,14 @@ public function testBlock()
             'block'
         ));
     }
+
+
+
+    public function testIdAndClassForwarding()
+    {
+
+        $this->assertEquals('<button class="btn btn-default" id="someId"></button>', $this->_renderer->render(
+            'id-and-class-forwarding'
+        ));
+    }
 }

Test/views/attributes/issue-33.jade

@@ -0,0 +1,8 @@
+
+meta(name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0")
+meta(http-equiv="X-UA-Compatible" content="chrome=1")
+
+link(rel="shortcut icon" href="/favicon.ico")
+link(rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,600")
+
+link(rel="stylesheet" href="/style.css")

Test/views/attributes/space-separated.jade

@@ -0,0 +1,6 @@
+
+
+meta(name='viewport' content='some viewport content')
+
+//- Mixed test
+a(href='google.de' target='_blank', title='Some link title')

Test/views/mixins/id-and-class-forwarding.jade

@@ -0,0 +1,7 @@
+
+mixin button(label)
+    button.btn(id=$id, class=$class)= $label
+
+
+
++button.btn-default#someId('My Button Label')

composer.json

@@ -25,7 +25,7 @@
         "php": ">=5.5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=4.0"
+        "phpunit/phpunit": "~4.0"
     },
     "autoload": {
         "psr-4": {

functions.php

@@ -18,7 +18,7 @@
  * @author     Talesoft <[email protected]>
  * @copyright  Copyright (c) 2015 Talesoft (http://talesoft.io)
  * @license    http://licenses.talesoft.io/2015/MIT.txt MIT License
- * @version    1.3.0
+ * @version    1.3.1
  * @link       http://jade.talesoft.io/docs/files/functions.html
  * @since      File available since Tag 1.0.1
  */

tasks.php

@@ -10,7 +10,7 @@
     './.git'
 ];
 
-$newVersion = '1.3.0';
+$newVersion = '1.3.1';
 
 
 if (!$newVersion) {