edoors-ruby 0.0.6 → 0.0.7

data/spec/door_spec.rb

@@ -17,10 +17,10 @@ describe Edoors::Door do
     it "require_p release_p" do
         door = Edoors::Door.new 'hell', @spin
         p0 = door.require_p Edoors::Particle
-        p1 = door.require_p Edoors::Particle
+        p1 = door.require_p
         (p0===p1).should be_false
         door.release_p p0
-        p2 = door.require_p Edoors::Particle
+        p2 = door.require_p
         (p0===p2).should be_true
     end
     #
@@ -67,7 +67,7 @@ describe Edoors::Door do
         p0.add_dst 'RELEASE'
         p0.split_dst!
         d0.process_p p0
-        p1 = d0.require_p Edoors::Particle
+        p1 = d0.require_p
         p1.should be p0
         p0.clear_dsts!
         #

data/spec/{spot_spec.rb → iota_spec.rb}

@@ -21,6 +21,26 @@ describe Edoors::Iota do
         lambda { Edoors::Iota.new('door0/', nil) }.should raise_error(Edoors::Exception)
     end
     #
+    it 'start! should do nothing' do
+        S.new('top', nil).start!.should be_nil
+    end
+    #
+    it 'stop! should do nothing' do
+        S.new('top', nil).stop!.should be_nil
+    end
+    #
+    it 'hibernate! should return empty hash'  do
+        S.new('top', nil).hibernate!.should be {}
+    end
+    #
+    it 'resume! should do nothing' do
+        S.new('top', nil).resume!(nil).should be_nil
+    end
+    #
+    it 'receive_p should raise NoMethodError' do
+        lambda { Edoors::Iota.new('top', nil).receive_p nil }.should raise_error(NoMethodError)
+    end
+    #
 end
 #
 # EOF

data/spec/link_spec.rb

@@ -10,26 +10,23 @@ describe Edoors::Link do
         @spin = Edoors::Spin.new 'dom0'
         p = @spin.require_p Edoors::Particle
         p.set_data Edoors::LNK_SRC, 'input1'
-        p.set_data Edoors::LNK_DSTS, 'concat1?follow,output1'
-        p.set_data Edoors::LNK_FIELDS, 'f0,f2'
-        p.set_data Edoors::LNK_CONDF, 'f0,f1,f2'
-        p.set_data Edoors::LNK_CONDV, 'v0v1v2'
-        lnk = Edoors::Link.from_particle_data p
+        p.set_data Edoors::LNK_DSTS, ['concat1?follow','output1']
+        p.set_data Edoors::LNK_KEYS, ['f0','f2']
+        p.set_data Edoors::LNK_VALUE, {'f0'=>'v0','f1'=>'v1','f2'=>'v2'}
+        lnk = Edoors::Link.from_particle p
         lnk.src.should eql 'input1'
-        lnk.dsts.should eql 'concat1?follow,output1'
-        lnk.fields.should eql 'f0,f2'
-        lnk.cond_fields.should eql 'f0,f1,f2'
-        lnk.cond_value.should eql 'v0v1v2'
+        lnk.dsts.should eql ['concat1?follow','output1']
+        lnk.keys.should eql ['f0','f2']
+        lnk.value.should == {'f0'=>'v0','f1'=>'v1','f2'=>'v2'}
     end
     #
     it "link->json->link" do
-        link = Edoors::Link.new  'input1', 'concat1?follow,output1', 'f0,f2', 'f0,f1,f2', 'v0v1v2'
+        link = Edoors::Link.new 'input1', ['concat1?follow','output1'], ['f0','f2'], {'f0'=>'v0','f1'=>'v1','f2'=>'v2'}
         lnk = Edoors::Link.json_create( JSON.load( JSON.generate(link) ) )
         link.src.should eql lnk.src
         link.dsts.should eql lnk.dsts
-        link.fields.should eql lnk.fields
-        link.cond_fields.should eql lnk.cond_fields
-        link.cond_value.should eql lnk.cond_value
+        link.keys.should eql lnk.keys
+        link.value.should eql lnk.value
         JSON.generate(link).should eql JSON.generate(lnk)
     end
     #

data/spec/particle_spec.rb

@@ -47,11 +47,32 @@ describe Edoors::Particle do
         p.merged(0).should be q
         p.merged(1).should be o
         p.merged(2).should be_nil
+        c = 0
+        p.each_merged do |o|
+            o.should be p.merged(c)
+            c+=1
+        end
+        c.should be 2
+        p.merged_length.should be 2
         p.merged_shift.should be q
         p.merged(0).should be o
         p.merged(1).should be_nil
+        c = 0
+        p.each_merged do |o|
+            o.should be p.merged(c)
+            c+=1
+        end
+        c.should be 1
+        p.merged_length.should be 1
         p.merged_shift.should be o
         p.merged(0).should be_nil
+        c = 0
+        p.each_merged do |o|
+            o.should be p.merged(c)
+            c+=1
+        end
+        c.should be 0
+        p.merged_length.should be 0
         p.merge! q
         p.merge! o
         p.merged(0).should be q
@@ -74,7 +95,7 @@ describe Edoors::Particle do
         d1 = Edoors::Door.new 'door1', nil
         p.dst.should be_nil
         p.next_dst.should be_nil
-        p.add_dsts 'some?where,room0/room1/door?action,room/door,door'
+        p.add_dsts 'some?where', 'room0/room1/door?action', 'room/door', 'door'
         p.next_dst.should eql 'some?where'
         p.dst_routed! d0
         p.dst.should be d0
@@ -110,6 +131,12 @@ describe Edoors::Particle do
         p.set_dst! 'action', d0
         p.action.should eql 'action'
         p.dst.should be d0
+        #
+        p.set_dst! 'action', '/world/room/door'
+        p.action.should eql 'action'
+        p.dst.should be nil
+        p.room.should eql '/world/room'
+        p.door.should eql 'door'
     end
     #
     it "routing: add_dst and split_dst!" do
@@ -149,7 +176,7 @@ describe Edoors::Particle do
         p.action.should eql 'action'
         p.clear_dsts!
         #
-        p.add_dsts 'door?action,?action'
+        p.add_dsts 'door?action', '?action'
         p.split_dst!
         p.room.should be_nil
         p.door.should eql 'door'
@@ -169,7 +196,7 @@ describe Edoors::Particle do
         p = Edoors::Particle.new
         d = Edoors::Door.new 'door', nil
         p.init! d
-        p.add_dsts 'door?action,?action'
+        p.add_dsts 'door?action', '?action'
         p.next_dst.should eql 'door?action'
         p.error! 'err_msg'
         p[Edoors::FIELD_ERROR_MSG].should eql 'err_msg'
@@ -177,17 +204,30 @@ describe Edoors::Particle do
         p.dst.should be d
     end
     #
-    it "link fields and link value" do
+    it "link keys and link values" do
+        p = Edoors::Particle.new
+        p['k0'] = 'v0'
+        p.set_data 'k1', 'v1'
+        p['k2'] = 'v2'
+        p['k3'] = 'v3'
+        p.set_link_keys 'k0', 'k2', 'k1'
+        p.link_value.should == {'k0'=>'v0','k1'=>'v1','k2'=>'v2'}
+        p.del_data 'k0'
+        p.link_value.should == {'k1'=>'v1','k2'=>'v2'}
+        p.set_link_keys 'k1', 'k0'
+        p.link_value.should == {'k1'=>'v1'}
+        p['k1']='vX'
+        p.link_value.should == {'k1'=>'vX'}
+    end
+    #
+    it 'link_with?' do
         p = Edoors::Particle.new
         p['k0'] = 'v0'
         p['k1'] = 'v1'
         p['k2'] = 'v2'
-        p.set_link_fields 'k0,k2'
-        p.link_value.should eql 'v0v2'
-        p.set_link_fields 'k1,k0'
-        p.link_value.should eql 'v1v0'
-        p['k0']='vx'
-        p.link_value.should eql 'v1vx'
+        p.link_with?(Edoors::Link.new('', '', '')).should be_true
+        p.link_with?(Edoors::Link.new('', '', '', {'k0'=>'v0','k1'=>'v1'})).should be_true
+        p.link_with?(Edoors::Link.new('', '', '', {'k0'=>'v2','k1'=>'v1'})).should be_false
     end
     #
     it "apply_link!" do
@@ -195,18 +235,18 @@ describe Edoors::Particle do
         p['k0'] = 'v0'
         p['k1'] = 'v1'
         p['k2'] = 'v2'
-        p.set_link_fields 'k0,k2'
-        p.add_dsts 'door?action,?action'
+        p.set_link_keys 'k0', 'k2'
+        p.add_dsts 'door?action', '?action'
         p.src.should be_nil
-        p.link_value.should eql 'v0v2'
+        p.link_value.should == {'k0'=>'v0','k2'=>'v2'}
         p.next_dst.should eql 'door?action'
-        lnk = Edoors::Link.new('door0', 'door1?get,door2', 'k1', 'f0,f1', 'v0v1')
+        lnk = Edoors::Link.new('door0', ['door1?get','door2'], 'k1', {'f0'=>'v0','f1'=>'v1'})
         f = Fake.new 'fake', nil
         lnk.door = f
         p.apply_link! lnk
         p.src.should be f
         p.next_dst.should eql 'door1?get'
-        p.link_value.should eql 'v1'
+        p.link_value.should == {'k1'=>'v1'}
     end
     #
     it "particle->json->particle" do
@@ -220,8 +260,8 @@ describe Edoors::Particle do
         p0['k1'] = 'v1'
         p0['k2'] = 'v2'
         p0.init! s3
-        p0.set_link_fields 'k0,k2'
-        p0.add_dsts 'room0/room1/room2/doorX?myaction,door?action,?action'
+        p0.set_link_keys 'k0', 'k2'
+        p0.add_dsts 'room0/room1/room2/doorX?myaction', 'door?action', '?action'
         p0.split_dst!
         p1 = Edoors::Particle.new
         p1['k3'] = 'v6'
@@ -229,8 +269,8 @@ describe Edoors::Particle do
         p1['k5'] = 'v8'
         p1.init! s3
         p1.dst_routed! s4
-        p1.set_link_fields 'k5,k4,k3'
-        p1.add_dsts 'room0/room1/door?action,output?action'
+        p1.set_link_keys 'k5', 'k4', 'k3'
+        p1.add_dsts 'room0/room1/door?action', 'output?action'
         p0.merge! p1
         o = JSON.load( JSON.generate(p0) )
         o['spin'] = s0
@@ -242,7 +282,7 @@ describe Edoors::Particle do
         px.door.should eql 'doorX'
         px.action.should eql 'myaction'
         px.next_dst.should eql 'room0/room1/room2/doorX?myaction'
-        px.link_value.should eql 'v0v2'
+        px.link_value.should == {'k0'=>'v0','k2'=>'v2'}
         px['k0'].should eql 'v0'
         px['k1'].should eql 'v1'
         px['k2'].should eql 'v2'
@@ -254,7 +294,7 @@ describe Edoors::Particle do
         py.door.should be_nil
         py.action.should be_nil
         py.next_dst.should eql 'room0/room1/door?action'
-        py.link_value.should eql 'v8v7v6'
+        py.link_value.should == {'k3'=>'v6','k4'=>'v7','k5'=>'v8'}
         py['k3'].should eql 'v6'
         py['k4'].should eql 'v7'
         py['k5'].should eql 'v8'

data/spec/room_spec.rb

@@ -203,7 +203,7 @@ describe Edoors::Room do
         room0 = Edoors::Room.new 'room0', @spin
         door0 = Edoors::Door.new 'door0', room0
         door1 = Edoors::Door.new 'door1', room0
-        room0.add_link Edoors::Link.new('door0', 'door1', 'fields', 'f0,f1', 'v0v1')
+        room0.add_link Edoors::Link.new('door0', 'door1', 'keys', {'f0'=>'v0','f1'=>'v1'})
         p = @spin.require_p Edoors::Particle
         p['f0']='v0'
         p['f1']='v1'
@@ -220,19 +220,22 @@ describe Edoors::Room do
             attr_reader :count
             def receive_p p
                 @count||=0
+                ['0','1','2'][@count].should == p.next_dst
                 @count += 1
             end
         end
         door1 = Out.new 'door1', room0
-        room0.add_link Edoors::Link.new('door0', 'door1')
-        room0.add_link Edoors::Link.new('door0', 'door1', 'fields', 'f0,f1', 'v0v1')
-        room0.add_link Edoors::Link.new('door0', 'door1', 'fields', 'f0,f1', 'v0v2')
+        room0.add_link Edoors::Link.new('door0', ['door1','0'])
+        room0.add_link Edoors::Link.new('door0', ['door1','1'], 'keys', {'f0'=>'v0'})
+        room0.add_link Edoors::Link.new('door0', ['door1','2'], 'keys', {'f0'=>'v0','f1'=>'v1'})
+        room0.add_link Edoors::Link.new('door0', ['door1','3'], 'keys', {'f0'=>'v0','f1'=>'v2'})
+        room0.add_link Edoors::Link.new('door0', ['door1','4'], 'keys', {'f0'=>'v0','f2'=>'v1'})
         p = @spin.require_p Edoors::Particle
         p['f0']='v0'
         p['f1']='v1'
         door0.send_p p
         @spin.spin!
-        door1.count.should eql 2
+        door1.count.should eql 3
     end
     #
     it "system route error: system no destination" do
@@ -278,9 +281,8 @@ describe Edoors::Room do
         p0 = @spin.require_p Edoors::Particle
         p0.set_data Edoors::LNK_SRC, 'door0'
         p0.set_data Edoors::LNK_DSTS, 'door1'
-        p0.set_data Edoors::LNK_FIELDS, 'fields'
-        p0.set_data Edoors::LNK_CONDF, 'f0,f1'
-        p0.set_data Edoors::LNK_CONDV, 'v0v1'
+        p0.set_data Edoors::LNK_KEYS, 'keys'
+        p0.set_data Edoors::LNK_VALUE, {'f0'=>'v0','f1'=>'v1'}
         p0.add_dst Edoors::SYS_ACT_ADD_LINK, room0.path
         room0.send_sys_p p0
         @spin.spin!
@@ -293,6 +295,22 @@ describe Edoors::Room do
         p.dst.should be door1
     end
     #
+    it "SYS_ACT_ADD_ROOM" do
+        room0 = Edoors::Room.new 'room0', @spin
+        p0 = @spin.require_p Edoors::Particle
+        p0.set_data Edoors::IOTA_NAME, 'roomX'
+        p0.add_dst Edoors::SYS_ACT_ADD_ROOM, room0.path
+        room0.send_sys_p p0
+        p1 = @spin.require_p Edoors::Particle
+        p1.set_data Edoors::IOTA_NAME, 'roomY'
+        p1.set_dst! Edoors::SYS_ACT_ADD_ROOM, room0
+        @spin.send_sys_p p1
+        @spin.spin!
+        @spin.search_world('dom0/room0/roomX').should be_a Edoors::Room
+        @spin.search_world('dom0/room0/roomY').should be_a Edoors::Room
+        @spin.search_world('dom0/room0/roomZ').should be nil
+    end
+    #
     it "room->json->room" do
         r0 = Edoors::Room.new 'r0', @spin
         r1 = Edoors::Room.new 'r1', r0
@@ -302,10 +320,10 @@ describe Edoors::Room do
         d0 = Edoors::Door.new 'd0', r1
         d1 = Edoors::Door.new 'd1', r1
         d2 = Edoors::Door.new 'd2', r2
-        r1.add_link Edoors::Link.new('d0', 'd1', 'fields', 'f0,f1', 'v0v1')
+        r1.add_link Edoors::Link.new('d0', 'd1', 'keys', {'f0'=>'v0','f1'=>'v1'})
         r1.add_link Edoors::Link.new('d0', 'd2')
         r1.add_link Edoors::Link.new('d1', 'd0')
-        r2.add_link Edoors::Link.new('d2', 'd1', 'fies', 'f5,f1', 'v9v1')
+        r2.add_link Edoors::Link.new('d2', 'd1', 'fies', {'f5'=>'v9','f1'=>'v1'})
         rx = Edoors::Room.json_create( JSON.load( JSON.generate(r0) ) )
         JSON.generate(r0).should eql JSON.generate(rx)
     end#

data/spec/spin_spec.rb

@@ -70,7 +70,7 @@ describe Edoors::Spin do
         spin.spin!
         f.p.should be p0
         f.sp.should be p1
-        spin.stop!
+        spin.stop_spinning!
     end
     #
     it "process_sys" do
@@ -86,10 +86,20 @@ describe Edoors::Spin do
     it "option debug" do
         spin = Edoors::Spin.new 'dom0'
         spin.debug_routing.should be false
-        spin.debug_errors.should be false
-        spin = Edoors::Spin.new 'dom0', :debug_routing=>true, :debug_errors=>true
+        spin.debug_garbage.should be false
+        spin = Edoors::Spin.new 'dom0', :debug_routing=>true, :debug_garbage=>true
         spin.debug_routing.should be true
-        spin.debug_errors.should be true
+        spin.debug_garbage.should be true
+    end
+    #
+    it "search world" do
+        spin = Edoors::Spin.new 'dom0', :debug_routing=>true
+        r0 = Edoors::Room.new 'r0', spin
+        r1 = Edoors::Room.new 'r1', r0
+        r2 = Edoors::Room.new 'r2', r1
+        spin.search_world(r0.path).should be r0
+        spin.search_world(r1.path).should be r1
+        spin.search_world(r2.path).should be r2
     end
     #
     it "spin->json->spin" do
@@ -119,7 +129,7 @@ describe Edoors::Spin do
         p0.add_dst Edoors::SYS_ACT_HIBERNATE
         Edoors::Room.new 'input', spin
         Edoors::Room.new 'output', spin
-        spin.add_link Edoors::Link.new('input', 'output', nil, nil, nil)
+        spin.add_link Edoors::Link.new('input', 'output', nil, nil)
         spin.send_sys_p p0
         spin.spin!
         dom0 = Edoors::Spin.resume! spin.hibernate_path

data/test/test_iotas.rb

@@ -136,7 +136,7 @@ class OutputDoor < Edoors::Door
     #
 end
 #
-spin = Edoors::Spin.new 'dom0', :debug_routing=>false, :debug_errors=>true
+spin = Edoors::Spin.new 'dom0', :debug_routing=>false, :debug_garbage=>true
 #
 room0 = Edoors::Room.new 'room0', spin
 room1 = Edoors::Room.new 'room1', spin
@@ -148,14 +148,13 @@ input1 = InputDoor.new 'input1', room1
 output1 = OutputDoor.new 'output1', room1, true
 concat1 = ConcatBoard.new 'concat1', room1
 #
-room0.add_link Edoors::Link.new('input0', 'output0', nil, nil, nil)
+room0.add_link Edoors::Link.new('input0', 'output0', nil, nil)
 #
 p0 = spin.require_p Edoors::Particle
 p0.set_data Edoors::LNK_SRC, 'input1'
-p0.set_data Edoors::LNK_DSTS, 'concat1?follow,output1'
-p0.set_data Edoors::LNK_FIELDS, 'f0,f2'
-p0.set_data Edoors::LNK_CONDF, 'f0,f1,f2'
-p0.set_data Edoors::LNK_CONDV, 'v0v1v2'
+p0.set_data Edoors::LNK_DSTS, ['concat1?follow','output1']
+p0.set_data Edoors::LNK_KEYS, ['f0','f2']
+p0.set_data Edoors::LNK_VALUE, {'f0'=>'v0','f1'=>'v1','f2'=>'v2'}
 p0.add_dst Edoors::SYS_ACT_ADD_LINK, room1.path
 room1.send_sys_p p0 # send_sys_p -> room0 -> spin -> room1 -> input1
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edoors-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11695920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *11695920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9674500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
+  version_requirements: *9674500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9674080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *9674080
 description: ! "Evenja propose a data centric paradigm. A traditional programm composed
   of many functions\n    is decomposed into small autonomous modifications applied
   on the data implemented in different instances of Door base class.\n    Routing
@@ -80,8 +65,13 @@ files:
 - Rakefile
 - bin/edoors.rb
 - edoors-ruby.gemspec
+- examples/board.json
+- examples/board.rb
+- examples/data.json
 - examples/hello_world.json
 - examples/hello_world.rb
+- examples/links.json
+- examples/links.rb
 - lib/edoors.rb
 - lib/edoors/board.rb
 - lib/edoors/door.rb
@@ -93,12 +83,12 @@ files:
 - lib/version.rb
 - spec/board_spec.rb
 - spec/door_spec.rb
+- spec/iota_spec.rb
 - spec/link_spec.rb
 - spec/particle_spec.rb
 - spec/room_spec.rb
 - spec/spec_helper.rb
 - spec/spin_spec.rb
-- spec/spot_spec.rb
 - test/test_iotas.rb
 homepage: http://github.com/jeremyz/edoors-ruby
 licenses: []
@@ -120,17 +110,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: ruby rewrite of C++ application framework evenja (http://www.revena.com/evenja)
 test_files:
 - spec/board_spec.rb
 - spec/door_spec.rb
+- spec/iota_spec.rb
 - spec/link_spec.rb
 - spec/particle_spec.rb
 - spec/room_spec.rb
 - spec/spec_helper.rb
 - spec/spin_spec.rb
-- spec/spot_spec.rb
 - test/test_iotas.rb
+has_rdoc: