riddl 1.0.5 → 1.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/ruby/riddl/client.rb +4 -2
- data/lib/ruby/riddl/ns/common-patterns/notifications-producer/1.0/producer.xml +21 -21
- data/lib/ruby/riddl/protocols/http/parser.rb +8 -1
- data/ns/common-patterns/notifications-producer/1.0/producer.xml +21 -21
- data/riddl.gemspec +2 -2
- metadata +4 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 70c104c8c22d254918359c92e76bb244aa12dac2233dc6736b5a3b5a5477ffd5
|
|
4
|
+
data.tar.gz: 284190ee2b77f47b12e39ffadf1b2ab292d1058c34e38bd917c7b1e0d3f013a6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9e1f66ab741bad0fb9ea4bd37196da75a43819abe09f59857009edc06c1b7c06f6f940ce2a99e21b7ca6875d68908b71b4cc69c88dfd998322016f5ec43c7615
|
|
7
|
+
data.tar.gz: a4871d0b6ddde238ff92c810287fb86270d4142c8b2733b3c1362dc7f1a6199ece70a4505db828260e5df9596f6344e154a71567ac3b925053cae0c3814a693f
|
data/lib/ruby/riddl/client.rb
CHANGED
|
@@ -265,11 +265,12 @@ unless Module.constants.include?('CLIENT_INCLUDED')
|
|
|
265
265
|
|
|
266
266
|
def exec_request(riddl_method,parameters,simulate) #{{{
|
|
267
267
|
parameters = [ parameters ] unless parameters.is_a? Array
|
|
268
|
+
nparameters = []
|
|
268
269
|
(URI.parse(@base)&.query || '').split(/[#{D}] */n).each do |p|
|
|
269
270
|
k, v = Riddl::Protocols::Utils::unescape(p).split('=', 2)
|
|
270
|
-
|
|
271
|
+
nparameters << Parameter::Simple.new(k,v,:query)
|
|
271
272
|
end
|
|
272
|
-
parameters = parameters
|
|
273
|
+
parameters = nparameters + parameters
|
|
273
274
|
headers = extract_headers(parameters)
|
|
274
275
|
options = extract_options(parameters)
|
|
275
276
|
role = nil
|
|
@@ -400,6 +401,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
|
|
|
400
401
|
response_headers['RIDDL_TYPE']
|
|
401
402
|
).params
|
|
402
403
|
bs.close
|
|
404
|
+
bs.unlink
|
|
403
405
|
|
|
404
406
|
return res.code.to_i, response, response_headers
|
|
405
407
|
#}}}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<element name="topics">
|
|
8
8
|
<zeroOrMore>
|
|
9
9
|
<ref name="topic"/>
|
|
10
|
-
</zeroOrMore>
|
|
10
|
+
</zeroOrMore>
|
|
11
11
|
</element>
|
|
12
12
|
</start>
|
|
13
13
|
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<element name="topic">
|
|
16
16
|
<attribute name="id">
|
|
17
17
|
<data type="string"/>
|
|
18
|
-
</attribute>
|
|
18
|
+
</attribute>
|
|
19
19
|
<zeroOrMore>
|
|
20
20
|
<element>
|
|
21
21
|
<choice>
|
|
@@ -25,15 +25,15 @@
|
|
|
25
25
|
<data type="string">
|
|
26
26
|
<param name="pattern">[\w-_]+</param>
|
|
27
27
|
</data>
|
|
28
|
-
</element>
|
|
28
|
+
</element>
|
|
29
29
|
</zeroOrMore>
|
|
30
30
|
</element>
|
|
31
|
-
</define>
|
|
31
|
+
</define>
|
|
32
32
|
|
|
33
33
|
</grammar>
|
|
34
34
|
</parameter>
|
|
35
35
|
</message>
|
|
36
|
-
|
|
36
|
+
|
|
37
37
|
<message name="subscriptions">
|
|
38
38
|
<parameter name="subscriptions" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
|
|
39
39
|
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
|
|
@@ -43,11 +43,11 @@
|
|
|
43
43
|
<choice>
|
|
44
44
|
<value>debug</value>
|
|
45
45
|
<value>production</value>
|
|
46
|
-
</choice>
|
|
46
|
+
</choice>
|
|
47
47
|
</attribute>
|
|
48
48
|
<zeroOrMore>
|
|
49
49
|
<ref name="subscription"/>
|
|
50
|
-
</zeroOrMore>
|
|
50
|
+
</zeroOrMore>
|
|
51
51
|
</element>
|
|
52
52
|
</start>
|
|
53
53
|
|
|
@@ -60,14 +60,14 @@
|
|
|
60
60
|
<attribute name="url">
|
|
61
61
|
<data type="string"/>
|
|
62
62
|
</attribute>
|
|
63
|
-
</optional>
|
|
63
|
+
</optional>
|
|
64
64
|
</element>
|
|
65
65
|
</define>
|
|
66
66
|
|
|
67
67
|
</grammar>
|
|
68
68
|
</parameter>
|
|
69
69
|
</message>
|
|
70
|
-
|
|
70
|
+
|
|
71
71
|
<message name="subscription">
|
|
72
72
|
<parameter name="subscription" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
|
|
73
73
|
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
|
|
@@ -77,12 +77,12 @@
|
|
|
77
77
|
<attribute name="url">
|
|
78
78
|
<data type="string"/>
|
|
79
79
|
</attribute>
|
|
80
|
-
</optional>
|
|
80
|
+
</optional>
|
|
81
81
|
<oneOrMore>
|
|
82
82
|
<element name="topic">
|
|
83
83
|
<attribute name="id">
|
|
84
84
|
<data type="string"/>
|
|
85
|
-
</attribute>
|
|
85
|
+
</attribute>
|
|
86
86
|
<oneOrMore>
|
|
87
87
|
<element>
|
|
88
88
|
<choice>
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
<data type="string">
|
|
93
93
|
<param name="pattern">[\w_]+</param>
|
|
94
94
|
</data>
|
|
95
|
-
</element>
|
|
95
|
+
</element>
|
|
96
96
|
</oneOrMore>
|
|
97
97
|
</element>
|
|
98
98
|
</oneOrMore>
|
|
@@ -103,9 +103,9 @@
|
|
|
103
103
|
<optional>
|
|
104
104
|
<parameter name="message-uid" type="string"/>
|
|
105
105
|
<parameter name="fingerprint-with-producer-secret" type="string"/>
|
|
106
|
-
</optional>
|
|
106
|
+
</optional>
|
|
107
107
|
</message>
|
|
108
|
-
|
|
108
|
+
|
|
109
109
|
<message name="delete">
|
|
110
110
|
<optional>
|
|
111
111
|
<parameter name="message-uid" type="string"/>
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
<optional>
|
|
117
117
|
<parameter name="message-uid" type="string"/>
|
|
118
118
|
<parameter name="fingerprint-with-producer-secret" type="string"/>
|
|
119
|
-
</optional>
|
|
119
|
+
</optional>
|
|
120
120
|
</message>
|
|
121
121
|
|
|
122
122
|
<message name="subscribe">
|
|
@@ -124,8 +124,8 @@
|
|
|
124
124
|
<parameter name="url" type="string"/>
|
|
125
125
|
<optional>
|
|
126
126
|
<parameter name="onbehalf" type="string"/>
|
|
127
|
-
</optional>
|
|
128
|
-
</optional>
|
|
127
|
+
</optional>
|
|
128
|
+
</optional>
|
|
129
129
|
<oneOrMore>
|
|
130
130
|
<parameter name="topic" type="string"/>
|
|
131
131
|
<choice>
|
|
@@ -137,7 +137,7 @@
|
|
|
137
137
|
</parameter>
|
|
138
138
|
</choice>
|
|
139
139
|
</oneOrMore>
|
|
140
|
-
</message>
|
|
140
|
+
</message>
|
|
141
141
|
<message name="acknowledgment">
|
|
142
142
|
<parameter name="key" type="string"/>
|
|
143
143
|
<parameter name="producer-secret" type="string"/>
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
<message name="details">
|
|
148
148
|
<optional>
|
|
149
149
|
<parameter name="url" type="string"/>
|
|
150
|
-
</optional>
|
|
150
|
+
</optional>
|
|
151
151
|
<oneOrMore>
|
|
152
152
|
<parameter name="topic" type="string"/>
|
|
153
153
|
<choice>
|
|
@@ -162,7 +162,7 @@
|
|
|
162
162
|
<optional>
|
|
163
163
|
<parameter name="message-uid" type="string"/>
|
|
164
164
|
<parameter name="fingerprint-with-producer-secret" type="string"/>
|
|
165
|
-
</optional>
|
|
165
|
+
</optional>
|
|
166
166
|
</message>
|
|
167
167
|
|
|
168
168
|
<message name="overview">
|
|
@@ -201,6 +201,6 @@
|
|
|
201
201
|
</resource>
|
|
202
202
|
</resource>
|
|
203
203
|
</resource>
|
|
204
|
-
</resource>
|
|
204
|
+
</resource>
|
|
205
205
|
|
|
206
206
|
</description>
|
|
@@ -54,7 +54,14 @@ module Riddl
|
|
|
54
54
|
end
|
|
55
55
|
body.rewind if body.respond_to?(:binmode)
|
|
56
56
|
|
|
57
|
-
|
|
57
|
+
if body.length > 0
|
|
58
|
+
add_to_params(name,body,filename,ctype,nil)
|
|
59
|
+
else
|
|
60
|
+
if body.respond_to?(:binmode)
|
|
61
|
+
body.close
|
|
62
|
+
body.unlink
|
|
63
|
+
end
|
|
64
|
+
end
|
|
58
65
|
#}}}
|
|
59
66
|
end
|
|
60
67
|
private :parse_content
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<element name="topics">
|
|
8
8
|
<zeroOrMore>
|
|
9
9
|
<ref name="topic"/>
|
|
10
|
-
</zeroOrMore>
|
|
10
|
+
</zeroOrMore>
|
|
11
11
|
</element>
|
|
12
12
|
</start>
|
|
13
13
|
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<element name="topic">
|
|
16
16
|
<attribute name="id">
|
|
17
17
|
<data type="string"/>
|
|
18
|
-
</attribute>
|
|
18
|
+
</attribute>
|
|
19
19
|
<zeroOrMore>
|
|
20
20
|
<element>
|
|
21
21
|
<choice>
|
|
@@ -25,15 +25,15 @@
|
|
|
25
25
|
<data type="string">
|
|
26
26
|
<param name="pattern">[\w-_]+</param>
|
|
27
27
|
</data>
|
|
28
|
-
</element>
|
|
28
|
+
</element>
|
|
29
29
|
</zeroOrMore>
|
|
30
30
|
</element>
|
|
31
|
-
</define>
|
|
31
|
+
</define>
|
|
32
32
|
|
|
33
33
|
</grammar>
|
|
34
34
|
</parameter>
|
|
35
35
|
</message>
|
|
36
|
-
|
|
36
|
+
|
|
37
37
|
<message name="subscriptions">
|
|
38
38
|
<parameter name="subscriptions" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
|
|
39
39
|
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
|
|
@@ -43,11 +43,11 @@
|
|
|
43
43
|
<choice>
|
|
44
44
|
<value>debug</value>
|
|
45
45
|
<value>production</value>
|
|
46
|
-
</choice>
|
|
46
|
+
</choice>
|
|
47
47
|
</attribute>
|
|
48
48
|
<zeroOrMore>
|
|
49
49
|
<ref name="subscription"/>
|
|
50
|
-
</zeroOrMore>
|
|
50
|
+
</zeroOrMore>
|
|
51
51
|
</element>
|
|
52
52
|
</start>
|
|
53
53
|
|
|
@@ -60,14 +60,14 @@
|
|
|
60
60
|
<attribute name="url">
|
|
61
61
|
<data type="string"/>
|
|
62
62
|
</attribute>
|
|
63
|
-
</optional>
|
|
63
|
+
</optional>
|
|
64
64
|
</element>
|
|
65
65
|
</define>
|
|
66
66
|
|
|
67
67
|
</grammar>
|
|
68
68
|
</parameter>
|
|
69
69
|
</message>
|
|
70
|
-
|
|
70
|
+
|
|
71
71
|
<message name="subscription">
|
|
72
72
|
<parameter name="subscription" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
|
|
73
73
|
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
|
|
@@ -77,12 +77,12 @@
|
|
|
77
77
|
<attribute name="url">
|
|
78
78
|
<data type="string"/>
|
|
79
79
|
</attribute>
|
|
80
|
-
</optional>
|
|
80
|
+
</optional>
|
|
81
81
|
<oneOrMore>
|
|
82
82
|
<element name="topic">
|
|
83
83
|
<attribute name="id">
|
|
84
84
|
<data type="string"/>
|
|
85
|
-
</attribute>
|
|
85
|
+
</attribute>
|
|
86
86
|
<oneOrMore>
|
|
87
87
|
<element>
|
|
88
88
|
<choice>
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
<data type="string">
|
|
93
93
|
<param name="pattern">[\w_]+</param>
|
|
94
94
|
</data>
|
|
95
|
-
</element>
|
|
95
|
+
</element>
|
|
96
96
|
</oneOrMore>
|
|
97
97
|
</element>
|
|
98
98
|
</oneOrMore>
|
|
@@ -103,9 +103,9 @@
|
|
|
103
103
|
<optional>
|
|
104
104
|
<parameter name="message-uid" type="string"/>
|
|
105
105
|
<parameter name="fingerprint-with-producer-secret" type="string"/>
|
|
106
|
-
</optional>
|
|
106
|
+
</optional>
|
|
107
107
|
</message>
|
|
108
|
-
|
|
108
|
+
|
|
109
109
|
<message name="delete">
|
|
110
110
|
<optional>
|
|
111
111
|
<parameter name="message-uid" type="string"/>
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
<optional>
|
|
117
117
|
<parameter name="message-uid" type="string"/>
|
|
118
118
|
<parameter name="fingerprint-with-producer-secret" type="string"/>
|
|
119
|
-
</optional>
|
|
119
|
+
</optional>
|
|
120
120
|
</message>
|
|
121
121
|
|
|
122
122
|
<message name="subscribe">
|
|
@@ -124,8 +124,8 @@
|
|
|
124
124
|
<parameter name="url" type="string"/>
|
|
125
125
|
<optional>
|
|
126
126
|
<parameter name="onbehalf" type="string"/>
|
|
127
|
-
</optional>
|
|
128
|
-
</optional>
|
|
127
|
+
</optional>
|
|
128
|
+
</optional>
|
|
129
129
|
<oneOrMore>
|
|
130
130
|
<parameter name="topic" type="string"/>
|
|
131
131
|
<choice>
|
|
@@ -137,7 +137,7 @@
|
|
|
137
137
|
</parameter>
|
|
138
138
|
</choice>
|
|
139
139
|
</oneOrMore>
|
|
140
|
-
</message>
|
|
140
|
+
</message>
|
|
141
141
|
<message name="acknowledgment">
|
|
142
142
|
<parameter name="key" type="string"/>
|
|
143
143
|
<parameter name="producer-secret" type="string"/>
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
<message name="details">
|
|
148
148
|
<optional>
|
|
149
149
|
<parameter name="url" type="string"/>
|
|
150
|
-
</optional>
|
|
150
|
+
</optional>
|
|
151
151
|
<oneOrMore>
|
|
152
152
|
<parameter name="topic" type="string"/>
|
|
153
153
|
<choice>
|
|
@@ -162,7 +162,7 @@
|
|
|
162
162
|
<optional>
|
|
163
163
|
<parameter name="message-uid" type="string"/>
|
|
164
164
|
<parameter name="fingerprint-with-producer-secret" type="string"/>
|
|
165
|
-
</optional>
|
|
165
|
+
</optional>
|
|
166
166
|
</message>
|
|
167
167
|
|
|
168
168
|
<message name="overview">
|
|
@@ -201,6 +201,6 @@
|
|
|
201
201
|
</resource>
|
|
202
202
|
</resource>
|
|
203
203
|
</resource>
|
|
204
|
-
</resource>
|
|
204
|
+
</resource>
|
|
205
205
|
|
|
206
206
|
</description>
|
data/riddl.gemspec
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
s.name = "riddl"
|
|
3
|
-
s.version = "1.0.
|
|
3
|
+
s.version = "1.0.7"
|
|
4
4
|
s.platform = Gem::Platform::RUBY
|
|
5
|
-
s.license = "LGPL-3.0"
|
|
5
|
+
s.license = "LGPL-3.0-or-later"
|
|
6
6
|
s.summary = "Restful Interface Description and Declaration Language: tools and client/server libs"
|
|
7
7
|
|
|
8
8
|
s.description = "REST service interface definition, mixing, and evolution. Supports mixed http and xmpp servers."
|
metadata
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: riddl
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Juergen 'eTM' Mangler
|
|
8
8
|
- Florian 'Solo' Stertz
|
|
9
9
|
- Sonja Biedermann
|
|
10
10
|
- Matthias Ehrendorfer
|
|
11
|
-
autorequire:
|
|
12
11
|
bindir: tools
|
|
13
12
|
cert_chain: []
|
|
14
|
-
date: 2025-
|
|
13
|
+
date: 2025-06-28 00:00:00.000000000 Z
|
|
15
14
|
dependencies:
|
|
16
15
|
- !ruby/object:Gem::Dependency
|
|
17
16
|
name: daemonite
|
|
@@ -538,9 +537,8 @@ files:
|
|
|
538
537
|
- tools/riddlprocess
|
|
539
538
|
homepage: http://github.com/etm/riddl/
|
|
540
539
|
licenses:
|
|
541
|
-
- LGPL-3.0
|
|
540
|
+
- LGPL-3.0-or-later
|
|
542
541
|
metadata: {}
|
|
543
|
-
post_install_message:
|
|
544
542
|
rdoc_options: []
|
|
545
543
|
require_paths:
|
|
546
544
|
- lib/ruby
|
|
@@ -555,8 +553,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
555
553
|
- !ruby/object:Gem::Version
|
|
556
554
|
version: '0'
|
|
557
555
|
requirements: []
|
|
558
|
-
rubygems_version: 3.
|
|
559
|
-
signing_key:
|
|
556
|
+
rubygems_version: 3.6.2
|
|
560
557
|
specification_version: 4
|
|
561
558
|
summary: 'Restful Interface Description and Declaration Language: tools and client/server
|
|
562
559
|
libs'
|