diff options
| author | Francois Perrad <francois.perrad@gadz.org> | 2010-10-15 16:36:05 +0200 |
|---|---|---|
| committer | Francois Perrad <francois.perrad@gadz.org> | 2010-10-15 16:36:05 +0200 |
| commit | d26bbba5c1a46162695b950ed045f0c3057f8077 (patch) | |
| tree | 0e17a85e61891ce36dd29dce45c485c6ffee4969 | |
| parent | graphical representation (UML Class Diagram) of the Rx schema. (diff) | |
| download | spore-specifications-d26bbba5c1a46162695b950ed045f0c3057f8077.tar.gz | |
more explicit names
Diffstat (limited to '')
| -rw-r--r-- | spore_validation.rx | 6 | ||||
| -rw-r--r-- | uml/api.dot | 2 | ||||
| -rw-r--r-- | uml/api.lua | 8 | ||||
| -rw-r--r-- | uml/api.png | bin | 25676 -> 27700 bytes |
4 files changed, 8 insertions, 8 deletions
diff --git a/spore_validation.rx b/spore_validation.rx index c908996..5d531f4 100644 --- a/spore_validation.rx +++ b/spore_validation.rx @@ -28,18 +28,18 @@ "path": "//str" }, "optional": { - "expected": { + "expected_status": { "type" : "//arr", "contents": { "type": "//int" } }, - "required": { + "required_params": { "type" : "//arr", "contents": { "type": "//str" }, - "optional": { + "optional_params": { "type": "//arr", "contents": { "type": "//str" diff --git a/uml/api.dot b/uml/api.dot index 4d2a3dc..43d92ca 100644 --- a/uml/api.dot +++ b/uml/api.dot @@ -3,7 +3,7 @@ digraph { node [shape=record]; "Method" - [label="{\N|authentication : boolean\lbase_url : string\ldescription : string\lexpected : table<number>\lformat : table<string>\lmethod : string\loptional : table<string>\lpath : string\lrequired : table<string>\l}"]; + [label="{\N|authentication : boolean\lbase_url : string\ldescription : string\lexpected_status : table<number>\lformat : table<string>\lmethod : string\loptional_params : table<string>\lpath : string\lrequired_params : table<string>\l}"]; "API" [label="{\N|authentication : boolean\lauthority : string\lbase_url : string\ldescription : string\lformat : table<string>\lmeta : table<string,string>\lmethods : table<string,Method>\lname : string\lversion : string\l}"]; diff --git a/uml/api.lua b/uml/api.lua index 16f187a..0cd4596 100644 --- a/uml/api.lua +++ b/uml/api.lua @@ -6,9 +6,9 @@ class 'Method' has._method = { is = 'ro', isa = 'string', required = true } has.path = { is = 'ro', isa = 'string', required = true } -has.expected = { is = 'ro', isa = 'table<number>' } -has.required = { is = 'ro', isa = 'table<string>' } -has.optional = { is = 'ro', isa = 'table<string>' } +has.expected_status = { is = 'ro', isa = 'table<number>' } +has.required_params = { is = 'ro', isa = 'table<string>' } +has.optional_params = { is = 'ro', isa = 'table<string>' } has.base_url = { is = 'ro', isa = 'string' } has.description = { is = 'ro', isa = 'string' } has.authentication = { is = 'ro', isa = 'boolean' } @@ -22,8 +22,8 @@ has.methods = { is = 'ro', isa = 'table<string,Method>', required = true has.base_url = { is = 'ro', isa = 'string' } has.description = { is = 'ro', isa = 'string' } has.authentication = { is = 'ro', isa = 'boolean' } +has.format = { is = 'ro', isa = 'table<string>' } has.version = { is = 'ro', isa = 'string' } has.authority = { is = 'ro', isa = 'string' } -has.format = { is = 'ro', isa = 'table<string>' } has.meta = { is = 'ro', isa = 'table<string,string>' } diff --git a/uml/api.png b/uml/api.png Binary files differindex b2045c9..1334481 100644 --- a/uml/api.png +++ b/uml/api.png |
