summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2012-05-04 09:44:32 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2012-05-04 09:44:32 +0200
commitf52b4843d1b195cac387d83f72db9a20c8ea725d (patch)
tree6825b3cb80635386177da9bb861d2b062b844590
parent2ee48c4f18470e733f244c659221e243ff998416 (diff)
downloadedoors-ruby-f52b4843d1b195cac387d83f72db9a20c8ea725d.zip
edoors-ruby-f52b4843d1b195cac387d83f72db9a20c8ea725d.tar.gz
AC_ADD_LINK -> SYS_ACT_ADD_LINK
-rw-r--r--lib/evendoors.rb5
-rw-r--r--lib/evendoors/room.rb2
-rw-r--r--test/test_evendoors.rb2
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/evendoors.rb b/lib/evendoors.rb
index 16504b6..305259b 100644
--- a/lib/evendoors.rb
+++ b/lib/evendoors.rb
@@ -6,10 +6,13 @@ module EvenDoors
PATH_SEP = '/'.freeze
LINK_SEP = ','.freeze
ACT_SEP = '?'.freeze
+ #
ACT_GET = 'get'.freeze
- ACT_ADD_LINK = 'add_link'.freeze
+ ACT_FOLLOW = 'follow'.freeze
ACT_ERROR = 'error'.freeze
#
+ SYS_ACT_ADD_LINK = 'sys_add_link'.freeze
+ #
LNK_SRC = 'edoors_lnk_src'.freeze
LNK_DSTS = 'edoors_lnk_dsts'.freeze
LNK_FIELDS = 'edoors_lnk_fields'.freeze
diff --git a/lib/evendoors/room.rb b/lib/evendoors/room.rb
index 671b529..0ca43bd 100644
--- a/lib/evendoors/room.rb
+++ b/lib/evendoors/room.rb
@@ -110,7 +110,7 @@ module EvenDoors
end
#
def process_sys p
- if p.action==ACT_ADD_LINK
+ if p.action==SYS_ACT_ADD_LINK
add_link EvenDoors::Link.from_particle_data p
end
EvenDoors::Twirl.release_p p
diff --git a/test/test_evendoors.rb b/test/test_evendoors.rb
index 78f84d7..c469539 100644
--- a/test/test_evendoors.rb
+++ b/test/test_evendoors.rb
@@ -69,7 +69,7 @@ p0.set_data EvenDoors::LNK_DSTS, 'output1'
p0.set_data EvenDoors::LNK_FIELDS, 'fx,fy,fz'
p0.set_data EvenDoors::LNK_CONDF, 'f0,f1,f2'
p0.set_data EvenDoors::LNK_CONDV, 'v0v1v2'
-p0.set_dst EvenDoors::ACT_ADD_LINK, room1.path
+p0.set_dst EvenDoors::SYS_ACT_ADD_LINK, room1.path
room0.send_sys_p p0 # send_sys_p -> room0 -> space -> room1 -> input1
#
space.twirl!