Fixed Less @import and tests.

Pawka · Dec 30, 2013 · cdf85cf · cdf85cf
1 parent ce9b883
commit cdf85cf
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 37 deletions.
diff --git a/Phrozn/Processor/Less.php b/Phrozn/Processor/Less.php
@@ -38,13 +38,6 @@ class Less
      */
     protected $lessc;
 
-    /**
-     * The path where the LESS compiler will search for @import directives
-     *
-     * @var string
-     */
-    protected $lessImportDir;
-
     /**
      * If configuration options are passes then twig environment
      * is initialized right away
@@ -61,16 +54,6 @@ public function __construct($options = array())
         }
     }
 
-    /**
-     * Store the input file if given
-     *
-     * @param $options
-     */
-    public function setLessImportDir($lessImportDir)
-    {
-        $this->lessImportDir = $lessImportDir;
-    }
-
     /**
      * Parse the incoming template
      *

diff --git a/Phrozn/Site/View/Less.php b/Phrozn/Site/View/Less.php
@@ -78,22 +78,6 @@ public function setInputFile($path)
         return $this;
     }
 
-    /**
-     * Set the input file into processors configuration
-     *
-     * @param $inputFile
-     */
-    public function setInputFile($inputFile)
-    {
-        if (null !== $processors = $this->getProcessors()) {
-            foreach ($processors as $processor) {
-                $processor->setLessImportDir(dirname($inputFile));
-            }
-        }
-
-        return parent::setInputFile($inputFile);
-    }
-
     /**
      * Get output file path
      *

diff --git a/configs/phrozn.yml b/configs/phrozn.yml
@@ -2,7 +2,7 @@
 ---
 name: Phrozn
 summary: Static web-site generator for PHP.
-description: &desc Phrozn is extremely flexible static site generator for PHP.
+description: &desc Phrozn is an extremely flexible static site generator for PHP.
 version: &ver "0.5.6DEV"
 stability: beta
 author: Victor Farazdagi

diff --git a/tests/Phrozn/Processor/LessTest.php b/tests/Phrozn/Processor/LessTest.php
@@ -57,10 +57,12 @@ public function testRenderImportLessDirective()
         $expectedResult = file_get_contents($this->path . 'tpl1.css');
 
         $processor = new Processor();
-        $processor->setLessImportDir($this->path);
+        $processor->setConfig(array(
+            'phr_template_dir' => $this->path
+        ));
 
         $rendered = $processor->render($tpl);
-        $this->assertSame($rendered, $expectedResult);
+        $this->assertSame(trim($rendered), trim($expectedResult));
     }
 
 }
diff --git a/tests/Phrozn/Processor/templates/tpl1.less b/tests/Phrozn/Processor/templates/tpl1.less
@@ -49,4 +49,3 @@ h2 {
         background: @color3;
     }
 }
-