sinatra-rocketio-linda 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebfcd893b6fd6ef33fa0c366cb796c70896b76f2
-  data.tar.gz: 85c84d5d7b420570cf6ed9a806dd2c94e2ea42ab
+  metadata.gz: 22a5549a8d89eeae678b0f22d44dae2afad0473f
+  data.tar.gz: aa42150b15eb7393de375740260e094c60e8ce00
 SHA512:
-  metadata.gz: d2f78eeef9f0237a405a87684b7d832a986dcafa6b3aad4194036190efeef7859af3b811c72783820294d1bccd7826e13b9f6d0b9df2a0c78b8f833a66c9b47b
-  data.tar.gz: a73311f2263b81720aa7c6963af7ea7e8eaf1b590637dfd43184da1409c7486dd613ec835d0bbec666d8ed65feb222154f418518985ae50262087ecaf588f2ff
+  metadata.gz: 5ce242560eb393dd968e79199708a6a7c5f1cce9a8593015d1f89b88286ee26ecb9f3d7f4aea5efc9856386ca5cdf39c255b2fe3f0a00793ca6940a369259111
+  data.tar.gz: 8f71b0aefc032cd9b2020a365b6633a95e7307817417ba4df96d2304a70a4b120d75544e43293f0e5a6fedd1418e5c646e16c655d6b1fa286088933665f6cab5

data/History.txt

@@ -1,8 +1,16 @@
+=== 0.0.3 2013-05-16
+
+* remove read/take/watch listener on client disconnect
+* {expire => false} option on tuple write
+* add ruby client's test
+
 === 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)

data/README.md

@@ -54,7 +54,7 @@ Server Side
 require 'sinatra'
 require 'sinatra/rocketio'
 require 'sinatra/rocketio/linda'
-set :linda, :check_expire => 60
+set :linda, :expire_check => 60
 
 run Sinatra::Application
 ```
@@ -151,6 +151,13 @@ Test
 
     % gem install bundler
     % bundle install
+
+start server
+
+    % rake test_server
+
+run test
+
     % rake test
 
 

data/Rakefile

@@ -5,4 +5,10 @@ Rake::TestTask.new do |t|
   t.pattern = "test/test_*.rb"
 end
 
+desc "Start test server"
+task :test_server do
+  require File.expand_path 'test/app', File.dirname(__FILE__)
+  App.start
+end
+
 task :default => :test

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

@@ -3,22 +3,26 @@ module Sinatra
     module Linda
 
       def self.tuplespaces
-        @@spaces ||= Hash.new{|h,k| h[k] = TupleSpace.new }
+        @@spaces ||= Hash.new{|h,k| h[k] = TupleSpace.new(k) }
       end
 
       def self.[](name)
         self.tuplespaces[name]
       end
 
+      def self.check_expire
+        tuplespaces.values.each do |ts|
+          ts.check_expire
+        end
+      end
+
     end
   end
 end
 
 Sinatra::RocketIO.on :start do
   EM::add_periodic_timer Sinatra::RocketIO::Linda.options[:expire_check] do
-    Sinatra::RocketIO::Linda::tuplespaces.values.each do |ts|
-      ts.check_expire
-    end
+    Sinatra::RocketIO::Linda.check_expire
   end
 end
 
@@ -43,50 +47,23 @@ Sinatra::RocketIO.on :__linda_write do |data, client|
   Sinatra::RocketIO::Linda[space].write tuple, opts
 end
 
-Sinatra::RocketIO.on :__linda_read 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_read"
-    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_read"
-    next
-  end
-  Sinatra::RocketIO::Linda[space].read tuple do |tuple|
-    Sinatra::RocketIO.push "__linda_read_callback_#{callback}", tuple.data, :to => client.session
-  end
-end
-
-Sinatra::RocketIO.on :__linda_take 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_take"
-    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_take"
-    next
-  end
-  Sinatra::RocketIO::Linda[space].take tuple do |tuple|
-    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
+[:read, :take, :watch].each do |func|
+  Sinatra::RocketIO.on "__linda_#{func}" 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_#{func}"
+      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_#{func}"
+      next
+    end
+    eid = Sinatra::RocketIO::Linda[space].__send__ func, tuple do |tuple|
+      Sinatra::RocketIO.push "__linda_#{func}_callback_#{callback}", tuple.data, :to => client.session
+    end
+    Sinatra::RocketIO.on :disconnect do |_client|
+      Sinatra::RocketIO::Linda[space].remove_callback eid if client.session == _client.session
+    end
   end
 end

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

@@ -10,7 +10,9 @@ module Sinatra
           end
           @data = data
           @type = data.class
-          @expire_at = Time.now+(opts[:expire] || 300)
+          if opts[:expire].class == Fixnum and opts[:expire] > 0
+            @expire_at = Time.now + opts[:expire]
+          end
         end
 
         def match?(target)

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

@@ -4,8 +4,10 @@ module Sinatra
 
       class TupleSpace
         include Enumerable
+        attr_reader :name
 
-        def initialize
+        def initialize(name="__default__")
+          @name = name
           @tuples = Array.new
           @callbacks = Array.new
         end
@@ -16,6 +18,10 @@ module Sinatra
           end
         end
 
+        def remove_callback(callback)
+          @callbacks.delete callback
+        end
+
         def size
           @tuples.size
         end
@@ -60,7 +66,11 @@ module Sinatra
               end
             end
           end
-          @callbacks.push(:type => :read, :callback => block, :tuple => tuple) if block_given?
+          if block_given?
+            callback = {:type => :read, :callback => block, :tuple => tuple}
+            @callbacks.push callback
+            return callback
+          end
         end
 
         def take(tuple, &block)
@@ -80,20 +90,26 @@ module Sinatra
               return matched_tuple
             end
           else
-            @callbacks.push(:type => :take, :callback => block, :tuple => tuple) if block_given?
+            if block_given?
+              callback = {:type => :take, :callback => block, :tuple => tuple}
+              @callbacks.push callback
+              return callback
+            end
           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)
+          callback = {:type => :watch, :callback => block, :tuple => tuple}
+          @callbacks.unshift callback
+          callback
         end
 
         def check_expire
           expires = []
-          each do |tuple|
-            expires.push tuple unless tuple.expire_at > Time.now
+          self.each do |tuple|
+            expires.push(tuple) if tuple.expire_at and tuple.expire_at < Time.now
           end
           expires.each do |tuple|
             @tuples.delete tuple

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

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

data/test/app.rb

@@ -0,0 +1,38 @@
+class App
+
+  def self.running
+    @running ? true : false
+  end
+
+  def self.port
+    ENV['PORT'] || 5000
+  end
+
+  def self.ws_port
+    ENV['WS_PORT'] || 5001
+  end
+
+  def self.url
+    "http://localhost:#{port}"
+  end
+
+  def self.websocketio_url
+    "ws://localhost:#{ws_port}"
+  end
+
+  def self.cometio_url
+    "http://localhost:#{port}/cometio/io"
+  end
+
+  def self.app_dir
+    File.expand_path 'app', File.dirname(__FILE__)
+  end
+
+  def self.start
+    return if running
+    @running = true
+    cmd = "cd #{app_dir} && WS_PORT=#{ws_port} rackup config.ru -p #{port}"
+    system cmd
+  end
+
+end

data/test/app/config.ru

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'sinatra'
+require 'sinatra/base'
+$stdout.sync = true
+$:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
+require 'sinatra/rocketio'
+require 'sinatra/rocketio/linda'
+require File.dirname(__FILE__)+'/main'
+
+set :linda, :expire_check => 30
+set :websocketio, :port => ENV['WS_PORT'].to_i
+
+run TestApp

data/test/app/main.rb

@@ -0,0 +1,28 @@
+class TestApp < Sinatra::Base
+  register Sinatra::RocketIO
+  io = Sinatra::RocketIO
+  register Sinatra::RocketIO::Linda
+  linda = Sinatra::RocketIO::Linda
+
+  get '/' do
+    "sinatra-rocketio-linda v#{Sinatra::RocketIO::Linda::VERSION}"
+  end
+
+  io.on :connect do |client|
+    puts "new client <session:#{client.session}> <type:#{client.type}>"
+  end
+
+  io.on :disconnect do |client|
+    puts "disconnect client <session:#{client.session}> <type:#{client.type}>"
+  end
+
+  io.on :check_expire do |data, client|
+    puts "check_expire"
+    linda.check_expire
+  end
+
+  io.on :* do |event, data, client|
+    next unless event.to_s =~ /linda/
+    puts "#{event} - #{data} from #{client}"
+  end
+end

data/test/test_client_disconnect.rb

@@ -0,0 +1,46 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+require 'sinatra/rocketio/linda/client'
+
+class TestClientDisconnect < MiniTest::Test
+
+  def test_client_disconnect
+    ts_name = "ts_#{Time.now.to_i}_#{Time.now.usec}"
+    client1 = Sinatra::RocketIO::Linda::Client.new App.url
+    _tuple1 = nil
+    _tuple2 = nil
+    _tuple3 = nil
+    _tuple4 = nil
+    client1.io.on :connect do
+      client2 = Sinatra::RocketIO::Linda::Client.new App.url
+      client2.io.on :connect do
+        ts1 = client1.tuplespace[ts_name]
+        ts2 = client2.tuplespace[ts_name]
+        ts1.read [1,2] do |tuple|
+          _tuple1 = tuple
+        end
+        ts1.take [1,2] do |tuple|
+          _tuple2 = tuple
+        end
+        ts1.watch [1,2] do |tuple|
+          _tuple3 = tuple
+        end
+        ts2.take [1,2] do |tuple|
+          _tuple4 = tuple
+        end
+        client1.io.close
+        sleep 3
+        ts2.write [1,2,3]
+        ts2.write [1,2,3,4]
+      end
+    end
+    50.times do
+      sleep 0.1
+      break if _tuple4
+    end
+    assert_equal _tuple1, nil
+    assert_equal _tuple2, nil
+    assert_equal _tuple3, nil
+    assert_equal _tuple4, [1,2,3]
+  end
+
+end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
 require 'rubygems'
+require 'bundler/setup'
 require 'minitest/autorun'
+require File.expand_path 'app', File.dirname(__FILE__)
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)

data/test/test_rubyclient.rb

@@ -0,0 +1,125 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+require 'sinatra/rocketio/linda/client'
+
+class TestRubyClient < MiniTest::Test
+
+  def setup
+    @client = Sinatra::RocketIO::Linda::Client.new App.url
+  end
+
+  def test_write_read_take
+    ts_name = "ts_#{rand Time.now.to_i}"
+    ts = @client.tuplespace[ts_name]
+    _tuple1 = nil
+    _tuple2 = nil
+    _tuple3 = nil
+    _tuple4 = nil
+    @client.io.on :connect do
+      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|
+        _tuple1 = tuple
+      end
+      ts.read ["rw",1,2] do |tuple|
+        _tuple2 = tuple
+      end
+      ts.take ["rw",1,2] do |tuple|
+        _tuple3 = tuple
+      end
+      client2 = Sinatra::RocketIO::Linda::Client.new App.url
+      ts2 = client2.tuplespace[ts_name]
+      client2.io.on :connect do
+        ts2.take ["rw",1] do |tuple|
+          _tuple4 = tuple
+        end
+      end
+    end
+    50.times do
+      sleep 0.1
+      break if _tuple4
+    end
+    assert_equal _tuple1, ["rw",1,2,"a"] # take
+    assert_equal _tuple2, ["rw",1,2,3] # read
+    assert_equal _tuple3, ["rw",1,2,3] # take
+    assert_equal _tuple4, ["rw",1,"a",2]
+  end
+
+  def test_watch
+    results = []
+    _tuple1 = nil
+    _tuple2 = nil
+    ts = @client.tuplespace["ts_#{rand Time.now.to_i}"]
+    @client.io.on :connect do
+      ts.take ["watch",1,2] do |tuple|
+        _tuple1 = tuple
+      end
+      ts.read ["watch",1,2] do |tuple|
+        _tuple2 = tuple
+      end
+      ts.watch ["watch",1,2] do |tuple|
+        results.push tuple
+      end
+      ts.write ["watch",1,2,3]
+      ts.write ["watch",1,"a",2]
+      ts.write ["watch",1,2,3,4]
+    end
+    50.times do
+      sleep 0.1
+      break if  _tuple1 != nil and _tuple2 != nil
+    end
+    assert_equal _tuple1, ["watch",1,2,3]
+    assert_equal _tuple2, ["watch",1,2,3,4]
+    assert_equal results.size, 2
+    assert_equal results[0], ["watch",1,2,3]
+    assert_equal results[1], ["watch",1,2,3,4]
+  end
+
+  def test_tuplespaces
+    ts1 = @client.tuplespace["ts1_#{rand Time.now.to_i}"]
+    ts2 = @client.tuplespace["ts2_#{rand Time.now.to_i}"]
+    _tuple1 = nil
+    _tuple2 = nil
+    @client.io.on :connect do
+      ts2.take ["a"] do |tuple|
+        _tuple2 = tuple
+      end
+      ts1.take [1] do |tuple|
+        _tuple1 = tuple
+      end
+      ts1.write [1,2,3]
+      ts2.write ["a","b","c"]
+    end
+    50.times do
+      sleep 0.1
+      break if _tuple1
+    end
+    assert_equal _tuple1, [1,2,3]
+    assert_equal _tuple2, ["a","b","c"]
+  end
+
+  def test_tuple_expire
+    ts = @client.tuplespace["ts_#{rand Time.now.to_i}"]
+    _tuple1 = nil
+    _tuple2 = nil
+    @client.io.on :connect do
+      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|
+        _tuple1 = tuple
+      end
+      sleep 3
+      @client.io.push :check_expire, []
+      ts.read ["expire",1,2] do |tuple|
+        _tuple2 = tuple
+      end
+    end
+    50.times do
+      sleep 0.1
+      break if _tuple2
+    end
+    assert_equal _tuple1, ["expire",1,2,"a","b"]
+    assert_equal _tuple2, ["expire",1,2,3]
+  end
+end

data/test/test_tuplespace.rb

@@ -117,13 +117,17 @@ class TestTupleSpace < MiniTest::Test
   end
 
   def test_tuple_expire
+    @space.write [1,2,999], :expire => false
     @space.write [1,2,3], :expire => 3
     @space.write [1,2,"a","b"], :expire => 2
-    assert_equal @space.size, 2
+    assert_equal @space.size, 3
     sleep 2
     @space.check_expire
-    assert_equal @space.size, 1
+    assert_equal @space.size, 2
     assert_equal @space.take([1,2]).data, [1,2,3]
+    assert_equal @space.size, 1
+    sleep 1
+    assert_equal @space.take([1,2]).data, [1,2,999]
     assert_equal @space.size, 0
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio-linda
 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-15 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,7 +156,12 @@ files:
 - sample/views/index.haml
 - sample/views/worker.haml
 - sinatra-rocketio-linda.gemspec
+- test/app.rb
+- test/app/config.ru
+- test/app/main.rb
+- test/test_client_disconnect.rb
 - test/test_helper.rb
+- test/test_rubyclient.rb
 - test/test_tuple.rb
 - test/test_tuplespace.rb
 homepage: https://github.com/shokai/sinatra-rocketio-linda
@@ -184,6 +189,11 @@ signing_key:
 specification_version: 4
 summary: Linda implementation on Sinatra RocketIO
 test_files:
+- test/app.rb
+- test/app/config.ru
+- test/app/main.rb
+- test/test_client_disconnect.rb
 - test/test_helper.rb
+- test/test_rubyclient.rb
 - test/test_tuple.rb
 - test/test_tuplespace.rb