iotas 0.0.3 → 0.0.4

data/lib/iotas/door.rb

@@ -44,7 +44,7 @@ module Iotas
         #
         def require_p p_kls
             p = @spin.require_p p_kls
-            p.src = self
+            p.init! self
             p
         end
         #
@@ -72,14 +72,16 @@ module Iotas
             @spin.release_p p
         end
         #
-        def send_p p
-            p.src = self
+        def send_p p, a=nil
+            p.init! self
+            p.set_dst! a, self if a
             @saved=nil if @saved==p # particle is sent back the data, all is good
             @parent.send_p p        # daddy will know what to do
         end
         #
-        def send_sys_p p
-            p.src = self
+        def send_sys_p p, a=nil
+            p.init! self
+            p.set_dst! a, self if a
             @saved=nil if @saved==p # particle is sent back the data, all is good
             @parent.send_sys_p p    # daddy will know what to do
         end

data/lib/iotas/particle.rb

@@ -76,16 +76,19 @@ module Iotas
         end
         #
         def reset!
-            @ts = Time.now
-            @src = @dst = @room = @door = @action = @link_value = nil
+            @ts = @src = @dst = @room = @door = @action = @link_value = nil
             @dsts.clear
             @link_fields.clear
             @payload.clear
             @merged.clear
         end
         #
-        attr_accessor :src
-        attr_reader :ts, :dst, :room, :door, :action, :link_value, :payload
+        def init! src
+            @src = src
+            @ts = Time.now
+        end
+        #
+        attr_reader :ts, :src, :dst, :room, :door, :action, :link_value, :payload
         #
         # routing
         #
@@ -107,12 +110,16 @@ module Iotas
             end
         end
         #
-        def set_dst! a, d=''
-            @dst = @room = @door = @action = nil
-            clear_dsts!
+        def add_dst a, d=''
             add_dsts d+Iotas::ACT_SEP+a
         end
         #
+        def set_dst! a, d
+            @room = @door = nil
+            @action = a
+            @dst = d
+        end
+        #
         def split_dst!
             @dst = @room = @door = @action = nil
             return if (n = next_dst).nil?
@@ -133,6 +140,12 @@ module Iotas
             @dsts.shift
         end
         #
+        def dst_reached!
+            d = @dst
+            @dst = nil
+            d
+        end
+        #
         def error! e, dst=nil
             @action = Iotas::ACT_ERROR
             @dst = dst||@src

data/lib/iotas/room.rb

@@ -134,6 +134,10 @@ module Iotas
         #
         def send_p p
             puts " * send_p #{(p.next_dst.nil? ? 'no dst' : p.next_dst)} ..." if @spin.debug_routing
+            if p.dst
+                puts "   -> #{p.dst.path}#{Iotas::ACT_SEP}#{p.action}" if @spin.debug_routing
+                return @spin.post_p p
+            end
             if p.src.nil?
                 # do not route orphan particles !!
                 p.error! Iotas::ERROR_ROUTE_NS, @spin
@@ -156,6 +160,10 @@ module Iotas
         #
         def send_sys_p p
             puts " * send_sys_p #{(p.next_dst.nil? ? 'no dst' : p.next_dst)} ..." if @spin.debug_routing
+            if p.dst
+                puts "   -> #{p.dst.path}#{Iotas::ACT_SEP}#{p.action}" if @spin.debug_routing
+                return @spin.post_sys_p p
+            end
             if p.next_dst
                 p.split_dst!
                 if p.door

data/lib/iotas/spin.rb

@@ -128,11 +128,11 @@ module Iotas
             while @run and (@sys_fifo.length>0 or @app_fifo.length>0)
                 while @run and @sys_fifo.length>0
                     p = @sys_fifo.shift
-                    p.dst.process_sys_p p
+                    p.dst_reached!.process_sys_p p
                 end
                 while @run and @app_fifo.length>0
                     p = @app_fifo.shift
-                    p.dst.process_p p
+                    p.dst_reached!.process_p p
                     break
                 end
             end

data/lib/version.rb

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

data/spec/board_spec.rb

@@ -68,9 +68,9 @@ describe Iotas::Board do
         b0.process_p p0
         p0.merged(0).should be_nil
         # need to set it to p0 too, so case in Board0 is ok
-        p0.set_dst! Iotas::ACT_FOLLOW
+        p0.add_dst Iotas::ACT_FOLLOW
         p0.split_dst!
-        p1.set_dst! Iotas::ACT_FOLLOW
+        p1.add_dst Iotas::ACT_FOLLOW
         p1.split_dst!
         b0.process_p p1
         b0.ok.should be_true

data/spec/door_spec.rb

@@ -55,27 +55,31 @@ describe Iotas::Door do
         d0 = Door0.new 'door0', f
         p0 = d0.require_p Iotas::Particle
         #
-        p0.set_dst! 'SEND'
+        p0.add_dst 'SEND'
         p0.split_dst!
         d0.process_p p0
         f.p.should eql p0
+        p0.clear_dsts!
         #
-        p0.set_dst! 'SEND_SYS'
+        p0.add_dst 'SEND_SYS'
         p0.split_dst!
         d0.process_p p0
         f.sp.should eql p0
+        p0.clear_dsts!
         #
-        p0.set_dst! 'RELEASE'
+        p0.add_dst 'RELEASE'
         p0.split_dst!
         d0.process_p p0
         p1 = d0.require_p Iotas::Particle
         p1.should be p0
+        p0.clear_dsts!
         #
-        p0.set_dst! 'LOST'
+        p0.add_dst 'LOST'
         p0.split_dst!
         d0.process_p p0
         p1 = d0.require_p Iotas::Particle
         p1.should be p0
+        p0.clear_dsts!
         #
         d0.process_sys_p p0
         p1 = @spin.require_p Iotas::Particle

data/spec/particle_spec.rb

@@ -80,52 +80,69 @@ describe Iotas::Particle do
     #
     it "wrong path should raise exeption" do
         p = Iotas::Particle.new
-        lambda { p.set_dst! 'action', '/room' }.should raise_error(Iotas::Exception)
-        lambda { p.set_dst! 'action', 'room/' }.should raise_error(Iotas::Exception)
-        lambda { p.set_dst! '', 'room/' }.should raise_error(Iotas::Exception)
-        lambda { p.set_dst! 'action', 'room//door' }.should raise_error(Iotas::Exception)
-        lambda { p.set_dst! ' ' }.should raise_error(Iotas::Exception)
-        lambda { p.set_dst! ' ', '' }.should raise_error(Iotas::Exception)
-        lambda { p.set_dst! 'f f' }.should raise_error(Iotas::Exception)
-        lambda { p.set_dst! '', ' d' }.should raise_error(Iotas::Exception)
-        lambda { p.set_dst! '' }.should raise_error(Iotas::Exception)
-        lambda { p.set_dst! '', '' }.should raise_error(Iotas::Exception)
-        lambda { p.set_dst! nil }.should raise_error(TypeError)
-        lambda { p.set_dst! 'action', nil }.should raise_error(NoMethodError)
+        lambda { p.add_dst 'action', '/room' }.should raise_error(Iotas::Exception)
+        lambda { p.add_dst 'action', 'room/' }.should raise_error(Iotas::Exception)
+        lambda { p.add_dst '', 'room/' }.should raise_error(Iotas::Exception)
+        lambda { p.add_dst 'action', 'room//door' }.should raise_error(Iotas::Exception)
+        lambda { p.add_dst ' ' }.should raise_error(Iotas::Exception)
+        lambda { p.add_dst ' ', '' }.should raise_error(Iotas::Exception)
+        lambda { p.add_dst 'f f' }.should raise_error(Iotas::Exception)
+        lambda { p.add_dst '', ' d' }.should raise_error(Iotas::Exception)
+        lambda { p.add_dst '' }.should raise_error(Iotas::Exception)
+        lambda { p.add_dst '', '' }.should raise_error(Iotas::Exception)
+        lambda { p.add_dst nil }.should raise_error(TypeError)
+        lambda { p.add_dst 'action', nil }.should raise_error(NoMethodError)
     end
     #
-    it "routing: set_dst! and split_dst!" do
+    it "routing: set_dst!" do
         p = Iotas::Particle.new
-        d0 = Iotas::Door.new 'door0', nil 
+        d0 = Iotas::Door.new 'door0', nil
+        #
+        p.set_dst! 'action', d0
+        p.action.should eql 'action'
+        p.dst.should be d0
+    end
+    #
+    it "routing: add_dst and split_dst!" do
+        p = Iotas::Particle.new
+        d0 = Iotas::Door.new 'door0', nil
         #
-        p.set_dst! 'action', 'room0/room1/door'
+        p.split_dst!
+        p.room.should be_nil
+        p.door.should be_nil
+        p.action.should be_nil
+        #
+        p.add_dst 'action', 'room0/room1/door'
         p.split_dst!
         p.room.should eql 'room0/room1'
         p.door.should eql 'door'
         p.action.should eql 'action'
+        p.clear_dsts!
         #
-        p.set_dst! 'action', 'room/door'
+        p.add_dst 'action', 'room/door'
         p.split_dst!
         p.room.should eql 'room'
         p.door.should eql 'door'
         p.action.should eql 'action'
+        p.clear_dsts!
         #
-        p.set_dst! 'action', ''
+        p.add_dst 'action', ''
         p.split_dst!
-        p.room.should eql nil
-        p.door.should eql nil
+        p.room.should be_nil
+        p.door.should be_nil
         p.action.should eql 'action'
+        p.clear_dsts!
         #
-        p.set_dst! 'action'
+        p.add_dst 'action'
         p.split_dst!
-        p.room.should eql nil
-        p.door.should eql nil
+        p.room.should be_nil
+        p.door.should be_nil
         p.action.should eql 'action'
-        #
         p.clear_dsts!
+        #
         p.add_dsts 'door?action,?action'
         p.split_dst!
-        p.room.should eql nil
+        p.room.should be_nil
         p.door.should eql 'door'
         p.action.should eql 'action'
         #
@@ -133,8 +150,8 @@ describe Iotas::Particle do
         #
         p.dst.should be d0
         p.split_dst!
-        p.room.should eql nil
-        p.door.should eql nil
+        p.room.should be_nil
+        p.door.should be_nil
         p.action.should eql 'action'
         #
     end
@@ -142,7 +159,7 @@ describe Iotas::Particle do
     it "routing: error!" do
         p = Iotas::Particle.new
         d = Iotas::Door.new 'door', nil
-        p.src = d
+        p.init! d
         p.add_dsts 'door?action,?action'
         p.next_dst.should eql 'door?action'
         p.error! 'err_msg'
@@ -193,7 +210,7 @@ describe Iotas::Particle do
         p0['k0'] = 'v0'
         p0['k1'] = 'v1'
         p0['k2'] = 'v2'
-        p0.src = s3
+        p0.init! s3
         p0.set_link_fields 'k0,k2'
         p0.add_dsts 'room0/room1/room2/doorX?myaction,door?action,?action'
         p0.split_dst!
@@ -201,7 +218,7 @@ describe Iotas::Particle do
         p1['k3'] = 'v6'
         p1['k4'] = 'v7'
         p1['k5'] = 'v8'
-        p1.src = s3
+        p1.init! s3
         p1.dst_routed! s4
         p1.set_link_fields 'k5,k4,k3'
         p1.add_dsts 'room0/room1/door?action,output?action'

data/spec/room_spec.rb

@@ -58,24 +58,34 @@ describe Iotas::Room do
         r4.search_down('dom0/r0/r1/r2').should be nil
     end
     #
-    it "routing success (direct)" do
+    it "routing success (direct add_dst)" 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'
+        p.init! Fake.new( 'fake', @spin)
+        p.add_dst 'get', 'door0'
         room0.send_p p
         p.action.should eql 'get'
         p.dst.should be door0
     end
     #
+    it "routing success (direct send)" do
+        room0 = Iotas::Room.new 'room0', @spin
+        door0 = Iotas::Door.new 'door0', room0
+        p = @spin.require_p Iotas::Particle
+        p.init! Fake.new( 'fake', @spin)
+        door0.send_p p, 'get'
+        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'
+        p.init! Fake.new('fake', @spin)
+        p.add_dst 'get', 'dom0/room0/room1/door0'
         room0.send_p p
         p.action.should eql 'get'
         p.dst.should be door0
@@ -84,7 +94,7 @@ describe Iotas::Room do
     it "route error: no source" do
         room = Iotas::Room.new 'room', @spin
         p = @spin.require_p Iotas::Particle
-        p.set_dst! 'get', 'room/door'
+        p.add_dst 'get', 'room/door'
         room.send_p p
         p.action.should eql Iotas::ACT_ERROR
         p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_NS
@@ -94,7 +104,7 @@ describe Iotas::Room do
     it "route error: no destination no links" do
         room = Iotas::Room.new 'room', @spin
         p = @spin.require_p Iotas::Particle
-        p.src = Fake.new 'fake', @spin
+        p.init! Fake.new('fake', @spin)
         room.send_p p
         p.action.should eql Iotas::ACT_ERROR
         p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_NDNL
@@ -104,8 +114,8 @@ describe Iotas::Room do
     it "route error: no 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', 'nodoor'
+        p.init! Fake.new('fake', @spin)
+        p.add_dst 'get', 'nodoor'
         room0.send_p p
         p.action.should eql Iotas::ACT_ERROR
         p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_RRWD
@@ -115,8 +125,8 @@ describe Iotas::Room do
     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/room0/nodoor'
+        p.init! Fake.new('fake', @spin)
+        p.add_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
@@ -127,8 +137,8 @@ describe Iotas::Room do
         room0 = Iotas::Room.new 'room0', @spin
         room1 = Iotas::Room.new 'room1', room0
         p = @spin.require_p Iotas::Particle
-        p.src = Fake.new 'fake', room0
-        p.set_dst! 'get', 'dom0/room0/nodoor'
+        p.init! Fake.new('fake', room0)
+        p.add_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_DNE
@@ -139,8 +149,8 @@ describe Iotas::Room 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', 'dom0/noroom/fake'
+        p.init! Fake.new('fake', @spin)
+        p.add_dst 'get', 'dom0/noroom/fake'
         room1.send_p p
         p.action.should eql Iotas::ACT_ERROR
         p[Iotas::FIELD_ERROR_MSG].should eql Iotas::ERROR_ROUTE_DNE
@@ -151,8 +161,8 @@ describe Iotas::Room do
         room0 = Iotas::Room.new 'room0', @spin
         door0 = Iotas::Door.new 'door0', room0
         p = @spin.require_p Iotas::Particle
-        p.src = door0
-        p.set_dst! 'get'
+        p.init! door0
+        p.add_dst 'get'
         room0.send_p p
         p.action.should eql 'get'
         p.dst.should be door0
@@ -205,11 +215,11 @@ describe Iotas::Room do
         p0 = door1.ps[0]
         p0.action.should be_nil
         p0.src.should be door0
-        p0.dst.should be door1
+        p0.dst.should be_nil
         p1 = door1.ps[1]
         p1.action.should be_nil
         p1.src.should be door0
-        p1.dst.should be door1
+        p1.dst.should be_nil
         p1.should be p
     end
     #
@@ -224,22 +234,31 @@ describe Iotas::Room do
     it "system routing success: action only" do
         room0 = Iotas::Room.new 'room0', @spin
         p = @spin.require_p Iotas::Particle
-        p.set_dst! Iotas::SYS_ACT_ADD_LINK
+        p.add_dst Iotas::SYS_ACT_ADD_LINK
         room0.send_sys_p p
         p.action.should eql Iotas::SYS_ACT_ADD_LINK
         p.dst.should be room0.spin
     end
     #
-    it "system routing success" do
+    it "system routing success (add_dst)" do
         room0 = Iotas::Room.new 'room0', @spin
         door0 = Iotas::Door.new 'door0', room0
         p = @spin.require_p Iotas::Particle
-        p.set_dst! Iotas::SYS_ACT_ADD_LINK, 'dom0/room0/door0'
+        p.add_dst Iotas::SYS_ACT_ADD_LINK, 'dom0/room0/door0'
         room0.send_sys_p p
         p.action.should eql Iotas::SYS_ACT_ADD_LINK
         p.dst.should be door0
     end
     #
+    it "system routing success (send_sys_p)" do
+        room0 = Iotas::Room.new 'room0', @spin
+        door0 = Iotas::Door.new 'door0', room0
+        p = @spin.require_p Iotas::Particle
+        door0.send_sys_p p, Iotas::SYS_ACT_ADD_LINK
+        p.action.should eql Iotas::SYS_ACT_ADD_LINK
+        p.dst.should be door0
+    end
+    #
     it "SYS_ACT_ADD_LINK" do
         room0 = Iotas::Room.new 'room0', @spin
         door0 = Iotas::Door.new 'door0', room0
@@ -250,7 +269,7 @@ describe Iotas::Room do
         p0.set_data Iotas::LNK_FIELDS, 'fields'
         p0.set_data Iotas::LNK_CONDF, 'f0,f1'
         p0.set_data Iotas::LNK_CONDV, 'v0v1'
-        p0.set_dst! Iotas::SYS_ACT_ADD_LINK, room0.path
+        p0.add_dst Iotas::SYS_ACT_ADD_LINK, room0.path
         room0.send_sys_p p0
         @spin.spin!
         p = @spin.require_p Iotas::Particle

data/spec/spin_spec.rb

@@ -76,7 +76,7 @@ describe Iotas::Spin do
     it "process_sys" do
         spin = Iotas::Spin.new 'dom0'
         p0 = spin.require_p Iotas::Particle
-        p0.set_dst! 'unknown'
+        p0.add_dst 'unknown'
         spin.send_sys_p p0
         spin.spin!
         p1 = spin.require_p Iotas::Particle
@@ -116,7 +116,7 @@ describe Iotas::Spin do
     it "hibernate! resume!" do
         spin = Iotas::Spin.new 'dom0'
         p0 = spin.require_p Iotas::Particle
-        p0.set_dst! Iotas::SYS_ACT_HIBERNATE
+        p0.add_dst Iotas::SYS_ACT_HIBERNATE
         spin.send_sys_p p0
         spin.spin!
         dom0 = Iotas::Spin.resume! spin.hibernate_path

data/test/{test_evendoors.rb → test_iotas.rb}

@@ -23,8 +23,8 @@ class InputDoor < Iotas::Door
         puts " -> start #{self.class.name} (#{@path})"
         # stimulate myself
         p = require_p Iotas::Particle
-        p.set_dst! Iotas::ACT_GET, path
-        send_p p
+        # p.add_dst Iotas::ACT_GET, path
+        send_p p, Iotas::ACT_GET
     end
     #
     def stop!
@@ -51,12 +51,12 @@ class InputDoor < Iotas::Door
             p.set_data 'f0', 'v0'
             p.set_data 'f1', 'v1'
             p.set_data 'f2', 'v2'
-            send_p p
+            send_p p    # will follow the link
             @idx+=1
             if @idx<@lines.length
                 # there is more to read, restimulate myself
                 p = require_p Iotas::Particle
-                p.set_dst! Iotas::ACT_GET, name
+                p.add_dst Iotas::ACT_GET, name
                 send_p p
             end
         else
@@ -68,7 +68,7 @@ class InputDoor < Iotas::Door
         if self.class.count==3
             p = require_p Iotas::Particle
             p[Iotas::FIELD_HIBERNATE_PATH] = HBN_PATH
-            p.set_dst! Iotas::SYS_ACT_HIBERNATE
+            p.add_dst Iotas::SYS_ACT_HIBERNATE
             send_sys_p p
         end
     end
@@ -156,7 +156,7 @@ p0.set_data Iotas::LNK_DSTS, 'concat1?follow,output1'
 p0.set_data Iotas::LNK_FIELDS, 'f0,f2'
 p0.set_data Iotas::LNK_CONDF, 'f0,f1,f2'
 p0.set_data Iotas::LNK_CONDV, 'v0v1v2'
-p0.set_dst! Iotas::SYS_ACT_ADD_LINK, room1.path
+p0.add_dst Iotas::SYS_ACT_ADD_LINK, room1.path
 room1.send_sys_p p0 # send_sys_p -> room0 -> spin -> room1 -> input1
 #
 spin.spin!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iotas
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -95,7 +95,7 @@ files:
 - spec/spec_helper.rb
 - spec/spin_spec.rb
 - spec/spot_spec.rb
-- test/test_evendoors.rb
+- test/test_iotas.rb
 homepage: http://github.com/jeremyz/iotas
 licenses: []
 post_install_message: 
@@ -129,4 +129,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/spin_spec.rb
 - spec/spot_spec.rb
-- test/test_evendoors.rb
+- test/test_iotas.rb