sync - npm Package Compare versions

Comparing version 0.1.3 to 0.1.4

._package.json

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRK����"
�"com.macromates.caret{
+Mac OS X        	2��ATTRK���"
�"com.macromates.caret{
     column = 22;
     line = 3;
 }

._README.md

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRK����$
�$com.macromates.caret{
-    column = 25;
-    line = 105;
+Mac OS X        	2��ATTRK���$
�$com.macromates.caret{
+    column = 31;
+    line = 101;
 }

benchmarks/._simple.js

@@ -1,1 +0,1 @@
-Mac OS X        	2��ATTRK��� 
� com.macromates.caretx���R������<[k0?'3/«��
+Mac OS X        	2��ATTRK���� 
� com.macromates.caretx���R������<[k0?'3/«��

examples/._async.js

@@ -0,0 +0,0 @@ Mac OS X        	2��ATTRK����#
�#com.macromates.caret{

examples/._blocking.js

 Mac OS X        	2��ATTRK���� 
� com.macromates.caretx���R������<[k0?'3/«��

examples/._exceptions.js

 Mac OS X        	2��ATTRK���� 
� com.macromates.caretx���R������<[k0?'3/«��

examples/._fiber.js

@@ -0,0 +0,0 @@ Mac OS X        	2��ATTRK����#
�#com.macromates.caret{

examples/._future.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRK�
��#
�#com.macromates.caret{
-    column = 52;
-    line = 29;
+Mac OS X        	2��ATTRK����#
�#com.macromates.caret{
+    column = 42;
+    line = 43;
 }

examples/._object.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRK���"
�"com.macromates.caret{
+Mac OS X        	2��ATTRK����"
�"com.macromates.caret{
     column = 0;
     line = 11;
 }

examples/._parallel.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRK���"
�"com.macromates.caret{
+Mac OS X        	2��ATTRK����"
�"com.macromates.caret{
     column = 7;
     line = 21;
 }

examples/._simple.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRK���"
�"com.macromates.caret{
+Mac OS X        	2��ATTRK����"
�"com.macromates.caret{
     column = 1;
     line = 14;
 }

examples/._simple2.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRK�	��#
�#com.macromates.caret{
+Mac OS X        	2��ATTRK����#
�#com.macromates.caret{
     column = 13;
     line = 17;
 }

examples/future.js

@@ -24,6 +24,7 @@
     // no-yield here, call asynchronously
+    // this functions executes in parallel
     var foo = someAsyncFunction.future(null, 2, 3);
     var bar = someAsyncFunction.future(null, 4, 4);
     
-    // we are immediately here
+    // we are immediately here, no blocking
     
@@ -36,2 +37,11 @@ // foo, bar - our tickets to the future!
     
+	// Or you can straightly use Sync.Future without wrapper
+	// This call doesn't blocks
+	someAsyncFunction(2, 3, foo = new Sync.Future());
+	
+	// foo is a ticket
+    console.log(foo); // { [Function: Future] result: [Getter], error: [Getter] }
+
+	// Wait for the result
+	console.log(foo.result); // 5 after 1 sec
 })

lib/._sync.js

 Mac OS X        	2��ATTRK����$
�$com.macromates.caret{
-    column = 43;
-    line = 109;
+    column = 22;
+    line = 213;
 }

lib/sync.js

@@ -123,3 +123,3 @@ /*
  */
-function SyncFuture(fiber)
+function SyncFuture()
 {
@@ -129,3 +129,3 @@ var self = this;
     this.resolved = false;
-    this.fiber = fiber;
+    this.fiber = Fiber.current;
     this.yielding = false;
@@ -135,13 +135,4 @@ this._result = undefined;
     
-    this.ticket = function Future()
+    this.ticket = function Future(err)
     {
-        while (!self.resolved) {
-            self.yielding = true;
-            yield();
-        }
-        if (self._error) throw self._error;
-        return self._result;
-    }
-    
-    this.callback = function syncCallback(err) {
         // forbid to call twice
@@ -182,3 +173,11 @@ if (self.resolved) return;
     
-    this.ticket.__defineGetter__('result', this.ticket);
+    this.ticket.__defineGetter__('result', function(){        
+        while (!self.resolved) {
+            self.yielding = true;
+            yield();
+        }
+        if (self._error) throw self._error;
+        return self._result;
+    });
+    
     this.ticket.__defineGetter__('error', function(){
@@ -200,2 +199,4 @@ if (self._error) {
     this.fiber.futures.push(this.ticket);
+    
+    return this.ticket;
 }
@@ -216,6 +217,6 @@
         obj = args.shift(),
-        future = new SyncFuture(Fiber.current);
+        future = new SyncFuture();
 
-    // virtual callback, push it as last argument
-    args.push(future.callback);
+    // virtual future callback, push it as last argument
+    args.push(future);
     
@@ -225,3 +226,3 @@ // call async function
     
-    return future.ticket;
+    return future;
 }
@@ -228,0 +229,0 @@

package.json

 {
     "name": "sync",
     "description": "Library that makes simple to run asynchronous functions in synchronous manner, using node-fibers.",
-    "version": "v0.1.3",
+    "version": "v0.1.4",
     "url": "http://github.com/octave/node-sync",
@@ -12,4 +12,4 @@ "author": "Yuriy Bogdanov <[e-mail]>",
     "dependencies" : {
-        "fibers": ">=0.2.0"
+        "fibers": ">=0.2.3"
     }
 }

README.md

@@ -93,2 +93,12 @@
 		console.log(foo.result, bar.result, baz.result); // 5 10 20
+		
+		// Or you can straightly use Sync.Future without wrapper
+		// This call doesn't blocks
+		asyncFunction(2, 3, foo = new Sync.Future());
+		
+		// foo is a ticket
+	    console.log(foo); // { [Function: Future] result: [Getter], error: [Getter] }
+	
+		// Wait for the result
+		console.log(foo.result); // 5
 	}
@@ -95,0 +105,0 @@ catch (e) {

test/._async.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRK����#
�#com.macromates.caret{
+Mac OS X        	2��ATTRK���#
�#com.macromates.caret{
     column = 58;
     line = 74;
 }

test/._fiber.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRK����#
�#com.macromates.caret{
+Mac OS X        	2��ATTRK���#
�#com.macromates.caret{
     column = 37;
     line = 57;
 }

test/._future.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRK����$
�$com.macromates.caret{
-    column = 10;
-    line = 157;
+Mac OS X        	2��ATTRK���$
�$com.macromates.caret{
+    column = 28;
+    line = 132;
 }

test/._index.js

@@ -0,0 +0,0 @@ Mac OS X        	2��ATTRK����"
�"com.macromates.caret{

test/._parallel.js

@@ -0,0 +0,0 @@ Mac OS X        	2��ATTRK����#
�#com.macromates.caret{

test/._sleep.js

@@ -0,0 +0,0 @@ Mac OS X        	2��ATTRK����#
�#com.macromates.caret{

test/._sync.js

@@ -0,0 +0,0 @@ Mac OS X        	2��ATTRK����$
�$com.macromates.caret{

test/future.js

@@ -132,2 +132,9 @@ require.paths.unshift(__dirname + '/../lib');
         
+        // test straight Sync.Future usage
+        asyncFunction(2, 3, future = new Sync.Future());
+        // check error
+        assert.strictEqual(future.error, null);
+        // check future result
+        assert.equal(future.result, 2 + 3);
+        
         // test two futures goes in parallel
@@ -134,0 +141,0 @@ var start = new Date();

New alerts

Manifest confusion

Supply chain risk

This package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.

Found 1 instance in 1 package

Fixed alerts

Manifest confusion

Supply chain risk

This package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

51923

increased by1.76%

Lines of code

1275

increased by1.11%

Number of lines in readme file

116

increased by9.43%

Dependency changes

• Updatedfibers@>=0.2.3