Merge pull request #12 from pug-php/fix-issue-11

Fix issue #11

.gitignore

@@ -1,5 +1,6 @@
 composer.lock
 composer.phar
 *debug.log*
+.idea
 /vendor/
 /coverage/

src/Jade/JadeSymfonyEngine.php

@@ -78,14 +78,7 @@ protected function crawlDirectories($srcDir, $appDir, &$assetsDirectories)
         return $baseDir ?: $appDir . '/Resources/views';
     }
 
-    /**
-     * Pug code transformation to do before Pug render.
-     *
-     * @param string $pugCode code input
-     *
-     * @return string
-     */
-    public function preRender($pugCode)
+    protected function replaceCode($pugCode)
     {
         $helperPattern = $this->getOption('expressionLanguage') === 'js'
             ? 'view.%s.%s'
@@ -113,6 +106,30 @@ public function preRender($pugCode)
         return $pugCode;
     }
 
+    /**
+     * Pug code transformation to do before Pug render.
+     *
+     * @param string $pugCode code input
+     *
+     * @return string
+     */
+    public function preRender($pugCode)
+    {
+        $newCode = '';
+        while (mb_strlen($pugCode)) {
+            if (!preg_match('/^(.*)("(?:\\\\[\\s\\S]|[^"\\\\])*"|\'(?:\\\\[\\s\\S]|[^\'\\\\])*\')/U', $pugCode, $match)) {
+                $newCode .= $this->replaceCode($pugCode);
+
+                break;
+            }
+
+            $newCode .= $this->replaceCode($match[1]) . $match[2];
+            $pugCode = mb_substr($pugCode, mb_strlen($match[0]));
+        }
+
+        return $newCode;
+    }
+
     protected function registerHelpers(ContainerInterface $services, $helpers)
     {
         $this->helpers = [];

tests/Pug/PugSymfonyBundle/Command/AssetsPublishCommandTest.php

@@ -28,7 +28,7 @@ public function testCommand()
 
         $output = $commandTester->getDisplay();
 
-        $this->assertContains('8 templates cached', $output, 'All templates can be cached except filter.pug as the upper filter does not exists.');
+        $this->assertContains('9 templates cached', $output, 'All templates can be cached except filter.pug as the upper filter does not exists.');
         $this->assertContains('1 templates failed to be cached', $output, 'filter.pug fails as the upper filter does not exists.');
     }
 }

tests/Pug/PugSymfonyEngineTest.php

@@ -297,4 +297,13 @@ public function testForbidView()
     {
         (new PugSymfonyEngine(self::$kernel))->render('p.pug', ['view' => 42]);
     }
+
+    public function testIssue11BackgroundImage()
+    {
+        $pugSymfony = new PugSymfonyEngine(self::$kernel);
+        $pugSymfony->setOption('expressionLanguage', 'js');
+        $html = trim($pugSymfony->render('background-image.pug', ['image' => 'foo']));
+
+        self::assertSame('<div style="background-image: url(foo);" class="slide"></div>', $html);
+    }
 }

tests/project/app/Resources/views/background-image.pug

@@ -0,0 +1 @@
+.slide(style="background-image: url(" + image + ");")