#3 add more compileX methods to LessCompiler

Author: agabrys

pom.xml

@@ -95,7 +95,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.7.2</version>
+            <version>2.7.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -187,7 +187,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.7.8</version>
+                    <version>0.7.9</version>
                     <configuration>
                         <rules>
                             <rule>

src/main/java/biz/gabrys/lesscss/compiler2/ImportNotFoundException.java

@@ -61,8 +61,8 @@ public LessCompilerOptions(final LessCompilerOptions options) {
         compressionEnabled = options.compressionEnabled;
         ieCompatabilityEnabled = options.ieCompatabilityEnabled;
         javaScriptAllowed = options.javaScriptAllowed;
-        includePaths = options.includePaths == null ? Collections.<String>emptyList() : new ArrayList<String>(options.includePaths);
-        lineNumbers = options.lineNumbers == null ? LineNumbersValue.DISABLED : options.lineNumbers;
+        includePaths = new ArrayList<String>(options.includePaths);
+        lineNumbers = options.lineNumbers;
         rootPath = options.rootPath;
         relativeUrlsRewriteEnabled = options.relativeUrlsRewriteEnabled;
         strictMathEnabled = options.strictMathEnabled;

src/main/java/biz/gabrys/lesscss/compiler2/LessCompiler.java

@@ -32,7 +32,7 @@
 import org.mozilla.javascript.ScriptableObject;
 import org.mozilla.javascript.tools.shell.Global;
 
-import biz.gabrys.lesscss.compiler2.util.IOUtils;
+import biz.gabrys.lesscss.compiler2.util.io.IOUtils;
 
 /**
  * <p>
@@ -111,8 +111,8 @@ public NativeLessCompiler() {
      * @return the compiler output (depends on options it can be e.g. CSS code, logs).
      * @throws InitializationException if an error occurred during compiler initialization.
      * @throws ConfigurationException if the compiler is configured incorrectly.
-     * @throws ReadFileException if the compiler cannot read file content.
-     * @throws ImportNotFoundException if any &#64;import operation point to non-existent file.
+     * @throws ReadFileException if the compiler cannot read source file or any &#64;import operation point to
+     *             non-existent file.
      * @throws SyntaxException if a syntax error occurred during source file compilation.
      * @throws CompilerException if an other error occurred during execution.
      * @since 2.0.0
@@ -187,8 +187,8 @@ private static CompilerException parseException(final JavaScriptException except
         if (value != null && ScriptableObject.hasProperty(value, "message")) {
             final String message = ScriptableObject.getProperty(value, "message").toString();
 
-            final Iterable<ExceptionConverter> converters = Arrays.asList(new ImportExceptionConverter(),
-                    new ConfigurationExceptionConverter(), new ReadFileExceptionConverter());
+            final Iterable<ExceptionConverter> converters = Arrays.asList(new ImportFileExceptionConverter(),
+                    new ConfigurationExceptionConverter(), new SourceFileExceptionConverter());
 
             for (final ExceptionConverter converter : converters) {
                 final Matcher matcher = converter.getPattern().matcher(message);
@@ -208,16 +208,17 @@ private interface ExceptionConverter {
         CompilerException createException(Exception cause, Matcher matcher, String message);
     }
 
-    private static class ImportExceptionConverter implements ExceptionConverter {
+    private static class ImportFileExceptionConverter implements ExceptionConverter {
 
         @Override
         public Pattern getPattern() {
-            return Pattern.compile("^FileError:\\s+'(.+)'\\s+wasn't\\s+found\\s+(?s).*");
+            return Pattern.compile("^FileError:\\s+'(.+)'\\s+does\\snot\\sexist\\sin\\s((?s).*)$");
         }
 
         @Override
         public CompilerException createException(final Exception cause, final Matcher matcher, final String message) {
-            return new ImportNotFoundException(message, cause, matcher.group(1));
+            return new ReadFileException(String.format("File \"%s\" does not exist. Error in %s", matcher.group(1), matcher.group(2)),
+                    cause, matcher.group(1));
         }
     }
 
@@ -234,11 +235,11 @@ public CompilerException createException(final Exception cause, final Matcher ma
         }
     }
 
-    private static class ReadFileExceptionConverter implements ExceptionConverter {
+    private static class SourceFileExceptionConverter implements ExceptionConverter {
 
         @Override
         public Pattern getPattern() {
-            return Pattern.compile("^Couldn't open source file: (.*)");
+            return Pattern.compile("^Couldn't open file (.*)");
         }
 
         @Override

src/main/java/biz/gabrys/lesscss/compiler2/LessCompilerOptions.java

@@ -56,7 +56,7 @@ public NativeLessCompilerOptionsBuilder() {
      * <li>{@link #withIeCompatability(boolean)}</li>
      * <li>{@link #withJavaScript(boolean)}</li>
      * <li>{@link #withIncludePaths(List)}</li>
-     * <li>{@link #withLineNumbers(LineNumbersValue)}</li>
+     * <li>{@link #withLineNumbers(LessCompilerOptions.LineNumbersValue)}</li>
      * <li>{@link #withRootPath(String)}</li>
      * <li>{@link #withRelativeUrls(boolean)}</li>
      * <li>{@link #withStrictMath(boolean)}</li>

src/main/java/biz/gabrys/lesscss/compiler2/NativeLessCompiler.java

@@ -10,10 +10,13 @@
  *  - a copy of the License at project page
  *  - a template of the License at https://opensource.org/licenses/BSD-3-Clause
  */
-package biz.gabrys.lesscss.compiler2.util;
+package biz.gabrys.lesscss.compiler2.util.io;
 
 import java.io.Closeable;
+import java.io.File;
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
 
 /**
  * Provides tools for working with I/O.
@@ -40,4 +43,29 @@ public static void closeQuietly(final Closeable closeable) {
             // do nothing
         }
     }
+
+    /**
+     * Writes a content to a file.
+     * @param file the file (cannot be {@code null}).
+     * @param content the content (cannot be {@code null}).
+     * @throws IllegalArgumentException if the file or the content is {@code null}.
+     * @throws IOException if an I/O error occurs.
+     * @since 2.0.0
+     */
+    public static void write(final File file, final CharSequence content) throws IOException {
+        if (file == null) {
+            throw new IllegalArgumentException("File cannot be null");
+        }
+        if (content == null) {
+            throw new IllegalArgumentException("Content cannot be null");
+        }
+
+        Writer writer = null;
+        try {
+            writer = new PrintWriter(file, "UTF-8");
+            writer.write(content.toString());
+        } finally {
+            IOUtils.closeQuietly(writer);
+        }
+    }
 }

src/main/java/biz/gabrys/lesscss/compiler2/NativeLessCompilerOptionsBuilder.java

@@ -0,0 +1,39 @@
+/*
+ * LessCSS Compiler
+ * http://lesscss-compiler.projects.gabrys.biz/
+ *
+ * Copyright (c) 2015 Adam Gabryś
+ *
+ * This file is licensed under the BSD 3-Clause (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain:
+ *  - a copy of the License at project page
+ *  - a template of the License at https://opensource.org/licenses/BSD-3-Clause
+ */
+package biz.gabrys.lesscss.compiler2.util.io;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Responsible for creating temporary files in a system default temporary directory.
+ * @since 2.0.0
+ */
+public class SystemDefaultTemporaryFileFactory implements TemporaryFileFactory {
+
+    /**
+     * The prefix string used in generating the temporary files names.
+     * @since 2.0.0
+     */
+    public static final String FILENAME_PREFIX = "gabrys-lesscss-compiler-";
+    /**
+     * The suffix string used in generating the temporary files names.
+     * @since 2.0.0
+     */
+    public static final String FILENAME_SUFFIX = ".less";
+
+    @Override
+    public File create() throws IOException {
+        return File.createTempFile(FILENAME_PREFIX, FILENAME_SUFFIX);
+    }
+}

src/main/java/biz/gabrys/lesscss/compiler2/util/IOUtils.java renamed to src/main/java/biz/gabrys/lesscss/compiler2/util/io/IOUtils.java

@@ -0,0 +1,31 @@
+/*
+ * LessCSS Compiler
+ * http://lesscss-compiler.projects.gabrys.biz/
+ *
+ * Copyright (c) 2015 Adam Gabryś
+ *
+ * This file is licensed under the BSD 3-Clause (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain:
+ *  - a copy of the License at project page
+ *  - a template of the License at https://opensource.org/licenses/BSD-3-Clause
+ */
+package biz.gabrys.lesscss.compiler2.util.io;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Responsible for creating temporary files.
+ * @since 2.0.0
+ */
+public interface TemporaryFileFactory {
+
+    /**
+     * Creates a temporary file.
+     * @return the temporary file.
+     * @throws IOException if the temporary file could not be created.
+     * @since 2.0.0
+     */
+    File create() throws IOException;
+}

src/main/java/biz/gabrys/lesscss/compiler2/util/io/SystemDefaultTemporaryFileFactory.java

@@ -0,0 +1,17 @@
+/*
+ * LessCSS Compiler
+ * http://lesscss-compiler.projects.gabrys.biz/
+ *
+ * Copyright (c) 2015 Adam Gabryś
+ *
+ * This file is licensed under the BSD 3-Clause (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain:
+ *  - a copy of the License at project page
+ *  - a template of the License at https://opensource.org/licenses/BSD-3-Clause
+ */
+/**
+ * Utilities classes responsible for operating on files.
+ * @since 2.0.0
+ */
+package biz.gabrys.lesscss.compiler2.util.io;

src/main/java/biz/gabrys/lesscss/compiler2/util/io/TemporaryFileFactory.java

@@ -11,7 +11,7 @@
  *  - a template of the License at https://opensource.org/licenses/BSD-3-Clause
  */
 /**
- * Utilities classes responsible for operating on strings, files, collections etc.
+ * Utilities classes responsible for operating on strings and collections.
  * @since 2.0.0
  */
 package biz.gabrys.lesscss.compiler2.util;

src/main/java/biz/gabrys/lesscss/compiler2/util/io/package-info.java

@@ -98,7 +98,7 @@ less.Parser.fileLoader = function(file, currentFileInfo, callback, env) {
     } catch (e) {
         callback({
             type: 'File',
-            message: "'" + less.modules.path.basename(href) + "' wasn't found"
+            message: "'" + less.modules.path.basename(href) + "' does not exist"
         });
         return;
     }
@@ -280,7 +280,7 @@ function writeFile(filename, content) {
     try {
         input = readFile(source, 'utf-8');
     } catch (e) {
-        throw new Error('Couldn\'t open source file: ' + source);
+        throw new Error('Couldn\'t open file ' + source);
     }
 
     options.filename = source;