em-rocketio-linda-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98dfdf7000ed33fed66fef953dee21449acf8815
-  data.tar.gz: a31dfc4320438cc867428cdf697b57500f54a7d6
+  metadata.gz: 0484939a37aaa0a93cd380fea16785a5e99fc6a2
+  data.tar.gz: b6bcde795bfc5303fd6b3076135d5f8c3c262b28
 SHA512:
-  metadata.gz: c9321a9e566c9e232d72b59de669038a8273d6f74b1b6f49af986559d303a41d9a2cf5f1fe1e18b20aec0462a67d9f813784eaa4991311ed95c2918293db3c92
-  data.tar.gz: 6a33d796dc72c353629baf72c081c6d0f89e4e6e2be4b78485781cc8d1738a7d0658503d14dd471cba79f6f92bb8cf9ba35cfb12abf3b82634d641305cd9a7f5
+  metadata.gz: 80ab851054515b3abce7c1e92cdf51b9f1fa558e52cfe9f0db9dee8406a1422c7a39e7316f7f7207646e740d6787377e3a38b5d7d8fc2bf66d8b41e868d3f225
+  data.tar.gz: a37de55934601f876eed60253a25ffc7dd48af85343fcf5721c02f20c360bff1a0dcf1bc22a2b63bbef5dd414553030c5a556653a60ab242a22e02e33108dfa6

data/.gitignore

@@ -1,3 +1,6 @@
+*~
+*#*
+.DS_Store
 *.gem
 *.rbc
 .bundle

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.3 2013-07-04
+
+* blocking style TupleSpace#read and TupleSpace#take
+
 === 0.0.2 2013-05-29
 
 * bugfix callback_id duplication in client lib

data/README.md

@@ -62,11 +62,11 @@ start server
 
     % export PORT=5000
     % export WS_PORT=9000
-    % rake test_server
+    % bundle exec rake test_server
 
 run test
 
-    % rake test
+    % bundle exec rake test
 
 
 Contributing

data/lib/em-rocketio-linda-client/client.rb

@@ -39,8 +39,20 @@ module EM
               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
+            if block_given?
+              @linda.io.once "__linda_read_callback_#{callback_id}", &block
+              @linda.io.push "__linda_read", [@name, tuple, callback_id]
+              return
+            end
+            result_tuple = nil
+            @linda.io.once "__linda_read_callback_#{callback_id}" do |tuple|
+              result_tuple = tuple
+            end
             @linda.io.push "__linda_read", [@name, tuple, callback_id]
+            while !result_tuple do
+              sleep 0.1
+            end
+            return result_tuple
           end
 
           def take(tuple, &block)
@@ -48,8 +60,20 @@ module EM
               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
+            if block_given?
+              @linda.io.once "__linda_take_callback_#{callback_id}", &block
+              @linda.io.push "__linda_take", [@name, tuple, callback_id]
+              return
+            end
+            result_tuple = nil
+            @linda.io.once "__linda_take_callback_#{callback_id}" do |tuple|
+              result_tuple = tuple
+            end
             @linda.io.push "__linda_take", [@name, tuple, callback_id]
+            while !result_tuple do
+              sleep 0.1
+            end
+            return result_tuple
           end
 
           def watch(tuple, &block)

data/lib/em-rocketio-linda-client/version.rb

@@ -2,7 +2,7 @@ module EM
   module RocketIO
     module Linda
       class Client
-        VERSION = "0.0.2"
+        VERSION = "0.0.3"
       end
     end
   end

data/sample/sample_blocking.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require "rubygems"
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'em-rocketio-linda-client'
+
+EM::run do
+  client = EM::RocketIO::Linda::Client.new "http://linda.shokai.org"
+  ts = client.tuplespace["test_spae"]
+
+  client.io.on :connect do
+    puts "connect #{client.io.type} (#{client.io.session})"
+    ts.write [1,2,3]
+    ts.write [1,2,3,4]
+    ts.write [1,2,3,4,"abc"]
+
+    EM::defer do
+      loop do
+        tuple = ts.take [1,2]
+        puts "blocking take #{tuple}"
+      end
+    end
+
+    EM::add_periodic_timer 1 do
+      ts.write [1,2, Time.now]
+    end
+  end
+
+end

data/test/test_blocking_read_take.rb

@@ -0,0 +1,73 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestBlockingReadTake < MiniTest::Test
+
+  def test_blocking_take
+    ts_name = "ts_blocking_take_#{rand Time.now.to_i}"
+    results = Array.new
+
+    EM::run do
+      client = EM::RocketIO::Linda::Client.new App.url
+      ts = client.tuplespace[ts_name]
+      
+      client.io.on :connect do
+        1.upto(3) do |i|
+          ts.write ["blocking", "take", i]
+        end
+
+        client2 = EM::RocketIO::Linda::Client.new App.url
+        ts2 = client2.tuplespace[ts_name]
+        client2.io.on :connect do
+          EM::defer do
+            loop do
+              results.push ts2.take ["blocking", "take"]
+            end
+          end
+        end
+      end
+
+      EM::defer do
+        50.times do
+          sleep 0.1
+          break if results.size > 2
+        end
+        EM::add_timer 1 do
+          EM::stop
+        end
+      end
+    end
+
+    assert_equal results.size, 3
+    assert_equal results.shift, ["blocking", "take", 3]
+    assert_equal results.shift, ["blocking", "take", 2]
+    assert_equal results.shift, ["blocking", "take", 1]
+  end
+
+
+  def test_blocking_read
+    ts_name = "ts_blocking_read_#{rand Time.now.to_i}"
+    results = Array.new
+
+    EM::run do
+      client = EM::RocketIO::Linda::Client.new App.url
+      ts = client.tuplespace[ts_name]
+      client.io.on :connect do
+        EM::defer do
+          1.upto(3) do |i|
+            ts.write ["blocking", "read", i]
+            results.push ts.read ["blocking", "read"]
+          end
+          EM::add_timer 1 do
+            EM::stop
+          end
+        end
+      end
+    end
+
+    assert_equal results.size, 3
+    assert_equal results.shift, ["blocking", "read", 1]
+    assert_equal results.shift, ["blocking", "read", 2]
+    assert_equal results.shift, ["blocking", "read", 3]
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-rocketio-linda-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,9 +140,11 @@ files:
 - lib/em-rocketio-linda-client/client.rb
 - lib/em-rocketio-linda-client/version.rb
 - sample/sample.rb
+- sample/sample_blocking.rb
 - test/app.rb
 - test/app/config.ru
 - test/app/main.rb
+- test/test_blocking_read_take.rb
 - test/test_client_disconnect.rb
 - test/test_em_rocketio_linda_client.rb
 - test/test_helper.rb
@@ -174,7 +176,7 @@ test_files:
 - test/app.rb
 - test/app/config.ru
 - test/app/main.rb
+- test/test_blocking_read_take.rb
 - test/test_client_disconnect.rb
 - test/test_em_rocketio_linda_client.rb
 - test/test_helper.rb
-has_rdoc: