cleaned and simplified code

lib/main.js

@@ -60,8 +60,8 @@ function generateHtml(schema, cb) {
   var ctx = {
     model: schema.getModel(),
     consts: consts,
-    _: _ ,
-	uriToPrefixesMap: schema.getURIToPrefixesMap()	
+    prefixes: schema.getPrefixMap(),
+    _: _
   };
 
   ejs.renderFile('./templates/schema.ejs', ctx, function (err, str) {

lib/schema.js

@@ -129,15 +129,8 @@ Schema.load = function (schemaFile, cb) {
       callback(new Error('Parsing ' + schemaFile + ' failed'));
       return;
     }
-	
-    var prefixes = {};
-	var uriToPrefixesMap = {};
-    _.forOwn(turtleParser.environment.prefixes, function (value, key) {
-      prefixes[key] = value;
-	  uriToPrefixesMap[value] = key;
-    });
 
-    var doc = { graph: graph, prefixes: prefixes, uriToPrefixesMap: uriToPrefixesMap };
+    var doc = { graph: graph, prefixes: turtleParser.environment.prefixes };
     callback(null, doc);
   }
 
@@ -259,12 +252,14 @@ Schema.prototype.getModel = function () {
 };
 
 /**
- * Returns the Prefix Map.
+ * Returns the prefix map, in instance of the <code>PrefixMap</code> RDF Interface.
+ *
+ * @see https://www.w3.org/TR/2012/NOTE-rdf-interfaces-20120705/#prefix-maps
  *
- * @return {prefixes} prefix map object
+ * @return {Object} prefix map object
  */
-Schema.prototype.getURIToPrefixesMap = function () {
-  return this._rdfDoc.uriToPrefixesMap;
+Schema.prototype.getPrefixMap = function () {
+  return this._rdfDoc.prefixes;
 };
 
 /**

templates/class.ejs

@@ -28,32 +28,26 @@
   <br>
   <div style = "font-size:large"><b>Properties:</b></div>
   <div class=" table " data-dist-id="table_246994025">
-   <table width="100%" cellspacing="0" cellpadding="1" border="1">
-   <thead><tr><th>Name&nbsp;</th>
-   <th>Json Name&nbsp;</th>
-   <th>Type</th>
-   <th>Description</th>
-   </tr></thead>	
-   <tbody>
-   <% _.forEach(clazz.properties, function (prop) { %>
-    <tr>
-	   <td align = "center"><b>
-	   <% var cond = prop["@id"].lastIndexOf('#') %>
-	   <% if(cond !== -1) { %>
-			<%- uriToPrefixesMap[prop["@id"].substring(0,prop["@id"].lastIndexOf('#')+1)] %>:
-			<%- prop["@id"].substring(prop["@id"].lastIndexOf('#')+1) %>
-	   <% } else { %>
-		    <%- uriToPrefixesMap[prop["@id"].substring(0,prop["@id"].lastIndexOf('/')+1)] %>:
-			<%- prop["@id"].substring(prop["@id"].lastIndexOf('/')+1) %>
-	   <% } %></b>
-	   </td>  
-	   <td><%- prop[consts.META_JSONNAME] %></td>
-	   <td><%- model.datatypes[prop[consts.RDFS_RANGE]][consts.RDFS_LABEL] %> </td>
-	   <td><%- prop[consts.RDFS_COMMENT] %></td>
-	</tr>   
-   <% }); %>
-   </tbody>
-  </table>
+    <table width="100%" cellspacing="0" cellpadding="1" border="1">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>JSON Name</th>
+          <th>Type</th>
+          <th>Description</th>
+        </tr>
+      </thead>
+      <tbody>
+      <% _.forEach(clazz.properties, function (prop) { %>
+        <tr>
+          <td align = "center"><b><%- prefixes.shrink(prop["@id"]) %></b></td>
+          <td><%- prop[consts.META_JSONNAME] %></td>
+          <td><%- model.datatypes[prop[consts.RDFS_RANGE]][consts.RDFS_LABEL] %></td>
+          <td><%- prop[consts.RDFS_COMMENT] %></td>
+        </tr>
+      <% }); %>
+      </tbody>
+    </table>
   </div>
 </li>
 

templates/schema.ejs

@@ -121,7 +121,7 @@
 <h2><u>Classes</u></h2>
 <ul>
   <% _.forEach(model.classes, function (clazz) { %>
-    <%- include('class', { clazz: clazz, model: model, consts: consts, uriToPrefixesMap:uriToPrefixesMap }); %>
+    <%- include('class', { clazz: clazz, model: model, consts: consts, _: _, prefixes: prefixes }); %>
     <br>
   <% }); %>
 </ul>