em-rocketio-linda-client 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a15ca83f00ae8e5e6bc71edc2da3216e5b14bd74
-  data.tar.gz: dfa050a61c09993ae3bc68d9ab424bffb0654c94
+  metadata.gz: 9c354cbf30aa56faacf8b95a45a48f1c77fa5af7
+  data.tar.gz: eb57bc2228a388b68c65c223fe02b8957376b380
 SHA512:
-  metadata.gz: 4e03ca5d2b34da1c771bb9e35dba97e17b07421c1bcd5c60763f213f18266ee82cda8ef1b6a72e0548e6e6a7416f9fa1d57517358f0e1c9b1be2f21b307e8d92
-  data.tar.gz: 8ca32be12723bfb4e55c81995a7babca40295ee31c92b7d52916efbb00abd7918b8642863aa1422c7021372770f4c2132d9f39f4aa96cb782079a3b7f54ba934
+  metadata.gz: 89e783fd0488ef8f09862f1c2fe6ae240e1e072b3ff4a07deacb5d5f56eb9f9694cb576327d8fc934e9e0364fed5baab1040a6383211776cb110042bc8040d7e
+  data.tar.gz: 37a84a3dcb573314fef925e0d76f5fed1c995842c5f6e2ae460a48efad0e11afe7bf68e0343b024a92482f25071af2fe331ba8cb561695864b3fcc5ffe85555c

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.1 2013-11-20
+
+* blocking-style TupleSpace#list  #5
+
 === 1.1.0 2013-11-19
 
 * add TupleSpace#list  #5

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

@@ -41,7 +41,7 @@ module EM
             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}"
+            callback_id = make_callback_id
             if block_given?
               @linda.io.once "__linda_read_callback_#{callback_id}" do |data|
                 block.call(data['tuple'], TupleInfo.new(data['info']))
@@ -64,7 +64,7 @@ module EM
             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}"
+            callback_id = make_callback_id
             if block_given?
               @linda.io.once "__linda_take_callback_#{callback_id}" do |data|
                 block.call data['tuple'], TupleInfo.new(data['info'])
@@ -88,7 +88,7 @@ module EM
               raise ArgumentError, "tuple must be Array or Hash"
             end
             return unless block_given?
-            callback_id = "#{Time.now.to_i}#{Time.now.usec}_#{rand(1000000).to_i}"
+            callback_id = make_callback_id
             @linda.io.on "__linda_watch_callback_#{callback_id}" do |data|
               block.call data['tuple'], TupleInfo.new(data['info'])
             end
@@ -99,7 +99,7 @@ module EM
             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}"
+            callback_id = make_callback_id
             if block_given?
               @linda.io.once "__linda_list_callback_#{callback_id}" do |list|
                 block.call list
@@ -107,6 +107,20 @@ module EM
               @linda.io.push "__linda_list", [@name, tuple, callback_id]
               return
             end
+            results = nil
+            @linda.io.once "__linda_list_callback_#{callback_id}" do |list|
+              results = list
+            end
+            @linda.io.push "__linda_list", [@name, tuple, callback_id]
+            while results == nil do
+              sleep 0.1
+            end
+            return results
+          end
+
+          private
+          def make_callback_id
+            "#{Time.now.to_i}#{Time.now.usec}_#{rand(1000000).to_i}"
           end
 
         end

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

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

data/sample/sample_blocking.rb

@@ -17,8 +17,10 @@ EM::run do
 
     EM::defer do
       loop do
-        tuple = ts.take [1,2]
+        tuple = ts.take [1,2]  ## read tuple([1,2]) and delete
         puts "blocking take #{tuple}"
+        list = ts.list [1,2]
+        puts "#{list.size} tuples exists."
       end
     end
 

data/test/test_blocking_read_take.rb

@@ -71,30 +71,28 @@ class TestBlockingReadTake < MiniTest::Test
   end
 
   def test_blocking_list
-    ts_name = "ts_blocking_read_#{rand Time.now.to_i}"
-    _tuple1 = ["a", "b", "c"]
-    _tuple2 = ["a", "b"]
-    _tuple3 = ["a", "b", "c", 1234]
+    ts_name = "ts_blocking_list_#{rand Time.now.to_i}"
+    _tuple1 = ["blocking", "a", "b", "c"]
+    _tuple2 = ["blocking", "a", "b"]
+    _tuple3 = ["blocking", "a", "b", "c", 1234]
     _result1 = nil
     _result2 = nil
     EM::run do
       client = EM::RocketIO::Linda::Client.new App.url
       ts = client.tuplespace[ts_name]
       client.io.on :connect do
-        ts.write _tuple1
-        ts.write _tuple2
-        ts.write _tuple3
-
-        _result1 = ts.list ["a", "b"]
-        p _result1
-        _result2 = ts.list ["a", "b", "c"]
-        p _result2
+        EM::defer do
+          ts.write _tuple1
+          ts.write _tuple2
+          ts.write _tuple3
+          _result1 = ts.list ["blocking", "a", "b"]
+          _result2 = ts.list ["blocking", "a", "b", "c"]
+        end
       end
 
       EM::defer do
         50.times do
           sleep 0.1
-          puts "waiting list"
           break if _result2
         end
         EM::add_timer 1 do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-rocketio-linda-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler