riddl 0.101.3 → 0.101.8

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ruby/riddl/ns/common-patterns/notifications-consumer/1.0/consumer.xml +5 -5
  3. data/lib/ruby/riddl/wrapper.rb +2 -1
  4. data/lib/ruby/riddl/wrapper/messageparser.rb +13 -5
  5. data/ns/common-patterns/notifications-consumer/1.0/consumer.xml +5 -5
  6. data/riddl.gemspec +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8463c8e66af82fe3e3253f557b3efba7cdf0a0a04af91a862c40ac880c863b0d
4
- data.tar.gz: 1cb38101d36c8e71a89a60287d46bfd230da7bc47ae595f4050ebf4eacd8eed3
3
+ metadata.gz: 31285a269fc4d180f673e30dc5bf6f5e511d8bf876e882a82383dc080714f166
4
+ data.tar.gz: 21baab5c204a3cb19b9f7bb31b902cc7c49ea9204293347c3ae214f03cb4091a
5
5
  SHA512:
6
- metadata.gz: d39cf79dfc0a202c8fba8c328b67020a9645813ce3f2e846b1a18bb93126ebe3967428639387e65c499afbbc4eaa476b74c8d232215130c1068ad802d7fcc2f6
7
- data.tar.gz: 95e428d2dd351b12f46307a443e624a2f0d6d6fc7e37c3519a30effdc06f452bb05e20c1d8fda88142fba0e9854a0816913a553ac96b6a751cc6e26a4a5d50f6
6
+ metadata.gz: 53d6ef1b368bfc7d912d03afacb53eafda78dc453fd141eead30f44ce2ac3a90ea0826ca51c9446c6afb8f650bbccaef1a0f9e95f9b86f731602a1037b2c8be6
7
+ data.tar.gz: 9d13b083954612db17b30d98e75df3fd5e4fa01ebef4c4c9630be3fa6a7e82c144bf34709a57cc7fba3ad46a3cfa932eb326206aa3128b50089048d4fb7d7905
data/lib/ruby/riddl/ns/common-patterns/notifications-consumer/1.0/consumer.xml CHANGED
@@ -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_\/]+</param>
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_\/]+</param>
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
- CHECK = "<element name=\"check\" datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"http://relaxng.org/ns/structure/1.0\"><data/></element>"
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)
data/lib/ruby/riddl/wrapper/messageparser.rb CHANGED
@@ -191,12 +191,20 @@ module Riddl
191
191
  else
192
192
  value = XML::Smart::string("<check/>")
193
193
  value.root.text = b
194
- type = XML::Smart::string(CHECK)
195
- data = type.root.children[0]
196
- data.attributes['type'] = a.attributes['type']
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
- e.namespaces.delete_all!
199
- data.add e
203
+ unless e.class == XML::Smart::Dom::Text
204
+ e.namespaces.delete_all!
205
+ e.find('.//*').each{ |x| x.namespaces.delete_all! }
206
+ data.add e
207
+ end
200
208
  end
201
209
  value.validate_against type
202
210
  end
data/ns/common-patterns/notifications-consumer/1.0/consumer.xml CHANGED
@@ -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_\/]+</param>
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_\/]+</param>
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"
3
+ s.version = "0.101.8"
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"
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.3
4
+ version: 0.101.8
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-04-20 00:00:00.000000000 Z
13
+ date: 2020-06-03 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: daemonite