iotas 0.0.2 → 0.0.3

data/Changelog

@@ -1,3 +1,7 @@
+2012-05-24 Jérémy Zurcher <jeremy@asynk.ch>
+	* release : 0.0.3
+	* change routing algo, use Spin@world hash when door is not found locally
+
 2012-05-18 Jérémy Zurcher <jeremy@asynk.ch>
 	* first release : v0.0.2
 

data/lib/iotas/iota.rb

@@ -24,13 +24,16 @@ module Iotas
     class Iota
         #
         def initialize n, p
+            raise Iotas::Exception.new "Iota name #{n} is not valid" if n.include? Iotas::PATH_SEP
             @name   = n     # unique in it's room
             @parent = p     # single direct parent
             @viewer = nil   # particle going through that position will be sent there readonly
             @path = ( @parent ? @parent.path+Iotas::PATH_SEP : '') + @name
             @spin = ( @parent ? @parent.spin : self )
-            @parent.add_iota self if @parent
-            raise Iotas::Exception.new "Iota name #{name} is not valid" if @name.include? Iotas::PATH_SEP
+            if @parent
+                @parent.add_iota self
+                @spin.add_to_world self if @spin.is_a? Iotas::Spin
+            end
         end
         #
         attr_reader :name, :path, :spin

data/lib/iotas/room.rb

@@ -23,8 +23,7 @@ module Iotas
     #
     ERROR_ROUTE_NS      = 'routing error: no source'.freeze
     ERROR_ROUTE_RRWD    = 'routing error: right room, wrong door'.freeze
-    ERROR_ROUTE_DDWR    = 'routing error: drill down, wrong room'.freeze
-    ERROR_ROUTE_TRWR    = 'routing error: top room, wrong room'.freeze
+    ERROR_ROUTE_DNE     = 'routing error: does not exists'.freeze
     ERROR_ROUTE_NDNL    = 'routing error: no destination, no link'.freeze
     ERROR_ROUTE_SND     = 'routing error: system no destination'.freeze
     #
@@ -126,17 +125,10 @@ module Iotas
                 else
                     p.error! Iotas::ERROR_ROUTE_RRWD
                 end
-            elsif (p.room=~/^#{path}\/(.*)/)==0
-                room, *more = $1.split Iotas::PATH_SEP
-                if child=@iotas[room]
-                    child.route_p p
-                else
-                    p.error! Iotas::ERROR_ROUTE_DDWR
-                end
-            elsif @parent
-                @parent.route_p p
+            elsif door = @spin.search_world(p.room+Iotas::PATH_SEP+p.door)
+                p.dst_routed! door
             else
-                p.error! Iotas::ERROR_ROUTE_TRWR
+                p.error! Iotas::ERROR_ROUTE_DNE
             end
         end
         #

data/lib/iotas/spin.rb

@@ -27,6 +27,7 @@ module Iotas
             super n, nil
             #
             @pool       = {}    # per particle class free list
+            @world      = {}    # global iotas index
             @sys_fifo   = []    # system particles fifo list
             @app_fifo   = []    # application particles fifo list
             #
@@ -70,6 +71,14 @@ module Iotas
             self.new o['name'], o
         end
         #
+        def add_to_world iota
+            @world[iota.path] = iota
+        end
+        #
+        def search_world path
+            @world[path]
+        end
+        #
         def clear!
             @iotas.clear
             @pool.clear

data/lib/version.rb

@@ -21,7 +21,7 @@
 #
 module Iotas
     #
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
     #
 end
 #

data/spec/room_spec.rb

@@ -58,6 +58,29 @@ describe Iotas::Room do
         r4.search_down('dom0/r0/r1/r2').should be nil
     end
     #
+    it "routing success (direct)" do
+        room0 = Iotas::Room.new 'room0', @spin
+        door0 = Iotas::Door.new 'door0', room0
+        p = @spin.require_p Iotas::Particle
+        p.src = Fake.new 'fake', @spin
+        p.set_dst! 'get', 'door0'
+        room0.send_p p
+        p.action.should eql 'get'
+        p.dst.should be door0
+    end
+    #
+    it "routing success through Spin@world" do
+        room0 = Iotas::Room.new 'room0', @spin
+        room1 = Iotas::Room.new 'room1', room0
+        door0 = Iotas::Door.new 'door0', room1
+        p = @spin.require_p Iotas::Particle
+        p.src = Fake.new 'fake', @spin
+        p.set_dst! 'get', 'dom0/room0/room1/door0'
+        room0.send_p p
+        p.action.should eql 'get'
+        p.dst.should be door0
+    end
+    #
     it "route error: no source" do
         room = Iotas::Room.new 'room', @spin
         p = @spin.require_p Iotas::Particle
@@ -78,96 +101,53 @@ describe Iotas::Room do
         p.dst.should be p.src
     end
     #
-    it "route error: top room, wrong room" do
+    it "route error: no rooom, wrong door -> right room wrong door" do
         room0 = Iotas::Room.new 'room0', @spin
-        room1 = Iotas::Room.new 'room1', room0
         p = @spin.require_p Iotas::Particle
         p.src = Fake.new 'fake', @spin
-        p.set_dst! 'get', 'noroom/door'
-        room1.send_p p
+        p.set_dst! 'get', 'nodoor'
+        room0.send_p p
         p.action.should eql Iotas::ACT_ERROR
-        p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_TRWR
+        p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_RRWD
         p.dst.should be p.src
     end
     #
-    it "route error: right room, wrong door" do
-        room = Iotas::Room.new 'room', @spin
+    it "route error: right rooom, wrong door -> right room wrong door" do
+        room0 = Iotas::Room.new 'room0', @spin
         p = @spin.require_p Iotas::Particle
         p.src = Fake.new 'fake', @spin
-        p.set_dst! 'get', 'dom0/room/nodoor'
-        room.send_p p
+        p.set_dst! 'get', 'dom0/room0/nodoor'
+        room0.send_p p
         p.action.should eql Iotas::ACT_ERROR
         p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_RRWD
         p.dst.should be p.src
     end
     #
-    it "route error: right room, wrong door (bubble up)" do
+    it "route error: right room, wrong door through Spin@world -> does not exists" do
         room0 = Iotas::Room.new 'room0', @spin
         room1 = Iotas::Room.new 'room1', room0
         p = @spin.require_p Iotas::Particle
-        p.src = Fake.new 'fake', @spin
+        p.src = Fake.new 'fake', room0
         p.set_dst! 'get', 'dom0/room0/nodoor'
         room1.send_p p
         p.action.should eql Iotas::ACT_ERROR
-        p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_RRWD
+        p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_DNE
         p.dst.should be p.src
     end
     #
-    it "routing success (direct)" do
-        room0 = Iotas::Room.new 'room0', @spin
-        door0 = Iotas::Door.new 'door0', room0
-        p = @spin.require_p Iotas::Particle
-        p.src = Fake.new 'fake', @spin
-        p.set_dst! 'get', 'door0'
-        room0.send_p p
-        p.action.should eql 'get'
-        p.dst.should be door0
-    end
-    #
-    it "routing success (bubble up the direct door)" do
+    it "route error: wrong room, right door through Spin@world -> does not exists" do
         room0 = Iotas::Room.new 'room0', @spin
         room1 = Iotas::Room.new 'room1', room0
-        door0 = Iotas::Door.new 'door0', room0
         p = @spin.require_p Iotas::Particle
         p.src = Fake.new 'fake', @spin
-        p.set_dst! 'get', 'dom0/room0/door0'
+        p.set_dst! 'get', 'dom0/noroom/fake'
         room1.send_p p
-        p.action.should eql 'get'
-        p.dst.should be door0
-    end
-    #
-    it "route success: bubble up x2, drill down x3" do
-        room00 = Iotas::Room.new 'room00', @spin
-        room01 = Iotas::Room.new 'room01', room00
-        room02 = Iotas::Room.new 'room02', room01
-        door000 = Iotas::Door.new 'door000', room02
-        room10 = Iotas::Room.new 'room10', @spin
-        room11 = Iotas::Room.new 'room11', room10
-        p = @spin.require_p Iotas::Particle
-        p.src = Fake.new 'fake', @spin
-        p.set_dst! 'get', 'dom0/room00/room01/room02/door000'
-        room11.send_p p
-        p.action.should eql 'get'
-        p.dst.should be door000
-    end
-    #
-    it "route error: bubble up x2 drill down x2" do
-        room00 = Iotas::Room.new 'room00', @spin
-        room01 = Iotas::Room.new 'room01', room00
-        room02 = Iotas::Room.new 'room02', room01
-        door000 = Iotas::Door.new 'door000', room02
-        room10 = Iotas::Room.new 'room10', @spin
-        room11 = Iotas::Room.new 'room11', room10
-        p = @spin.require_p Iotas::Particle
-        p.src = Fake.new 'fake', @spin
-        p.set_dst! 'get', 'dom0/room00/room01/wrong/door000'
-        room11.send_p p
         p.action.should eql Iotas::ACT_ERROR
-        p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_DDWR
+        p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_DNE
         p.dst.should be p.src
     end
     #
-    it "routing success: no door name -> src" do
+    it "routing ~failure: no door name -> src" do
         room0 = Iotas::Room.new 'room0', @spin
         door0 = Iotas::Door.new 'door0', room0
         p = @spin.require_p Iotas::Particle

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iotas
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json