Refactor daos

.travis.yml

@@ -30,7 +30,6 @@ before_install:
   - cd ..
 
 install:
-  - sudo apt-get install sqlite3 libsqlite3-dev
   - sudo luarocks install lrexlib-pcre PCRE_LIBDIR=$(dirname `sudo find / -type f -name "libpcre.so*" -print -quit`)
   - sudo luarocks install luasec OPENSSL_LIBDIR=$(dirname `sudo find / -type f -name "libssl.so*" -print -quit`)
   - sudo make global

Makefile

@@ -1,79 +1,81 @@
 PWD = `pwd`
 
 # Dev environment variables
-export ENV_DAEMON ?= off
-export ENV_LUA_LIB ?= lua_package_path \"$(PWD)/src/?.lua\;\;\"\;
-export ENV_LUA_CODE_CACHE ?= off
-export ENV_APENODE_PORT ?= 8000
-export ENV_APENODE_WEB_PORT ?= 8001
-export ENV_DIR ?= $(PWD)/tmp
-export ENV_APENODE_CONF ?= $(ENV_DIR)/apenode.dev.yaml
-export ENV_SILENT ?=
+export DAEMON ?= off
+export LUA_LIB ?= lua_package_path \"$(PWD)/src/?.lua\;\;\"\;
+export LUA_CODE_CACHE ?= on
+export KONG_PORT ?= 8000
+export KONG_WEB_PORT ?= 8001
+export DIR ?= $(PWD)/tmp
+export KONG_CONF ?= $(DIR)/kong.conf
+export SILENT ?=
 
 .PHONY: build global test test-web test-all run migrate populate drop
 
 global:
-	@luarocks make apenode-*.rockspec
+	@luarocks make kong-*.rockspec --only-server=http://rocks.moonscript.org
 
 test:
 	@busted spec/unit
 
 test-web:
-	@$(MAKE) build ENV_DAEMON=on
-	@$(MAKE) migrate ENV_SILENT=-s
+	@$(MAKE) build DAEMON=on
+	@$(MAKE) migrate SILENT=-s
 	@$(MAKE) run
-	@$(MAKE) seed ENV_SILENT=-s
+	@$(MAKE) seed SILENT=-s
 	@busted spec/web/ || (make stop;make drop; exit 1)
 	@$(MAKE) stop
-	@$(MAKE) drop ENV_SILENT=-s
+	@$(MAKE) drop SILENT=-s
 
 test-proxy:
-	@$(MAKE) build ENV_DAEMON=on
-	@$(MAKE) migrate ENV_SILENT=-s
+	@$(MAKE) build DAEMON=on
+	@$(MAKE) migrate SILENT=-s
 	@$(MAKE) run
-	@$(MAKE) seed ENV_SILENT=-s
+	@$(MAKE) seed SILENT=-s
 	@busted spec/proxy/ || (make stop;make drop; exit 1)
 	@$(MAKE) stop
-	@$(MAKE) drop ENV_SILENT=-s
+	@$(MAKE) drop SILENT=-s
 
 test-all:
-	@$(MAKE) build ENV_DAEMON=on
-	@$(MAKE) migrate ENV_SILENT=-s
+	@$(MAKE) build DAEMON=on
+	@$(MAKE) migrate SILENT=-s
 	@$(MAKE) run
-	@sleep 2 # Wait for the nginx process to start
-	@$(MAKE) seed ENV_SILENT=-s
+	@$(MAKE) seed SILENT=-s
 	@busted spec/ || (make stop;make drop; exit 1)
 	@$(MAKE) stop
-	@$(MAKE) drop ENV_SILENT=-s
+	@$(MAKE) drop SILENT=-s
 
 migrate:
-	@scripts/migrate migrate $(ENV_SILENT) --conf=$(ENV_APENODE_CONF)
+	@scripts/migrate migrate $(SILENT) --conf=$(KONG_CONF)
+
+reset:
+	@scripts/migrate reset $(SILENT) --conf=$(KONG_CONF)
 
 seed:
-	@scripts/seed seed $(ENV_SILENT) --conf=$(ENV_APENODE_CONF)
+	@scripts/seed seed $(SILENT) --conf=$(KONG_CONF)
 
 drop:
-	@scripts/seed drop $(ENV_SILENT) --conf=$(ENV_APENODE_CONF)
+	@scripts/seed drop $(SILENT) --conf=$(KONG_CONF)
 
 run:
-	@nginx -p $(ENV_DIR)/nginx -c nginx.conf
+	@nginx -p $(DIR)/nginx -c nginx.conf
 
 stop:
-	@nginx -p $(ENV_DIR)/nginx -c nginx.conf -s stop
+	@nginx -p $(DIR)/nginx -c nginx.conf -s stop
 
 build:
-	@mkdir -p $(ENV_DIR)/nginx/logs
-	@cp templates/apenode.yaml $(ENV_APENODE_CONF)
-	@echo "" > $(ENV_DIR)/nginx/logs/error.log
-	@echo "" > $(ENV_DIR)/nginx/logs/access.log
+	@mkdir -p $(DIR)/nginx/logs
+	@cp templates/kong.conf $(KONG_CONF)
+	@echo "" > $(DIR)/nginx/logs/error.log
+	@echo "" > $(DIR)/nginx/logs/access.log
 	@sed \
-		-e "s/{{DAEMON}}/$(ENV_DAEMON)/g" \
-		-e "s@{{LUA_LIB_PATH}}@$(ENV_LUA_LIB)@g" \
-		-e "s/{{LUA_CODE_CACHE}}/$(ENV_LUA_CODE_CACHE)/g" \
-		-e "s/{{PORT}}/$(ENV_APENODE_PORT)/g" \
-		-e "s/{{WEB_PORT}}/$(ENV_APENODE_WEB_PORT)/g" \
-		-e "s@{{APENODE_CONF}}@$(ENV_APENODE_CONF)@g" \
-		templates/nginx.conf > $(ENV_DIR)/nginx/nginx.conf;
+		-e "s/{{DAEMON}}/$(DAEMON)/g" \
+		-e "s@{{LUA_LIB_PATH}}@$(LUA_LIB)@g" \
+		-e "s/{{LUA_CODE_CACHE}}/$(LUA_CODE_CACHE)/g" \
+		-e "s/{{PORT}}/$(KONG_PORT)/g" \
+		-e "s/{{WEB_PORT}}/$(KONG_WEB_PORT)/g" \
+		-e "s@{{KONG_CONF}}@$(KONG_CONF)@g" \
+		templates/nginx.conf > $(DIR)/nginx/nginx.conf;
 
-	@cp -R src/apenode/web/static $(ENV_DIR)/nginx
-	@cp -R src/apenode/web/admin $(ENV_DIR)/nginx
+	@cp -R src/kong/web/static $(DIR)/nginx
+	@cp -R src/kong/web/admin $(DIR)/nginx

README.md

@@ -1,6 +1,6 @@
-## Apenode
+## Kong
 
-[![Build Status](https://magnum.travis-ci.com/Mashape/lua-resty-apenode.svg?token=ZqXY1Sn8ga8gv6vUrw3N&branch=master)](https://magnum.travis-ci.com/Mashape/lua-resty-apenode)
+[![Build Status](https://magnum.travis-ci.com/Mashape/kong.svg?token=ZqXY1Sn8ga8gv6vUrw3N&branch=master)](https://magnum.travis-ci.com/Mashape/kong)
 
 ```
  ______________________________________
@@ -17,7 +17,7 @@
 - Luarocks for Lua `5.1`
 - [Openrestify](http://openresty.com/#Download) `1.7.4.1`
 
-### Run apenode (development)
+### Run Kong (development)
 
 - `make global`
 - `make build`
@@ -28,19 +28,20 @@
 
 ### Commands
 
-Commands consist of apenode's scripts and Makefile:
+Commands consist of Kong's scripts and Makefile:
 
 #### Makefile
 
 | Name         | Description                                                                                         |
 | ------------ | --------------------------------------------------------------------------------------------------- |
-| `global`     | Install the apenode luarock globally                                                                |
-| `build`      | Generates an apenode environment (nginx + apenode configurations) in a given folder (see `ENV_DIR`) |
-| `migrate`    | Migrate your database according to the given apenode config (see `ENV_APENODE_CONF`)                |
-| `seed`       | Seed your database according to the given apenode config                                            |
-| `drop`       | Drop your database according to the given apenode config                                            |
-| `run`        | Runs the given apenode environment in a given folder (see `ENV_DIR`)                                |
-| `stop`       | Stops the given apenode environment in a given folder (see `ENV_DIR`)                               |
+| `global`     | Install the Kong luarock globally                                                                   |
+| `build`      | Generates a Kong environment (nginx + Kong configurations) in a given folder (see `DIR`)            |
+| `migrate`    | Migrate your database according to the given Kong config (see `KONG_CONF`)                          |
+| `reset`      | Reset your database schema according to the given Kong config (see `KONG_CONF`)                     |
+| `seed`       | Seed your database according to the given Kong config                                               |
+| `drop`       | Drop your database according to the given Kong config                                               |
+| `run`        | Runs the given Kong environment in a given folder (see `DIR`)                                       |
+| `stop`       | Stops the given Kong environment in a given folder (see `DIR`)                                      |
 | `test`       | Runs the unit tests                                                                                 |
 | `test-proxy` | Runs the proxy integration tests                                                                    |
 | `test-web`   | Runs the web integration tests                                                                      |
@@ -50,13 +51,13 @@ Commands consist of apenode's scripts and Makefile:
 
 | Name                   | Default                   | Commands                  | Description                                                                    |
 | ---------------------- | ------------------------- | ------------------------- | ------------------------------------------------------------------------------ |
-| `ENV_DIR`              | `tmp/`                    | `build|run|stop`          | Specify a folder where an apenode environment lives or should live if building |
-| `ENV_APENODE_CONF`     | `tmp/apenode.dev.yaml`    | `build|migrate|seed|drop` | Points the command to the given apenode configuration file                     |
-| `ENV_DAEMON`           | `off`                     | `build`                   | Sets the nginx daemon property in the generated `nginx.conf`                   |
-| `ENV_APENODE_PORT`     | `8000`                    | `build`                   | Sets the apenode proxy port in the generated `nginx.conf`                      |
-| `ENV_APENODE_WEB_PORT` | `8001`                    | `build`                   | Sets the apenode web port in the generated `nginx.conf`                        |
-| `ENV_LUA_CODE_CACHE`   | `off`                     | `build`                   | Sets the nginx `lua_code_cache` property in the generated `nginx.conf`         |
-| `ENV_LUA_LIB`          | `$(PWD)/src/?.lua;;`      | `build`                   | Sets the nginx `lua_package_path` property in the generated `nginx.conf`       |
+| `DIR`                  | `tmp/`                    | `build|run|stop`          | Specify a folder where an Kong environment lives or should live if building    |
+| `KONG_CONF`            | `tmp/kong.conf`           | `build|migrate|seed|drop` | Points the command to the given Kong configuration file                        |
+| `DAEMON`               | `off`                     | `build`                   | Sets the nginx daemon property in the generated `nginx.conf`                   |
+| `KONG_PORT`            | `8000`                    | `build`                   | Sets Kong's proxy port in the generated `nginx.conf`                           |
+| `KONG_WEB_PORT`        | `8001`                    | `build`                   | Sets Kong's web port in the generated `nginx.conf`                             |
+| `LUA_CODE_CACHE`       | `off`                     | `build`                   | Sets the nginx `lua_code_cache` property in the generated `nginx.conf`         |
+| `LUA_LIB`              | `$(PWD)/src/?.lua;;`      | `build`                   | Sets the nginx `lua_package_path` property in the generated `nginx.conf`       |
 
 #### Scripts
 
@@ -71,30 +72,3 @@ Commands consist of apenode's scripts and Makefile:
 |            | `seed --conf=[conf]`     | Seed the database configured in the given conf                        | `-s` (Optional) No output                                   |
 |            |                          |                                                                       | `-r` (Optional) Also populate random data (1000 by default) |
 |            | `drop --conf=[conf]`     | Drop the database configured in the given conf                        | `-s` (Optional) No output                                   |
-
-### API
-
-The Apenode provides APIs to interact with the underlying data model and create APIs, accounts and applications
-
-#### Create APIs
-
-`POST /apis/`
-
-* **required** `public_dns`: The public DNS of the API
-* **required** `target_url`: The target URL
-* **required** `authentication_type`: The authentication to enable on the API, can be `query`, `header`, `basic`.
-* **required** `authentication_key_names`: A *comma-separated* list of authentication parameter names, like `apikey` or `x-mashape-key`.
-
-#### Create Accounts
-
-`POST /accounts/`
-
-* `provider_id`: A custom id to be set in the account entity
-
-#### Create Applications
-
-`POST /applications/`
-
-* **required** `account_id`: The `account_id` that the application belongs to.
-* `public_key`: The public key, or username if Basic Authentication is enabled.
-* **required** `secret_key`: The secret key, or api key, or password if Basic authentication is enabled. Use only this fields for simple api keys.