riddl 0.100.1 → 0.100.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -11,8 +11,8 @@
11
11
  <xsl:apply-templates select="./*[name()!='optional']"/>
12
12
  <xsl:apply-templates select="p:optional"/>
13
13
  </interleave>
14
- </element>
15
- </start>
14
+ </element>
15
+ </start>
16
16
 
17
17
  <define name="arbitrary">
18
18
  <zeroOrMore>
@@ -40,7 +40,7 @@
40
40
  </element>
41
41
  </define>
42
42
 
43
- </grammar>
43
+ </grammar>
44
44
  </xsl:template>
45
45
 
46
46
  <xsl:template match="p:optional">
@@ -59,12 +59,17 @@
59
59
  <xsl:if test="@type='arbitrary'">
60
60
  <ref name="arbitrary"/>
61
61
  </xsl:if>
62
-
62
+
63
63
  <xsl:if test="@type='complex'">
64
64
  <xsl:apply-templates mode="copy-no-ns"/>
65
- </xsl:if>
65
+ </xsl:if>
66
66
 
67
67
  <xsl:if test="@type='state'">
68
+ <optional>
69
+ <attribute name="changed">
70
+ <data type="dateTime"/>
71
+ </attribute>
72
+ </optional>
68
73
  <choice>
69
74
  <xsl:for-each select='*'>
70
75
  <value><xsl:value-of select='name()'/></value>
@@ -11,8 +11,8 @@
11
11
  <xsl:apply-templates select="./*[name()!='optional']"/>
12
12
  <xsl:apply-templates select="p:optional"/>
13
13
  </interleave>
14
- </element>
15
- </start>
14
+ </element>
15
+ </start>
16
16
 
17
17
  <define name="arbitrary">
18
18
  <zeroOrMore>
@@ -40,7 +40,7 @@
40
40
  </element>
41
41
  </define>
42
42
 
43
- </grammar>
43
+ </grammar>
44
44
  </xsl:template>
45
45
 
46
46
  <xsl:template match="p:optional">
@@ -59,12 +59,17 @@
59
59
  <xsl:if test="@type='arbitrary'">
60
60
  <ref name="arbitrary"/>
61
61
  </xsl:if>
62
-
62
+
63
63
  <xsl:if test="@type='complex'">
64
64
  <xsl:apply-templates mode="copy-no-ns"/>
65
- </xsl:if>
65
+ </xsl:if>
66
66
 
67
67
  <xsl:if test="@type='state'">
68
+ <optional>
69
+ <attribute name="changed">
70
+ <data type="dateTime"/>
71
+ </attribute>
72
+ </optional>
68
73
  <choice>
69
74
  <xsl:for-each select='*'>
70
75
  <value><xsl:value-of select='name()'/></value>
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "riddl"
3
- s.version = "0.100.1"
3
+ s.version = "0.100.2"
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"
@@ -35,5 +35,5 @@ Gem::Specification.new do |s|
35
35
  s.add_runtime_dependency 'mime-types', '>= 2.4', '~>2'
36
36
  s.add_runtime_dependency 'minitest', '>= 5.0.0', '~>5'
37
37
  s.add_runtime_dependency 'charlock_holmes', '>= 0.7', '~>0'
38
- s.add_runtime_dependency 'redis', '>= 4.0', '~>4.0'
38
+ s.add_runtime_dependency 'redis', '>= 3.3.0', '~>3.3', '~> 4.0'
39
39
  end
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.100.1
4
+ version: 0.100.2
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: 2018-07-18 00:00:00.000000000 Z
13
+ date: 2018-11-08 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: daemonite
@@ -234,7 +234,10 @@ dependencies:
234
234
  requirements:
235
235
  - - ">="
236
236
  - !ruby/object:Gem::Version
237
- version: '4.0'
237
+ version: 3.3.0
238
+ - - "~>"
239
+ - !ruby/object:Gem::Version
240
+ version: '3.3'
238
241
  - - "~>"
239
242
  - !ruby/object:Gem::Version
240
243
  version: '4.0'
@@ -244,7 +247,10 @@ dependencies:
244
247
  requirements:
245
248
  - - ">="
246
249
  - !ruby/object:Gem::Version
247
- version: '4.0'
250
+ version: 3.3.0
251
+ - - "~>"
252
+ - !ruby/object:Gem::Version
253
+ version: '3.3'
248
254
  - - "~>"
249
255
  - !ruby/object:Gem::Version
250
256
  version: '4.0'
@@ -285,6 +291,7 @@ files:
285
291
  - examples/declaration-server-distributed/properties.xml
286
292
  - examples/declaration-server-distributed/rngs/instance-info.rng
287
293
  - examples/declaration-server-distributed/rngs/instances.rng
294
+ - examples/declaration-server-distributed/test.xml
288
295
  - examples/declaration-server-distributed/xsloverlay.rb
289
296
  - examples/declaration-server-distributed/xsloverlay.xml
290
297
  - examples/declaration-server-distributed/xsls/info.xsl
@@ -324,6 +331,7 @@ files:
324
331
  - examples/declaration-test/declaration2.xml
325
332
  - examples/declaration-test/goal/goal.txt
326
333
  - examples/declaration-test/goal/goal.xml
334
+ - examples/declaration-test/main.log
327
335
  - examples/declaration-test/main.rb
328
336
  - examples/declaration-test/main.xml
329
337
  - examples/declaration-test/over.xml
@@ -347,6 +355,7 @@ files:
347
355
  - examples/flickr/Exif/exif.test
348
356
  - examples/flickr/Exif/exif.xml
349
357
  - examples/flickr/Exif/riddl.jpg
358
+ - examples/flickr/Exif/riddl.new.jpg
350
359
  - examples/flickr/Flickr/authenticate.rb
351
360
  - examples/flickr/Flickr/find.rb
352
361
  - examples/flickr/Flickr/flickr.rb
@@ -395,8 +404,6 @@ files:
395
404
  - examples/properties/properties.xml
396
405
  - examples/properties/server.properties.schema
397
406
  - examples/properties/server.properties.xml
398
- - examples/simple/server.rb
399
- - examples/simple/simple.xml
400
407
  - examples/twitter/README
401
408
  - examples/twitter/client.rb
402
409
  - examples/twitter/declaration.xml
@@ -406,6 +413,11 @@ files:
406
413
  - examples/websocket/description.xml
407
414
  - examples/websocket/sample.html
408
415
  - examples/websocket/server.rb
416
+ - examples/xmpp/blather/description.xml
417
+ - examples/xmpp/blather/direct.rb
418
+ - examples/xmpp/blather/load.rb
419
+ - examples/xmpp/blather/pp.rb
420
+ - examples/xmpp/blather/test.rb
409
421
  - examples/xmpp/client.rb
410
422
  - examples/xmpp/description.rb
411
423
  - examples/xmpp/properties.xml
@@ -413,6 +425,7 @@ files:
413
425
  - examples/xmpp/server.properties.xml
414
426
  - examples/zotero/README
415
427
  - examples/zotero/client.rb
428
+ - examples/zotero/litlist.html
416
429
  - examples/zotero/zotero.xml
417
430
  - lib/ruby/riddl/client.rb
418
431
  - lib/ruby/riddl/commonlogger.rb
@@ -543,12 +556,12 @@ specification_version: 4
543
556
  summary: 'restful interface description and declaration language: tools and client/server
544
557
  libs'
545
558
  test_files:
546
- - test/tc_helloworld.rb
547
- - test/tc_declaration-distributed.rb
548
- - test/tc_declaration-local.rb
549
- - test/tc_producer.rb
550
559
  - test/tc_properties.rb
551
- - test/tc_websocket.rb
552
560
  - test/tc_declaration-hybrid.rb
561
+ - test/tc_declaration-local.rb
562
+ - test/tc_helloworld.rb
553
563
  - test/tc_library.rb
564
+ - test/tc_declaration-distributed.rb
565
+ - test/tc_websocket.rb
566
+ - test/tc_producer.rb
554
567
  - test/smartrunner.rb
@@ -1,21 +0,0 @@
1
- #!/usr/bin/ruby
2
- require 'pp'
3
- require 'memory_profiler'
4
- require File.expand_path(File.join(__dir__,'..','..','lib','ruby','riddl','server'))
5
-
6
- class Hello < Riddl::Implementation
7
- def response
8
- Riddl::Parameter::Complex.new("hello","text/plain","Hello World")
9
- end
10
- end
11
-
12
- Riddl::Server.new(__dir__ + '/simple.xml', :port => 9292) do
13
- accessible_description true
14
-
15
- on resource do
16
- MemoryProfiler.start
17
- run Hello if get
18
- report = MemoryProfiler.stop
19
- puts report.pretty_print
20
- end
21
- end.loop!
@@ -1,11 +0,0 @@
1
- <description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
2
-
3
- <message name="hello">
4
- <parameter name="return" mimetype="text/plain"/>
5
- </message>
6
-
7
- <resource>
8
- <get in="*" out="hello"/>
9
- </resource>
10
-
11
- </description>