Rename-upsert (#154)

* todo list

* fix path

* fix ui

* rename update to upsert

README.md

@@ -91,3 +91,17 @@ Editor preferences are available in the [editor config](.editorconfig) for easy
 [npm-version]: https://img.shields.io/npm/v/mockbin.svg?style=flat-square
 [gitter-url]: https://gitter.im/Kong/mockbin
 [gitter-image]: https://img.shields.io/badge/Gitter-Join%20Chat-blue.svg?style=flat-square
+
+## TODO
+
+- [x] update node
+- [x] github action
+- [x] autofix on save
+- [x] upsert bin endpoint
+- [x] simplify entrypoint and environment
+- [x] replace unirest with fetch
+- [ ] redis function binding
+- [ ] callback tests
+- [ ] bin tests
+- [ ] support method as parameter
+- [ ] wild cards in url

docs/api/bins.md

@@ -16,7 +16,6 @@ Responds with a `Location` header with the newly created **Bin**, e.g. `Location
   - HTTP headers *(e.g. `X-My-Header-Name: Value`)*
   - body content *(max of 100mb)*
   - query string *(e.g. `?foo=bar`)*
-  - path arguments *(e.g. `/bin/3c149e20-bc9c-4c68-8614-048e6023a108/any/extra/path/`)*
 - All requests to Bin will be [logged](#view-logs) for later inspection *(max of 100 requests)*
 
 ###### Request
@@ -91,18 +90,18 @@ Responds with a `Location` header with the newly created **Bin**, e.g. `Location
 
 ----
 
-#### Update Bin
+#### Upsert Bin
 
-> ##### `PUT /bin/:id/a/b/c`
+> ##### `PUT /bin/upsert/:id/a/b/c`
 
-Creates or updates a **Bin** with a mock HTTP response as described by a [HAR Response Object](http://www.softwareishard.com/blog/har-12-spec/#response) body. /a/b/c represeent any following paths than will be combined with the id for response matching.
+Creates or replaces a **Bin** with a mock HTTP response as described by a [HAR Response Object](http://www.softwareishard.com/blog/har-12-spec/#response) body. /a/b/c represeent any following paths than will be combined with the id for response matching.
 
 Responds with a `Location` header with the updated **Bin**, e.g. `Location: /bin/3c149e20-bc9c-4c68-8614-048e6023a108/a/b/c` *(the Bin ID is also repeated in the body)*
 
 ###### Request
 
 > ```http
-> PUT /bin/3c149e20-bc9c-4c68-8614-048e6023a108/a/b/c HTTP/1.1
+> PUT /bin/update/3c149e20-bc9c-4c68-8614-048e6023a108/a/b/c HTTP/1.1
 > Host: mockbin.org
 > Content-Type: application/json
 > Accept: application/json

lib/routes/bins.js

@@ -50,7 +50,7 @@ module.exports = function bins(dsnStr) {
 			path: "/delete/:uuid*",
 			route: routes.delete.bind(this),
 		},
-		{ action: "put", path: "/:uuid*", route: routes.update.bind(this) },
+		{ action: "put", path: "/upsert/:uuid*", route: routes.update.bind(this) },
 		{ action: "all", path: "/:uuid*", route: routes.run.bind(this) },
 	];
 

lib/routes/bins/view.js

@@ -1,7 +1,7 @@
 const debug = require("debug")("mockbin");
 
 module.exports = function (req, res, next) {
-	this.client.get(`bin:${req.params.uuid}`, (err, value) => {
+	this.client.get(`bin:${req.params.uuid + req.params[0]}`, (err, value) => {
 		if (err) {
 			debug(err);
 

src/views/bin/log.pug

@@ -9,12 +9,12 @@ mixin method (method)
 block content
   div(data-page="bin/log").container
     div.btn-group.pull-right.hidden-xs
-      a(href= '/bin/view/' + req.params.uuid).btn.btn-primary View Details
+      a(href= '/bin/view/' + req.params.uuid + req.params[0]).btn.btn-primary View Details
 
-    h3 Bin History: #[code= req.params.uuid]
+    h3 Bin History: #[code= req.params.uuid + req.params[0]]
 
     div.visible-xs
-      a(href= '/bin/view' + req.params.uuid).btn.btn-block.btn-primary View Details
+      a(href= '/bin/view' + req.params.uuid + req.params[0]).btn.btn-block.btn-primary View Details
 
     hr
 

src/views/bin/view.pug

@@ -4,7 +4,7 @@ block content
   div(data-page="bin/view").container
     div.row
       div.col-sm-9
-        h3 Bin Identifier: #[code= req.params.uuid]
+        h3 Bin Identifier: #[code= req.params.uuid + req.params[0]]
 
         div#preview
           pre: code= data.json
@@ -13,14 +13,14 @@ block content
         h3 Next Steps
 
         a(href= '#apiembed').btn.btn-block.btn-primary #[span.badge 1]   Send Some Requests
-        a(href= '/bin/' + req.params.uuid).btn.btn-block.btn-primary #[span.badge 2]   Visit in Browser
-        a(href= '/bin/log/' + req.params.uuid).btn.btn-block.btn-primary #[span.badge 3]   View History
+        a(href= '/bin/' + req.params.uuid + req.params[0]).btn.btn-block.btn-primary #[span.badge 2]   Visit in Browser
+        a(href= '/bin/log/' + req.params.uuid + req.params[0]).btn.btn-block.btn-primary #[span.badge 3]   View History
 
     br
 
     h4#apiembed Send Some Requests:
 
-    p Send request to #[a(target="_blank", href=req.protocol + '://' + req.get('host') +  '/bin/'+ req.params.uuid )= req.protocol + '://' + req.get('host') +   '/bin/' + req.params.uuid ]
+    p Send request to #[a(target="_blank", href=req.protocol + '://' + req.get('host') +  '/bin/'+ req.params.uuid + req.params[0] )= req.protocol + '://' + req.get('host') +   '/bin/' + req.params.uuid + req.params[0] ]
 
 
 

src/views/redirect.pug

@@ -4,4 +4,4 @@ html
     meta(http-equiv='refresh', content=`0; url=${res.getHeaders().location.replace('/bin','/bin/view')}`)
 
   body
-    p Redirecting to #[a(href=res.getHeaders().location)= res.getHeaders().location.replace('/bin','/bin/view')]
+    p Redirecting to #[a(href=res.getHeaders().location.replace('/bin','/bin/view'))= res.getHeaders().location.replace('/bin','/bin/view')]