riddl 0.99.180 → 0.99.181

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/examples/xmpp/client.rb +1 -1
  3. data/examples/xmpp/description.rb +1 -1
  4. data/examples/xmpp/server.properties.xml +1 -1
  5. data/lib/ruby/riddl/ns/common/datatypes-1_0.rng +2 -2
  6. data/lib/ruby/riddl/ns/description/1.0/description.rng +13 -3
  7. data/ns/common/datatypes-1_0.rng +2 -2
  8. data/ns/description/1.0/description.rng +13 -3
  9. data/riddl.gemspec +11 -11
  10. metadata +60 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 01dd747df8b7170003378d369c3704bf826c2859
4
- data.tar.gz: db4f4d00c5883d8e65b59beb65d5fbc173f4c7b8
3
+ metadata.gz: bfb269a26b484119cded1171abb59e1f1f1aa94a
4
+ data.tar.gz: a4225e8aafc73f368f41af6af5feb389c2e41357
5
5
  SHA512:
6
- metadata.gz: c137b81591dfd033ce4d92ef592c525f0c15af1bd5bdd02fce8df29b03b7103add3ef17a1e37f87838776118d9e6567087b07fe1fecd96ba291b21819493f02e
7
- data.tar.gz: c1b92114011704e2cf834052d7d9fe8d0964fda378b69c103985a6740db29b78ad48469efd3472d8e1f82a8259f434789de67a4beb8d9bfd45e8c59508118dba
6
+ metadata.gz: 913247fe848afe125b407fc1bdcfd703cf6674c22ea0e39a955767be94452ff6272898fd409a40518022f7a89516107ddf074e3587863f599cf820bd2440acb2
7
+ data.tar.gz: c9dc1568677e626c7b02725aab102768bff43f610513c2b3386661427f76bf057098a908e72f0b40e1c284a9461b84e55a9287ce5fdad47ab87c9258bb68c732
data/examples/xmpp/client.rb CHANGED
@@ -4,7 +4,7 @@ require '../../lib/ruby/riddl/client'
4
4
  require 'pp'
5
5
 
6
6
  #props = Riddl::Client.interface("http://localhost:9191","properties.xml")
7
- props = Riddl::Client.interface("xmpp://adventure_processexecution@fp7-adventure.eu", "properties.xml", :jid => 'jürgen@fp7-adventure.eu', :pass => 'mangler', :debug => STDOUT)
7
+ props = Riddl::Client.interface("xmpp://adventure_processexecution@cpee.org", "properties.xml", :jid => 'juergen@cpee.org', :pass => 'mangler', :debug => STDOUT)
8
8
 
9
9
  test = props.resource("/values/state")
10
10
  status, res = test.get
data/examples/xmpp/description.rb CHANGED
@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/server'
4
4
  require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/properties')
5
5
 
6
6
  Riddl::Server.new(File.dirname(__FILE__) + '/properties.xml', :port => 9191) do |opts|
7
- xmpp 'adventure_processexecution@fp7-adventure.eu', 'adventure_processexecution'
7
+ xmpp 'adventure_processexecution@cpee.org', 'adventure_processexecution'
8
8
 
9
9
  backend = Riddl::Utils::Properties::Backend.new(
10
10
  opts[:basepath] + '/server.properties.schema',
data/examples/xmpp/server.properties.xml CHANGED
@@ -11,6 +11,6 @@
11
11
  </endpoints>
12
12
  <handlerwrapper>Test</handlerwrapper>
13
13
  <description>lala</description>
14
- <state>stopped</state>
14
+ <state>running</state>
15
15
  <transformation>xxx</transformation>
16
16
  </properties>
data/lib/ruby/riddl/ns/common/datatypes-1_0.rng CHANGED
@@ -3,12 +3,12 @@
3
3
 
4
4
  <define name="riddl-datatype-relpath">
5
5
  <data type="string">
6
- <param name="pattern">[\c+*?.\\]+</param>
6
+ <param name="pattern">[\]\[()\c+\-*?.\\ ]+</param>
7
7
  </data>
8
8
  </define>
9
9
  <define name="riddl-datatype-pathtemplate">
10
10
  <data type="string">
11
- <param name="pattern">/|(/(\c+|\{\}))*</param>
11
+ <param name="pattern">/|(/([\[\]()\c+\-*?.\\ ]+|\{\}))*</param>
12
12
  </data>
13
13
  </define>
14
14
 
data/lib/ruby/riddl/ns/description/1.0/description.rng CHANGED
@@ -278,16 +278,25 @@
278
278
  </define>
279
279
 
280
280
  <define name="riddl-description-others">
281
- <ref name="other"/>
282
281
  <zeroOrMore>
283
- <attribute>
282
+ <element>
284
283
  <anyName>
285
284
  <except>
286
285
  <nsName/>
287
286
  <nsName ns=""/>
287
+ <nsName ns="http://riddl.org/ns/description/1.0/"/>
288
288
  </except>
289
289
  </anyName>
290
- </attribute>
290
+ <zeroOrMore>
291
+ <choice>
292
+ <attribute>
293
+ <anyName/>
294
+ </attribute>
295
+ <text/>
296
+ <ref name="any"/>
297
+ </choice>
298
+ </zeroOrMore>
299
+ </element>
291
300
  </zeroOrMore>
292
301
  </define>
293
302
 
@@ -298,6 +307,7 @@
298
307
  <except>
299
308
  <nsName/>
300
309
  <nsName ns=""/>
310
+ <nsName ns="http://riddl.org/ns/description/1.0/"/>
301
311
  </except>
302
312
  </anyName>
303
313
  </attribute>
data/ns/common/datatypes-1_0.rng CHANGED
@@ -3,12 +3,12 @@
3
3
 
4
4
  <define name="riddl-datatype-relpath">
5
5
  <data type="string">
6
- <param name="pattern">[\c+*?.\\]+</param>
6
+ <param name="pattern">[\]\[()\c+\-*?.\\ ]+</param>
7
7
  </data>
8
8
  </define>
9
9
  <define name="riddl-datatype-pathtemplate">
10
10
  <data type="string">
11
- <param name="pattern">/|(/(\c+|\{\}))*</param>
11
+ <param name="pattern">/|(/([\[\]()\c+\-*?.\\ ]+|\{\}))*</param>
12
12
  </data>
13
13
  </define>
14
14
 
data/ns/description/1.0/description.rng CHANGED
@@ -278,16 +278,25 @@
278
278
  </define>
279
279
 
280
280
  <define name="riddl-description-others">
281
- <ref name="other"/>
282
281
  <zeroOrMore>
283
- <attribute>
282
+ <element>
284
283
  <anyName>
285
284
  <except>
286
285
  <nsName/>
287
286
  <nsName ns=""/>
287
+ <nsName ns="http://riddl.org/ns/description/1.0/"/>
288
288
  </except>
289
289
  </anyName>
290
- </attribute>
290
+ <zeroOrMore>
291
+ <choice>
292
+ <attribute>
293
+ <anyName/>
294
+ </attribute>
295
+ <text/>
296
+ <ref name="any"/>
297
+ </choice>
298
+ </zeroOrMore>
299
+ </element>
291
300
  </zeroOrMore>
292
301
  </define>
293
302
 
@@ -298,6 +307,7 @@
298
307
  <except>
299
308
  <nsName/>
300
309
  <nsName ns=""/>
310
+ <nsName ns="http://riddl.org/ns/description/1.0/"/>
301
311
  </except>
302
312
  </anyName>
303
313
  </attribute>
data/riddl.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "riddl"
3
- s.version = "0.99.180"
3
+ s.version = "0.99.181"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3"
6
6
  s.summary = "restful interface description and declaration language: tools and client/server libs"
@@ -22,15 +22,15 @@ Gem::Specification.new do |s|
22
22
 
23
23
  s.required_ruby_version = '>=1.9.3'
24
24
 
25
- s.add_runtime_dependency 'xml-smart', '>=0.3.6'
26
- s.add_runtime_dependency 'rdf-smart', '>=0.0.160'
27
- s.add_runtime_dependency 'rack'
25
+ s.add_runtime_dependency 'xml-smart', '>=0.3.6', '~>0'
26
+ s.add_runtime_dependency 'rdf-smart', '>=0.0.160', '~>0'
27
+ s.add_runtime_dependency 'rack', '~>1.6'
28
28
  s.add_runtime_dependency 'thin', '~>1.6'
29
- s.add_runtime_dependency 'eventmachine', '>= 1.0.0'
30
- s.add_runtime_dependency 'em-websocket', '>= 0.4.0'
31
- s.add_runtime_dependency 'em-websocket-client'
32
- s.add_runtime_dependency 'mime-types'
33
- s.add_runtime_dependency 'minitest', '>= 5.0.0'
34
- s.add_runtime_dependency 'blather'
35
- s.add_runtime_dependency 'charlock_holmes'
29
+ s.add_runtime_dependency 'eventmachine', '>= 1.0.0', '~>1.0'
30
+ s.add_runtime_dependency 'em-websocket', '>= 0.4.0', '~>0'
31
+ s.add_runtime_dependency 'em-websocket-client', '>= 0.1', '~>0'
32
+ s.add_runtime_dependency 'mime-types', '>= 2.4', '~>2'
33
+ s.add_runtime_dependency 'minitest', '>= 5.0.0', '~>5'
34
+ s.add_runtime_dependency 'blather', '~>1'
35
+ s.add_runtime_dependency 'charlock_holmes', '>= 0.7', '~>0'
36
36
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: riddl
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.99.180
4
+ version: 0.99.181
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
8
8
  autorequire:
9
9
  bindir: tools
10
10
  cert_chain: []
11
- date: 2015-02-17 00:00:00.000000000 Z
11
+ date: 2015-03-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: xml-smart
@@ -17,6 +17,9 @@ dependencies:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.3.6
20
+ - - "~>"
21
+ - !ruby/object:Gem::Version
22
+ version: '0'
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
24
27
  - - ">="
25
28
  - !ruby/object:Gem::Version
26
29
  version: 0.3.6
30
+ - - "~>"
31
+ - !ruby/object:Gem::Version
32
+ version: '0'
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: rdf-smart
29
35
  requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
31
37
  - - ">="
32
38
  - !ruby/object:Gem::Version
33
39
  version: 0.0.160
40
+ - - "~>"
41
+ - !ruby/object:Gem::Version
42
+ version: '0'
34
43
  type: :runtime
35
44
  prerelease: false
36
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -38,20 +47,23 @@ dependencies:
38
47
  - - ">="
39
48
  - !ruby/object:Gem::Version
40
49
  version: 0.0.160
50
+ - - "~>"
51
+ - !ruby/object:Gem::Version
52
+ version: '0'
41
53
  - !ruby/object:Gem::Dependency
42
54
  name: rack
43
55
  requirement: !ruby/object:Gem::Requirement
44
56
  requirements:
45
- - - ">="
57
+ - - "~>"
46
58
  - !ruby/object:Gem::Version
47
- version: '0'
59
+ version: '1.6'
48
60
  type: :runtime
49
61
  prerelease: false
50
62
  version_requirements: !ruby/object:Gem::Requirement
51
63
  requirements:
52
- - - ">="
64
+ - - "~>"
53
65
  - !ruby/object:Gem::Version
54
- version: '0'
66
+ version: '1.6'
55
67
  - !ruby/object:Gem::Dependency
56
68
  name: thin
57
69
  requirement: !ruby/object:Gem::Requirement
@@ -73,6 +85,9 @@ dependencies:
73
85
  - - ">="
74
86
  - !ruby/object:Gem::Version
75
87
  version: 1.0.0
88
+ - - "~>"
89
+ - !ruby/object:Gem::Version
90
+ version: '1.0'
76
91
  type: :runtime
77
92
  prerelease: false
78
93
  version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +95,9 @@ dependencies:
80
95
  - - ">="
81
96
  - !ruby/object:Gem::Version
82
97
  version: 1.0.0
98
+ - - "~>"
99
+ - !ruby/object:Gem::Version
100
+ version: '1.0'
83
101
  - !ruby/object:Gem::Dependency
84
102
  name: em-websocket
85
103
  requirement: !ruby/object:Gem::Requirement
@@ -87,6 +105,9 @@ dependencies:
87
105
  - - ">="
88
106
  - !ruby/object:Gem::Version
89
107
  version: 0.4.0
108
+ - - "~>"
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
90
111
  type: :runtime
91
112
  prerelease: false
92
113
  version_requirements: !ruby/object:Gem::Requirement
@@ -94,11 +115,17 @@ dependencies:
94
115
  - - ">="
95
116
  - !ruby/object:Gem::Version
96
117
  version: 0.4.0
118
+ - - "~>"
119
+ - !ruby/object:Gem::Version
120
+ version: '0'
97
121
  - !ruby/object:Gem::Dependency
98
122
  name: em-websocket-client
99
123
  requirement: !ruby/object:Gem::Requirement
100
124
  requirements:
101
125
  - - ">="
126
+ - !ruby/object:Gem::Version
127
+ version: '0.1'
128
+ - - "~>"
102
129
  - !ruby/object:Gem::Version
103
130
  version: '0'
104
131
  type: :runtime
@@ -106,6 +133,9 @@ dependencies:
106
133
  version_requirements: !ruby/object:Gem::Requirement
107
134
  requirements:
108
135
  - - ">="
136
+ - !ruby/object:Gem::Version
137
+ version: '0.1'
138
+ - - "~>"
109
139
  - !ruby/object:Gem::Version
110
140
  version: '0'
111
141
  - !ruby/object:Gem::Dependency
@@ -114,14 +144,20 @@ dependencies:
114
144
  requirements:
115
145
  - - ">="
116
146
  - !ruby/object:Gem::Version
117
- version: '0'
147
+ version: '2.4'
148
+ - - "~>"
149
+ - !ruby/object:Gem::Version
150
+ version: '2'
118
151
  type: :runtime
119
152
  prerelease: false
120
153
  version_requirements: !ruby/object:Gem::Requirement
121
154
  requirements:
122
155
  - - ">="
123
156
  - !ruby/object:Gem::Version
124
- version: '0'
157
+ version: '2.4'
158
+ - - "~>"
159
+ - !ruby/object:Gem::Version
160
+ version: '2'
125
161
  - !ruby/object:Gem::Dependency
126
162
  name: minitest
127
163
  requirement: !ruby/object:Gem::Requirement
@@ -129,6 +165,9 @@ dependencies:
129
165
  - - ">="
130
166
  - !ruby/object:Gem::Version
131
167
  version: 5.0.0
168
+ - - "~>"
169
+ - !ruby/object:Gem::Version
170
+ version: '5'
132
171
  type: :runtime
133
172
  prerelease: false
134
173
  version_requirements: !ruby/object:Gem::Requirement
@@ -136,25 +175,31 @@ dependencies:
136
175
  - - ">="
137
176
  - !ruby/object:Gem::Version
138
177
  version: 5.0.0
178
+ - - "~>"
179
+ - !ruby/object:Gem::Version
180
+ version: '5'
139
181
  - !ruby/object:Gem::Dependency
140
182
  name: blather
141
183
  requirement: !ruby/object:Gem::Requirement
142
184
  requirements:
143
- - - ">="
185
+ - - "~>"
144
186
  - !ruby/object:Gem::Version
145
- version: '0'
187
+ version: '1'
146
188
  type: :runtime
147
189
  prerelease: false
148
190
  version_requirements: !ruby/object:Gem::Requirement
149
191
  requirements:
150
- - - ">="
192
+ - - "~>"
151
193
  - !ruby/object:Gem::Version
152
- version: '0'
194
+ version: '1'
153
195
  - !ruby/object:Gem::Dependency
154
196
  name: charlock_holmes
155
197
  requirement: !ruby/object:Gem::Requirement
156
198
  requirements:
157
199
  - - ">="
200
+ - !ruby/object:Gem::Version
201
+ version: '0.7'
202
+ - - "~>"
158
203
  - !ruby/object:Gem::Version
159
204
  version: '0'
160
205
  type: :runtime
@@ -162,6 +207,9 @@ dependencies:
162
207
  version_requirements: !ruby/object:Gem::Requirement
163
208
  requirements:
164
209
  - - ">="
210
+ - !ruby/object:Gem::Version
211
+ version: '0.7'
212
+ - - "~>"
165
213
  - !ruby/object:Gem::Version
166
214
  version: '0'
167
215
  description: rest service interface definition, mixing, and evolution. supports mixed