riddl 0.99.107 → 0.99.108

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
  SHA1:
3
- metadata.gz: 488e7e14c6a59129b3444212a7fd3328251f9dba
4
- data.tar.gz: b663b637b235e739d9d775be1da0acd8c2807348
3
+ metadata.gz: 21554eb960cfa1386d840106707c1607b04a0323
4
+ data.tar.gz: 69790306553039cb7b9c2ba49efc81a24c532463
5
5
  SHA512:
6
- metadata.gz: 477c2e9a00f3da5f6c9b33c3c5dcd4bfb069f791722003aebce6cf5fe760e4e182339d4f2c9e4e5d726846b4f198741a09abb5a6ba2bfce6246c71144a358106
7
- data.tar.gz: 297a4ecc24c6fe1caa11db5f67bcd2d3a4390204fbf21040251bdc418a8a138edaf785b99dc89f6ed440a78c1c7b410a255d95c28fda201fc8a6460b8271018c
6
+ metadata.gz: 8d2cfc84d14da29c4df86b7234b1463675b533078ee480cc7cb23d0aa0e06f163a8709aa784f1fdb59eba3da01a70f13bb1cb7ce2fc3fecfde3023bc9ad7e532
7
+ data.tar.gz: 86eafd48e051efb0fd6e387f6e9f07cd3d8bded277194dc3343fc8064c32e33d264fa81d01074ec2bece264dc5d1759cc5453d72ccc2ac9a5d312e2f75009a4b
@@ -0,0 +1,150 @@
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>
@@ -0,0 +1,12 @@
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="riddl-description-response">
4
+ <parameter name="riddl-description" mimetype="text/xml"/>
5
+ </message>
6
+ <message name="riddl-description-request">
7
+ <parameter name="riddl-description" type="string"/>
8
+ </message>
9
+ <resource>
10
+ <get in="riddl-description-request" out="riddl-description-response"/>
11
+ </resource>
12
+ </description>
data/lib/riddl/wrapper.rb CHANGED
@@ -55,6 +55,7 @@ module Riddl
55
55
  XINCLUDE = "http://www.w3.org/2001/XInclude"
56
56
  DESCRIPTION_FILE = "#{File.dirname(__FILE__)}/ns/description/#{VERSION_MAJOR}.#{VERSION_MINOR}/description.rng"
57
57
  DECLARATION_FILE = "#{File.dirname(__FILE__)}/ns/declaration/#{VERSION_MAJOR}.#{VERSION_MINOR}/declaration.rng"
58
+ RIDDL_DESCRIPTION_SHOW = "#{File.dirname(__FILE__)}/ns/common-patterns/riddl-description/show.xml"
58
59
  COMMON = "datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"#{DESCRIPTION}\" xmlns:xi=\"http://www.w3.org/2001/XInclude\""
59
60
  CHECK = "<element name=\"check\" datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"http://relaxng.org/ns/structure/1.0\"><data/></element>"
60
61
  #}}}
@@ -80,6 +81,7 @@ module Riddl
80
81
  end
81
82
  end
82
83
  end
84
+
83
85
  @doc.register_namespace 'x', XINCLUDE
84
86
  @doc.find('//x:include/@href').each do |i|
85
87
  if i.value =~ /^http:\/\/(www\.)?riddl\.org(\/ns\/common-patterns\/.*)/
@@ -88,32 +90,26 @@ module Riddl
88
90
  end
89
91
  end
90
92
  fpath.nil? ? @doc.xinclude! : @doc.xinclude!(fpath)
91
- @doc.register_namespace 'des', DESCRIPTION
92
- @doc.register_namespace 'dec', DECLARATION
93
+
93
94
  qname = @doc.root.qname
94
95
  @is_description = qname.href == DESCRIPTION && qname.name == 'description'
95
96
  @is_declaration = qname.href == DECLARATION && qname.name == 'declaration'
96
-
97
- if @is_description && get_description
98
- n = @doc.root.children
99
- if n.empty?
100
- @doc.root.add("message",:name=>"riddl-description-request").add("parameter",:name=>"riddl-description",:type=>"string")
101
- @doc.root.add("message",:name=>"riddl-description-response").add("parameter",:name=>"riddl-description",:mimetype=>"text/xml")
102
- else
103
- n.first.add_before("message",:name=>"riddl-description-response").add("parameter",:name=>"riddl-description",:mimetype=>"text/xml")
104
- n.first.add_before("message",:name=>"riddl-description-request").add("parameter",:name=>"riddl-description",:type=>"string")
105
- end
106
97
 
98
+ @doc.register_namespace 'des', DESCRIPTION
99
+ @doc.register_namespace 'dec', DECLARATION
100
+ if @is_description && get_description
101
+ rds = XML::Smart::open_unprotected(RIDDL_DESCRIPTION_SHOW)
102
+ @doc.root.prepend rds.find('/xmlns:description/xmlns:message')
107
103
  r = @doc.find("/des:description/des:resource")
108
- unless r.empty?
109
- n = r.first.children
110
- if n.empty?
111
- r.add("get",:in=>'riddl-description-request',:out=>'riddl-description-response')
112
- else
113
- n.first.add_before("get",:in=>'riddl-description-request',:out=>'riddl-description-response')
114
- end
115
- end
104
+ r.first.prepend rds.find('/xmlns:description/xmlns:resource/*') unless r.empty?
105
+ puts @doc
116
106
  end
107
+ if @is_declaration && get_description
108
+ n = @doc.root.prepend("dec:interface",:name=>"riddldescription").add XML::Smart::open_unprotected(RIDDL_DESCRIPTION_SHOW).root
109
+ n = @doc.root.find("dec:facade/dec:tile")
110
+ n.first.prepend("layer",:name =>"riddldescription") if n.any?
111
+ end
112
+
117
113
  @declaration = @description = nil
118
114
  #}}}
119
115
  end
@@ -0,0 +1,150 @@
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>
@@ -0,0 +1,12 @@
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="riddl-description-response">
4
+ <parameter name="riddl-description" mimetype="text/xml"/>
5
+ </message>
6
+ <message name="riddl-description-request">
7
+ <parameter name="riddl-description" type="string"/>
8
+ </message>
9
+ <resource>
10
+ <get in="riddl-description-request" out="riddl-description-response"/>
11
+ </resource>
12
+ </description>
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.107"
3
+ s.version = "0.99.108"
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"
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
21
21
 
22
22
  s.required_ruby_version = '>=1.9.3'
23
23
 
24
- s.add_runtime_dependency 'xml-smart', '>=0.3.4'
24
+ s.add_runtime_dependency 'xml-smart', '>=0.3.6'
25
25
  s.add_runtime_dependency 'rack'
26
26
  s.add_runtime_dependency 'thin'
27
27
  s.add_runtime_dependency 'eventmachine', '>= 1.0.0'
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.99.107
4
+ version: 0.99.108
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - ! '>='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.3.4
19
+ version: 0.3.6
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ! '>='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.3.4
26
+ version: 0.3.6
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rack
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,8 @@ files:
149
149
  - lib/riddl/ns/common/relaxng.rng
150
150
  - lib/riddl/ns/common/datatypes-1_0.rng
151
151
  - lib/riddl/ns/description/1.0/description.rng
152
+ - lib/riddl/ns/common-patterns/riddl-description/properties.xml
153
+ - lib/riddl/ns/common-patterns/riddl-description/show.xml
152
154
  - lib/riddl/ns/common-patterns/properties/1.0/properties.xml
153
155
  - lib/riddl/ns/common-patterns/properties/1.0/properties.schema.xsl
154
156
  - lib/riddl/ns/common-patterns/properties/1.0/properties.schema.schema
@@ -167,6 +169,8 @@ files:
167
169
  - ns/common/relaxng.rng
168
170
  - ns/common/datatypes-1_0.rng
169
171
  - ns/description/1.0/description.rng
172
+ - ns/common-patterns/riddl-description/properties.xml
173
+ - ns/common-patterns/riddl-description/show.xml
170
174
  - ns/common-patterns/properties/1.0/properties.xml
171
175
  - ns/common-patterns/properties/1.0/properties.schema.xsl
172
176
  - ns/common-patterns/properties/1.0/properties.schema.schema