em-rocketio-linda-client 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0484939a37aaa0a93cd380fea16785a5e99fc6a2
-  data.tar.gz: b6bcde795bfc5303fd6b3076135d5f8c3c262b28
+  metadata.gz: d086a2200e04156cd3d5b5ac51af52214fb327f4
+  data.tar.gz: c530e1da28c79b35e5b99657d5435992560e64b8
 SHA512:
-  metadata.gz: 80ab851054515b3abce7c1e92cdf51b9f1fa558e52cfe9f0db9dee8406a1422c7a39e7316f7f7207646e740d6787377e3a38b5d7d8fc2bf66d8b41e868d3f225
-  data.tar.gz: a37de55934601f876eed60253a25ffc7dd48af85343fcf5721c02f20c360bff1a0dcf1bc22a2b63bbef5dd414553030c5a556653a60ab242a22e02e33108dfa6
+  metadata.gz: 310a6c7198955a044b2c8fed74dda469981afde1877c320b707a5e0829189c83550edebfc7da75d9ed5bea2ce33fa71d65c4e410816eeea85dcc153d3968b4ca
+  data.tar.gz: 11b0d3acb0fffb21267b72769801b37ff29a3c5e4287d09b64194680b173d0980f6317a9e0fef4d2dfbb4b6f737e4f6800165875280c03e83cb7e0e762b8b77a

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.0 2013-10-03
+
+* !!! protocol was updated
+
 === 0.0.3 2013-07-04
 
 * blocking style TupleSpace#read and TupleSpace#take

data/README.md

@@ -34,7 +34,7 @@ EM::run do
   end
 
   ## watch Tuples
-  ts.watch [1,2] do |tuple|
+  ts.watch [1,2] do |tuple, info|
     p tuple
   end
 

data/em-rocketio-linda-client.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "thin"
 
   spec.add_dependency "em-rocketio-client"
+  spec.add_dependency "hashie"
   spec.add_dependency "eventmachine"
   spec.add_dependency "event_emitter"
 end

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

@@ -1,6 +1,7 @@
 require "eventmachine"
 require "em-rocketio-client"
 require "event_emitter"
+require "hashie"
 
 require "em-rocketio-linda-client/version"
 require "em-rocketio-linda-client/client"

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

@@ -5,6 +5,9 @@ module EM
         class Error < StandardError
         end
 
+        class TupleInfo < Hashie::Mash
+        end
+
         include EventEmitter
         attr_reader :io, :tuplespace
         def initialize(io_or_url)
@@ -40,13 +43,15 @@ module EM
             end
             callback_id = "#{Time.now.to_i}#{Time.now.usec}_#{rand(1000000).to_i}"
             if block_given?
-              @linda.io.once "__linda_read_callback_#{callback_id}", &block
+              @linda.io.once "__linda_read_callback_#{callback_id}" do |data|
+                block.call(data['tuple'], TupleInfo.new(data['info']))
+              end
               @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
+            @linda.io.once "__linda_read_callback_#{callback_id}" do |data|
+              result_tuple = data['tuple']
             end
             @linda.io.push "__linda_read", [@name, tuple, callback_id]
             while !result_tuple do
@@ -61,13 +66,15 @@ module EM
             end
             callback_id = "#{Time.now.to_i}#{Time.now.usec}_#{rand(1000000).to_i}"
             if block_given?
-              @linda.io.once "__linda_take_callback_#{callback_id}", &block
+              @linda.io.once "__linda_take_callback_#{callback_id}" do |data|
+                block.call data['tuple'], TupleInfo.new(data['info'])
+              end
               @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
+            @linda.io.once "__linda_take_callback_#{callback_id}" do |data|
+              result_tuple = data['tuple']
             end
             @linda.io.push "__linda_take", [@name, tuple, callback_id]
             while !result_tuple do
@@ -80,8 +87,11 @@ module EM
             unless [Hash, Array].include? tuple.class
               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}"
-            @linda.io.on "__linda_watch_callback_#{callback_id}", &block
+            @linda.io.on "__linda_watch_callback_#{callback_id}" do |data|
+              block.call data['tuple'], TupleInfo.new(data['info'])
+            end
             @linda.io.push "__linda_watch", [@name, tuple, callback_id]
           end
 

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

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

data/sample/sample.rb

@@ -3,14 +3,16 @@ require "rubygems"
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'em-rocketio-linda-client'
 
+url = ARGV.empty? ? "http://linda.shokai.org" : ARGV.shift
+
 EM::run do
-  client = EM::RocketIO::Linda::Client.new "http://linda.shokai.org"
+  client = EM::RocketIO::Linda::Client.new url
   ts = client.tuplespace["test_spae"]
 
   client.io.on :connect do
     puts "connect #{client.io.type} (#{client.io.session})"
 
-    ts.watch [1,2] do |tuple|
+    ts.watch [1,2] do |tuple, info|
       p tuple
     end
 

data/sample/sample_blocking.rb

@@ -3,8 +3,10 @@ require "rubygems"
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'em-rocketio-linda-client'
 
+url = ARGV.empty? ? "http://linda.shokai.org" : ARGV.shift
+
 EM::run do
-  client = EM::RocketIO::Linda::Client.new "http://linda.shokai.org"
+  client = EM::RocketIO::Linda::Client.new url
   ts = client.tuplespace["test_spae"]
 
   client.io.on :connect do

data/test/test_client_disconnect.rb

@@ -17,16 +17,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_em_rocketio_linda_client.rb

@@ -17,19 +17,19 @@ class TestEmRocketIOLindaClient < 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 = EM::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
@@ -59,13 +59,13 @@ class TestEmRocketIOLindaClient < MiniTest::Test
       client = EM::RocketIO::Linda::Client.new App.url
       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]
@@ -100,10 +100,10 @@ class TestEmRocketIOLindaClient < MiniTest::Test
       ts2 = client.tuplespace["ts2_#{rand Time.now.to_i}"]
 
       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]
@@ -134,12 +134,12 @@ class TestEmRocketIOLindaClient < 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
@@ -156,4 +156,52 @@ class TestEmRocketIOLindaClient < MiniTest::Test
     assert_equal _tuple1, ["expire",1,2,"a","b"]
     assert_equal _tuple2, ["expire",1,2,3]
   end
+
+  def test_tuple_info
+    _tuple1 = nil
+    _tuple2 = nil
+    _tuple3 = nil
+    _info1 = nil
+    _info2 = nil
+    _info3 = nil
+    EM::run do
+      client = EM::RocketIO::Linda::Client.new App.url
+      ts = client.tuplespace["ts_#{rand Time.now.to_i}"]
+
+      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
+      EM::defer do
+        50.times do
+          sleep 0.1
+          break if _tuple3
+        end
+        EM::add_timer 1 do
+          EM::stop
+        end
+      end
+    end
+    assert_equal _tuple1, [1,2,3]
+    assert_equal _tuple2, [1,2,3]
+    assert_equal _tuple3, [1,2,3]
+    assert_equal _info1.class, Sinatra::RocketIO::Linda::Client::TupleInfo
+    assert_equal _info2.class, Sinatra::RocketIO::Linda::Client::TupleInfo
+    assert_equal _info3.class, Sinatra::RocketIO::Linda::Client::TupleInfo
+    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: em-rocketio-linda-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  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'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +182,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: RocketIO Linda client for eventmachine