[policy] rename policy.lua to init.lua

* and let policy to decide own file name for the implementation

CHANGELOG.md

@@ -49,6 +49,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Renamed `apicast/policy/policy.lua` to `apicast/policy.lua` [PR #569](https://github.com/3scale/apicast/pull/569)
 - Sandbox loading policies [PR #566](https://github.com/3scale/apicast/pull/566)
 - Extracted `usage` and `mapping_rules_matcher` modules so they can be used from policies [PR #580](https://github.com/3scale/apicast/pull/580)
+- Renamed all `apicast/policy/*/policy.lua` to `apicast/policy/*/init.lua` to match Lua naming [PR #579](https://github.com/3scale/apicast/pull/579)
 
 ## [3.2.0-alpha2] - 2017-11-30
 

examples/custom-module/README.md

@@ -15,7 +15,7 @@ There is another example of custom module implementation for IP blacklisting in
 APICAST_MODULE=$(pwd)/verbose.lua ../../bin/apicast -c $(pwd)/../configuration/local.json
 ```
 
-This starts APIcast with module `verbose.lua` instead of the default [`apicast.lua`](../../gateway/src/apicast/policy/apicast/policy.lua). Local configuration file is used, so no 3scale account is needed.
+This starts APIcast with module `verbose.lua` instead of the default [`apicast.lua`](../../gateway/src/apicast/policy/apicast/apicast.lua). Local configuration file is used, so no 3scale account is needed.
 
 ## Testing
 

gateway/src/apicast/loader.lua

@@ -8,7 +8,9 @@
 -- Policies can be packaged as `some_name/policy.lua` so the directory also contains the JSON spec.
 
 local loadfile = loadfile
-local find = string.find
+local sub = string.sub
+
+local policy_loader = require 'apicast.policy_loader'
 
 local map = {
   ['apicast'] = 'apicast.policy.apicast'
@@ -24,28 +26,21 @@ local function loader(name, path)
   return file, err
 end
 
---- Try to load a policy. Policies can have a `.policy` suffix.
-local function policy_loader(name, path)
-  if not find(name, '.policy.', 1, true) then return end
-
-  local policy = name .. '.policy'
-
-  return loader(policy, path or package.path)
-end
-
 --- Searcher has to return the loader or an error message.
-local function policy_searcher(name, path)
-  local found, err = policy_loader(name, path)
+local function policy_searcher(name)
+  if sub(name, 1, 15) == 'apicast.policy.' then
+    local mod = policy_loader:pcall(sub(name, 16), 'builtin')
 
-  return found or err
+    if mod then return function () return mod end end
+  end
 end
 
 local function prefix_loader(name, path)
   local prefixed = 'apicast.' .. name
   local found, err = loader(prefixed, path)
 
   if not found then
-    found = policy_loader(prefixed, path)
+    found = policy_searcher(prefixed)
   end
 
   if found then
@@ -60,7 +55,7 @@ local function rename_loader(name, path)
   local found, err = loader(new, path)
 
   if not found then
-    found = policy_loader(new, path)
+    found = policy_searcher(new)
   end
 
   if found then

gateway/src/apicast/policy/apicast/init.lua

@@ -0,0 +1 @@
+return require('apicast')

gateway/src/apicast/policy/caching/init.lua

@@ -0,0 +1 @@
+return require('caching')

gateway/src/apicast/policy/cors/init.lua

@@ -0,0 +1 @@
+return require('cors')

gateway/src/apicast/policy/echo/init.lua

@@ -0,0 +1 @@
+return require('echo')

gateway/src/apicast/policy/find_service/init.lua

@@ -0,0 +1 @@
+return require('find_service')

gateway/src/apicast/policy/headers/init.lua

@@ -0,0 +1 @@
+return require('headers')

gateway/src/apicast/policy/load_configuration/init.lua

@@ -0,0 +1 @@
+return require('load_configuration')

gateway/src/apicast/policy/local_chain/init.lua

@@ -0,0 +1 @@
+return require('local_chain')

gateway/src/apicast/policy/phase_logger/init.lua

@@ -0,0 +1 @@
+return require('phase_logger')

gateway/src/apicast/policy/upstream/init.lua

@@ -0,0 +1 @@
+return require('upstream')

gateway/src/apicast/policy/url_rewriting/init.lua

@@ -0,0 +1 @@
+return require('url_rewriting')

gateway/src/apicast/policy_loader.lua

@@ -275,7 +275,7 @@ function _M:call(name, version, dir)
 
   -- passing the "exclusive" flag for the require so it does not fallback to native require
   -- it should load only policies and not other code and fail if there is no such policy
-  return loader('policy', true)
+  return loader('init', true)
 end
 
 function _M:pcall(name, version, dir)

spec/fixtures/policies/test/1.0.0-0/init.lua

@@ -0,0 +1 @@
+return require('test')

spec/policy_loader_spec.lua

@@ -17,8 +17,8 @@ describe('APIcast Policy Loader', function()
       local ok, ret = pcall(_M.call, _M, 'unknown', '0.1')
 
       assert.falsy(ok)
-      assert.match([[module 'policy' not found:
-%s+no file '%g+/gateway/policies/unknown/0.1/policy.lua']], ret)
+      assert.match([[module 'init' not found:
+%s+no file '%g+/gateway/policies/unknown/0.1/init.lua']], ret)
     end)
 
     it('loads two instances of the same policy', function()