Merge pull request #203 from nschonni/revert-breaking-build

Revert "merge in sourceMap support"

lib/cli.js

@@ -14,9 +14,6 @@ var optimist = require('optimist')
     describe: 'Include debug info in output (none|normal|map)',
     'default': 'none'
   })
-  .options('source-map', {
-    describe: 'Emit source map'
-  })
   .options('include-path', {
     describe: 'Path to look for @import-ed files',
     'default': cwd
@@ -102,16 +99,6 @@ exports = module.exports = function(args) {
     options.sourceComments = options.sourceComments[0];
   }
 
-  // set source map file and set sourceComments to 'map'
-  if (argv['source-map']) {
-    options.sourceComments = 'map';
-    if (argv['source-map'] === true) {
-      options.sourceMap = outFile + '.map';
-    } else {
-      options.sourceMap = path.resolve(cwd, argv['source-map']);
-    }
-  }
-
   if (argv.w) {
 
     var watchDir = argv.w;

lib/render.js

@@ -9,15 +9,7 @@ function render(options, emitter) {
     includePaths: options.includePaths,
     outputStyle: options.outputStyle,
     sourceComments: options.sourceComments,
-    sourceMap: options.sourceMap,
-    success: function(css, sourceMap) {
-
-      var todo = 1;
-      var done = function() {
-        if (--todo <= 0) {
-          emitter.emit('done');
-        }
-      };
+    success: function(css) {
 
       emitter.emit('warn', chalk.green('Rendering Complete, saving .css file...'));
 
@@ -25,19 +17,8 @@ function render(options, emitter) {
         if (err) { return emitter.emit('error', chalk.red('Error: ' + err)); }
         emitter.emit('warn', chalk.green('Wrote CSS to ' + options.outFile));
         emitter.emit('write', err, options.outFile, css);
-        done();
       });
 
-      if (options.sourceMap) {
-        todo++;
-        fs.writeFile(options.sourceMap, sourceMap, function(err) {
-          if (err) {return emitter.emit('error', chalk.red('Error' + err)); }
-          emitter.emit('warn', chalk.green('Wrote Source Map to ' + options.sourceMap));
-          emitter.emit('write-source-map', err, options.sourceMap, sourceMap);
-          done();
-        });
-      }
-
       if (options.stdout) {
         emitter.emit('log', css);
       }

sass.js

 var binding;
 var fs = require('fs');
+var path = require('path');
+
+var v8 = 'v8-' + /[0-9]+\.[0-9]+/.exec(process.versions.v8)[0];
+var modPath = path.join(__dirname, 'bin', process.platform + '-' + process.arch + '-' + v8, 'binding');
 try {
   if (fs.realpathSync(__dirname + '/build')) {
     // use the build version if it exists
     binding = require(__dirname + '/build/Release/binding');
   }
 } catch (e) {
-  // default to a precompiled binary if no build exists
-  var platform_full = process.platform+'-'+process.arch;
-  binding = require(__dirname + '/precompiled/'+platform_full+'/binding');
-}
-if (binding === null) {
-  throw new Error('Cannot find appropriate binary library for node-sass');
+  try {
+    fs.realpathSync(modPath + '.node');
+    binding = require(modPath);
+  } catch (ex) {
+    // No binary!
+    throw new Error('`'+ modPath + '.node` is missing. Try reinstalling `node-sass`?');
+  }
 }
 
 var SASS_OUTPUT_STYLE = {
@@ -29,11 +34,11 @@ var SASS_SOURCE_COMMENTS = {
 };
 
 var prepareOptions = function(options) {
-  var paths, style, comments;
-  options = typeof options !== 'object' ? {} : options;
-  paths = options.include_paths || options.includePaths || [];
-  style = SASS_OUTPUT_STYLE[options.output_style || options.outputStyle] || 0;
-  comments = SASS_SOURCE_COMMENTS[options.source_comments || options.sourceComments] || 0;
+  var paths, style;
+  var options = typeof options !== 'object' ? {} : options;
+  var paths = options.include_paths || options.includePaths || [];
+  var style = SASS_OUTPUT_STYLE[options.output_style || options.outputStyle] || 0;
+  var comments = SASS_SOURCE_COMMENTS[options.source_comments || options.sourceComments] || 0;
 
   return {
     paths: paths,
@@ -44,13 +49,7 @@ var prepareOptions = function(options) {
 
 var deprecatedRender = function(css, callback, options) {
   options = prepareOptions(options);
-  var errCallback = function(err) {
-    callback(err);
-  };
-  var oldCallback = function(css, err) {
-    callback(null, css);
-  };
-  return binding.render(css, oldCallback, errCallback, options.paths.join(':'), options.style, options.comments);
+  return binding.oldRender(css, callback, options.paths.join(':'), options.style, options.comments);
 };
 
 var deprecatedRenderSync = function(css, options) {
@@ -69,11 +68,11 @@ exports.render = function(options) {
   options.error = options.error || function(){};
 
   if (options.file !== undefined && options.file !== null) {
-    return binding.renderFile(options.file, options.success, options.error, newOptions.paths.join(':'), newOptions.style, newOptions.comments, options.sourceMap);
+    return binding.renderFile(options.file, options.success, options.error, newOptions.paths.join(path.delimiter), newOptions.style, newOptions.comments);
   }
 
   //Assume data is present if file is not. binding/libsass will tell the user otherwise!
-  return binding.render(options.data, options.success, options.error, newOptions.paths.join(":"), newOptions.style);
+  return binding.render(options.data, options.success, options.error, newOptions.paths.join(path.delimiter), newOptions.style);
 };
 
 exports.renderSync = function(options) {
@@ -86,11 +85,11 @@ exports.renderSync = function(options) {
   newOptions = prepareOptions(options);
 
   if (options.file !== undefined && options.file !== null) {
-    return binding.renderFileSync(options.file, newOptions.paths.join(':'), newOptions.style, newOptions.comments);
+    return binding.renderFileSync(options.file, newOptions.paths.join(path.delimiter), newOptions.style, newOptions.comments);
   }
 
   //Assume data is present if file is not. binding/libsass will tell the user otherwise!
-  return binding.renderSync(options.data, newOptions.paths.join(":"), newOptions.style);
+  return binding.renderSync(options.data, newOptions.paths.join(path.delimiter), newOptions.style);
 };
 
 exports.middleware = require('./lib/middleware');

sass_context_wrapper.cpp

@@ -12,7 +12,21 @@ extern "C" {
   void sass_free_context_wrapper(sass_context_wrapper* ctx_w)
   {
     if (ctx_w->ctx) sass_free_context(ctx_w->ctx);
-    if (ctx_w->fctx) sass_free_file_context(ctx_w->fctx);
+
+    delete ctx_w->callback;
+    delete ctx_w->errorCallback;
+
+    free(ctx_w);
+  }
+
+  sass_file_context_wrapper* sass_new_file_context_wrapper()
+  {
+    return (sass_file_context_wrapper*) calloc(1, sizeof(sass_file_context_wrapper));
+  }
+
+  void sass_free_file_context_wrapper(sass_file_context_wrapper* ctx_w)
+  {
+    if (ctx_w->ctx) sass_free_file_context(ctx_w->ctx);
 
     delete ctx_w->callback;
     delete ctx_w->errorCallback;

sass_context_wrapper.h

@@ -7,7 +7,6 @@ extern "C" {
 
 struct sass_context_wrapper {
   sass_context* ctx;
-  sass_file_context* fctx;
   uv_work_t request;
   NanCallback* callback;
   NanCallback* errorCallback;
@@ -16,6 +15,16 @@ struct sass_context_wrapper {
 struct sass_context_wrapper*      sass_new_context_wrapper(void);
 void sass_free_context_wrapper(struct sass_context_wrapper* ctx);
 
+struct sass_file_context_wrapper {
+  sass_file_context* ctx;
+  uv_work_t request;
+  NanCallback* callback;
+  NanCallback* errorCallback;
+};
+
+struct sass_file_context_wrapper*      sass_new_file_context_wrapper(void);
+void sass_free_file_context_wrapper(struct sass_file_context_wrapper* ctx);
+
 #ifdef __cplusplus
 }
 #endif

test/cli.js

@@ -103,40 +103,4 @@ describe('cli', function() {
     });
   });
 
-  it('should compile with the --source-map option', function(done){
-    var emitter = cli([path.join(__dirname, 'sample.scss'), '--source-map']);
-    emitter.on('error', done);
-    emitter.on('write-source-map', function(err, file) {
-      assert.equal(file, path.join(__dirname, '../sample.css.map'));
-      fs.exists(file, function(exists) {
-        assert(exists);
-      });
-    });
-    emitter.on('done', function() {
-      fs.unlink(path.join(__dirname, '../sample.css.map'), function() {
-        fs.unlink(path.join(__dirname, '../sample.css'), function() {
-          done();
-        });
-      });
-    });
-  });
-
-  it('should compile with the --source-map option with specific filename', function(done){
-    var emitter = cli([path.join(__dirname, 'sample.scss'), '--source-map', path.join(__dirname, '../sample.map')]);
-    emitter.on('error', done);
-    emitter.on('write-source-map', function(err, file) {
-      assert.equal(file, path.join(__dirname, '../sample.map'));
-      fs.exists(file, function(exists) {
-        assert(exists);
-      });
-    });
-    emitter.on('done', function() {
-      fs.unlink(path.join(__dirname, '../sample.map'), function() {
-        fs.unlink(path.join(__dirname, '../sample.css'), function() {
-          done();
-        });
-      });
-    });
-  });
-
 });