sinatra-rocketio-linda 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00ad1eabde4c411c5f3cc5e2face0f8a7447f0d1
-  data.tar.gz: c3fd2667f18996af19914b5ac4c80f94d5c9fe9a
+  metadata.gz: d0857d4b25976ea5ce37682c263f65dfe835a915
+  data.tar.gz: 4b50812ba66530ebe94bdf43aaea55e50f6eb577
 SHA512:
-  metadata.gz: 89508b6b7807fd90c6c98db253af38e7875bcb97b278dc3ab8c1b1b6762741515762d4b4348f03b4139a40ddb92b4454ff47c15e3a25523d6f50fe44aa6aaf42
-  data.tar.gz: 7c4807cc17a4c3bbcc6cbcd9fac5e1e5b28b163aaa0e8a97f048d3fd9bea58b51bed79ce49793f1d1ce28343ffed68c63c427546bdcbdc4106588b181056342f
+  metadata.gz: efeffd1b6e4ecb925c2c003d368c4cfcfe4b1eaa1edd1f02a1ca78e42e06ebe8b337c87e02e6adf6eabd1714b2f0a0180181048658da9ca5bc168f683f6ec3b3
+  data.tar.gz: 675fca70a3d4da4af53382fff880c13c47e826f4ac7c95a8e3cb3d5d411d621d8563ee3e55c31fe241df58dbebcbc703fcf5588a66773e6d8d61c706bb2c3fe8

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.2 2013-06-09
+
+* linda-rocketio command
+
 === 0.1.1 2013-05-31
 
 * fix canceling callback on client disconnect

data/README.md

@@ -147,6 +147,13 @@ linda.wait
 ```
 
 
+linda-rocketio command
+----------------------
+
+    % lidna-rocketio --help
+    % linda-rocketio --write '["say","hello"]' --base http://example.com --space test
+
+
 JavaScript Lib for browser
 --------------------------
 

data/bin/linda-rocketio

@@ -0,0 +1,122 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'rubygems'
+require 'sinatra/rocketio/linda/client'
+require 'args_parser'
+
+args = ArgsParser.parse ARGV do
+  arg :write, 'write Tuple(s)'
+  arg :read, 'read a Tuple'
+  arg :take, 'take a Tuple'
+  arg :watch, 'watch Tuples'
+  arg :base, 'linda base URL', :default => 'http://linda.shokai.org'
+  arg :space, 'linda space name', :default => 'test'
+  arg :timeout, 'wait (sec)', :default => 10
+  arg :verbose, 'verbose mode', :alias => :v
+  arg :help, 'show help', :alias => :h
+
+  validate :base, "invalid linda URL" do |v|
+    v =~ /^https?:\/\/.+/
+  end
+
+  [:write, :read, :take, :watch].each do |arg|
+    filter arg do |v|
+      JSON.parse v
+    end
+  end
+end
+
+class Console
+  def self.enable=(bool)
+    @@enable = bool
+  end
+
+  def self.enable?
+    @@enable
+  end
+
+  def self.log(str)
+    STDOUT.puts "* #{str}" if enable?
+  end
+
+  def self.error(str)
+    STDERR.puts "! #{str}" if enable?
+  end
+end
+
+Console.enable = args.has_option? :verbose
+
+if args.has_option? :help or !args.has_param? :base, :space
+  bin = $0.split("/").last
+  STDERR.puts "RocketIO::Linda v#{Sinatra::RocketIO::Linda::VERSION}"
+  STDERR.puts " - https://github.com/shokai/sinatra-rocketio-linda"
+  STDERR.puts
+  STDERR.puts args.help
+  STDERR.puts
+  STDERR.puts "e.g."
+  STDERR.puts %Q{write   #{bin} --base http://example.com --space test --write '["say","hello"]'}
+  STDERR.puts %Q{        echo '["say","hello"]\\n["say","world"]' | #{bin} --base http://example.com --space test --write}
+  STDERR.puts %Q{read    #{bin} --base http://example.com --space test --read '["say"]'}
+  STDERR.puts %Q{take    #{bin} --base http://example.com --space test --take '["say"]'}
+  STDERR.puts %Q{watch   #{bin} --base http://example.com --space test --watch '["say"]'}
+  exit 1
+end
+
+io = Sinatra::RocketIO::Client.new args[:base]
+linda = Sinatra::RocketIO::Linda::Client.new io
+ts = linda.tuplespace[ args[:space] ]
+
+linda.io.on :connect do
+  Console.log "connect #{io.session} (#{io.type})"
+  if args.has_param? :write
+    Console.log "write #{args[:write].to_json}"
+    ts.write args[:write]
+    exit
+  elsif args.has_option? :write
+    while line = STDIN.gets do
+      begin
+        tuple = JSON.parse line.strip
+        Console.log "write #{tuple.to_json}"
+        puts tuple.to_json
+        ts.write tuple
+      rescue => e
+        Console.error e
+      end
+    end
+    exit
+  elsif args.has_param? :read
+    Console.log "read #{args[:read].to_json}"
+    ts.read args[:read] do |tuple|
+      puts tuple.to_json
+      exit
+    end
+  elsif args.has_param? :take
+    Console.log "take #{args[:take].to_json}"
+    ts.take args[:take] do |tuple|
+      puts tuple.to_json
+      exit
+    end
+  elsif args.has_param? :watch
+    Console.log "watch #{args[:watch].to_json}"
+    ts.watch args[:watch] do |tuple|
+      puts tuple.to_json
+    end
+  else
+    exit 1
+  end
+end
+
+linda.io.on :disconnect do
+  Console.log "disconnect #{io.session} (#{io.type})"
+end
+
+Console.log "waiting #{args[:base]}"
+io.connect
+
+if [Fixnum, Float].include? args[:timeout].class and args[:timeout] > 0 and !args.has_option?(:write)
+  sleep args[:timeout]
+else
+  linda.wait
+end
+
+Console.log "timeout (#{args[:timeout]}sec)"

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

@@ -1,3 +1,4 @@
+require File.expand_path 'version', File.dirname(__FILE__)
 require 'event_emitter'
 require 'sinatra/rocketio/client'
 

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

@@ -1,7 +1,7 @@
 module Sinatra
   module RocketIO
     module Linda
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

data/linda.js

@@ -1,4 +1,4 @@
-// Linda.js v0.0.9 (rocketio v0.2.6)
+// Linda.js v0.1.1 (rocketio v0.2.6)
 // https://github.com/shokai/sinatra-rocketio-linda
 // (c) 2013 Sho Hashimoto <hashimoto@shokai.org>
 // The MIT License
@@ -195,7 +195,7 @@ var CometIO = function(url, opts){
     if(!running) return;
     $.ajax(
       {
-        url : self.url,
+        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){
@@ -245,13 +245,14 @@ var WebSocketIO = function(url, opts){
     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{
-        var data_ = JSON.parse(e.data);
-        self.emit(data_.type, data_.data);
+        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){

data/linda.min.js

@@ -1,5 +1,5 @@
-// Linda.js v0.0.9 (rocketio v0.2.6)
+// Linda.js v0.1.1 (rocketio v0.2.6)
 // 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,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){try{var data_=JSON.parse(e.data);self.emit(data_.type,data_.data)}catch(e){self.emit("error","WebSocketIO data parse error")}};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,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}

data/sinatra-rocketio-linda.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra-rocketio"
   spec.add_dependency "event_emitter"
   spec.add_dependency "sinatra"
+  spec.add_dependency "args_parser"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio-linda
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,10 +150,25 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: args_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Linda implementation on Sinatra RocketIO
 email:
 - hashimoto@shokai.org
-executables: []
+executables:
+- linda-rocketio
 extensions: []
 extra_rdoc_files: []
 files:
@@ -164,6 +179,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/linda-rocketio
 - lib/js/linda.js
 - lib/sinatra-rocketio-linda/application.rb
 - lib/sinatra-rocketio-linda/helper.rb