riddl 0.99.195 → 0.99.196
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/examples/declaration-server-distributed/test.xml +138 -0
- data/lib/ruby/riddl/server.rb +3 -3
- data/riddl.gemspec +1 -1
- data/test/tc_producer.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 71e91dab768e617feaeefd4578f8f6ed7a5b0794
|
|
4
|
+
data.tar.gz: 22ea00a94c657f994e37c5450f3dcf6466c2079c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 41c7e768e4b3fb83274672d08e15cc832822d488904e943d700e316b1e11dc6879231a675e9347a9688f17efb7cd98ed1292204df7ecc1a33a04c37afca894f7
|
|
7
|
+
data.tar.gz: 62fd64e0c2d91059bce0b209572c95f34aa54a7178897ec2600e084464bcc3e0553398c20206a08e1f9b6419e4e7ca7e96576faa9a72c2ae05bcd6372ea2f547
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
<?xml version="1.0"?>
|
|
2
|
+
<description xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
|
3
|
+
<message name="addxsl">
|
|
4
|
+
<parameter name="xml" mimetype="*/xml"/>
|
|
5
|
+
</message>
|
|
6
|
+
<message name="query">
|
|
7
|
+
<parameter name="query" type="string"/>
|
|
8
|
+
</message>
|
|
9
|
+
<message name="resource-document-schema">
|
|
10
|
+
<parameter name="document-schema" mimetype="text/xml"/>
|
|
11
|
+
</message>
|
|
12
|
+
<message name="property">
|
|
13
|
+
<parameter name="name" type="string">
|
|
14
|
+
<param name="pattern">[a-zA-Z_][a-zA-Z0-9_]*</param>
|
|
15
|
+
</parameter>
|
|
16
|
+
<choice>
|
|
17
|
+
<parameter name="value" type="string"/>
|
|
18
|
+
<parameter name="value" mimetype="text/plain"/>
|
|
19
|
+
<parameter name="content" mimetype="text/xml"/>
|
|
20
|
+
<!-- add everything inside the root tag -->
|
|
21
|
+
<parameter name="content" type="string"/>
|
|
22
|
+
<!-- add everything inside the root tag -->
|
|
23
|
+
</choice>
|
|
24
|
+
</message>
|
|
25
|
+
<message name="properties">
|
|
26
|
+
<oneOrMore>
|
|
27
|
+
<parameter name="name" type="string"/>
|
|
28
|
+
<choice>
|
|
29
|
+
<parameter name="value" type="string"/>
|
|
30
|
+
<parameter name="value" mimetype="text/plain"/>
|
|
31
|
+
<parameter name="content" mimetype="text/xml"/>
|
|
32
|
+
<!-- add everything inside the root tag -->
|
|
33
|
+
<parameter name="content" type="string"/>
|
|
34
|
+
<!-- add everything inside the root tag -->
|
|
35
|
+
</choice>
|
|
36
|
+
</oneOrMore>
|
|
37
|
+
</message>
|
|
38
|
+
<message name="addcontent">
|
|
39
|
+
<choice>
|
|
40
|
+
<parameter name="value" type="string"/>
|
|
41
|
+
<parameter name="value" mimetype="text/xml"/>
|
|
42
|
+
</choice>
|
|
43
|
+
</message>
|
|
44
|
+
<message name="updcontent">
|
|
45
|
+
<choice>
|
|
46
|
+
<parameter name="value" type="string"/>
|
|
47
|
+
<parameter name="value" mimetype="text/plain"/>
|
|
48
|
+
<parameter name="content" mimetype="text/xml"/>
|
|
49
|
+
<!-- add everything inside the root tag -->
|
|
50
|
+
<parameter name="content" type="string"/>
|
|
51
|
+
<!-- add everything inside the root tag -->
|
|
52
|
+
</choice>
|
|
53
|
+
</message>
|
|
54
|
+
<message name="value">
|
|
55
|
+
<choice>
|
|
56
|
+
<parameter name="value" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
|
|
57
|
+
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/properties/1.0">
|
|
58
|
+
<start>
|
|
59
|
+
<choice>
|
|
60
|
+
<element name="value">
|
|
61
|
+
<ref name="value"/>
|
|
62
|
+
</element>
|
|
63
|
+
<element name="not-existing">
|
|
64
|
+
<empty/>
|
|
65
|
+
</element>
|
|
66
|
+
</choice>
|
|
67
|
+
</start>
|
|
68
|
+
<define name="value">
|
|
69
|
+
<zeroOrMore>
|
|
70
|
+
<choice>
|
|
71
|
+
<text/>
|
|
72
|
+
<ref name="any"/>
|
|
73
|
+
</choice>
|
|
74
|
+
</zeroOrMore>
|
|
75
|
+
</define>
|
|
76
|
+
<define name="any">
|
|
77
|
+
<element>
|
|
78
|
+
<anyName/>
|
|
79
|
+
<zeroOrMore>
|
|
80
|
+
<attribute>
|
|
81
|
+
<anyName/>
|
|
82
|
+
</attribute>
|
|
83
|
+
</zeroOrMore>
|
|
84
|
+
<ref name="value"/>
|
|
85
|
+
</element>
|
|
86
|
+
</define>
|
|
87
|
+
</grammar>
|
|
88
|
+
</parameter>
|
|
89
|
+
<parameter name="value" type="string"/>
|
|
90
|
+
<parameter name="content" mimetype="text/xml"/>
|
|
91
|
+
<parameter name="content" mimetype="text/plain"/>
|
|
92
|
+
</choice>
|
|
93
|
+
</message>
|
|
94
|
+
<resource>
|
|
95
|
+
<get in="*" out="addxsl"/>
|
|
96
|
+
<resource>
|
|
97
|
+
<get in="*" out="addxsl"/>
|
|
98
|
+
<delete in="*"/>
|
|
99
|
+
<resource relative="properties">
|
|
100
|
+
<get in="query" out="addxsl"/>
|
|
101
|
+
<get in="*" out="addxsl"/>
|
|
102
|
+
<resource relative="schema">
|
|
103
|
+
<get in="*" out="resource-document-schema"/>
|
|
104
|
+
<resource relative="rng">
|
|
105
|
+
<get in="*" out="resource-document-schema"/>
|
|
106
|
+
</resource>
|
|
107
|
+
<resource relative="xsd">
|
|
108
|
+
<get in="*" out="resource-document-schema"/>
|
|
109
|
+
</resource>
|
|
110
|
+
</resource>
|
|
111
|
+
<resource relative="values">
|
|
112
|
+
<post in="property"/>
|
|
113
|
+
<put in="properties"/>
|
|
114
|
+
<get in="*" out="addxsl"/>
|
|
115
|
+
<resource>
|
|
116
|
+
<post in="addcontent"/>
|
|
117
|
+
<put in="updcontent"/>
|
|
118
|
+
<get in="*" out="value"/>
|
|
119
|
+
<delete in="*"/>
|
|
120
|
+
<resource>
|
|
121
|
+
<put in="updcontent"/>
|
|
122
|
+
<get in="*" out="value"/>
|
|
123
|
+
<delete in="*"/>
|
|
124
|
+
<resource recursive="true">
|
|
125
|
+
<get in="*" out="value"/>
|
|
126
|
+
</resource>
|
|
127
|
+
</resource>
|
|
128
|
+
</resource>
|
|
129
|
+
</resource>
|
|
130
|
+
</resource>
|
|
131
|
+
</resource>
|
|
132
|
+
<resource relative="xsls">
|
|
133
|
+
<resource recursive="true">
|
|
134
|
+
<get in="*" out="addxsl"/>
|
|
135
|
+
</resource>
|
|
136
|
+
</resource>
|
|
137
|
+
</resource>
|
|
138
|
+
</description>
|
data/lib/ruby/riddl/server.rb
CHANGED
|
@@ -18,7 +18,7 @@ require 'stringio'
|
|
|
18
18
|
require 'rack/content_length'
|
|
19
19
|
require 'rack/chunked'
|
|
20
20
|
require 'securerandom'
|
|
21
|
-
require '
|
|
21
|
+
require 'psych.rb'
|
|
22
22
|
require 'blather/client/client'
|
|
23
23
|
|
|
24
24
|
module Riddl
|
|
@@ -217,7 +217,7 @@ module Riddl
|
|
|
217
217
|
@riddl_opts = OPTS.merge(opts)
|
|
218
218
|
|
|
219
219
|
if File.exists?(@riddl_opts[:basepath] + '/' + @riddl_opts[:conffile])
|
|
220
|
-
@riddl_opts.merge!(
|
|
220
|
+
@riddl_opts.merge!(Psych::load_file(@riddl_opts[:basepath] + '/' + @riddl_opts[:conffile]))
|
|
221
221
|
end
|
|
222
222
|
@riddl_opts[:url] = (@riddl_opts[:secure] ? 'https://' : 'http://') + @riddl_opts[:host] + ':' + @riddl_opts[:port].to_s
|
|
223
223
|
|
|
@@ -379,7 +379,7 @@ module Riddl
|
|
|
379
379
|
@riddl_res = Rack::Response.new
|
|
380
380
|
@riddl_status = 404
|
|
381
381
|
|
|
382
|
-
@riddl_pinfo = @riddl_env["PATH_INFO"].gsub(/\/+/,'/')
|
|
382
|
+
@riddl_pinfo = Riddl::Protocols::Utils::unescape(@riddl_env["PATH_INFO"].gsub(/\/+/,'/'))
|
|
383
383
|
@riddl_matching_path = @riddl_paths.find{ |e| e[1] =~ @riddl_pinfo }
|
|
384
384
|
|
|
385
385
|
if @riddl_matching_path
|
data/riddl.gemspec
CHANGED
data/test/tc_producer.rb
CHANGED
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.
|
|
4
|
+
version: 0.99.196
|
|
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-
|
|
11
|
+
date: 2015-08-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: xml-smart
|
|
@@ -245,6 +245,7 @@ files:
|
|
|
245
245
|
- examples/declaration-server-distributed/properties.xml
|
|
246
246
|
- examples/declaration-server-distributed/rngs/instance-info.rng
|
|
247
247
|
- examples/declaration-server-distributed/rngs/instances.rng
|
|
248
|
+
- examples/declaration-server-distributed/test.xml
|
|
248
249
|
- examples/declaration-server-distributed/xsloverlay.rb
|
|
249
250
|
- examples/declaration-server-distributed/xsloverlay.xml
|
|
250
251
|
- examples/declaration-server-distributed/xsls/info.xsl
|