Merge pull request #9 from deanmao/master

added callback support

README.md

@@ -6,13 +6,12 @@ Node bindings to libsass
 
 ## Install
 
-    cd libsass && make && cd ..
-    node-waf configure && node-waf build
+    npm install
 
 ## Usage
 
     var sass = require('./sass');
-    sass.render('body{background:blue; a{color:black;}}', function(css){
+    sass.render('body{background:blue; a{color:black;}}', function(err, css){
       console.log(css)
     });
 

binding.cpp

 #include <v8.h>
 #include <node.h>
+#include <string>
+#include <cstdlib>
 #include "libsass/sass_interface.h"
 
 using namespace v8;
 
+void WorkOnContext(uv_work_t* req) {
+    sass_context* ctx = static_cast<sass_context*>(req->data);
+    sass_compile(ctx);
+}
+
+void MakeCallback(uv_work_t* req) {
+    HandleScope scope;
+    TryCatch try_catch;
+    sass_context* ctx = static_cast<sass_context*>(req->data);
+
+    if (ctx->error_status == 0) {
+        // if no error, do callback(null, result)
+        const unsigned argc = 2;
+        Local<Value> argv[argc] = {
+            Local<Value>::New(Null()),
+            Local<Value>::New(String::New(ctx->output_string))
+        };
+
+        ctx->callback->Call(Context::GetCurrent()->Global(), argc, argv);
+    } else {
+        // if error, do callback(error)
+        const unsigned argc = 1;
+        Local<Value> argv[argc] = {
+            Local<Value>::New(String::New(ctx->error_message))
+        };
+
+        ctx->callback->Call(Context::GetCurrent()->Global(), argc, argv);
+    }
+    if (try_catch.HasCaught()) {
+        node::FatalException(try_catch);
+    }
+}
+
 Handle<Value> Render(const Arguments& args) {
     HandleScope scope;
-    struct sass_context* ctx = sass_new_context();
+    sass_context* ctx = sass_new_context();
     String::AsciiValue astr(args[0]);
-    char * cs = *astr;
+    Local<Function> callback = Local<Function>::Cast(args[1]);
 
-    ctx->source_string = cs;
+    ctx->source_string = new char[strlen(*astr)+1];
+    strcpy(ctx->source_string, *astr);
     ctx->options.include_paths = 0;
     ctx->options.output_style = SASS_STYLE_NESTED;
+    ctx->callback = Persistent<Function>::New(callback);
+    ctx->request.data = ctx;
 
-    sass_compile(ctx);
+    int status = uv_queue_work(uv_default_loop(), &ctx->request, WorkOnContext, MakeCallback);
+    assert(status == 0);
 
-    return scope.Close(String::New(ctx->output_string));
+    return Undefined();
 }
 
 void RegisterModule(v8::Handle<v8::Object> target) {

lib/middleware.js

@@ -99,8 +99,8 @@ module.exports = function(options){
           var style = options.compile();
           var paths = [];
           delete imports[sassPath];
-          style.render(str, function(css){
-            // if (err) return next(err);
+          style.render(str, function(err, css){
+            if (err) return next(err);
             if (debug) log('render', sassPath);
             imports[sassPath] = paths;
             mkdirp(dirname(cssPath), 0700, function(err){

libsass/context.cpp

@@ -124,3 +124,4 @@ namespace Sass {
   }
 
 }
+

libsass/context.hpp

@@ -63,3 +63,4 @@ namespace Sass {
   };
 
 }
+

libsass/document.cpp

@@ -121,3 +121,4 @@ namespace Sass {
     return retval;
   }
 }
+

libsass/document.hpp

@@ -173,3 +173,4 @@ namespace Sass {
 
   };
 }
+

libsass/document_parser.cpp

@@ -976,3 +976,4 @@ namespace Sass {
   }
 
 }
+

libsass/error.hpp

@@ -15,3 +15,4 @@ namespace Sass {
   };
 
 }
+

libsass/eval_apply.cpp

@@ -855,3 +855,4 @@ namespace Sass {
   { return selector_but(sel, new_Node, 0, 1); }
 
 }
+

libsass/eval_apply.hpp

@@ -29,3 +29,4 @@ namespace Sass {
   Node selector_butlast(Node sel, Node_Factory& new_Node);
 
 }
+

libsass/functions.cpp

@@ -648,3 +648,4 @@ namespace Sass {
 
   }
 }
+

libsass/functions.hpp

@@ -156,3 +156,4 @@ namespace Sass {
   }
 
 }
+

libsass/node.cpp

@@ -319,3 +319,4 @@ namespace Sass {
   }
 
 }
+

libsass/node.hpp

@@ -390,3 +390,4 @@ namespace Sass {
   inline bool Node::is_null_ptr() const { return !ip_; }
 
 }
+

libsass/node_emitters.cpp

@@ -406,3 +406,4 @@ namespace Sass {
   void Node::echo(stringstream& buf, size_t depth) { }
   void Node::emit_expanded_css(stringstream& buf, const string& prefix) { }
 }
+

libsass/node_factory.cpp

@@ -85,3 +85,4 @@ namespace Sass {
   { for (size_t i = 0, S = pool_.size(); i < S; ++i) delete pool_[i]; }
 
 }
+

libsass/node_factory.hpp

@@ -35,3 +35,4 @@ namespace Sass {
   };
 
 }
+

libsass/prelexer.cpp

@@ -368,3 +368,4 @@ namespace Sass {
     }
   }
 }
+

libsass/prelexer.hpp

@@ -436,3 +436,4 @@ namespace Sass {
 
   }
 }
+

libsass/sass_interface.cpp

@@ -130,3 +130,4 @@ extern "C" {
   }
 
 }
+

libsass/sass_interface.h

+#include <node.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -18,6 +20,8 @@ struct sass_context {
   struct sass_options options;
   int error_status;
   char* error_message;
+  uv_work_t request;
+  v8::Persistent<v8::Function> callback;
 };
 
 struct sass_file_context {
@@ -51,3 +55,4 @@ int sass_compile_folder     (struct sass_folder_context* ctx);
 #ifdef __cplusplus
 }
 #endif
+

libsass/test_node_factory.cpp

@@ -93,3 +93,4 @@ int main()
   new_Node.free();
   return 0;
 }
+

sass.js

 var binding = require('./build/Release/binding')
 
-var render = function(str, cb){
-  cb(binding.render(str))
-}
-
-exports.render = render
+exports.render = binding.render
 exports.middleware = require('./lib/middleware');