sinatra-rocketio-linda 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0294f5d3a02665a4a387de3e3881901f5d7f6608
-  data.tar.gz: c09d1bb3e75e86f21f3076970865596362be56f0
+  metadata.gz: 80ea427ebe1d5b5567614294e23521c21878ea81
+  data.tar.gz: 9939c563e0d718a87ad755187efd8c8eb3452b4c
 SHA512:
-  metadata.gz: 11388a5aa10b0a23ee081d3ddc12d25bfa5744d2bbb274aba6f2b98aa4368fe0f3e5a3953da9ff145943203b1346b1d9d819527dde0e6cf3b8a5e4cd94fbac59
-  data.tar.gz: 4b29d75a5a3c4b744f00671ca5e40ac7fad9a150a486177ffad010af44f03fdcbf3407e0a05a851df73aa590c47f510ecdf8bf1d1d4364223c32ebf4c260cde3
+  metadata.gz: 62affc882c4199c103f37c6788d277748d6517140dd1d9e8c696530899981e10f8f5a40c9b2e540a00defc90cc1f001a1858480ca370851a036fda89000c1f23
+  data.tar.gz: 31bfd9e8adb98c70eac4578d130455eda41bfd3486a3e80c6e9f34386492dd959cac334ac95063ecb238437ca3aace28bf0cc4017d03100a5f04a321d80ba683

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.0 2013-10-03
+
+* !!! protocol was updated
+
 === 0.2.0 2013-06-10
 
 * changed linda-rocketio command options

data/README.md

@@ -89,7 +89,7 @@ $("#btn_request").click(function(){
 
 // wait result
 var take_result = function(){
-  ts.take(["calc_result"], function(tuple){
+  ts.take(["calc_result"], function(tuple, info){
     var result = tuple[1]; // from 'worker' side
     console.log(result);
     take_result(); // recursive call
@@ -106,7 +106,7 @@ var ts = new linda.TupleSpace("calc");
 
 // calculate
 var calc = function(){
-  ts.take(["calc_request"], function(tuple){
+  ts.take(["calc_request"], function(tuple, info){
     var query = tuple[1]; // => "1-2+3*4"
     var result = eval(query);
     console.log(query+" = "+result); // => "1-2+3*4 = 11"
@@ -129,7 +129,7 @@ ts = linda.tuplespace["calc"]
 
 ## calculate
 calc = lambda{
-  ts.take ["calc_request"] do |tuple|
+  ts.take ["calc_request"] do |tuple, info|
     query = tuple[1] ## => "1-2+3*4"
     result = eval(query)
     puts "calc: #{query} = #{result}" ## => "1-2+3*4 = 11"

data/Rakefile

@@ -1,3 +1,4 @@
+require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
 

data/lib/js/linda.js

@@ -25,21 +25,27 @@ var Linda = function(io, opts){
       if(tuple === null || typeof tuple !== "object") return;
       if(typeof callback !== "function") return;
       var callback_id = make_callback_id();
-      self.io.once("__linda_read_callback_"+callback_id, callback);
+      self.io.once("__linda_read_callback_"+callback_id, function(data){
+        callback(data.tuple, data.info);
+      });
       self.io.push("__linda_read", [space.name, tuple, callback_id]);
     };
     this.take = function(tuple, callback){
       if(tuple === null || typeof tuple !== "object") return;
       if(typeof callback !== "function") return;
       var callback_id = make_callback_id();
-      self.io.once("__linda_take_callback_"+callback_id, callback);
+      self.io.once("__linda_take_callback_"+callback_id, function(data){
+        callback(data.tuple, data.info);
+      });
       self.io.push("__linda_take", [space.name, tuple, callback_id]);
     };
     this.watch = function(tuple, callback){
       if(tuple === null || typeof tuple !== "object") return;
       if(typeof callback !== "function") return;
       var callback_id = make_callback_id();
-      self.io.on("__linda_watch_callback_"+callback_id, callback);
+      self.io.on("__linda_watch_callback_"+callback_id, function(data){
+        callback(data.tuple, data.info);
+      });
       self.io.push("__linda_watch", [space.name, tuple, callback_id]);
     };
   };

data/lib/sinatra-rocketio-linda/linda.rb

@@ -48,7 +48,9 @@ Sinatra::RocketIO.on :__linda_write do |data, client|
     end
     opts = opts_
   end
-  Sinatra::RocketIO::Linda[space].write tuple, opts
+  opts[:from] = client.address
+  _tuple = Sinatra::RocketIO::Linda::Tuple.new tuple, opts
+  Sinatra::RocketIO::Linda[space].write _tuple
   Sinatra::RocketIO::Linda.emit :write, Hashie::Mash.new(:space => space, :tuple => tuple), client
 end
 
@@ -65,7 +67,7 @@ end
       next
     end
     callback_id = Sinatra::RocketIO::Linda[space].__send__ func, tuple do |tuple|
-      Sinatra::RocketIO.push "__linda_#{func}_callback_#{callback}", tuple, :to => client.session
+      Sinatra::RocketIO.push "__linda_#{func}_callback_#{callback}", {:tuple => tuple.data, :info => {:from => tuple.from}}, :to => client.session
       Sinatra::RocketIO::Linda.emit func, Hashie::Mash.new(:space => space, :tuple => tuple), client
     end
     Sinatra::RocketIO::Linda.callbacks[client.session].push(:space => space, :callback => callback_id)

data/lib/sinatra-rocketio-linda/tuple.rb

@@ -5,6 +5,13 @@ module Sinatra
     module Linda
       # use linda gem (https://rubygems.org/gems/linda)
       class Tuple < ::Linda::Tuple
+
+        attr_reader :from
+        def initialize(data, opts={})
+          @from = opts[:from] if opts.kind_of? Hash
+          super data, opts
+        end
+
       end
     end
   end

data/lib/sinatra/rocketio/linda/client.rb

@@ -1,11 +1,15 @@
 require File.expand_path 'version', File.dirname(__FILE__)
 require 'event_emitter'
+require 'hashie'
 require 'sinatra/rocketio/client'
 
 module Sinatra
   module RocketIO
     module Linda
 
+      class TupleInfo < Hashie::Mash
+      end
+
       class Client
         attr_reader :io, :tuplespace
         def initialize(io_or_url)
@@ -46,8 +50,12 @@ module Sinatra
             unless [Hash, Array].include? tuple.class
               raise ArgumentError, "tuple must be Array or Hash"
             end
-            callback_id = "#{Time.now.to_i}#{Time.now.usec}_#{(rand*1000000).to_i}"
-            @linda.io.once "__linda_read_callback_#{callback_id}", &block
+            callback_id = create_callback_id
+            if block_given?
+              @linda.io.once "__linda_read_callback_#{callback_id}" do |data|
+                block.call(data['tuple'], TupleInfo.new(data['info']))
+              end
+            end
             @linda.io.push "__linda_read", [@name, tuple, callback_id]
           end
 
@@ -55,8 +63,12 @@ module Sinatra
             unless [Hash, Array].include? tuple.class
               raise ArgumentError, "tuple must be Array or Hash"
             end
-            callback_id = "#{Time.now.to_i}#{Time.now.usec}_#{(rand*1000000).to_i}"
-            @linda.io.once "__linda_take_callback_#{callback_id}", &block
+            callback_id = create_callback_id
+            if block_given?
+              @linda.io.once "__linda_take_callback_#{callback_id}" do |data|
+                block.call(data['tuple'], TupleInfo.new(data['info']))
+              end
+            end
             @linda.io.push "__linda_take", [@name, tuple, callback_id]
           end
 
@@ -64,11 +76,20 @@ module Sinatra
             unless [Hash, Array].include? tuple.class
               raise ArgumentError, "tuple must be Array or Hash"
             end
-            callback_id = "#{Time.now.to_i}#{Time.now.usec}_#{(rand*1000000).to_i}"
-            @linda.io.on "__linda_watch_callback_#{callback_id}", &block
+            callback_id = create_callback_id
+            if block_given?
+              @linda.io.on "__linda_watch_callback_#{callback_id}" do |data|
+                block.call(data['tuple'], TupleInfo.new(data['info']))
+              end
+            end
             @linda.io.push "__linda_watch", [@name, tuple, callback_id]
           end
 
+          private
+          def create_callback_id
+            "#{Time.now.to_i}#{Time.now.usec}_#{(rand*1000000).to_i}"
+          end
+
         end
 
       end

data/lib/sinatra/rocketio/linda/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module RocketIO
     module Linda
-      VERSION = "0.2.0"
+      VERSION = "1.0.0"
     end
   end
 end

data/linda.js

@@ -1,4 +1,4 @@
-// Linda.js v0.2.0 (rocketio v0.2.6)
+// Linda.js v1.0.0 (rocketio v0.3.0)
 // https://github.com/shokai/sinatra-rocketio-linda
 // (c) 2013 Sho Hashimoto <hashimoto@shokai.org>
 // The MIT License
@@ -29,21 +29,27 @@ var Linda = function(io, opts){
       if(tuple === null || typeof tuple !== "object") return;
       if(typeof callback !== "function") return;
       var callback_id = make_callback_id();
-      self.io.once("__linda_read_callback_"+callback_id, callback);
+      self.io.once("__linda_read_callback_"+callback_id, function(data){
+        callback(data.tuple, data.info);
+      });
       self.io.push("__linda_read", [space.name, tuple, callback_id]);
     };
     this.take = function(tuple, callback){
       if(tuple === null || typeof tuple !== "object") return;
       if(typeof callback !== "function") return;
       var callback_id = make_callback_id();
-      self.io.once("__linda_take_callback_"+callback_id, callback);
+      self.io.once("__linda_take_callback_"+callback_id, function(data){
+        callback(data.tuple, data.info);
+      });
       self.io.push("__linda_take", [space.name, tuple, callback_id]);
     };
     this.watch = function(tuple, callback){
       if(tuple === null || typeof tuple !== "object") return;
       if(typeof callback !== "function") return;
       var callback_id = make_callback_id();
-      self.io.on("__linda_watch_callback_"+callback_id, callback);
+      self.io.on("__linda_watch_callback_"+callback_id, function(data){
+        callback(data.tuple, data.info);
+      });
       self.io.push("__linda_watch", [space.name, tuple, callback_id]);
     };
   };

data/linda.min.js

@@ -1,5 +1,5 @@
-// Linda.js v0.2.0 (rocketio v0.2.6)
+// Linda.js v1.0.0 (rocketio v0.3.0)
 // https://github.com/shokai/sinatra-rocketio-linda
 // (c) 2013 Sho Hashimoto <hashimoto@shokai.org>
 // The MIT License
-var Linda=function(io,opts){var self=this;this.io=null;if(io===null||typeof io==="undefined"){this.io=(new RocketIO).connect()}else{this.io=io}this.opts=opts||{};this.TupleSpace=function(name){if(name===null||typeof name!=="string")name="__default__";this.name=name;this.linda=self;var space=this;var make_callback_id=function(){return new Date-0+"_"+Math.floor(Math.random()*1e6)};this.write=function(tuple,opts){if(tuple===null||typeof tuple!=="object")return;if(opts===null||typeof opts==="undefined")opts={};self.io.push("__linda_write",[space.name,tuple,opts])};this.read=function(tuple,callback){if(tuple===null||typeof tuple!=="object")return;if(typeof callback!=="function")return;var callback_id=make_callback_id();self.io.once("__linda_read_callback_"+callback_id,callback);self.io.push("__linda_read",[space.name,tuple,callback_id])};this.take=function(tuple,callback){if(tuple===null||typeof tuple!=="object")return;if(typeof callback!=="function")return;var callback_id=make_callback_id();self.io.once("__linda_take_callback_"+callback_id,callback);self.io.push("__linda_take",[space.name,tuple,callback_id])};this.watch=function(tuple,callback){if(tuple===null||typeof tuple!=="object")return;if(typeof callback!=="function")return;var callback_id=make_callback_id();self.io.on("__linda_watch_callback_"+callback_id,callback);self.io.push("__linda_watch",[space.name,tuple,callback_id])}}};var RocketIO=function(opts){(new EventEmitter).apply(this);if(typeof opts==="undefined"||opts===null)opts={};this.type=opts.type||null;this.session=opts.session||null;this.channel=null;if(typeof opts.channel!=="undefined"&&opts.channel!==null){this.channel=""+opts.channel}var setting={};this.io=null;var self=this;var ws_close_timer=null;self.on("__connect",function(session_id){self.session=session_id;self.io.push("__channel_id",self.channel);self.emit("connect")});this.connect=function(url){if(typeof url==="string"){$.getJSON(url+"/rocketio/settings",function(res){setting=res;connect_io()});return self}else{return connect_io()}};var connect_io=function(){self.io=function(){if(self.type==="comet")return;if(typeof WebSocketIO!=="function")return;var io=new WebSocketIO;if(typeof setting.websocket==="string")io.url=setting.websocket;io.session=self.session;return io.connect()}()||function(){if(typeof CometIO!=="function")return;var io=new CometIO;if(typeof setting.comet==="string")io.url=setting.comet;io.session=self.session;return io.connect()}();if(typeof self.io==="undefined"){setTimeout(function(){self.emit("error","WebSocketIO and CometIO are not available")},100);return self}if(self.io.url.match(/^ws:\/\/.+/))self.type="websocket";else if(self.io.url.match(/cometio/))self.type="comet";else self.type="unknown";self.io.on("*",function(event_name,args){if(event_name==="connect")event_name="__connect";self.emit(event_name,args)});ws_close_timer=setTimeout(function(){self.close();self.type="comet";connect_io()},3e3);self.once("connect",function(){if(ws_close_timer)clearTimeout(ws_close_timer);ws_close_timer=null});return self};this.close=function(){self.io.close()};this.push=function(type,data){self.io.push(type,data)}};var CometIO=function(url,opts){(new EventEmitter).apply(this);if(typeof opts==="undefined"||opts===null)opts={};this.url=url||"";this.session=opts.session||null;var running=false;var self=this;var post_queue=[];var flush=function(){if(!running||post_queue.length<1)return;var post_data={json:JSON.stringify({session:self.session,events:post_queue})};$.ajax({url:self.url,data:post_data,success:function(data){},error:function(req,stat,e){self.emit("error","CometIO push error")},complete:function(e){},type:"POST",dataType:"json",timeout:1e4});post_queue=[]};setInterval(flush,1e3);this.push=function(type,data){if(!running||!self.session){self.emit("error","CometIO not connected");return}post_queue.push({type:type,data:data})};this.connect=function(){if(running)return self;self.on("__session_id",function(session){self.session=session;self.emit("connect",self.session)});running=true;get();return self};this.close=function(){running=false;self.removeListener("__session_id")};var get=function(){if(!running)return;$.ajax({url:self.url+"?"+(new Date-0),data:{session:self.session},success:function(data_arr){if(data_arr!==null&&typeof data_arr=="object"&&!!data_arr.length){for(var i=0;i<data_arr.length;i++){var data=data_arr[i];if(data)self.emit(data.type,data.data)}}get()},error:function(req,stat,e){self.emit("error","CometIO get error");setTimeout(get,1e4)},complete:function(e){},type:"GET",dataType:"json",timeout:13e4})}};var WebSocketIO=function(url,opts){(new EventEmitter).apply(this);if(typeof opts==="undefined"||opts===null)opts={};this.url=url||"";this.session=opts.session||null;this.websocket=null;this.connecting=false;var reconnect_timer_id=null;var running=false;var self=this;self.on("__session_id",function(session_id){self.session=session_id;self.emit("connect",self.session)});this.connect=function(){if(typeof WebSocket==="undefined"){self.emit("error","websocket not exists in this browser");return null}self.running=true;var url=self.session?self.url+"/session="+self.session:self.url;self.websocket=new WebSocket(url);self.websocket.onmessage=function(e){var data_=null;try{data_=JSON.parse(e.data)}catch(e){self.emit("error","WebSocketIO data parse error")}if(!!data_)self.emit(data_.type,data_.data)};self.websocket.onclose=function(){if(self.connecting){self.connecting=false;self.emit("disconnect")}if(self.running){reconnect_timer_id=setTimeout(self.connect,1e4)}};self.websocket.onopen=function(){self.connecting=true};return self};this.close=function(){clearTimeout(reconnect_timer_id);self.running=false;self.websocket.close()};this.push=function(type,data){if(!self.connecting){self.emit("error","websocket not connected");return}self.websocket.send(JSON.stringify({type:type,data:data,session:self.session}))}};var EventEmitter=function(){var self=this;this.apply=function(target,prefix){if(!prefix)prefix="";for(var func in self){if(self.hasOwnProperty(func)&&func!=="apply"){target[prefix+func]=this[func]}}};this.__events=new Array;this.on=function(type,listener,opts){if(typeof listener!=="function")return;var event_id=self.__events.length>0?1+self.__events[self.__events.length-1].id:0;var params={id:event_id,type:type,listener:listener};for(i in opts){if(!params[i])params[i]=opts[i]}self.__events.push(params);return event_id};this.once=function(type,listener){self.on(type,listener,{once:true})};this.emit=function(type,data){for(var i=0;i<self.__events.length;i++){var e=self.__events[i];switch(e.type){case type:e.listener(data);if(e.once)e.type=null;break;case"*":e.listener(type,data);if(e.once)e.type=null;break}}self.removeListener()};this.removeListener=function(id_or_type){for(var i=self.__events.length-1;i>=0;i--){var e=self.__events[i];switch(typeof id_or_type){case"number":if(e.id===id_or_type)self.__events.splice(i,1);break;case"string":case"object":if(e.type===id_or_type)self.__events.splice(i,1);break}}}};if(typeof module!=="undefined"&&typeof module.exports!=="undefined"){module.exports=EventEmitter}
+var Linda=function(io,opts){var self=this;this.io=null;if(io===null||typeof io==="undefined"){this.io=(new RocketIO).connect()}else{this.io=io}this.opts=opts||{};this.TupleSpace=function(name){if(name===null||typeof name!=="string")name="__default__";this.name=name;this.linda=self;var space=this;var make_callback_id=function(){return new Date-0+"_"+Math.floor(Math.random()*1e6)};this.write=function(tuple,opts){if(tuple===null||typeof tuple!=="object")return;if(opts===null||typeof opts==="undefined")opts={};self.io.push("__linda_write",[space.name,tuple,opts])};this.read=function(tuple,callback){if(tuple===null||typeof tuple!=="object")return;if(typeof callback!=="function")return;var callback_id=make_callback_id();self.io.once("__linda_read_callback_"+callback_id,function(data){callback(data.tuple,data.info)});self.io.push("__linda_read",[space.name,tuple,callback_id])};this.take=function(tuple,callback){if(tuple===null||typeof tuple!=="object")return;if(typeof callback!=="function")return;var callback_id=make_callback_id();self.io.once("__linda_take_callback_"+callback_id,function(data){callback(data.tuple,data.info)});self.io.push("__linda_take",[space.name,tuple,callback_id])};this.watch=function(tuple,callback){if(tuple===null||typeof tuple!=="object")return;if(typeof callback!=="function")return;var callback_id=make_callback_id();self.io.on("__linda_watch_callback_"+callback_id,function(data){callback(data.tuple,data.info)});self.io.push("__linda_watch",[space.name,tuple,callback_id])}}};var RocketIO=function(opts){(new EventEmitter).apply(this);if(typeof opts==="undefined"||opts===null)opts={};this.type=opts.type||null;this.session=opts.session||null;this.channel=null;if(typeof opts.channel!=="undefined"&&opts.channel!==null){this.channel=""+opts.channel}var setting={};this.io=null;var self=this;var ws_close_timer=null;self.on("__connect",function(session_id){self.session=session_id;self.io.push("__channel_id",self.channel);self.emit("connect")});this.connect=function(url){if(typeof url==="string"){$.getJSON(url+"/rocketio/settings",function(res){setting=res;connect_io()});return self}else{return connect_io()}};var connect_io=function(){self.io=function(){if(self.type==="comet")return;if(typeof WebSocketIO!=="function")return;var io=new WebSocketIO;if(typeof setting.websocket==="string")io.url=setting.websocket;io.session=self.session;return io.connect()}()||function(){if(typeof CometIO!=="function")return;var io=new CometIO;if(typeof setting.comet==="string")io.url=setting.comet;io.session=self.session;return io.connect()}();if(typeof self.io==="undefined"){setTimeout(function(){self.emit("error","WebSocketIO and CometIO are not available")},100);return self}if(self.io.url.match(/^ws:\/\/.+/))self.type="websocket";else if(self.io.url.match(/cometio/))self.type="comet";else self.type="unknown";self.io.on("*",function(event_name,args){if(event_name==="connect")event_name="__connect";self.emit(event_name,args)});ws_close_timer=setTimeout(function(){self.close();self.type="comet";connect_io()},3e3);self.once("connect",function(){if(ws_close_timer)clearTimeout(ws_close_timer);ws_close_timer=null});return self};this.close=function(){self.io.close()};this.push=function(type,data){self.io.push(type,data)}};var CometIO=function(url,opts){(new EventEmitter).apply(this);if(typeof opts==="undefined"||opts===null)opts={};this.url=url||"";this.session=opts.session||null;var running=false;var self=this;var post_queue=[];var flush=function(){if(!running||post_queue.length<1)return;var post_data={json:JSON.stringify({session:self.session,events:post_queue})};$.ajax({url:self.url,data:post_data,success:function(data){},error:function(req,stat,e){self.emit("error","CometIO push error")},complete:function(e){},type:"POST",dataType:"json",timeout:1e4});post_queue=[]};setInterval(flush,1e3);this.push=function(type,data){if(!running||!self.session){self.emit("error","CometIO not connected");return}post_queue.push({type:type,data:data})};this.connect=function(){if(running)return self;self.on("__session_id",function(session){self.session=session;self.emit("connect",self.session)});running=true;get();return self};this.close=function(){running=false;self.removeListener("__session_id")};var get=function(){if(!running)return;$.ajax({url:self.url+"?"+(new Date-0),data:{session:self.session},success:function(data_arr){if(data_arr!==null&&typeof data_arr=="object"&&!!data_arr.length){for(var i=0;i<data_arr.length;i++){var data=data_arr[i];if(data)self.emit(data.type,data.data)}}get()},error:function(req,stat,e){self.emit("error","CometIO get error");setTimeout(get,1e4)},complete:function(e){},type:"GET",dataType:"json",timeout:13e4})}};var WebSocketIO=function(url,opts){(new EventEmitter).apply(this);if(typeof opts==="undefined"||opts===null)opts={};this.url=url||"";this.session=opts.session||null;this.websocket=null;this.connecting=false;var reconnect_timer_id=null;var running=false;var self=this;self.on("__session_id",function(session_id){self.session=session_id;self.emit("connect",self.session)});this.connect=function(){if(typeof WebSocket==="undefined"){self.emit("error","websocket not exists in this browser");return null}self.running=true;var url=self.session?self.url+"/session="+self.session:self.url;self.websocket=new WebSocket(url);self.websocket.onmessage=function(e){var data_=null;try{data_=JSON.parse(e.data)}catch(e){self.emit("error","WebSocketIO data parse error")}if(!!data_)self.emit(data_.type,data_.data)};self.websocket.onclose=function(){if(self.connecting){self.connecting=false;self.emit("disconnect")}if(self.running){reconnect_timer_id=setTimeout(self.connect,1e4)}};self.websocket.onopen=function(){self.connecting=true};return self};this.close=function(){clearTimeout(reconnect_timer_id);self.running=false;self.websocket.close()};this.push=function(type,data){if(!self.connecting){self.emit("error","websocket not connected");return}self.websocket.send(JSON.stringify({type:type,data:data,session:self.session}))}};var EventEmitter=function(){var self=this;this.apply=function(target,prefix){if(!prefix)prefix="";for(var func in self){if(self.hasOwnProperty(func)&&func!=="apply"){target[prefix+func]=this[func]}}};this.__events=new Array;this.on=function(type,listener,opts){if(typeof listener!=="function")return;var event_id=self.__events.length>0?1+self.__events[self.__events.length-1].id:0;var params={id:event_id,type:type,listener:listener};for(i in opts){if(!params[i])params[i]=opts[i]}self.__events.push(params);return event_id};this.once=function(type,listener){self.on(type,listener,{once:true})};this.emit=function(type,data){for(var i=0;i<self.__events.length;i++){var e=self.__events[i];switch(e.type){case type:e.listener(data);if(e.once)e.type=null;break;case"*":e.listener(type,data);if(e.once)e.type=null;break}}self.removeListener()};this.removeListener=function(id_or_type){for(var i=self.__events.length-1;i>=0;i--){var e=self.__events[i];switch(typeof id_or_type){case"number":if(e.id===id_or_type)self.__events.splice(i,1);break;case"string":case"object":if(e.type===id_or_type)self.__events.splice(i,1);break}}}};if(typeof module!=="undefined"&&typeof module.exports!=="undefined"){module.exports=EventEmitter}

data/sample/bin/cui_calc_watcher.rb

@@ -8,8 +8,8 @@ ts = linda.tuplespace["calc"]
 
 linda.io.on :connect do
   puts "connect #{io.session}"
-  ts.watch [] do |tuple|
-    puts "watch #{tuple}"
+  ts.watch [] do |tuple, info|
+    puts "watch #{tuple} (from:#{info.from})"
   end
 end
 

data/sample/bin/cui_calc_worker.rb

@@ -7,10 +7,10 @@ linda = Sinatra::RocketIO::Linda::Client.new 'http://localhost:5000'
 ts = linda.tuplespace["calc"]
 
 calc = lambda{
-  ts.take ["calc_request"] do |tuple|
+  ts.take ["calc_request"] do |tuple, info|
     query = tuple[1]
     result = eval(query)
-    puts "calc: #{query} = #{result}"
+    puts "calc: #{query} = #{result} (from:#{info.from})"
     ts.write ["calc_result", result]
     calc.call
   end

data/sample/public/client.js

@@ -19,7 +19,8 @@ var take_result = function(){
 
 io.on("connect", take_result);
 io.on("connect", function(){
-  ts.watch(["calc_request"], function(tuple){
+  ts.watch(["calc_request"], function(tuple, info){
     console.log(tuple);
+    console.log(info)
   });
 });

data/sample/public/worker.js

@@ -2,7 +2,7 @@ var linda = new Linda();
 var ts = new linda.TupleSpace("calc");
 
 var calc = function(){
-  ts.take(["calc_request"], function(tuple){
+  ts.take(["calc_request"], function(tuple, info){
     var query = tuple[1];
     var result = eval(query);
     $("#log").prepend( $("<p>").text(query+" = "+result).prepend("calc: ") );

data/sinatra-rocketio-linda.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "linda", ">= 0.0.4"
   spec.add_dependency "hashie"
-  spec.add_dependency "sinatra-rocketio"
+  spec.add_dependency "sinatra-rocketio", "~> 0.3"
   spec.add_dependency "event_emitter"
   spec.add_dependency "sinatra"
   spec.add_dependency "args_parser"

data/test/test_client_disconnect.rb

@@ -15,16 +15,16 @@ class TestClientDisconnect < MiniTest::Test
       client2.io.on :connect do
         ts1 = client1.tuplespace[ts_name]
         ts2 = client2.tuplespace[ts_name]
-        ts1.read [1,2] do |tuple|
+        ts1.read [1,2] do |tuple, info|
           _tuple1 = tuple
         end
-        ts1.take [1,2] do |tuple|
+        ts1.take [1,2] do |tuple, info|
           _tuple2 = tuple
         end
-        ts1.watch [1,2] do |tuple|
+        ts1.watch [1,2] do |tuple, info|
           _tuple3 = tuple
         end
-        ts2.take [1,2] do |tuple|
+        ts2.take [1,2] do |tuple, info|
           _tuple4 = tuple
         end
         client1.io.close

data/test/test_rubyclient.rb

@@ -18,19 +18,19 @@ class TestRubyClient < MiniTest::Test
       ts.write ["rw",1,2,3]
       ts.write ["rw",1,2,"a"]
       ts.write ["rw",1,"a",2]
-      ts.take ["rw",1,2] do |tuple|
+      ts.take ["rw",1,2] do |tuple, info|
         _tuple1 = tuple
       end
-      ts.read ["rw",1,2] do |tuple|
+      ts.read ["rw",1,2] do |tuple, info|
         _tuple2 = tuple
       end
-      ts.take ["rw",1,2] do |tuple|
+      ts.take ["rw",1,2] do |tuple, info|
         _tuple3 = tuple
       end
       client2 = Sinatra::RocketIO::Linda::Client.new App.url
       ts2 = client2.tuplespace[ts_name]
       client2.io.on :connect do
-        ts2.take ["rw",1] do |tuple|
+        ts2.take ["rw",1] do |tuple, info|
           _tuple4 = tuple
         end
       end
@@ -51,13 +51,13 @@ class TestRubyClient < MiniTest::Test
     _tuple2 = nil
     ts = @client.tuplespace["ts_#{rand Time.now.to_i}"]
     @client.io.on :connect do
-      ts.take ["watch",1,2] do |tuple|
+      ts.take ["watch",1,2] do |tuple, info|
         _tuple1 = tuple
       end
-      ts.read ["watch",1,2] do |tuple|
+      ts.read ["watch",1,2] do |tuple, info|
         _tuple2 = tuple
       end
-      ts.watch ["watch",1,2] do |tuple|
+      ts.watch ["watch",1,2] do |tuple, info|
         results.push tuple
       end
       ts.write ["watch",1,2,3]
@@ -81,10 +81,10 @@ class TestRubyClient < MiniTest::Test
     _tuple1 = nil
     _tuple2 = nil
     @client.io.on :connect do
-      ts2.take ["a"] do |tuple|
+      ts2.take ["a"] do |tuple, info|
         _tuple2 = tuple
       end
-      ts1.take [1] do |tuple|
+      ts1.take [1] do |tuple, info|
         _tuple1 = tuple
       end
       ts1.write [1,2,3]
@@ -106,12 +106,12 @@ class TestRubyClient < MiniTest::Test
       ts.write ["expire",1,2,999], :expire => false
       ts.write ["expire",1,2,3], :expire => 10
       ts.write ["expire",1,2,"a","b"], :expire => 2
-      ts.read ["expire",1,2] do |tuple|
+      ts.read ["expire",1,2] do |tuple, info|
         _tuple1 = tuple
       end
       sleep 3
       push :check_expire, nil
-      ts.read ["expire",1,2] do |tuple|
+      ts.read ["expire",1,2] do |tuple, info|
         _tuple2 = tuple
       end
     end
@@ -122,4 +122,39 @@ class TestRubyClient < MiniTest::Test
     assert_equal _tuple1, ["expire",1,2,"a","b"]
     assert_equal _tuple2, ["expire",1,2,3]
   end
+
+  def test_tuple_info
+    ts = @client.tuplespace["ts_#{rand Time.now.to_i}"]
+    _tuple1 = nil
+    _tuple2 = nil
+    _tuple3 = nil
+    _info1 = nil
+    _info2 = nil
+    _info3 = nil
+    @client.io.on :connect do
+      ts.read [1,2] do |tuple, info|
+        _tuple1 = tuple
+        _info1 = info
+      end
+      ts.watch [1] do |tuple, info|
+        _tuple2 = tuple
+        _info2 = info
+      end
+      ts.take [1,2,3] do |tuple, info|
+        _tuple3 = tuple
+        _info3 = info
+      end
+      ts.write [1,2,3]
+    end
+    50.times do
+      sleep 0.1
+      break if _tuple3
+    end
+    assert_equal _tuple1, [1,2,3]
+    assert_equal _tuple2, [1,2,3]
+    assert_equal _tuple3, [1,2,3]
+    assert _info1.from =~ /^\d+\.\d+\.\d+\.\d+$/
+    assert _info2.from =~ /^\d+\.\d+\.\d+\.\d+$/
+    assert _info3.from =~ /^\d+\.\d+\.\d+\.\d+$/
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio-linda
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,16 +112,16 @@ dependencies:
   name: sinatra-rocketio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: event_emitter
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Linda implementation on Sinatra RocketIO
@@ -244,4 +244,3 @@ test_files:
 - test/test_rubyclient.rb
 - test/test_tuple.rb
 - test/test_tuplespace.rb
-has_rdoc: