riddl 0.101.4 → 0.101.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ruby/riddl/ns/common-patterns/notifications-consumer/1.0/consumer.xml +5 -5
- data/lib/ruby/riddl/wrapper.rb +2 -1
- data/lib/ruby/riddl/wrapper/messageparser.rb +9 -4
- data/ns/common-patterns/notifications-consumer/1.0/consumer.xml +5 -5
- data/riddl.gemspec +2 -2
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 485b05cdb56232f73ec2c861aa9a7dc2f0c2dee2da745c705491c691694b8410
|
4
|
+
data.tar.gz: b3580b50e80d3a2f9d593d50b5c7bdd22ff41c141a954a10049d7236977fdb93
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a59af7d2703b4576311615ff4f124987de255c4778d27ac7ff7d2ef441266f2c4bca075d60ba4c63825e5be5e9ad05645c3b3b4aa3023e770451cdbb17bdb291
|
7
|
+
data.tar.gz: 53bdb586356b3f23eb5bf2802e510a1119e9cea7367a977603639c4a05c5382c287b1eb0261b49c5e8b8d463c77f0a7dfe3ce180ce588c9057bf1bda9c206b71
|
@@ -3,7 +3,7 @@
|
|
3
3
|
<message name="event">
|
4
4
|
<parameter name="key" type="string"/>
|
5
5
|
<parameter name="topic" type="string">
|
6
|
-
<param name="pattern">[\w_
|
6
|
+
<param name="pattern">[\w_/]+</param>
|
7
7
|
</parameter>
|
8
8
|
<parameter name="event" type="string">
|
9
9
|
<param name="pattern">[\w_]+</param>
|
@@ -17,7 +17,7 @@
|
|
17
17
|
<message name="vote">
|
18
18
|
<parameter name="key" type="string"/>
|
19
19
|
<parameter name="topic" type="string">
|
20
|
-
<param name="pattern">[\w_
|
20
|
+
<param name="pattern">[\w_/]+</param>
|
21
21
|
</parameter>
|
22
22
|
<parameter name="vote" type="string">
|
23
23
|
<param name="pattern">[\w_]+</param>
|
@@ -37,8 +37,8 @@
|
|
37
37
|
<value>false</value>
|
38
38
|
<value>callback</value>
|
39
39
|
</choice>
|
40
|
-
</parameter>
|
41
|
-
</optional>
|
40
|
+
</parameter>
|
41
|
+
</optional>
|
42
42
|
<optional>
|
43
43
|
<parameter name="fingerprint-with-consumer-secret" type="string"/>
|
44
44
|
</optional>
|
@@ -47,6 +47,6 @@
|
|
47
47
|
<resource pattern="http://riddl.org/ns/common-patterns/notifications-consumer/1.0">
|
48
48
|
<post in="event"/>
|
49
49
|
<post in="vote" out="acknowledgment"/>
|
50
|
-
</resource>
|
50
|
+
</resource>
|
51
51
|
|
52
52
|
</description>
|
data/lib/ruby/riddl/wrapper.rb
CHANGED
@@ -63,7 +63,8 @@ module Riddl
|
|
63
63
|
RIDDL_DESCRIPTION_SHOW = "#{File.dirname(__FILE__)}/ns/common-patterns/riddl-description/show.xml"
|
64
64
|
RIDDL_DESCRIPTION_RESOURCE_SHOW = "#{File.dirname(__FILE__)}/ns/common-patterns/riddl-description/resource-show.xml"
|
65
65
|
COMMON = "datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"#{DESCRIPTION}\" xmlns:xi=\"http://www.w3.org/2001/XInclude\""
|
66
|
-
|
66
|
+
CHECK_DATA = "<element name=\"check\" datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"http://relaxng.org/ns/structure/1.0\"><data/></element>"
|
67
|
+
CHECK_CHOICE = "<element name=\"check\" datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"http://relaxng.org/ns/structure/1.0\"></element>"
|
67
68
|
#}}}
|
68
69
|
|
69
70
|
def initialize(name,get_description=false)
|
@@ -191,12 +191,17 @@ module Riddl
|
|
191
191
|
else
|
192
192
|
value = XML::Smart::string("<check/>")
|
193
193
|
value.root.text = b
|
194
|
-
|
195
|
-
|
196
|
-
|
194
|
+
if a.find('des:choice').length > 0
|
195
|
+
type = XML::Smart::string(CHECK_CHOICE)
|
196
|
+
data = type.root
|
197
|
+
else
|
198
|
+
type = XML::Smart::string(CHECK_DATA)
|
199
|
+
data = type.root.children[0]
|
200
|
+
data.attributes['type'] = a.attributes['type']
|
201
|
+
end
|
197
202
|
a.children.each do |e|
|
198
203
|
unless e.class == XML::Smart::Dom::Text
|
199
|
-
e.namespaces.
|
204
|
+
e.namespaces[nil] = 'http://relaxng.org/ns/structure/1.0'
|
200
205
|
data.add e
|
201
206
|
end
|
202
207
|
end
|
@@ -3,7 +3,7 @@
|
|
3
3
|
<message name="event">
|
4
4
|
<parameter name="key" type="string"/>
|
5
5
|
<parameter name="topic" type="string">
|
6
|
-
<param name="pattern">[\w_
|
6
|
+
<param name="pattern">[\w_/]+</param>
|
7
7
|
</parameter>
|
8
8
|
<parameter name="event" type="string">
|
9
9
|
<param name="pattern">[\w_]+</param>
|
@@ -17,7 +17,7 @@
|
|
17
17
|
<message name="vote">
|
18
18
|
<parameter name="key" type="string"/>
|
19
19
|
<parameter name="topic" type="string">
|
20
|
-
<param name="pattern">[\w_
|
20
|
+
<param name="pattern">[\w_/]+</param>
|
21
21
|
</parameter>
|
22
22
|
<parameter name="vote" type="string">
|
23
23
|
<param name="pattern">[\w_]+</param>
|
@@ -37,8 +37,8 @@
|
|
37
37
|
<value>false</value>
|
38
38
|
<value>callback</value>
|
39
39
|
</choice>
|
40
|
-
</parameter>
|
41
|
-
</optional>
|
40
|
+
</parameter>
|
41
|
+
</optional>
|
42
42
|
<optional>
|
43
43
|
<parameter name="fingerprint-with-consumer-secret" type="string"/>
|
44
44
|
</optional>
|
@@ -47,6 +47,6 @@
|
|
47
47
|
<resource pattern="http://riddl.org/ns/common-patterns/notifications-consumer/1.0">
|
48
48
|
<post in="event"/>
|
49
49
|
<post in="vote" out="acknowledgment"/>
|
50
|
-
</resource>
|
50
|
+
</resource>
|
51
51
|
|
52
52
|
</description>
|
data/riddl.gemspec
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
s.name = "riddl"
|
3
|
-
s.version = "0.101.
|
3
|
+
s.version = "0.101.10"
|
4
4
|
s.platform = Gem::Platform::RUBY
|
5
5
|
s.license = "LGPL-3.0"
|
6
6
|
s.summary = "restful interface description and declaration language: tools and client/server libs"
|
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
|
|
25
25
|
|
26
26
|
s.add_runtime_dependency 'daemonite', '~>0.2'
|
27
27
|
s.add_runtime_dependency 'typhoeus', '~>1.3'
|
28
|
-
s.add_runtime_dependency 'xml-smart', '>=0.3
|
28
|
+
s.add_runtime_dependency 'xml-smart', '>=0.4.3', '~>0'
|
29
29
|
s.add_runtime_dependency 'rdf-smart', '>=0.0.160', '~>0'
|
30
30
|
s.add_runtime_dependency 'rack', '~>2.2'
|
31
31
|
s.add_runtime_dependency 'thin', '~>1.6'
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: riddl
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.101.
|
4
|
+
version: 0.101.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Juergen 'eTM' Mangler
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: tools
|
12
12
|
cert_chain: []
|
13
|
-
date: 2020-
|
13
|
+
date: 2020-06-05 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: daemonite
|
@@ -46,7 +46,7 @@ dependencies:
|
|
46
46
|
requirements:
|
47
47
|
- - ">="
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version: 0.3
|
49
|
+
version: 0.4.3
|
50
50
|
- - "~>"
|
51
51
|
- !ruby/object:Gem::Version
|
52
52
|
version: '0'
|
@@ -56,7 +56,7 @@ dependencies:
|
|
56
56
|
requirements:
|
57
57
|
- - ">="
|
58
58
|
- !ruby/object:Gem::Version
|
59
|
-
version: 0.3
|
59
|
+
version: 0.4.3
|
60
60
|
- - "~>"
|
61
61
|
- !ruby/object:Gem::Version
|
62
62
|
version: '0'
|