LinkedDataFragments
diff --git a/‎assets/logo.svg renamed to ‎assets/images/logo.svg b/‎assets/logo.svg renamed to ‎assets/images/logo.svg
diff --git a/‎assets/style.css renamed to ‎assets/styles/ldf-server.css b/‎assets/style.css renamed to ‎assets/styles/ldf-server.css
diff --git a/‎lib/controllers/AssetsController.js
Lines changed: 21 additions & 8 deletions b/‎lib/controllers/AssetsController.js
Lines changed: 21 additions & 8 deletions
diff --git a/‎lib/views/base.html
Lines changed: 2 additions & 2 deletions b/‎lib/views/base.html
Lines changed: 2 additions & 2 deletions
diff --git a/‎test/controllers/AssetsController-test.js
Lines changed: 4 additions & 4 deletions b/‎test/controllers/AssetsController-test.js
Lines changed: 4 additions & 4 deletions
@@ -18,18 +18,31 @@ function AssetsController(options) {
   var assetsPath = options.assetsPath || '/assets/';
   this._matcher = new RegExp('^' + Util.toRegExp(assetsPath) + '(.+)|^/(\\w*)\\.ico$');
 
-  // Read assets into memory
+  // Read all assets
   var assetsFolder = options.assetsFolder || path.join(__dirname, '../../assets/');
-  this._assets = fs.readdirSync(assetsFolder).reduce(function (assets, filename) {
-    var assetType = mime.lookup(filename);
-    return assets[filename.replace(/[.][^.]+$/, '')] = {
-      type: assetType.indexOf('text/') ? assetType : assetType + ';charset=utf-8',
-      contents: fs.readFileSync(path.join(assetsFolder, filename)),
-    }, assets;
-  }, {});
+  this._assets = {};
+  this._readAssetsFolder(assetsFolder, '');
 }
 Controller.extend(AssetsController);
 
+// Recursively reads assets in the folder, assigning them to the URL path
+AssetsController.prototype._readAssetsFolder = function (assetsFolder, assetsPath) {
+  fs.readdirSync(assetsFolder).forEach(function (name) {
+    var filename = path.join(assetsFolder, name), stats = fs.statSync(filename);
+    // Read an asset file into memory
+    if (stats.isFile()) {
+      var assetType = mime.lookup(filename);
+      this._assets[assetsPath + name.replace(/[.][^.]+$/, '')] = {
+        type: assetType.indexOf('text/') ? assetType : assetType + ';charset=utf-8',
+        contents: fs.readFileSync(filename),
+      };
+    }
+    // Read all asset files in a folder
+    else if (stats.isDirectory())
+      this._readAssetsFolder(filename, assetsPath + name + '/');
+  }, this);
+};
+
 // Try to serve the requested asset
 AssetsController.prototype._handleRequest = function (request, response, next) {
   var assetMatch = request.url.match(this._matcher), asset;
 
@@ -4,15 +4,15 @@
 <head>
   <meta charset="utf-8">
   <title><%= title || header || 'Linked Data Fragments Server' %></title>
-  <link rel="stylesheet" href="<%= assetsPath %>style" />
+  <link rel="stylesheet" href="<%= assetsPath %>styles/ldf-server" />
   <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:700italic,400,700|Droid+Sans+Mono" type="text/css" />
   <meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1">
 </head>
 <body>
   <header>
     <h1><a href="<%= baseURL %>"><%= header || 'Linked Data Fragments Server' %></a></h1>
     <figure class="logo">
-      <a href="http://linkeddatafragments.org/"><img src="<%= assetsPath %>logo" alt="Linked Data Fragments" /></a>
+      <a href="http://linkeddatafragments.org/"><img src="<%= assetsPath %>images/logo" alt="Linked Data Fragments" /></a>
     </figure>
   </header>
   <main>
 
@@ -29,8 +29,8 @@ describe('AssetsController', function () {
     });
 
     it('should correctly serve SVG assets', function (done) {
-      client.get('/assets/logo').expect(function (response) {
-        var asset = fs.readFileSync(path.join(__dirname, '/../../assets/logo.svg'), 'utf8');
+      client.get('/assets/images/logo').expect(function (response) {
+        var asset = fs.readFileSync(path.join(__dirname, '/../../assets/images/logo.svg'), 'utf8');
         controller.next.should.not.have.been.called;
         response.should.have.property('statusCode', 200);
         response.headers.should.have.property('content-type', 'image/svg+xml');
@@ -40,8 +40,8 @@ describe('AssetsController', function () {
     });
 
     it('should correctly serve CSS assets', function (done) {
-      client.get('/assets/style').expect(function (response) {
-        var asset = fs.readFileSync(path.join(__dirname, '/../../assets/style.css'), 'utf8');
+      client.get('/assets/styles/ldf-server').expect(function (response) {
+        var asset = fs.readFileSync(path.join(__dirname, '/../../assets/styles/ldf-server.css'), 'utf8');
         controller.next.should.not.have.been.called;
         response.should.have.property('statusCode', 200);
         response.headers.should.have.property('content-type', 'text/css;charset=utf-8');