Prepare release 1.7

README.md

@@ -32,6 +32,11 @@ WSAPI CVS and bug tracker are available at its Github page.
 
 # History
 
+## WSAPI 1.7 [26/Feb/2018]
+
+* Lua 5.3 compatibility
+* Refactor coxpcall dependency
+
 ## WSAPI 1.6.1 [21/Mar/2014]
 * Restores Lua 5.1 compatibility (incorrect usage of coxpcall)
 * Improvements to wsapi.mock

doc/us/index.html

@@ -77,7 +77,7 @@ <h2>Download</h2>
 <h3>Unix Installer Script</h3>
 
 <p>You can also get an installer script that installs Lua+LuaRocks+WSAPI
-<a href="http://www.keplerproject.org/files/wsapi-install-1.6.1.tar.gz">here</a>. See
+<a href="https://github.com/keplerproject/wsapi/blob/master/wsapi-install-1.7">here</a>. See
 the <a href="manual.html">manual</a> for installation instructions.</p>
 
 <h3>Customizing the installer</h3>
@@ -89,15 +89,15 @@ <h3>Customizing the installer</h3>
 <pre class="example">
 # Installer parameters
 
-LUA_VERSION=5.2.1
+LUA_VERSION=5.3.4
 PACKAGE=WSAPI
 PACKAGE_OPT=wsapi
 PACKAGE_ROCK=wsapi-xavante
-INSTALLER_VERSION=0.7
-PACKAGE_VERSION=1.6
+INSTALLER_VERSION=0.8
+PACKAGE_VERSION=1.7
 LUAROCKS_REPO=http://luarocks.org/repositories/rocks
-LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.0.12.tar.gz
-LUAROCKS_VERSION=2.0.12
+LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.4.3.tar.gz
+LUAROCKS_VERSION=2.4.3
 </pre>
 
 
@@ -131,10 +131,19 @@ <h2>Latest Sources and Bug Tracker</h2>
 
 <h2>History</h2>
 
-<p><strong>WSAPI</strong> [unreleased]</p>
+<p><strong>WSAPI 1.7</strong> [26/Feb/2018]</p>
 
 <ul>
-    <li>Refactor coxpcall dependency (Francois Perrad)</li>
+    <li>Lua 5.3 compatibility</li>
+    <li>Refactor coxpcall dependency</li>
+</ul>
+
+<ul>
+    <li>Restores Lua 5.1 compatibility (incorrect usage of coxpcall)</li>
+    <li>Improvements to wsapi.mock</li>
+    <li>wsapi.request.qs_encode produces proper querystrings</li>
+    <li>FastCGI fixes</li>
+    <li>Additional options for cookies such as httponly and max age.</li>
 </ul>
 
 <p><strong>WSAPI 1.6.1</strong> [21/Mar/2014]</p>

doc/us/index.md

@@ -30,7 +30,7 @@ luarocks install wsapi-xavante
 ### Unix Installer Script
 
 You can also get an installer script that installs Lua+LuaRocks+WSAPI
-[here](http://www.keplerproject.org/files/wsapi-install-1.6.1.tar.gz). See
+[here](https://github.com/keplerproject/wsapi/blob/master/wsapi-install-1.7). See
 the [manual](manual.html) for installation instructions.
 
 ### Customizing the installer
@@ -41,15 +41,15 @@ control the installer:
 <pre class="example">
 # Installer parameters
 
-LUA_VERSION=5.2.1
+LUA_VERSION=5.3.4
 PACKAGE=WSAPI
 PACKAGE_OPT=wsapi
 PACKAGE_ROCK=wsapi-xavante
-INSTALLER_VERSION=0.7
-PACKAGE_VERSION=1.6
+INSTALLER_VERSION=0.8
+PACKAGE_VERSION=1.7
 LUAROCKS_REPO=http://luarocks.org/repositories/rocks
-LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.0.12.tar.gz
-LUAROCKS_VERSION=2.0.12
+LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.4.3.tar.gz
+LUAROCKS_VERSION=2.4.3
 </pre>
 
 To install something else change PACKAGE to the full name of the
@@ -80,6 +80,12 @@ WSAPI sources and bug tracker are available at its [Github](http://github.com/ke
 
 ## History
 
+**WSAPI 1.7** [26/Feb/2018]
+
+* Lua 5.3 compatibility
+* Refactor coxpcall dependency
+* Format status code as integer when building status line
+
 **WSAPI 1.6.1** [21/Mar/2014]
 
 * Restores Lua 5.1 compatibility (incorrect usage of coxpcall)

rockspec/wsapi-1.7-1.rockspec

@@ -0,0 +1,37 @@
+package = "WSAPI"
+
+version = "1.7-1"
+
+description = {
+  summary = "Lua Web Server API",
+  detailed = [[
+    WSAPI is an API that abstracts the web server from Lua web applications. This is the rock
+    that contains the base WSAPI libraries plus the CGI adapters.
+  ]],
+  license = "MIT/X11",
+  homepage = "http://github.com/keplerproject/wsapi"
+}
+
+dependencies = { "luafilesystem >= 1.6.2", "rings >= 1.3.0", "coxpcall >= 1.14" }
+
+source = {
+  url = "git://github.com/keplerproject/wsapi",
+  tag = "v1.7",
+}
+
+build = {
+  type = "builtin",
+  modules = {
+    ["wsapi"] = "src/wsapi.lua",
+    ["wsapi.common"] = "src/wsapi/common.lua",
+    ["wsapi.request"] = "src/wsapi/request.lua",
+    ["wsapi.response"] = "src/wsapi/response.lua",
+    ["wsapi.util"] = "src/wsapi/util.lua",
+    ["wsapi.cgi"] = "src/wsapi/cgi.lua",
+    ["wsapi.sapi"] = "src/wsapi/sapi.lua",
+    ["wsapi.ringer"] = "src/wsapi/ringer.lua",
+    ["wsapi.mock"] = "src/wsapi/mock.lua",
+  },
+  copy_directories = { "samples", "doc", "tests" },
+  install = { bin = { "src/launcher/wsapi.cgi" } }
+}

rockspec/wsapi-fcgi-1.7-1.rockspec

@@ -0,0 +1,61 @@
+package = "WSAPI-FCGI"
+
+version = "1.7-1"
+
+description = {
+  summary = "Lua Web Server API FastCGI Adapter",
+  detailed = [[
+    WSAPI is an API that abstracts the web server from Lua web applications. This
+    is the rock that contains the FCGI module lfcgi.
+  ]],
+  license = "MIT/X11",
+  homepage = "http://www.keplerproject.org/wsapi"
+}
+
+dependencies = { "wsapi >= 1.6.1" }
+
+external_dependencies = {
+  platforms = {
+    unix = {
+      FASTCGI = {
+        header = "fcgi_stdio.h"
+      }
+    }
+  }
+}
+
+source = {
+  url = "git://github.com/keplerproject/wsapi",
+  tag = "v1.7",
+}
+
+build = {
+  platforms = {
+    unix = {
+      type = "builtin",
+      modules = {
+        ["wsapi.fastcgi"] = "src/wsapi/fastcgi.lua",
+        lfcgi = {
+          sources = "src/fastcgi/lfcgi.c",
+          libraries = "fcgi",
+          incdirs = "$(FASTCGI_INCDIR)",
+          libdirs = "$(FASTCGI_LIBDIR)"
+        }
+      },
+      install = { bin = { "src/launcher/wsapi.fcgi" } }
+    },
+    windows = {
+      type = "builtin",
+      modules = {
+        ["wsapi.fastcgi"] = "src/wsapi/fastcgi.lua",
+        lfcgi = {
+          sources = "src/fastcgi/lfcgi.c",
+          libraries = { "libfcgi", "ws2_32" },
+          incdirs = "$(FASTCGI_INCDIR)",
+          libdirs = "$(FASTCGI_LIBDIR)"
+        }
+      },
+      install = { bin = { "src/launcher/wsapi.fcgi" } }
+    }
+  }
+}

rockspec/wsapi-xavante-1.7-1.rockspec

@@ -0,0 +1,28 @@
+package = "WSAPI-Xavante"
+
+version = "1.7-1"
+
+description = {
+  summary = "Lua Web Server API - Xavante Handler",
+  detailed = [[
+    WSAPI is an API that abstracts the web server from Lua web applications. This is the rock
+    that contains the Xavante adapter and launcher.
+  ]],
+  license = "MIT/X11",
+  homepage = "http://www.keplerproject.org/wsapi"
+}
+
+dependencies = { "wsapi >= 1.6.1", "xavante >= 2.3.0" }
+
+source = {
+  url = "git://github.com/keplerproject/wsapi",
+  tag = "v1.7",
+}
+
+build = {
+  type = "builtin",
+  modules = {
+    ["wsapi.xavante"] = "src/wsapi/xavante.lua"
+  },
+  install = { bin = { "src/launcher/wsapi" } }
+}