Merge pull request #29 from drgrice1/renderer-no-app

Remove "App" from the app name.

Author: somiaj

.gitignore

@@ -1,5 +1,5 @@
 *.DS_Store
-render_app.conf
+renderer.conf
 lib/.pls-tmp-*
 webwork-open-problem-library
 private

Dockerfile

@@ -51,7 +51,7 @@ RUN cpanm install Mojo::Base Statistics::R::IO::Rserve Date::Format Future::Asyn
 
 COPY . .
 
-RUN cp render_app.conf.dist render_app.conf
+RUN cp renderer.conf.dist renderer.conf
 
 RUN cp conf/pg_config.yml lib/PG/conf/pg_config.yml
 
@@ -63,4 +63,4 @@ EXPOSE 3000
 
 HEALTHCHECK CMD curl -I localhost:3000/health
 
-CMD hypnotoad -f ./script/render_app
+CMD hypnotoad -f ./script/renderer

Dockerfile_with_OPL

@@ -62,7 +62,7 @@ RUN rm -r webwork-open-problem-library-master/
 
 COPY . .
 
-RUN cp render_app.conf.dist render_app.conf
+RUN cp renderer.conf.dist renderer.conf
 
 RUN cp conf/pg_config.yml lib/PG/conf/pg_config.yml
 
@@ -74,4 +74,4 @@ EXPOSE 3000
 
 HEALTHCHECK CMD curl -I localhost:3000/health
 
-CMD hypnotoad -f ./script/render_app
+CMD hypnotoad -f ./script/renderer

README.md

@@ -36,7 +36,7 @@ A default configuration file is included in the container, but it can be overrid
 application root. This is necessary if, for example, you want to run the container in `production` mode.
 
 ```bash
-  --mount type=bind,source=/pathToYour/render_app.conf,target=/usr/app/render_app.conf \
+  --mount type=bind,source=/pathToYour/renderer.conf,target=/usr/app/renderer.conf \
 ```
 
 ## LOCAL INSTALL
@@ -48,7 +48,7 @@ If using a local install instead of docker:
 - Install Perl dependencies listed in Dockerfile (CPANMinus recommended)
 - clone webwork-open-problem-library into the provided stub ./webwork-open-problem-library
   - `git clone https://github.com/openwebwork/webwork-open-problem-library ./webwork-open-problem-library`
-- copy `render_app.conf.dist` to `render_app.conf` and make any desired modifications
+- copy `renderer.conf.dist` to `renderer.conf` and make any desired modifications
 - copy `conf/pg_config.yml` to `lib/PG/pg_config.yml` and make any desired modifications
 - install third party JavaScript dependencies
   - `cd public/`
@@ -57,7 +57,7 @@ If using a local install instead of docker:
 - install PG JavaScript dependencies
   - `cd lib/PG/htdocs`
   - `npm ci`
-- start the app with `morbo ./script/render_app` or `morbo -l http://localhost:3000 ./script/render_app` if changing
+- start the app with `morbo ./script/renderer` or `morbo -l http://localhost:3000 ./script/renderer` if changing
   root url
 - access on `localhost:3000` by default or otherwise specified root url
 
@@ -111,12 +111,12 @@ The bare minimum of parameters that must be included are:
 
 ### Infrastructure Parameters
 
-The defaults for these parameters are set in `render_app.conf`, but these can be overridden on a per-request basis.
+The defaults for these parameters are set in `renderer.conf`, but these can be overridden on a per-request basis.
 
-| Key     | Type   | Default Value                               | Description                 | Notes |
-| ------- | ------ | ------------------------------------------- | --------------------------- | ----- |
-| baseURL | string | '/' (as set in `render_app.conf`)           | the URL for relative paths  |       |
-| formURL | string | '/render-api' (as set in `render_app.conf`) | the URL for form submission |       |
+| Key     | Type   | Default Value                             | Description                 | Notes |
+| ------- | ------ | ----------------------------------------- | --------------------------- | ----- |
+| baseURL | string | '/' (as set in `renderer.conf`)           | the URL for relative paths  |       |
+| formURL | string | '/render-api' (as set in `renderer.conf`) | the URL for form submission |       |
 
 ### Display Parameters
 

docs/make_translation_files.md

@@ -6,7 +6,7 @@
 
 ```bash
 cd lib
-xgettext.pl -o WeBWorK/Localize/standalone.pot -D PG/lib -D PG/macros -D RenderApp -D WeBWorK RenderApp.pm
+xgettext.pl -o WeBWorK/Localize/standalone.pot -D PG/lib -D PG/macros -D Renderer -D WeBWorK Renderer.pm
 ```
 
 - That creates the POT file of all strings found

lib/RenderApp.pm lib/Renderer.pmlib/RenderApp.pm renamed to lib/Renderer.pm

@@ -1,4 +1,4 @@
-package RenderApp;
+package Renderer;
 use Mojo::Base 'Mojolicious';
 
 BEGIN {
@@ -16,18 +16,17 @@ BEGIN {
 	$ENV{OPL_DIRECTORY} = "$ENV{RENDER_ROOT}/webwork-open-problem-library";
 
 	$ENV{MOJO_CONFIG} =
-		(-r "$ENV{RENDER_ROOT}/render_app.conf")
-		? "$ENV{RENDER_ROOT}/render_app.conf"
-		: "$ENV{RENDER_ROOT}/render_app.conf.dist";
+		(-r "$ENV{RENDER_ROOT}/renderer.conf")
+		? "$ENV{RENDER_ROOT}/renderer.conf"
+		: "$ENV{RENDER_ROOT}/renderer.conf.dist";
 	$ENV{MOJO_LOG_LEVEL} = 'debug';
 }
 
 use lib "$main::libname";
 print "using root directory: $ENV{RENDER_ROOT}\n";
 
-use RenderApp::Model::Problem;
-use RenderApp::Controller::IO;
-use WeBWorK::RenderProblem;
+use Renderer::Model::Problem;
+use Renderer::Controller::IO;
 use WeBWorK::FormatRenderedProblem;
 
 sub startup {
@@ -115,15 +114,15 @@ sub startup {
 	}
 
 	# Models
-	$self->helper(newProblem => sub { shift; RenderApp::Model::Problem->new(@_) });
+	$self->helper(newProblem => sub { shift; Renderer::Model::Problem->new(@_) });
 
 	# Helpers
 	$self->helper(format          => sub { WeBWorK::FormatRenderedProblem::formatRenderedProblem(@_) });
-	$self->helper(validateRequest => sub { RenderApp::Controller::IO::validate(@_) });
-	$self->helper(parseRequest    => sub { RenderApp::Controller::Render::parseRequest(@_) });
-	$self->helper(croak           => sub { RenderApp::Controller::Render::croak(@_) });
+	$self->helper(validateRequest => sub { Renderer::Controller::IO::validate(@_) });
+	$self->helper(parseRequest    => sub { Renderer::Controller::Render::parseRequest(@_) });
+	$self->helper(croak           => sub { Renderer::Controller::Render::croak(@_) });
 	$self->helper(logID           => sub { shift->req->request_id });
-	$self->helper(exception       => sub { RenderApp::Controller::Render::exception(@_) });
+	$self->helper(exception       => sub { Renderer(@_) });
 
 	# Routes
 	# baseURL sets the root at which the renderer is listening,

lib/RenderApp/Controller/IO.pm lib/Renderer/Controller/IO.pmlib/RenderApp/Controller/IO.pm renamed to lib/Renderer/Controller/IO.pm

@@ -1,4 +1,4 @@
-package RenderApp::Controller::IO;
+package Renderer::Controller::IO;
 use Mojo::Base -async_await;
 use Mojo::Base 'Mojolicious::Controller';
 use File::Spec::Functions qw(splitdir);

lib/RenderApp/Controller/Pages.pm lib/Renderer/Controller/Pages.pmlib/RenderApp/Controller/Pages.pm renamed to lib/Renderer/Controller/Pages.pm

@@ -1,4 +1,4 @@
-package RenderApp::Controller::Pages;
+package Renderer::Controller::Pages;
 use Mojo::Base 'Mojolicious::Controller';
 
 sub twocolumn {

lib/RenderApp/Controller/Render.pm lib/Renderer/Controller/Render.pmlib/RenderApp/Controller/Render.pm renamed to lib/Renderer/Controller/Render.pm

@@ -1,4 +1,4 @@
-package RenderApp::Controller::Render;
+package Renderer::Controller::Render;
 use Mojo::Base 'Mojolicious::Controller', -async_await;
 
 use Mojo::JSON  qw(encode_json decode_json);

lib/RenderApp/Controller/StaticFiles.pm lib/Renderer/Controller/StaticFiles.pmlib/RenderApp/Controller/StaticFiles.pm renamed to lib/Renderer/Controller/StaticFiles.pm

@@ -1,4 +1,4 @@
-package RenderApp::Controller::StaticFiles;
+package Renderer::Controller::StaticFiles;
 use Mojo::Base 'Mojolicious::Controller', -signatures;
 
 use Mojo::File qw(path);