riddl 0.101.5 → 0.101.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6bad8a1d5c21f1767e546e97ebd56285444e0ef40adecb1d673edf9c7031a2df
4
- data.tar.gz: f3d7b1643191198d7c6a78b0975c7424aed5f16d0303ff9cc8d91e4268eea17b
3
+ metadata.gz: 5d978936f72adba90d559b02854c9a9e90b29667c758b699719b7c3813ac336b
4
+ data.tar.gz: fbeb981ed3830b2fc6a7fcce299b1a7bd82e1823debcef16d5ae584e890afa06
5
5
  SHA512:
6
- metadata.gz: 5e13bf32becac8796a8515dc8ee2516977de3ce85ff4fd96ede134ece61d13806f8bb97ecdbc6bbd90266dc49af912c25180eea43044d79be6ce25b58c8a0051
7
- data.tar.gz: 9144097317e79a1617945d7b27b55490391134b5fd3516323477e880333dd40a511c26b556f8154c18cd5162b7dfde02d80d3796218d54dad7ce1a9d2badf8ef
6
+ metadata.gz: 195c791d35d2481885a121ba7dd749db315e41a0d2cb9a06873d5bdb89fb110cd4b7d85493b5382163ed7f1f22d90377897d3423268682315140a08b5c1bf12d
7
+ data.tar.gz: c95886c342f3c7d351702af686ac7225fde1af60402bdc1aa1025634bb523cce9dc364671b6c849c024e50cd575aaea9ed90939f07165376581f9f1998231f9c
@@ -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)
@@ -191,12 +191,18 @@ 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
203
  unless e.class == XML::Smart::Dom::Text
199
- e.namespaces.delete_all!
204
+ e = e.to_doc.root
205
+ e.namespaces[nil] = 'http://relaxng.org/ns/structure/1.0'
200
206
  data.add e
201
207
  end
202
208
  end
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "riddl"
3
- s.version = "0.101.5"
3
+ s.version = "0.101.11"
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.6', '~>0'
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.5
4
+ version: 0.101.11
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-05-05 00:00:00.000000000 Z
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.6
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.6
59
+ version: 0.4.3
60
60
  - - "~>"
61
61
  - !ruby/object:Gem::Version
62
62
  version: '0'