Merge branch 'master' into month_name

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "desirae",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "authors": [
     "AJ ONeal <awesome@coolaj86.com>"
   ],

desirae.js

@@ -143,7 +143,7 @@
   Desi.permalinkify = function (desi, purl, entity) {
     var parts = purl.split('/')
       ;
-      
+
     // when created from the web or cmd the file doesn't yet exist
     if (!entity.name) {
       entity.name = entity.slug + '.html';
@@ -267,6 +267,10 @@
     if (!themename) {
       themename = desi.site.theme || desi.config.theme;
     }
+    if (!desi.config.themes[themename]) {
+      console.error("'" + themename + "' was not found among the themes");
+      return arr;
+    }
 
     // TODO NO DEFAULTS
     if ('__page__' === layoutname) {
@@ -345,12 +349,12 @@
     d.hour   = m[4] = Desi.pad(m[5] || '00');  // hours
     d.minute = m[5] = Desi.pad(m[6] || '00');  // minutes
     d.second = m[6] = Desi.pad(m[8] || '00');  // seconds
- 
+
     if (parseInt(m[4], 10) > 12) {
       d.twelve_hour = m[7] = m[4] - 12;   // 12-hour
       d.meridian    = m[8] = 'pm';        // am/pm
     } else {
-      d.twelve_hour = m[7] = m[4]; 
+      d.twelve_hour = m[7] = m[4];
       d.meridian    = m[8] = 'am';
     }
 
@@ -386,7 +390,7 @@
     ]).then(function (plop) {
       var arr = plop[0]
         //, blogdir = plop[1]
-        ; 
+        ;
 
       //desi.blogdir = blogdir;
       //desi.originals = {};
@@ -432,7 +436,7 @@
       return PromiseA.all([
         Desi.fsapi.getMeta(
           themenames.map(function (n) { return path.join(THEME_PREFIX, n); })
-        , { dotfiles: false 
+        , { dotfiles: false
           , extensions: Object.keys(Desi._exts.themes)
           }
         )
@@ -450,7 +454,7 @@
         )
       , Desi.fsapi.getMeta(
           assetnames
-        , { dotfiles: false 
+        , { dotfiles: false
           //, extensions: Object.keys(Desi._exts.assets)
           }
         )
@@ -468,7 +472,7 @@
 
             metaf.path = path.join(metaf.relativePath, metaf.name);
 
-            
+
             if (metaf.error) {
               console.error("Couldn't read '" + metaf.path + "'");
               console.error(metaf.error);
@@ -612,7 +616,7 @@
         return desi;
       });
     });
-  };  
+  };
 
   Desi.copyAssets = function(desi, env) {
     var files = {}
@@ -833,7 +837,7 @@
       return Desi.render(current.ext, body, view).then(function (html) {
         // TODO organize datamap inheritence
         var datamap = Desi._datamaps[current.config && current.datamap]
-              || Desi._datamaps[env.datamap] 
+              || Desi._datamaps[env.datamap]
               || Desi._datamaps[entity.datamap]
               || Desi._datamaps['ruhoh@2.6']
           , newview
@@ -927,7 +931,7 @@
 
         if (!/\.x?html?$/.test(nav.href)) {
           // add trailing slash
-          nav.href += '/'; 
+          nav.href += '/';
         }
 
         if (nav.href.replace(/(\/)?(\/index)?(\.html)?$/i, '')

lib/utils.js

@@ -78,7 +78,10 @@
               console.error(file);
             }
 
-            obj[keyname][filename] = data || obj[keyname][filename];
+            data = obj[keyname][filename] = data || obj[keyname][filename];
+            if (data) {
+              data.filename = file.name;
+            }
             /*
             if (!obj[keyname][filename]) {
               obj[keyname][filename] = {};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "desirae",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "An in-browser static blog library and static site generator. Similar to Jekyll, Octopress, Nanoc, etc",
   "main": "desirae.js",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:DearDesi/desirae.git"
+    "url": "git@git.daplie.com:Daplie/desirae.git"
   },
   "keywords": [
     "dear",
@@ -25,9 +25,9 @@
   "author": "AJ ONeal",
   "license": "Apache2",
   "bugs": {
-    "url": "https://github.com/DearDesi/desirae/issues"
+    "url": "https://git.daplie.com/Daplie/desirae/issues"
   },
-  "homepage": "https://github.com/DearDesi/desirae",
+  "homepage": "https://git.daplie.com/Daplie/desirae",
   "dependencies": {
     "bluebird": "^2.5.3",
     "escape-string-regexp": "^1.0.2",