4 files changed, 7 insertions, 39 deletions

diff --git a/uml/Makefile b/uml/Makefile
index 219141c..0f77174 100644
--- a/uml/Makefile
+++ b/uml/Makefile
@@ -2,9 +2,5 @@
 api.png: api.dot
 	dot -T png -o api.png api.dot
 
-api.dot: api.lua
-	coat2dot api > api.dot
-	perl -i.bak -pe "s/_method/method/g" api.dot
-
 clean:
-	rm *.bak *.dot *.png
\ No newline at end of file
+	rm *.png
diff --git a/uml/api.dot b/uml/api.dot
index 1b81647..d5ade1d 100644
--- a/uml/api.dot
+++ b/uml/api.dot
@@ -2,12 +2,13 @@ digraph {
 
     node [shape=record];
 
-    "Method"
-        [label="{\N|authentication : boolean\lbase_url : string\ldescription : string\lexpected_status : table<number>\lformats : 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\lformats : table<string>\lmeta : table<string,string>\lmethods : table<string,Method>\lname : string\lversion : string\l}"];
-    "API" -> "Method" // attr isa table<string,Method>
+        [label="{\N|methods : map&lt;string,Method&gt;\lname : string\l\lauthentication : boolean\lauthority : string\lbase_url : string\ldescription : string\lformats : array&lt;string&gt;\lmeta : map&lt;string,string&gt;\lversion : string\l}"];
+
+    "API" -> "Method"
         [label = "methods", arrowhead = none, arrowtail = odiamond];
 
+    "Method"
+        [label="{\N|method : string\lpath : string\l\lauthentication : boolean\lbase_url : string\ldescription : string\lexpected_status : array&lt;number&gt;\lformats : array&lt;string&gt;\loptional_params : array&lt;string&gt;\lrequired_params : array&lt;string&gt;\l}"];
+
 }
diff --git a/uml/api.lua b/uml/api.lua
deleted file mode 100644
index 83f1dd2..0000000
--- a/uml/api.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-
-require 'Coat'
-require 'Coat.Types'
-
-class 'Method'
-
-has._method         = { is = 'ro', isa = 'string', required = true }
-has.path            = { is = 'ro', isa = 'string', required = true }
-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' }
-has.formats         = { is = 'ro', isa = 'table<string>' }
-
-
-class 'API'
-
-has.name            = { is = 'ro', isa = 'string', required = true }
-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.formats         = { is = 'ro', isa = 'table<string>' }
-has.version         = { is = 'ro', isa = 'string' }
-has.authority       = { is = 'ro', isa = 'string' }
-has.meta            = { is = 'ro', isa = 'table<string,string>' }
-
diff --git a/uml/api.png b/uml/api.png
index 2ed711a..a147d35 100644
--- a/uml/api.png
+++ b/uml/api.png