Merge pull request #407 from splitbrain/FS#2875

FS#2875 : Allow less to parse @import of .less files

2 files changed, 112 insertions, 2 deletions

diff --git a/_test/tests/lib/exe/css_at_import_less.test.php b/_test/tests/lib/exe/css_at_import_less.test.php
new file mode 100644
index 000000000..4a6efcf44
--- /dev/null
+++ b/_test/tests/lib/exe/css_at_import_less.test.php
@@ -0,0 +1,78 @@
+<?php
+
+require_once DOKU_INC.'lib/exe/css.php';
+
+class css_at_import_less_test extends DokuWikiTest {
+
+    protected $file = '';
+    protected $import = '';
+
+    public function setUpFiles($subdir = '') {
+
+        $dir = TMP_DIR . $subdir;
+        if (!is_dir($dir)) {
+            mkdir($dir, 0777, true);
+        }
+        if (!is_dir($dir)) {
+            $this->markTestSkipped('Could not create directory.');
+        }
+
+        $this->file = tempnam($dir, 'css');
+
+        $import = '';
+        do {
+            if ($import) unlink($import);
+            $import = tempnam($dir, 'less');
+            $ok = rename($import, $import.'.less');
+        } while (!$ok);
+
+        $this->import = $import.'.less';
+    }
+
+    private function csstest($input, $expected_css, $expected_less) {
+        $location = "http://test.com/";
+        io_saveFile($this->file, $input);
+        $css = css_loadfile($this->file, $location);
+        $less = css_parseless($css);
+        $this->assertEquals($expected_css, $css);
+        $this->assertEquals($expected_less, $less);
+    }
+
+    public function test_basic() {
+        $this->setUpFiles();
+
+        $import = preg_replace('#(^.*[/])#','',$this->import);
+        $in_css = '@import "'.$import.'";';
+        $in_less = '@foo: "bar";
+content: @foo;';
+
+        $expected_css = '@import "/'.$import.'";';
+        $expected_less = 'content: "bar";';
+
+        io_saveFile($this->import, $in_less);
+        $this->csstest($in_css, $expected_css, $expected_less);
+    }
+
+    public function test_subdirectory() {
+        $this->setUpFiles('/foo/bar');
+
+        $import = preg_replace('#(^.*[/])#','',$this->import);
+        $in_css = '@import "'.$import.'";';
+        $in_less = '@foo: "bar";
+content: @foo;';
+
+        $expected_css = '@import "/foo/bar/'.$import.'";';
+        $expected_less = 'content: "bar";';
+
+        io_saveFile($this->import, $in_less);
+        $this->csstest($in_css, $expected_css, $expected_less);
+    }
+
+    public function tearDown() {
+        unlink($this->file);
+        unlink($this->import);
+        unset($this->file, $this->import);
+    }
+}
+
+//Setup VIM: ex: et ts=4 sw=4 :
diff --git a/_test/tests/lib/exe/css_css_loadfile.test.php b/_test/tests/lib/exe/css_css_loadfile.test.php
index c89b69b2c..c336702f8 100644
--- a/_test/tests/lib/exe/css_css_loadfile.test.php
+++ b/_test/tests/lib/exe/css_css_loadfile.test.php
@@ -3,13 +3,16 @@
 require_once DOKU_INC.'lib/exe/css.php';
 
 class css_css_loadfile_test extends DokuWikiTest {
+
+    protected $file = '';
+
     public function setUp() {
-        $this->file = tempnam('/tmp', 'css');
+        $this->file = tempnam(TMP_DIR, 'css');
     }
 
     private function csstest($input, $output = null, $location = 'http://www.example.com/') {
         io_saveFile($this->file, $input);
-        $this->assertEquals(css_loadfile($this->file, $location), (is_null($output) ? $input : $output));
+        $this->assertEquals((is_null($output) ? $input : $output), css_loadfile($this->file, $location));
     }
 
     public function test_url_relative() {
@@ -32,11 +35,15 @@ class css_css_loadfile_test extends DokuWikiTest {
     public function test_import_relative() {
         $this->csstest('@import "test/test.png";', '@import "http://www.example.com/test/test.png";');
         $this->csstest('@import \'test/test.png\';', '@import \'http://www.example.com/test/test.png\';');
+        $this->csstest('@import url(test/test.png);', '@import url(http://www.example.com/test/test.png);');
+        $this->csstest('@import url("test/test.png");', '@import url("http://www.example.com/test/test.png");');
     }
 
     public function test_import_absolute() {
         $this->csstest('@import "/test/test.png";');
         $this->csstest('@import \'/test/test.png\';');
+        $this->csstest('@import url(/test/test.png);');
+        $this->csstest('@import url("/test/test.png");');
     }
 
     public function test_import_with_protocol() {
@@ -44,6 +51,31 @@ class css_css_loadfile_test extends DokuWikiTest {
         $this->csstest('@import "https://www.test.com/test/test.png";');
         $this->csstest('@import \'http://www.test.com/test/test.png\';');
         $this->csstest('@import \'https://www.test.com/test/test.png\';');
+        $this->csstest('@import url(http://www.test.com/test/test.png);');
+        $this->csstest('@import url("http://www.test.com/test/test.png");');
+    }
+
+    public function test_less_basic() {
+        $this->csstest('@import "test.less"', '@import "/test.less"');
+        $this->csstest('@import "/test.less"', '@import "/test.less"');
+        $this->csstest('@import "foo/test.less"', '@import "/foo/test.less"');
+        $this->csstest('@import url(http://test.less)');
+    }
+
+    // more expected use, where less @import(ed) from e.g. lib/plugins/plugin_name
+    public function test_less_subdirectories() {
+
+        unlink($this->file);
+
+        $dir = TMP_DIR.'/foo/bar';
+        mkdir($dir,0777,true);
+        $this->file = tempnam($dir, 'css');
+
+        $this->csstest('@import "test.less"', '@import "/foo/bar/test.less"');
+        $this->csstest('@import \'test.less\'', '@import \'/foo/bar/test.less\'');
+        $this->csstest('@import url(test.less)', '@import url(/foo/bar/test.less)');
+
+        $this->csstest('@import "abc/test.less"', '@import "/foo/bar/abc/test.less"');
     }
 
     public function tearDown() {