riddl 0.113 → 0.118
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/client.rb +1 -0
- data/lib/ruby/riddl/ns/common-patterns/notifications-producer/2.0/producer.xml +3 -0
- data/lib/ruby/riddl/protocols/http/generator.rb +13 -9
- data/lib/ruby/riddl/server.rb +4 -1
- data/ns/common-patterns/notifications-producer/2.0/producer.xml +3 -0
- data/riddl.gemspec +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f6503335672eb9a820fbc3d27497221a05a93aa52c9cf283f2aab72a7a60c0f7
|
4
|
+
data.tar.gz: 17313cb3a0992cbda479bd261a9c84a82b921ae9299111a32da5726549a5a848
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b883778615ca086be4f95af5bd47f54ce80b97eab211b4b35bd1ecd5a1743d1383161f93a9fa15b056eff3010692bcf03f7bcba919147e1aced52667ad030824
|
7
|
+
data.tar.gz: b8c1723a3f1320ba5ce758a013769eabadc05d07a02d5e7064cf3b129754e3d41077dd81698a8206d9dc8aa312a18a87b8f94ae5fcb0c12ef07d04705f8d6437
|
data/lib/ruby/riddl/client.rb
CHANGED
@@ -355,6 +355,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
|
|
355
355
|
:headers => headers,
|
356
356
|
:body => tmp.read,
|
357
357
|
:ssl_verifypeer => false
|
358
|
+
#:followlocation => true
|
358
359
|
}
|
359
360
|
if url.user && url.password
|
360
361
|
opts[:username] = Protocols::Utils::unescape(url.user)
|
@@ -67,6 +67,9 @@
|
|
67
67
|
<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/2.0">
|
68
68
|
<start>
|
69
69
|
<element name="subscription">
|
70
|
+
<attribute name="id">
|
71
|
+
<data type="string"/>
|
72
|
+
</attribute>
|
70
73
|
<optional>
|
71
74
|
<attribute name="url">
|
72
75
|
<data type="string"/>
|
@@ -19,9 +19,13 @@ module Riddl
|
|
19
19
|
elsif @params.is_a?(Array) && @params.length > 1
|
20
20
|
multipart(mode)
|
21
21
|
else
|
22
|
-
|
23
|
-
|
24
|
-
|
22
|
+
if mode == :output
|
23
|
+
@headers['Content-Type'] = 'text/plain'
|
24
|
+
StringIO.new('','r+b')
|
25
|
+
else
|
26
|
+
StringIO.new('','r+b')
|
27
|
+
end
|
28
|
+
end
|
25
29
|
end
|
26
30
|
|
27
31
|
def body(r,mode)
|
@@ -46,7 +50,7 @@ module Riddl
|
|
46
50
|
@headers['Content-ID'] = r.name
|
47
51
|
else
|
48
52
|
@headers['Content-Disposition'] = "riddl-data; name=\"#{r.name}\"; filename=\"#{r.filename}\""
|
49
|
-
end
|
53
|
+
end
|
50
54
|
end
|
51
55
|
tmp.flush
|
52
56
|
tmp.rewind
|
@@ -63,7 +67,7 @@ module Riddl
|
|
63
67
|
scount += 1
|
64
68
|
when Riddl::Parameter::Complex
|
65
69
|
ccount += 1
|
66
|
-
end
|
70
|
+
end
|
67
71
|
end
|
68
72
|
if scount > 0 && ccount == 0
|
69
73
|
@headers['Content-Type'] = 'application/x-www-form-urlencoded'
|
@@ -72,7 +76,7 @@ module Riddl
|
|
72
76
|
case r
|
73
77
|
when Riddl::Parameter::Simple
|
74
78
|
res << Riddl::Protocols::Utils::escape(r.name) + '=' + Riddl::Protocols::Utils::escape(r.value)
|
75
|
-
end
|
79
|
+
end
|
76
80
|
end
|
77
81
|
tmp.write res.join('&')
|
78
82
|
else
|
@@ -97,7 +101,7 @@ module Riddl
|
|
97
101
|
tmp.write EOL
|
98
102
|
tmp.write(r.value.respond_to?(:read) ? r.value.read : r.value)
|
99
103
|
tmp.write EOL
|
100
|
-
end
|
104
|
+
end
|
101
105
|
end
|
102
106
|
tmp.write "--" + BOUNDARY + EOL
|
103
107
|
end
|
@@ -107,8 +111,8 @@ module Riddl
|
|
107
111
|
tmp
|
108
112
|
end
|
109
113
|
private :multipart
|
110
|
-
|
114
|
+
|
111
115
|
end
|
112
116
|
end
|
113
117
|
end
|
114
|
-
end
|
118
|
+
end
|
data/lib/ruby/riddl/server.rb
CHANGED
@@ -178,7 +178,7 @@ module Riddl
|
|
178
178
|
@riddl_res['Content-Length'] = '0'
|
179
179
|
@riddl_status = 200
|
180
180
|
else
|
181
|
-
@riddl_log.write "501:
|
181
|
+
@riddl_log.write "501: a #{@riddl_method} with the these parameters is not part in the description (xml).\n"
|
182
182
|
@riddl_status = 501 # not implemented?!
|
183
183
|
end
|
184
184
|
else
|
@@ -253,6 +253,9 @@ module Riddl
|
|
253
253
|
@riddl_env['HTTP_CONTENT_ID'],
|
254
254
|
@riddl_env['HTTP_RIDDL_TYPE']
|
255
255
|
).params
|
256
|
+
if @riddl_opts[:http_debug]
|
257
|
+
pp @riddl_parameters
|
258
|
+
end
|
256
259
|
|
257
260
|
@riddl_method = @riddl_env['REQUEST_METHOD'].downcase
|
258
261
|
@riddl_path = '/'
|
@@ -67,6 +67,9 @@
|
|
67
67
|
<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/2.0">
|
68
68
|
<start>
|
69
69
|
<element name="subscription">
|
70
|
+
<attribute name="id">
|
71
|
+
<data type="string"/>
|
72
|
+
</attribute>
|
70
73
|
<optional>
|
71
74
|
<attribute name="url">
|
72
75
|
<data type="string"/>
|
data/riddl.gemspec
CHANGED
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.
|
4
|
+
version: '0.118'
|
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:
|
13
|
+
date: 2022-05-23 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: daemonite
|
@@ -548,18 +548,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
548
548
|
- !ruby/object:Gem::Version
|
549
549
|
version: '0'
|
550
550
|
requirements: []
|
551
|
-
rubygems_version: 3.
|
551
|
+
rubygems_version: 3.3.7
|
552
552
|
signing_key:
|
553
553
|
specification_version: 4
|
554
554
|
summary: 'restful interface description and declaration language: tools and client/server
|
555
555
|
libs'
|
556
556
|
test_files:
|
557
|
-
- test/
|
557
|
+
- test/tc_declaration-distributed.rb
|
558
558
|
- test/tc_declaration-hybrid.rb
|
559
559
|
- test/tc_declaration-local.rb
|
560
560
|
- test/tc_helloworld.rb
|
561
561
|
- test/tc_library.rb
|
562
|
-
- test/tc_declaration-distributed.rb
|
563
|
-
- test/tc_websocket.rb
|
564
562
|
- test/tc_producer.rb
|
563
|
+
- test/tc_properties.rb
|
564
|
+
- test/tc_websocket.rb
|
565
565
|
- test/smartrunner.rb
|