sinatra-rocketio-linda 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 523bf63e3fe852d759d5e75b62e82d8b5900ffa9
-  data.tar.gz: ca656ff542d98f73c942542ddeaf5654566f5b60
+  metadata.gz: ebfcd893b6fd6ef33fa0c366cb796c70896b76f2
+  data.tar.gz: 85c84d5d7b420570cf6ed9a806dd2c94e2ea42ab
 SHA512:
-  metadata.gz: 6328614db8c10c14410d515d7aad2a0885335165e4aaeae081852fae8dd13cf45687cf4ae30e6caf571a8b2d5cca7b08434d8387b962bf30f350c3a83290792f
-  data.tar.gz: 0f41f574bbcace16a210b0f4e3a93f29d0aca235ae1dd3e9b85b52f1dd0ffe548a123e125f6cdd87c9d1d3590af7e723c7fe6a2de837c995847f50e1ef3b50c6
+  metadata.gz: d2f78eeef9f0237a405a87684b7d832a986dcafa6b3aad4194036190efeef7859af3b811c72783820294d1bccd7826e13b9f6d0b9df2a0c78b8f833a66c9b47b
+  data.tar.gz: a73311f2263b81720aa7c6963af7ea7e8eaf1b590637dfd43184da1409c7486dd613ec835d0bbec666d8ed65feb222154f418518985ae50262087ecaf588f2ff

data/History.txt

@@ -1,8 +1,11 @@
-=== 0.0.1 2013-05-15
+=== 0.0.2 2013-05-15
+* update README
+* TupleSpace#watch(tuple, callback(tuple))
 
+=== 0.0.1 2013-05-15
 * JavaScript Linda Client for WebBrowser
 * Ruby Linda Client
 * TupleSpace#write(tuple)
 * TupleSpace#take(tuple, callback(tuple))
 * TupleSpace#read(tuple, callback(tuple))
-* sinatra config - set :linda, :expire_check => 60 (sec)
+* sinatra config - set :linda, :check_expire => 60 (sec)

data/README.md

@@ -5,13 +5,6 @@ sinatra-rocketio-linda
 * https://github.com/shokai/sinatra-rocketio-linda
 
 
-Linda
------
-
-* http://en.wikipedia.org/wiki/Linda_(coordination_language)
-* http://ja.wikipedia.org/wiki/Linda
-
-
 Installation
 ------------
 
@@ -27,6 +20,29 @@ Requirements
 * [jQuery](http://jquery.com)
 
 
+Linda
+-----
+Linda is a coordination launguage for parallel programming.
+
+* http://en.wikipedia.org/wiki/Linda_(coordination_language)
+* http://ja.wikipedia.org/wiki/Linda
+
+
+### TupleSpace
+Shared memory on Sinatra.
+
+
+### Tuple Operations
+- write( tuple, options )
+  - put a Tuple into the TupleSpace
+- take( tuple, callback(tuple) )
+  - get a matched Tuple from the TupleSpace and delete
+- read( tuple, callback(tuple) )
+  - get a matched Tuple from the TupleSpace
+- watch( tuple, callback(tuple) )
+  - overwatch written Tuples in the TupleSpace
+
+
 Usage
 -----
 
@@ -99,6 +115,37 @@ var calc = function(){
 io.on("connect", calc); // RocketIO's "connect" event
 ```
 
+worker side (Ruby)
+
+```ruby
+require 'rubygems'
+require 'sinatra/rocketio/linda/client'
+
+## create tuplespace
+linda = Sinatra::RocketIO::Linda::Client.new 'http://localhost:5000'
+ts = linda.tuplespace["calc"]
+
+## calculate
+calc = lambda{
+  ts.take ["calc_request"] do |tuple|
+    query = tuple[1] ## => "1-2+3*4"
+    result = eval(query)
+    puts "calc: #{query} = #{result}" ## => "1-2+3*4 = 11"
+    ts.write ["calc_result", result]  ## return to 'client' side
+    calc.call ## recursive call
+  end
+}
+
+linda.io.on :connect do  ## RocketIO's "connect" event
+  puts "connect #{io.session}"
+  calc.call
+end
+
+loop do
+end
+```
+
+
 Test
 ----
 

data/lib/js/linda.js

@@ -32,5 +32,12 @@ var Linda = function(io, opts){
       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 = new Date()-0+"";
+      self.io.on("__linda_watch_callback_"+callback_id, callback);
+      self.io.push("__linda_watch", [space.name, tuple, callback_id]);
+    };
   };
 };

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

@@ -74,3 +74,19 @@ Sinatra::RocketIO.on :__linda_take do |data, client|
     Sinatra::RocketIO.push "__linda_take_callback_#{callback}", tuple.data, :to => client.session
   end
 end
+
+Sinatra::RocketIO.on :__linda_watch do |data, client|
+  space, tuple, callback = data
+  space = "__default__" if !space or !space.kind_of? String or space.empty?
+  unless [Hash, Array].include? tuple.class
+    Sinatra::RocketIO::Linda.emit :error, "received Tuple is not Hash or Array at :__linda_watch"
+    next
+  end
+  if !callback or !callback.kind_of? String or callback.empty?
+    Sinatra::RocketIO::Linda.emit :error, "received Callback ID is not valid at :__linda_watch"
+    next
+  end
+  Sinatra::RocketIO::Linda[space].watch tuple do |tuple|
+    Sinatra::RocketIO.push "__linda_watch_callback_#{callback}", tuple.data, :to => client.session
+  end
+end

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

@@ -35,7 +35,7 @@ module Sinatra
           @callbacks.each do |callback|
             next unless callback[:tuple].match? tuple
             callback[:callback].call tuple
-            calleds.push callback
+            calleds.push callback unless callback[:type] == :watch
             if callback[:type] == :take
               taked = tuple
               break
@@ -84,6 +84,12 @@ module Sinatra
           end
         end
 
+        def watch(tuple, &block)
+          raise ArgumentError, "block not given" unless block_given?
+          tuple = Tuple.new tuple unless tuple.kind_of? Tuple
+          @callbacks.unshift(:type => :watch, :callback => block, :tuple => tuple)
+        end
+
         def check_expire
           expires = []
           each do |tuple|

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

@@ -51,6 +51,16 @@ module Sinatra
             @linda.io.once "__linda_take_callback_#{callback_id}", &block
             @linda.io.push "__linda_take", [@name, tuple, callback_id]
           end
+
+          def watch(tuple, &block)
+            unless [Hash, Array].include? tuple.class
+              raise ArgumentError, "tuple must be Array or Hash"
+            end
+            callback_id = "#{Time.now.to_i}#{Time.now.usec}"
+            @linda.io.on "__linda_watch_callback_#{callback_id}", &block
+            @linda.io.push "__linda_watch", [@name, tuple, callback_id]
+          end
+
         end
 
       end

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

@@ -1,7 +1,7 @@
 module Sinatra
   module RocketIO
     module Linda
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/sample/bin/cui_calc_watcher.rb

@@ -0,0 +1,21 @@
+$:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
+require 'rubygems'
+require 'bundler/setup'
+require 'sinatra/rocketio/linda/client'
+
+linda = Sinatra::RocketIO::Linda::Client.new 'http://localhost:5000'
+ts = linda.tuplespace["calc"]
+
+linda.io.on :connect do
+  puts "connect #{io.session}"
+  ts.watch [] do |tuple|
+    puts "watch #{tuple}"
+  end
+end
+
+linda.io.on :disconnect do
+  puts "disconnect #{io.session}"
+end
+
+loop do
+end

data/sample/public/client.js

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

data/test/test_tuplespace.rb

@@ -96,6 +96,26 @@ class TestTupleSpace < MiniTest::Test
     assert_equal @space.size, 0
   end
 
+  def test_watch
+    assert_equal @space.size, 0
+    _tuple1 = nil
+    @space.take [1] do |tuple|
+      _tuple1 = tuple
+    end
+    results = []
+    @space.watch [1,2] do |tuple|
+      results << tuple
+    end
+    @space.write [1,2,3]
+    @space.write [1,2,"aa"]
+    @space.write [1,"a",3]
+    assert_equal _tuple1.data, [1,2,3]
+    assert_equal @space.size, 2
+    assert_equal results.size, 2
+    assert_equal results[0].data, [1,2,3]
+    assert_equal results[1].data, [1,2,"aa"]
+  end
+
   def test_tuple_expire
     @space.write [1,2,3], :expire => 3
     @space.write [1,2,"a","b"], :expire => 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio-linda
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,6 +146,7 @@ files:
 - lib/sinatra/rocketio/linda.rb
 - lib/sinatra/rocketio/linda/client.rb
 - lib/sinatra/rocketio/linda/version.rb
+- sample/bin/cui_calc_watcher.rb
 - sample/bin/cui_calc_worker.rb
 - sample/config.ru
 - sample/main.rb