commited working hem module and example

AbleCoder · Apr 2, 2012 · 95c7f93 · 95c7f93
1 parent ff239f2
commit 95c7f93
Show file tree

Hide file tree

Showing 19 changed files with 49 additions and 43 deletions.
diff --git a/examples/css/import.less b/examples/css/import.less
diff --git a/examples/css/index.less b/examples/css/index.less
diff --git a/examples/css/index.styl b/examples/css/index.styl
@@ -0,0 +1,4 @@
+body {
+  background: black;
+  color: white;
+}
diff --git a/examples/html/__footer.eco b/examples/html/__footer.eco
@@ -1,4 +1,4 @@
   <hr>
-  <p>Goodbye!</p>
+  <p>Footer :: Goodbye!</p>
   </body>
 </html>
diff --git a/examples/html/__global.coffee b/examples/html/__global.coffee
@@ -1,3 +1,3 @@
-exports =
+module.exports =
   siteName: 'Example Site'
   pageName: null
diff --git a/examples/html/__header.eco b/examples/html/__header.eco
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= @title %>- <%= @pageName %></title>
+    <title><%= @siteName %> - <%= @pageName %></title>
     <script src="/application.js" type="text/javascript" charset="utf-8"></script>
     <link rel="stylesheet" href="/application.css" type="text/css" media="screen" title="no title" charset="utf-8">
   </head>
   <body>
     <h1>siteName = <%= @siteName %></h1>
     <h2>pageName = <%= @pageName %></h2>
+    <a href="/">Home</a>
+    <a href="/contact.html">Contact</a>
diff --git a/examples/html/contact.eco b/examples/html/contact.eco
@@ -1,3 +1,3 @@
 <%- @render "__header.eco", {pageName: 'Contact'} %>
-<p>Conatact me in person.</p>
+<p>Conatact me in person or else!</p>
 <%- @render "__footer.eco", %>
diff --git a/examples/html/index.eco b/examples/html/index.eco
@@ -1,3 +1,3 @@
 <%- @render "__header.eco", {pageName: 'Home'} %>
-<p>This is the home page boooy!!!!!!!</p>
+<p>This is the home page my fine lad.</p>
 <%- @render "__footer.eco" %>
diff --git a/examples/package.json b/examples/package.json
@@ -8,8 +8,6 @@
     "es5-shimify": "~0.0.1",
     "json2ify": "~0.0.1",
     "jqueryify": "~0.0.1",
-    "amplifyjsify": "~0.0.3",
-    "bootstrap-stylus": "0.2.1",
     "spine": "~1.0.6"
   }
 }
diff --git a/examples/public/contact.html b/examples/public/contact.html
@@ -1,17 +1,19 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>- Contact</title>
+    <title>Example Site - Contact</title>
     <script src="/application.js" type="text/javascript" charset="utf-8"></script>
     <link rel="stylesheet" href="/application.css" type="text/css" media="screen" title="no title" charset="utf-8">
   </head>
   <body>
-    <h1>siteName = </h1>
+    <h1>siteName = Example Site</h1>
     <h2>pageName = Contact</h2>
+    <a href="/">Home</a>
+    <a href="/contact.html">Contact</a>
 
-<p>Conatact me in person.</p>
+<p>Conatact me in person or else!</p>
 
   <hr>
-  <p>Goodbye!</p>
+  <p>Footer :: Goodbye!</p>
   </body>
 </html>
diff --git a/examples/public/index.html b/examples/public/index.html
@@ -1,17 +1,19 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>- Home</title>
+    <title>Example Site - Home</title>
     <script src="/application.js" type="text/javascript" charset="utf-8"></script>
     <link rel="stylesheet" href="/application.css" type="text/css" media="screen" title="no title" charset="utf-8">
   </head>
   <body>
-    <h1>siteName = </h1>
+    <h1>siteName = Example Site</h1>
     <h2>pageName = Home</h2>
+    <a href="/">Home</a>
+    <a href="/contact.html">Contact</a>
 
-<p>This is the home page boooy!!!!!!!</p>
+<p>This is the home page my fine lad.</p>
   <hr>
-  <p>Goodbye!</p>
+  <p>Footer :: Goodbye!</p>
   </body>
 </html>
 
diff --git a/examples/slug.js b/examples/slug.js
@@ -1,6 +1,4 @@
 var hem  = new (require('../lib/hem-render-html'));
 var argv = process.argv.slice(2);
 
-//hem.compilers.less = require('hem-render-html').compiler;
-
 hem.exec(argv[0]);
diff --git a/lib/hem-render-html.js b/lib/hem-render-html.js
diff --git a/lib/html.js b/lib/html.js
diff --git a/lib/render-eco.js b/lib/render-eco.js
@@ -24,17 +24,20 @@
     }
 
     RenderEco.prototype.render = function(templateFile, localContext, includeGlobalContext) {
-      var context, k, template, v;
+      var context, k, template, v, _ref;
       if (localContext == null) localContext = {};
-      if (includeGlobalContext == null) includeGlobalContext = false;
+      if (includeGlobalContext == null) includeGlobalContext = true;
+      context = {};
       if (includeGlobalContext) {
-        context = this.globalContext;
-        for (k in localContext) {
-          v = localContext[k];
+        _ref = this.globalContext;
+        for (k in _ref) {
+          v = _ref[k];
           context[k] = v;
         }
-      } else {
-        context = localContext;
+      }
+      for (k in localContext) {
+        v = localContext[k];
+        context[k] = v;
       }
       context['render'] = this.render;
       template = fs.readFileSync("" + this.srcPath + "/" + templateFile, 'utf-8');

diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
   },
   "dependencies": {
     "eco": "1.1.0-rc-3",
-    "hem": "~0.1.7"
+    "hem": "~0.1.7",
+    "watch" : "~0.4.0"
   },
   "licenses": [{
     "type": "MIT",

diff --git a/src/hem-render-html.coffee b/src/hem-render-html.coffee
@@ -27,16 +27,19 @@ class HemRenderHtml extends Hem
         @htmlPackage().compile()
 
   watch: ->
+    console.log "WATCH HTML"
     @watchHtml()
     super
 
   watchHtml: ->
     @buildHtml()
+    console.log path.existsSync(@options.html)
     dir = path.dirname(@options.html)
+    dir = @options.html
     if path.existsSync(dir)
       require('watch').watchTree dir, (file, curr, prev) =>
         if curr and (curr.nlink is 0 or +curr.mtime isnt +prev?.mtime)
-          console.log "#{file} changed.  Rebuilding all HTML files."
+          console.log "#{file} changed. Rebuilding all HTML files."
           @buildHtml()
 
   htmlPackage: ->

diff --git a/src/html.coffee b/src/html.coffee
@@ -9,7 +9,6 @@ class HTML
       @renderPath   = path.resolve(renderPath)
       @renderEngine = new RenderEco(@srcPath)
     catch e
-      console.log e
 
   compile: ->
     return unless @srcPath and @renderPath

diff --git a/src/render-eco.coffee b/src/render-eco.coffee
@@ -14,12 +14,12 @@ class RenderEco
     delete require.cache[path]
     @globalContext = require(path)
 
-  render: (templateFile, localContext = {}, includeGlobalContext = no) =>
+  render: (templateFile, localContext = {}, includeGlobalContext = yes) =>
+    context = {}
     if includeGlobalContext
-      context = @globalContext
-      context[k] = v for k, v of localContext
-    else
-      context = localContext
+      context[k] = v for k, v of @globalContext
+
+    context[k] = v for k, v of localContext
 
     # add render helper to context
     context['render'] = @render