vispan 0.15.0 → 0.16.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/vispan/node.rb +8 -5
- data/lib/vispan/relation.rb +6 -6
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5ec28f8dc64a67b0761e6fa0ef0ef17920805e84
|
|
4
|
+
data.tar.gz: d3810de66a8af714cc3801d5f027728d9d0ffe89
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 81e0a5cf8d2414280055a64d85e04536697163c7db493258db693b0484894656876aaa3f7b686b0de13a060f633d7d2ebd60574266d28efd323069c189fcda4f
|
|
7
|
+
data.tar.gz: 86aa3852c83204aaacf2e81da9d7a430246822bd4452a77e3ad2c5c023877cc0a443e9481eeedf446a71da408a361bee63ba2cb9342db1db4291bca39202bb92
|
data/lib/vispan/node.rb
CHANGED
|
@@ -1,17 +1,20 @@
|
|
|
1
|
+
require 'securerandom'
|
|
2
|
+
|
|
1
3
|
class Node
|
|
2
4
|
|
|
3
5
|
attr_accessor :name, :type, :label, :rank
|
|
4
6
|
NODE_TYPES = ["screen", "email", "pdf", "command", "helper"]
|
|
5
7
|
|
|
6
|
-
def initialize(type, label, index)
|
|
7
|
-
@name = transform_to_name(label, index)
|
|
8
|
+
def initialize(type, label, index, effect_flag)
|
|
9
|
+
@name = transform_to_name(type, label, index, effect_flag)
|
|
8
10
|
@type = NODE_TYPES.include?(type)? type : ""
|
|
9
11
|
@label = label
|
|
10
12
|
@rank = 0
|
|
11
13
|
end
|
|
12
14
|
|
|
13
|
-
def transform_to_name(label, index)
|
|
14
|
-
|
|
15
|
-
label.gsub(/[
|
|
15
|
+
def transform_to_name(type, label, index, effect_flag)
|
|
16
|
+
name = "node_" + SecureRandom.uuid if effect_flag
|
|
17
|
+
name = label.gsub(/[-\s.]/, "") + index.to_s
|
|
18
|
+
name.gsub(/[\/\'|\"|\*|\\]/, "_")
|
|
16
19
|
end
|
|
17
20
|
end
|
data/lib/vispan/relation.rb
CHANGED
|
@@ -10,10 +10,10 @@ class Relation
|
|
|
10
10
|
end
|
|
11
11
|
|
|
12
12
|
def extract(relation_array, index)
|
|
13
|
-
@start = set_node(relation_array.shift, index)
|
|
13
|
+
@start = set_node(relation_array.shift, index, false)
|
|
14
14
|
set_connection(relation_array.shift)
|
|
15
|
-
@stop = set_node(relation_array.shift, index)
|
|
16
|
-
@effects = relation_array.map{|effect| set_node(effect, index)}
|
|
15
|
+
@stop = set_node(relation_array.shift, index, false)
|
|
16
|
+
@effects = relation_array.map{|effect| set_node(effect, index, true)}
|
|
17
17
|
end
|
|
18
18
|
|
|
19
19
|
def set_connection(label_string)
|
|
@@ -23,12 +23,12 @@ class Relation
|
|
|
23
23
|
adjust_length(@label)
|
|
24
24
|
end
|
|
25
25
|
|
|
26
|
-
def set_node(node_string, index)
|
|
26
|
+
def set_node(node_string, index, effect_flag)
|
|
27
27
|
node_array = node_string.split(":")
|
|
28
28
|
type = node_array.shift.strip.downcase
|
|
29
29
|
label = node_array.join(":").strip
|
|
30
30
|
adjust_length(label)
|
|
31
|
-
Node.new(type, label, index)
|
|
31
|
+
Node.new(type, label, index, effect_flag)
|
|
32
32
|
end
|
|
33
33
|
|
|
34
34
|
def adjust_length(string)
|
|
@@ -49,7 +49,7 @@ class Relation
|
|
|
49
49
|
end
|
|
50
50
|
|
|
51
51
|
def set_helper(index)
|
|
52
|
-
@helper = Node.new("helper", @label, index)
|
|
52
|
+
@helper = Node.new("helper", @label, index, false)
|
|
53
53
|
@helper.name = "helper_"+ @helper.name + @stop.name
|
|
54
54
|
end
|
|
55
55
|
end
|