linda 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0d21f85711ad7ff91ac04e9e2a19511f50aa523
-  data.tar.gz: 24c7df040039b124cc46b7ad3366d119138c01e3
+  metadata.gz: 222fc25528f372a65dedf1ba623a39bedb5a1611
+  data.tar.gz: 122f6d8a6d936b20e4b39f3946c499916c7124e4
 SHA512:
-  metadata.gz: 246eace4880e3e1f1ab4a56dba6669bc94ea681fd868b6276b4e33a96e1ac4d7cc43ed99eeffd2841ab0bc372ee5f6d5181dc217d125988f1f7606c36e071ccf
-  data.tar.gz: 5f18ac034f70d406bfa4814cafac4766962a84aed30aa55ad10ea0eccbc9364152ea0caf8f73e7fcc82b6ffc9f303564cb615ff9cb904b8f0b2e0cb5db16cc6c
+  metadata.gz: fa137ac6811892d6ffda280d7c43a821a5daee3d92f57548d065b2efb41c848f032bf5086f3953f9d6f00aabb2037e9aea841e1156dbf4a4929eabc5e012598d
+  data.tar.gz: 682893a29a0406d0e5edc61a28f6fc879aa2214b6f2b20f0b78b9af605b1b29812d7f2bb0a8b7498775d4b2d9ef507523326bb5e85650ffbf9da455d55e93094

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.4 2013-05-31
+
+* TupleSpace#cancel for remove read/take/watch callback
+* fix tests
+
 === 0.0.3 2013-05-20
 
 * add tests

data/README.md

@@ -98,6 +98,11 @@ Tuple/TupleSpace Functions
 - callback Tuples which matches when TupleSpace#write(tuple) is called.
 
 
+### TupleSpace#cancel(callback_id)
+
+- remove read/take/watch callback by Callback-ID.
+
+
 Test your Linda implementation
 ------------------------------
 

data/lib/linda/test/tuplespace.rb

@@ -37,24 +37,24 @@ module Linda
         assert_equal @space.size, 0
         _tuple1 = nil
         @space.read [1,2] do |tuple|
-          _tuple1 = tuple
+          _tuple1 = tuple.data
         end
         _tuple2 = nil
         @space.read [1,"a"] do |tuple|
-          _tuple2 = tuple
+          _tuple2 = tuple.data
         end
         _tuple3 = nil
         @space.read [1,2,3] do |tuple|
-          _tuple3 = tuple
+          _tuple3 = tuple.data
         end
         @space.write [1,2,3]
-        assert_equal _tuple1.data, [1,2,3]
+        assert_equal _tuple1, [1,2,3]
         assert_equal _tuple2, nil
-        assert_equal _tuple3.data, [1,2,3]
+        assert_equal _tuple3, [1,2,3]
         assert_equal @space.read([1]).data, [1,2,3]
         assert_equal @space.size, 1
         @space.write [1,2,4]
-        assert_equal _tuple1.data, [1,2,3]
+        assert_equal _tuple1, [1,2,3]
         assert_equal @space.size, 2
       end
 
@@ -82,28 +82,28 @@ module Linda
         assert_equal @space.size, 0
         _tuple1 = nil
         @space.take [1,2] do |tuple|
-          _tuple1 = tuple
+          _tuple1 = tuple.data
         end
         _tuple2 = nil
         @space.take [1,"a"] do |tuple|
-          _tuple2 = tuple
+          _tuple2 = tuple.data
         end
         _tuple3 = nil
         @space.read [1,2,3] do |tuple|
-          _tuple3 = tuple
+          _tuple3 = tuple.data
         end
         _tuple4 = nil
         @space.take [1,2,3] do |tuple|
-          _tuple4 = tuple
+          _tuple4 = tuple.data
         end
         1.upto(3) do |i|
           @space.write [1,2,3,"a"*i]
         end
         assert_equal @space.size, 1
-        assert_equal _tuple1.data, [1,2,3,"a"]
+        assert_equal _tuple1, [1,2,3,"a"]
         assert_equal _tuple2, nil
-        assert_equal _tuple3.data, [1,2,3,"aa"]
-        assert_equal _tuple4.data, [1,2,3,"aa"]
+        assert_equal _tuple3, [1,2,3,"aa"]
+        assert_equal _tuple4, [1,2,3,"aa"]
         assert_equal @space.take([1]).data, [1,2,3,"aaa"]
         assert_equal @space.size, 0
       end
@@ -112,20 +112,20 @@ module Linda
         assert_equal @space.size, 0
         _tuple1 = nil
         @space.take [1] do |tuple|
-          _tuple1 = tuple
+          _tuple1 = tuple.data
         end
         results = []
         @space.watch [1,2] do |tuple|
-          results << tuple
+          results << tuple.data
         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 _tuple1, [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"]
+        assert_equal results[0], [1,2,3]
+        assert_equal results[1], [1,2,"aa"]
       end
 
       def test_tuple_expire
@@ -143,6 +143,59 @@ module Linda
         assert_equal @space.size, 0
       end
 
+      def test_cancel_read
+        _tuple1 = nil
+        _tuple2 = nil
+        callback_id1 = @space.read [1,2] do |tuple|
+          _tuple1 = tuple.data
+        end
+        callback_id2 = @space.read [1,2] do |tuple|
+          _tuple2 = tuple.data
+        end
+        @space.cancel callback_id1
+        @space.write [1,2,3]
+        sleep 1
+        assert_equal _tuple1, nil
+        assert_equal _tuple2, [1,2,3]
+        assert callback_id1 != callback_id2
+      end
+
+      def test_cancel_take
+        _tuple1 = nil
+        _tuple2 = nil
+        callback_id1 = @space.take [1,2] do |tuple|
+          _tuple1 = tuple.data
+        end
+        callback_id2 = @space.take [1,2] do |tuple|
+          _tuple2 = tuple.data
+        end
+        @space.cancel callback_id1
+        @space.write [1,2,3]
+        sleep 1
+        assert_equal _tuple1, nil
+        assert_equal _tuple2, [1,2,3]
+        assert callback_id1 != callback_id2
+      end
+
+
+      def test_cancel_watch
+        _tuple1 = nil
+        _tuple2 = nil
+        callback_id1 = @space.watch [1,2] do |tuple|
+          _tuple1 = tuple.data
+        end
+        callback_id2 = @space.watch [1,2] do |tuple|
+          _tuple2 = tuple.data
+        end
+        @space.write [1,2,3]
+        @space.cancel callback_id1
+        @space.write [1,2,3,4]
+        sleep 1
+        assert_equal _tuple1, [1,2,3]
+        assert_equal _tuple2, [1,2,3,4]
+        assert callback_id1 != callback_id2
+      end
+
     end
   end
 end

data/lib/linda/tuplespace.rb

@@ -16,7 +16,7 @@ module Linda
       end
     end
 
-    def remove_callback(callback)
+    def cancel(callback)
       @callbacks.delete callback
     end
 

data/lib/linda/version.rb

@@ -1,3 +1,3 @@
 module Linda
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linda
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -119,3 +119,4 @@ test_files:
 - test/test_helper.rb
 - test/test_tuple.rb
 - test/test_tuplespace.rb
+has_rdoc: