Merge pull request #501 from kevva/minor-fixes

Minor tweaks

lib/index.js

@@ -110,7 +110,7 @@ function getStyle(options) {
 function getSourceMap(options) {
   var file = options.file;
   var outFile = options.outFile;
-  var sourceMap = options.sourceMap;
+  var sourceMap = options.sourceMap || null;
 
   if (sourceMap) {
     if (typeof sourceMap !== 'string') {
@@ -275,7 +275,7 @@ module.exports.renderFile = function(options) {
   var success = options.success;
 
   if (options.sourceMap === true) {
-    options.sourceMap = options.outFile + '.map';
+    options.sourceMap = outFile + '.map';
   }
 
   options.success = function(css, sourceMap) {
@@ -285,10 +285,10 @@ module.exports.renderFile = function(options) {
       }
 
       if (!options.sourceMap) {
-        return success(options.outFile);
+        return success(outFile);
       }
 
-      var dir = path.dirname(options.outFile);
+      var dir = path.dirname(outFile);
       var sourceMapFile = path.resolve(dir, options.sourceMap);
 
       fs.writeFile(sourceMapFile, sourceMap, function(err) {
@@ -296,7 +296,7 @@ module.exports.renderFile = function(options) {
           return options.error(err);
         }
 
-        success(options.outFile, sourceMapFile);
+        success(outFile, sourceMapFile);
       });
     });
   };