Merge pull request #201 from nschonni/revert-refactor-for-reapplication

Revert "major refactor" for reapplication of PRs

README.md

@@ -120,10 +120,10 @@ Check out the project:
 
     git clone https://github.com/andrew/node-sass.git
     cd node-sass
-    npm install
-    npm install -g node-gyp
     git submodule init
     git submodule update
+    npm install
+    npm install -g node-gyp
     node-gyp rebuild
 
 Replace the prebuild binary with your newly generated one

binding.gyp

@@ -6,6 +6,7 @@
         'binding.cpp',
         'sass_context_wrapper.cpp',
         'libsass/ast.cpp',
+        'libsass/base64vlq.cpp',
         'libsass/bind.cpp',
         'libsass/constants.cpp',
         'libsass/context.cpp',
@@ -29,8 +30,12 @@
         'libsass/to_string.cpp',
         'libsass/units.cpp'
       ],
+      'include_dirs': [
+        '<!(node -e "require(\'nan\')")'
+      ],
       'cflags!'   : [ '-fno-exceptions' ],
       'cflags_cc!': [ '-fno-exceptions' ],
+      'cflags_cc' : [ '-fexceptions', '-frtti' ],
       'conditions': [
         ['OS=="mac"', {
           'xcode_settings': {
@@ -38,12 +43,6 @@
             'GCC_ENABLE_CPP_RTTI': 'YES',
             'MACOSX_DEPLOYMENT_TARGET': '10.7'
           }
-         }],
-        ['OS=="linux"', {
-          'cflags_cc': [
-            '-fexceptions',
-            '-frtti'
-          ]
          }]
       ]
     }

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);
+    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,24 @@ 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;
 
     free(ctx_w);
   }

sass_context_wrapper.h

 #include "libsass/sass_interface.h"
-#include <node.h>
+#include <nan.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -7,15 +7,24 @@ extern "C" {
 
 struct sass_context_wrapper {
   sass_context* ctx;
-  sass_file_context* fctx;
   uv_work_t request;
-  v8::Persistent<v8::Function> callback;
-  v8::Persistent<v8::Function> errorCallback;
+  NanCallback* callback;
+  NanCallback* errorCallback;
 };
 
 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.js

@@ -10,20 +10,7 @@ var scssStr = '#navbar {\
     a {\
       font-weight: bold; }}';
 
-//sass.render(scssStr, function(err, css){
-  //console.log(css)
-//})
+sass.render(scssStr, function(err, css){
+  console.log(css)
+})
 
-//console.log(sass.renderSync(scssStr));
-console.log(sass.renderSync(scssStr));
-
-//console.log(sass.renderSync({
-      //file: './test/sample.scss'
-//}));
-
-
-sass.render({
-  file: './test/sample.scss'
-}, function(output) {
-  console.log(output);
-});