raml2html with 1.0 syntax working

doc/api/api.raml

@@ -2,35 +2,29 @@
 ---
 title: Metamaps
 version: v2
-baseUri: http://metamaps.cc/api/v2
+baseUri: https://metamaps.cc/api/v2
 mediaType: application/json
 
 securitySchemes:
-  - oauth_2_0:
+  oauth_2_0: !include securitySchemes/oauth_2_0.raml
-      description: |
+securedBy: [ oauth_2_0 ]
-        OAuth 2.0 implementation
-      type: OAuth 2.0
-      settings:
-        authorizationUri: https://metamaps.cc/api/v2/oauth/authorize
-        accessTokenUri: https://metamaps.cc/api/v2/oauth/token
-        authorizationGrants: [ authorization_code, password, client_credentials, implicit, refresh_token ]
 
 traits:
-  - pageable: !include traits/pageable.raml
+  pageable: !include traits/pageable.raml
-  - orderable: !include traits/orderable.raml
+  orderable: !include traits/orderable.raml
-  - searchable: !include traits/searchable.raml
+  searchable: !include traits/searchable.raml
 
 schemas:
-  - topic: !include schemas/_topic.json
+  topic: !include schemas/_topic.json
-  - synapse: !include schemas/_synapse.json
+  synapse: !include schemas/_synapse.json
-  - map: !include schemas/_map.json
+  map: !include schemas/_map.json
-  - mapping: !include schemas/_mapping.json
+  mapping: !include schemas/_mapping.json
-  - token: !include schemas/_token.json
+  token: !include schemas/_token.json
 
-resourceTypes:
+#resourceTypes:
-  - base: !include resourceTypes/base.raml
+#  base: !include resourceTypes/base.raml
-  - item: !include resourceTypes/item.raml
+#  item: !include resourceTypes/item.raml
-  - collection: !include resourceTypes/collection.raml
+#  collection: !include resourceTypes/collection.raml
 
 /topics: !include apis/topics.raml
 /synapses: !include apis/synapses.raml

doc/api/apis/mappings.raml

@@ -1,4 +1,4 @@
-type: collection
+#type: collection
 get:
   responses:
     200:
@@ -25,7 +25,7 @@ post:
         application/json:
           example: !include ../examples/mapping.json
 /{id}:
-  type: item
+  #type: item
   get:
     responses:
       200:

doc/api/apis/maps.raml

@@ -1,4 +1,4 @@
-type: collection
+#type: collection
 get:
   responses:
     200:
@@ -27,7 +27,7 @@ post:
         application/json:
           example: !include ../examples/map.json
 /{id}:
-  type: item
+  #type: item
   get:
     responses:
       200:

doc/api/apis/synapses.raml

@@ -1,4 +1,4 @@
-type: collection
+#type: collection
 get:
   responses:
     200:
@@ -27,7 +27,7 @@ post:
         application/json:
           example: !include ../examples/synapse.json
 /{id}:
-  type: item
+  #type: item
   get:
     responses:
       200:

doc/api/apis/tokens.raml

@@ -1,4 +1,4 @@
-type: collection
+#type: collection
 post:
   body:
     application/json:
@@ -18,7 +18,7 @@ post:
           application/json:
             example: !include ../examples/tokens.json
 /{id}:
-  type: item
+  #type: item
   delete:
     responses:
       204:

doc/api/apis/topics.raml

@@ -1,4 +1,4 @@
-type: collection
+#type: collection
 get:
   responses:
     200:
@@ -25,7 +25,7 @@ post:
         application/json:
           example: !include ../examples/topic.json
 /{id}:
-  type: item
+  #type: item
   get:
     responses:
       200:

doc/api/resourceTypes/collection.raml

@@ -16,7 +16,7 @@ get?:
 post?:
   description: Create a new <<resourcePathName | !singularize>>
   responses:
-    200:
+    201:
       body:
         application/json:
           schema: <<resourcePathName | !singularize>>

doc/api/resourceTypes/item.raml

@@ -1,3 +1,4 @@
+type: base
 get?:
   description: Get a <<resourcePathName | !singularize>>
   responses:
@@ -26,4 +27,3 @@ delete?:
   responses:
     204:
       description: Removed
-type: base

doc/api/schemas/_page.json

@@ -35,4 +35,3 @@
     "per"
   ]
 }
-

doc/api/schemas/error.json

@@ -0,0 +1 @@
+{}

doc/api/securitySchemes/oauth_2_0.raml

@@ -0,0 +1,7 @@
+description: |
+  OAuth 2.0 implementation
+type: OAuth 2.0
+settings:
+  authorizationUri: https://metamaps.cc/api/v2/oauth/authorize
+  accessTokenUri: https://metamaps.cc/api/v2/oauth/token
+  authorizationGrants: [ authorization_code, client_credentials ]

doc/api/traits/orderable.raml

@@ -1,3 +1,3 @@
 queryParameters:
   sort:
-    description: The name of the field to sort by, prefixed by "-" to sort descending
+    description: The name of the comma-separated fields to sort by, prefixed by "-" to sort descending

doc/api/traits/pageable.raml

@@ -2,6 +2,8 @@ queryParameters:
   page:
     description: The page number
     type: integer
+    default: 1
   per:
     description: Number of records per page
     type: integer
+    default: 20

package.json

@@ -41,6 +41,7 @@
     "chai": "^3.5.0",
     "eslint": "^3.5.0",
     "eslint-plugin-react": "^6.3.0",
-    "mocha": "^3.0.2"
+    "mocha": "^3.0.2",
+    "raml2html": "^4.0.0-beta5"
   }
 }