riddl 0.99.246 → 0.99.248
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/properties.xml +1 -0
- data/examples/declaration-server-distributed/xsls/test/properties.xsl +1 -0
- data/examples/declaration-server-hybrid/properties.xml +1 -0
- data/examples/declaration-server-local/properties.xml +1 -0
- data/examples/downloadify/downloadify.xml +1 -0
- data/examples/flickr/Exif/riddl.jpg +1 -0
- data/examples/flickr/Flickr/riddl.png +1 -0
- data/examples/flickr/riddl.jpg +1 -0
- data/examples/helloworld/declaration-definition_goal.xml +0 -4
- data/examples/notifications/producer.main.xml +1 -0
- data/examples/properties/properties.xml +1 -0
- data/examples/twitter/client.rb +7 -7
- data/examples/xmpp/properties.xml +1 -0
- data/lib/ruby/riddl/client.rb +10 -8
- data/lib/ruby/riddl/roles/http%3A%2F%2Foauth.net%2F1.0/base.rb +2 -2
- data/lib/ruby/riddl/server.rb +2 -1
- data/lib/ruby/riddl/wrapper.rb +18 -18
- data/lib/ruby/riddl/wrapper/declaration.rb +10 -10
- data/lib/ruby/riddl/wrapper/declaration/facade.rb +1 -2
- data/lib/ruby/riddl/wrapper/declaration/tile.rb +4 -4
- data/lib/ruby/riddl/wrapper/description.rb +6 -6
- data/lib/ruby/riddl/wrapper/description/access.rb +7 -6
- data/lib/ruby/riddl/wrapper/layerchecker.rb +2 -2
- data/lib/ruby/riddl/wrapper/resourcechecker.rb +6 -6
- data/riddl.gemspec +3 -3
- data/tools/riddlcheck +1 -0
- data/tools/riddlprocess +1 -0
- metadata +6 -7
- data/examples/declaration-server-distributed/properties.xml +0 -150
- data/examples/declaration-server-distributed/xsls/test/properties.xsl +0 -185
- data/examples/declaration-server-hybrid/properties.xml +0 -150
- data/examples/declaration-server-local/properties.xml +0 -150
- data/examples/downloadify/downloadify.xml +0 -18
- data/examples/flickr/Exif/riddl.jpg +0 -0
- data/examples/flickr/Flickr/riddl.png +0 -0
- data/examples/flickr/riddl.jpg +0 -0
- data/examples/library/server-9292.pid +0 -1
- data/examples/notifications/producer.main.xml +0 -206
- data/examples/properties/properties.xml +0 -150
- data/examples/xmpp/properties.xml +0 -150
- data/tools/riddlcheck +0 -36
- data/tools/riddlprocess +0 -51
|
@@ -1,150 +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="value">
|
|
4
|
-
<choice>
|
|
5
|
-
<parameter name="value" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
|
|
6
|
-
<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">
|
|
7
|
-
<start>
|
|
8
|
-
<choice>
|
|
9
|
-
<element name="value">
|
|
10
|
-
<ref name="value"/>
|
|
11
|
-
</element>
|
|
12
|
-
<element name="not-existing">
|
|
13
|
-
<empty/>
|
|
14
|
-
</element>
|
|
15
|
-
</choice>
|
|
16
|
-
</start>
|
|
17
|
-
|
|
18
|
-
<define name="value">
|
|
19
|
-
<zeroOrMore>
|
|
20
|
-
<choice>
|
|
21
|
-
<text/>
|
|
22
|
-
<ref name="any"/>
|
|
23
|
-
</choice>
|
|
24
|
-
</zeroOrMore>
|
|
25
|
-
</define>
|
|
26
|
-
|
|
27
|
-
<define name="any">
|
|
28
|
-
<element>
|
|
29
|
-
<anyName/>
|
|
30
|
-
<zeroOrMore>
|
|
31
|
-
<attribute>
|
|
32
|
-
<anyName/>
|
|
33
|
-
</attribute>
|
|
34
|
-
</zeroOrMore>
|
|
35
|
-
<ref name="value"/>
|
|
36
|
-
</element>
|
|
37
|
-
</define>
|
|
38
|
-
|
|
39
|
-
</grammar>
|
|
40
|
-
</parameter>
|
|
41
|
-
<parameter name="value" type="string"/>
|
|
42
|
-
|
|
43
|
-
<parameter name="content" mimetype="text/xml"/>
|
|
44
|
-
<parameter name="content" mimetype="text/plain"/>
|
|
45
|
-
</choice>
|
|
46
|
-
</message>
|
|
47
|
-
|
|
48
|
-
<message name="resource-document">
|
|
49
|
-
<parameter name="document" mimetype="text/xml"/>
|
|
50
|
-
</message>
|
|
51
|
-
<message name="resource-document-schema">
|
|
52
|
-
<parameter name="document-schema" mimetype="text/xml"/>
|
|
53
|
-
</message>
|
|
54
|
-
|
|
55
|
-
<message name="properties">
|
|
56
|
-
<oneOrMore>
|
|
57
|
-
<parameter name="name" type="string"/>
|
|
58
|
-
<choice>
|
|
59
|
-
<parameter name="value" type="string"/>
|
|
60
|
-
<parameter name="value" mimetype="text/plain"/>
|
|
61
|
-
<parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
|
|
62
|
-
<parameter name="content" type="string"/> <!-- add everything inside the root tag -->
|
|
63
|
-
</choice>
|
|
64
|
-
</oneOrMore>
|
|
65
|
-
</message>
|
|
66
|
-
|
|
67
|
-
<message name="propertylist">
|
|
68
|
-
<parameter name="properties" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
|
|
69
|
-
<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">
|
|
70
|
-
<start>
|
|
71
|
-
<element name="properties">
|
|
72
|
-
<zeroOrMore>
|
|
73
|
-
<ref name="property"/>
|
|
74
|
-
</zeroOrMore>
|
|
75
|
-
</element>
|
|
76
|
-
</start>
|
|
77
|
-
|
|
78
|
-
<define name="property">
|
|
79
|
-
<element>
|
|
80
|
-
<anyName/>
|
|
81
|
-
<data type="string"/>
|
|
82
|
-
</element>
|
|
83
|
-
</define>
|
|
84
|
-
|
|
85
|
-
</grammar>
|
|
86
|
-
</parameter>
|
|
87
|
-
</message>
|
|
88
|
-
<message name="addcontent">
|
|
89
|
-
<choice>
|
|
90
|
-
<parameter name="value" type="string"/>
|
|
91
|
-
<parameter name="value" mimetype="text/xml"/>
|
|
92
|
-
</choice>
|
|
93
|
-
</message>
|
|
94
|
-
<message name="updcontent">
|
|
95
|
-
<choice>
|
|
96
|
-
<parameter name="value" type="string"/>
|
|
97
|
-
<parameter name="value" mimetype="text/plain"/>
|
|
98
|
-
<parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
|
|
99
|
-
<parameter name="content" type="string"/> <!-- add everything inside the root tag -->
|
|
100
|
-
</choice>
|
|
101
|
-
</message>
|
|
102
|
-
<message name="property">
|
|
103
|
-
<parameter name="name" type="string">
|
|
104
|
-
<param name="pattern">[a-zA-Z_][a-zA-Z0-9_]*</param>
|
|
105
|
-
</parameter>
|
|
106
|
-
<choice>
|
|
107
|
-
<parameter name="value" type="string"/>
|
|
108
|
-
<parameter name="value" mimetype="text/plain"/>
|
|
109
|
-
<parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
|
|
110
|
-
<parameter name="content" type="string"/> <!-- add everything inside the root tag -->
|
|
111
|
-
</choice>
|
|
112
|
-
</message>
|
|
113
|
-
<message name="query">
|
|
114
|
-
<parameter name="query" type="string"/>
|
|
115
|
-
</message>
|
|
116
|
-
|
|
117
|
-
<resource pattern="http://riddl.org/ns/common-patterns/properties/1.0">
|
|
118
|
-
<get in="*" out="resource-document"/>
|
|
119
|
-
<get in="query" out="value"/>
|
|
120
|
-
<resource relative="schema">
|
|
121
|
-
<get in="*" out="resource-document-schema"/>
|
|
122
|
-
<resource relative="rng">
|
|
123
|
-
<get in="*" out="resource-document-schema"/>
|
|
124
|
-
</resource>
|
|
125
|
-
<resource relative="xsd">
|
|
126
|
-
<get in="*" out="resource-document-schema"/>
|
|
127
|
-
</resource>
|
|
128
|
-
</resource>
|
|
129
|
-
<resource relative="values">
|
|
130
|
-
<get in="*" out="propertylist"/>
|
|
131
|
-
<post in="property"/>
|
|
132
|
-
<put in="properties"/>
|
|
133
|
-
<resource>
|
|
134
|
-
<get in="*" out="value"/>
|
|
135
|
-
<delete in="*"/>
|
|
136
|
-
<post in="addcontent"/>
|
|
137
|
-
<put in="updcontent"/>
|
|
138
|
-
<resource>
|
|
139
|
-
<get in="*" out="value"/>
|
|
140
|
-
<put in="updcontent"/>
|
|
141
|
-
<delete in="*"/>
|
|
142
|
-
<resource recursive='true'>
|
|
143
|
-
<get in="*" out="value"/>
|
|
144
|
-
</resource>
|
|
145
|
-
</resource>
|
|
146
|
-
</resource>
|
|
147
|
-
</resource>
|
|
148
|
-
</resource>
|
|
149
|
-
|
|
150
|
-
</description>
|
|
@@ -1,150 +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="value">
|
|
4
|
-
<choice>
|
|
5
|
-
<parameter name="value" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
|
|
6
|
-
<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">
|
|
7
|
-
<start>
|
|
8
|
-
<choice>
|
|
9
|
-
<element name="value">
|
|
10
|
-
<ref name="value"/>
|
|
11
|
-
</element>
|
|
12
|
-
<element name="not-existing">
|
|
13
|
-
<empty/>
|
|
14
|
-
</element>
|
|
15
|
-
</choice>
|
|
16
|
-
</start>
|
|
17
|
-
|
|
18
|
-
<define name="value">
|
|
19
|
-
<zeroOrMore>
|
|
20
|
-
<choice>
|
|
21
|
-
<text/>
|
|
22
|
-
<ref name="any"/>
|
|
23
|
-
</choice>
|
|
24
|
-
</zeroOrMore>
|
|
25
|
-
</define>
|
|
26
|
-
|
|
27
|
-
<define name="any">
|
|
28
|
-
<element>
|
|
29
|
-
<anyName/>
|
|
30
|
-
<zeroOrMore>
|
|
31
|
-
<attribute>
|
|
32
|
-
<anyName/>
|
|
33
|
-
</attribute>
|
|
34
|
-
</zeroOrMore>
|
|
35
|
-
<ref name="value"/>
|
|
36
|
-
</element>
|
|
37
|
-
</define>
|
|
38
|
-
|
|
39
|
-
</grammar>
|
|
40
|
-
</parameter>
|
|
41
|
-
<parameter name="value" type="string"/>
|
|
42
|
-
|
|
43
|
-
<parameter name="content" mimetype="text/xml"/>
|
|
44
|
-
<parameter name="content" mimetype="text/plain"/>
|
|
45
|
-
</choice>
|
|
46
|
-
</message>
|
|
47
|
-
|
|
48
|
-
<message name="resource-document">
|
|
49
|
-
<parameter name="document" mimetype="text/xml"/>
|
|
50
|
-
</message>
|
|
51
|
-
<message name="resource-document-schema">
|
|
52
|
-
<parameter name="document-schema" mimetype="text/xml"/>
|
|
53
|
-
</message>
|
|
54
|
-
|
|
55
|
-
<message name="properties">
|
|
56
|
-
<oneOrMore>
|
|
57
|
-
<parameter name="name" type="string"/>
|
|
58
|
-
<choice>
|
|
59
|
-
<parameter name="value" type="string"/>
|
|
60
|
-
<parameter name="value" mimetype="text/plain"/>
|
|
61
|
-
<parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
|
|
62
|
-
<parameter name="content" type="string"/> <!-- add everything inside the root tag -->
|
|
63
|
-
</choice>
|
|
64
|
-
</oneOrMore>
|
|
65
|
-
</message>
|
|
66
|
-
|
|
67
|
-
<message name="propertylist">
|
|
68
|
-
<parameter name="properties" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
|
|
69
|
-
<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">
|
|
70
|
-
<start>
|
|
71
|
-
<element name="properties">
|
|
72
|
-
<zeroOrMore>
|
|
73
|
-
<ref name="property"/>
|
|
74
|
-
</zeroOrMore>
|
|
75
|
-
</element>
|
|
76
|
-
</start>
|
|
77
|
-
|
|
78
|
-
<define name="property">
|
|
79
|
-
<element>
|
|
80
|
-
<anyName/>
|
|
81
|
-
<data type="string"/>
|
|
82
|
-
</element>
|
|
83
|
-
</define>
|
|
84
|
-
|
|
85
|
-
</grammar>
|
|
86
|
-
</parameter>
|
|
87
|
-
</message>
|
|
88
|
-
<message name="addcontent">
|
|
89
|
-
<choice>
|
|
90
|
-
<parameter name="value" type="string"/>
|
|
91
|
-
<parameter name="value" mimetype="text/xml"/>
|
|
92
|
-
</choice>
|
|
93
|
-
</message>
|
|
94
|
-
<message name="updcontent">
|
|
95
|
-
<choice>
|
|
96
|
-
<parameter name="value" type="string"/>
|
|
97
|
-
<parameter name="value" mimetype="text/plain"/>
|
|
98
|
-
<parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
|
|
99
|
-
<parameter name="content" type="string"/> <!-- add everything inside the root tag -->
|
|
100
|
-
</choice>
|
|
101
|
-
</message>
|
|
102
|
-
<message name="property">
|
|
103
|
-
<parameter name="name" type="string">
|
|
104
|
-
<param name="pattern">[a-zA-Z_][a-zA-Z0-9_]*</param>
|
|
105
|
-
</parameter>
|
|
106
|
-
<choice>
|
|
107
|
-
<parameter name="value" type="string"/>
|
|
108
|
-
<parameter name="value" mimetype="text/plain"/>
|
|
109
|
-
<parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
|
|
110
|
-
<parameter name="content" type="string"/> <!-- add everything inside the root tag -->
|
|
111
|
-
</choice>
|
|
112
|
-
</message>
|
|
113
|
-
<message name="query">
|
|
114
|
-
<parameter name="query" type="string"/>
|
|
115
|
-
</message>
|
|
116
|
-
|
|
117
|
-
<resource pattern="http://riddl.org/ns/common-patterns/properties/1.0">
|
|
118
|
-
<get in="*" out="resource-document"/>
|
|
119
|
-
<get in="query" out="value"/>
|
|
120
|
-
<resource relative="schema">
|
|
121
|
-
<get in="*" out="resource-document-schema"/>
|
|
122
|
-
<resource relative="rng">
|
|
123
|
-
<get in="*" out="resource-document-schema"/>
|
|
124
|
-
</resource>
|
|
125
|
-
<resource relative="xsd">
|
|
126
|
-
<get in="*" out="resource-document-schema"/>
|
|
127
|
-
</resource>
|
|
128
|
-
</resource>
|
|
129
|
-
<resource relative="values">
|
|
130
|
-
<get in="*" out="propertylist"/>
|
|
131
|
-
<post in="property"/>
|
|
132
|
-
<put in="properties"/>
|
|
133
|
-
<resource>
|
|
134
|
-
<get in="*" out="value"/>
|
|
135
|
-
<delete in="*"/>
|
|
136
|
-
<post in="addcontent"/>
|
|
137
|
-
<put in="updcontent"/>
|
|
138
|
-
<resource>
|
|
139
|
-
<get in="*" out="value"/>
|
|
140
|
-
<put in="updcontent"/>
|
|
141
|
-
<delete in="*"/>
|
|
142
|
-
<resource recursive='true'>
|
|
143
|
-
<get in="*" out="value"/>
|
|
144
|
-
</resource>
|
|
145
|
-
</resource>
|
|
146
|
-
</resource>
|
|
147
|
-
</resource>
|
|
148
|
-
</resource>
|
|
149
|
-
|
|
150
|
-
</description>
|
data/tools/riddlcheck
DELETED
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/ruby
|
|
2
|
-
curpath = __FILE__
|
|
3
|
-
while ::File::symlink?(curpath)
|
|
4
|
-
curpath = ::File::dirname(curpath) + '/' + ::File::readlink(curpath)
|
|
5
|
-
end
|
|
6
|
-
require 'rubygems'
|
|
7
|
-
require ::File::dirname(curpath) + "/../lib/ruby/riddl/wrapper"
|
|
8
|
-
require 'optparse'
|
|
9
|
-
|
|
10
|
-
ARGV.options { |opt|
|
|
11
|
-
opt.summary_indent = ' ' * 2
|
|
12
|
-
opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] [FILENAME]\n"
|
|
13
|
-
opt.on("Options:")
|
|
14
|
-
opt.on("--help", "-h", "This text") { puts opt; exit }
|
|
15
|
-
opt.on("Filename is either a description or a declaration.")
|
|
16
|
-
opt.parse!
|
|
17
|
-
}
|
|
18
|
-
if ARGV.length == 0 || !File.exists?(ARGV[0])
|
|
19
|
-
puts ARGV.options
|
|
20
|
-
exit
|
|
21
|
-
end
|
|
22
|
-
fname = ARGV[0]
|
|
23
|
-
|
|
24
|
-
riddl = Riddl::Wrapper::new(fname)
|
|
25
|
-
|
|
26
|
-
if riddl.description?
|
|
27
|
-
puts 'RIDDL description found.'
|
|
28
|
-
elsif riddl.declaration?
|
|
29
|
-
puts 'RIDDL declaration found.'
|
|
30
|
-
else
|
|
31
|
-
puts 'Neither a RIDDL description, nor a RIDDL declaration.'
|
|
32
|
-
exit
|
|
33
|
-
end
|
|
34
|
-
|
|
35
|
-
messages = riddl.validate!
|
|
36
|
-
puts messages ? "RIDDL looks valid." : "RIDDL not valid."
|
data/tools/riddlprocess
DELETED
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/ruby
|
|
2
|
-
curpath = __FILE__
|
|
3
|
-
while ::File::symlink?(curpath)
|
|
4
|
-
curpath = ::File::dirname(curpath) + '/' + ::File::readlink(curpath)
|
|
5
|
-
end
|
|
6
|
-
require 'rubygems'
|
|
7
|
-
require ::File::dirname(curpath) + "/../lib/ruby/riddl/wrapper"
|
|
8
|
-
require 'optparse'
|
|
9
|
-
require 'pp'
|
|
10
|
-
|
|
11
|
-
dowhat = nil
|
|
12
|
-
ARGV.options { |opt|
|
|
13
|
-
opt.summary_indent = ' ' * 2
|
|
14
|
-
opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] [FILENAME]\n"
|
|
15
|
-
opt.on("Options:")
|
|
16
|
-
opt.on("--help", "-h", "This text.") { puts opt; exit }
|
|
17
|
-
opt.on("--vtl", "-l", "For each tile visualize the resource tree and the layers.") { dowhat = "layers" }
|
|
18
|
-
opt.on("--vtc", "-c", "For each tile visualize the resource tree and the resulting compositions.") { dowhat = "compositions" }
|
|
19
|
-
opt.on("--vf", "-f", "Visualize the resulting facade.") { dowhat = "facade" }
|
|
20
|
-
opt.on("--description", "-d", "Return the XML description for the facade.") { dowhat = "description" }
|
|
21
|
-
opt.on("Filename has to be a declaration.")
|
|
22
|
-
opt.parse!
|
|
23
|
-
}
|
|
24
|
-
if ARGV.length == 0 || !File.exists?(ARGV[0]) || dowhat.nil?
|
|
25
|
-
puts ARGV.options
|
|
26
|
-
exit
|
|
27
|
-
end
|
|
28
|
-
fname = ARGV[0]
|
|
29
|
-
|
|
30
|
-
riddl = Riddl::Wrapper.new(fname)
|
|
31
|
-
|
|
32
|
-
unless riddl.declaration?
|
|
33
|
-
puts 'Not a RIDDL declaration.'
|
|
34
|
-
exit
|
|
35
|
-
end
|
|
36
|
-
unless riddl.validate!
|
|
37
|
-
puts "Does not conform to specification."
|
|
38
|
-
exit
|
|
39
|
-
end
|
|
40
|
-
|
|
41
|
-
d = riddl.declaration
|
|
42
|
-
case dowhat
|
|
43
|
-
when 'layers'
|
|
44
|
-
d.visualize_tiles_and_layers
|
|
45
|
-
when 'compositions'
|
|
46
|
-
d.visualize_tiles_and_compositions
|
|
47
|
-
when 'facade'
|
|
48
|
-
d.visualize_facade
|
|
49
|
-
when 'description'
|
|
50
|
-
puts d.description_xml
|
|
51
|
-
end
|