Add new API request /api/v1/source/CHAPTER/SECTION which returns the …

…source code for that section.

The tour controller now fetches the source through this API call. That way the
source code is always correctly escaped and we just set the initial source
in the controller init function. This eliminates the ugly source code setting
within the DIET template. And it later on enabled restoring user's changed
source editor content.

public/content/en/welcome.md

@@ -26,6 +26,7 @@ features.
 
 import std.stdio;
 
+// Let's get going!
 void main() {
     writeln("Hello World!");
 }

public/static/js/tour-controller.js

@@ -9,6 +9,13 @@ dlangTourApp.controller('DlangTourAppCtrl', [ '$scope', '$http', function($scope
 		theme: "elegant"
 	};
 
+	$scope.init = function(chapterId, section) {
+		$http.get('/api/v1/source/' + chapterId + "/" + section)
+			.success(function(data) {
+				$scope.sourceCode = $scope.resetCode = data.sourceCode;
+			});
+	}
+
 	$scope.programOutput = "";
 
 	$scope.run = function() {

source/app.d

@@ -57,7 +57,7 @@ shared static this()
 	fsettings.serverPathPrefix = "/static";
 	urlRouter
 		.registerWebInterface(new WebInterface(contentProvider))
-		.registerRestInterface(new ApiV1(execProvider))
+		.registerRestInterface(new ApiV1(execProvider, contentProvider))
 		.get("/static/*", serveStaticFiles(config.publicDir ~ "/static/", fsettings));
 
 	listenHTTP(settings, urlRouter);

source/rest/apiv1.d

@@ -1,15 +1,19 @@
 module rest.apiv1;
 
+import vibe.d;
 import rest.iapiv1;
 import exec.iexecprovider;
+import contentprovider;
 
 class ApiV1: IApiV1
 {
 	private IExecProvider execProvider_;
+	private ContentProvider contentProvider_;
 
-	this(IExecProvider execProvider)
+	this(IExecProvider execProvider, ContentProvider contentProvider)
 	{
 		this.execProvider_ = execProvider;
+		this.contentProvider_ = contentProvider;
 	}
 
 	RunOutput run(string source)
@@ -21,4 +25,15 @@ class ApiV1: IApiV1
 		auto result = execProvider_.compileAndExecute(source);
 		return RunOutput(result.output, result.success);
 	}
+
+	SourceOutput getSource(string _chapter, int _section)
+	{
+		auto tourData = contentProvider_.getContent("en", _chapter, _section);
+		if (tourData.content == null) {
+			throw new HTTPStatusException(404,
+				"Couldn't find tour data for chapter '%s', section %d".format(_chapter, _section));
+		}
+
+		return SourceOutput(tourData.content.sourceCode);
+	}
 }

source/rest/iapiv1.d

@@ -7,13 +7,43 @@ import vibe.d;
 +/
 interface IApiV1
 {
+	/+
+		POST /api/v1/run
+		{
+			source: "..."
+		}
+
+		Returns: output of compiled D program with success
+		flag.
+		{
+			output: "Program Output",
+			success: true/false
+		}
+	+/
 	struct RunOutput
 	{
 		string output;
 		bool success;
 	}
-
 	@method(HTTPMethod.POST)
 	@path("/api/v1/run")
 	RunOutput run(string source);
+
+	/+
+		GET /api/v1/source/CHAPTER/SECTION
+
+		Returns: source code (or empty if none) for the given
+		chapter and section. Also returns changed source code
+		if user switched between sections.
+		{
+			sourceCode: "..."
+		}
+	+/
+	struct SourceOutput
+	{
+		string sourceCode;
+	}
+	@method(HTTPMethod.GET)
+	@path("/api/v1/source/:chapter/:section")
+	SourceOutput getSource(string _chapter, int _section);
 }

source/webinterface.d

@@ -78,15 +78,15 @@ class WebInterface
 		}
 
 		auto htmlContent = tourData.content.html;
-		auto sourceCode = tourData.content.sourceCode;
 		auto chapterId = _chapter;
+		auto hasSourceCode = !tourData.content.sourceCode.empty;
 		auto section = _section;
 		auto sectionCount = tourData.sectionCount;
 		auto toc = &toc_;
 		auto previousLink = previousSectionLink(_chapter, _section);
 		auto nextLink = nextSectionLink(_chapter, _section);
-		render!("tour.dt", htmlContent, sourceCode, section,
-				sectionCount, chapterId,
+		render!("tour.dt", htmlContent, section,
+				sectionCount, chapterId, hasSourceCode,
 				nextLink, previousLink,
 				toc)();
 	}

views/tour.dt

@@ -10,10 +10,10 @@ block head
 	link(rel="stylesheet", href="/static/css/tour.css")
 
 block content
-	#content(ng-controller="DlangTourAppCtrl as ctrl", ng-init="sourceCode = resetCode = '#{sourceCode}'")
+	#content(ng-controller="DlangTourAppCtrl as ctrl", ng-init="init('#{chapterId}',  #{section})")
 		.row
 			.col-md-6
-				- if (!sourceCode.empty)
+				- if (hasSourceCode)
 					#code-box
 						ui-codemirror(ui-codemirror-opts="editorOptions", ng-model="sourceCode")
 						.text-right#command-box