improved sub application modularization and template rendering layout…

… system, updated examples due to changes
kadirpekel · Jul 3, 2011 · 2db3c3e · 2db3c3e
1 parent 69680ed
commit 2db3c3e
Show file tree

Hide file tree

Showing 31 changed files with 165 additions and 82 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ mate.context.highlight = (color, txt) ->
 mate.get '/greet/:name', ->
 	# this is context variable
 	@greet_msg = "Hello, #{@req.params.name}"
-	@render 'home.eco'
+	@render 'home'
 
 # Stream it
 mate.io.sockets.on 'connection', (socket) ->
@@ -42,6 +42,17 @@ mate.io.sockets.on 'connection', (socket) ->
 mate.listen 3000
 ```
 
+``` html
+<!-- layout.eco -->
+<html>
+  <head>
+  </head>
+  <body>
+      <%- @include @body %>
+  </body>
+</html>
+```
+
 ``` html
 <!-- main.eco -->
 

diff --git a/examples/coffeekup/views/layout.coffeekup b/examples/coffeekup/views/layout.coffeekup
@@ -0,0 +1,4 @@
+html ->
+  head
+  body ->
+    include @body
diff --git a/examples/coffeekup/views/main.coffeekup b/examples/coffeekup/views/main.coffeekup
@@ -1,10 +1,7 @@
-html ->
-  head
-  body ->
-    h1 "A cup of coffee demonstration"
-    div ->
-      include "nested1"
-    div ->
-      include "nested2"
-    div ->
-      include "nested3"
+h1 "A cup of coffee demonstration"
+div ->
+  include "nested1"
+div ->
+  include "nested2"
+div ->
+  include "nested3"
diff --git a/examples/connect/app.coffee b/examples/connect/app.coffee
@@ -4,6 +4,6 @@ mate.logger()
 mate.static(__dirname + '/public')
 
 mate.get '/', ->
-  @render 'main.eco'
+  @render 'main'
 
 mate.listen 3000
diff --git a/examples/connect/layout.eco b/examples/connect/layout.eco
@@ -0,0 +1,7 @@
+<html>
+  <head>
+  </head>
+  <body>
+      <%- @include @body %>
+  </body>
+</html>
diff --git a/examples/helpers/app.coffee b/examples/helpers/app.coffee
@@ -4,6 +4,6 @@ mate.context.highlight = (msg) ->
   "<span style=\"background-color:#ff0\">#{msg}</span>"
 
 mate.get '/', ->
-  @render 'main.eco'
+  @render 'main'
 
 mate.listen 3000
diff --git a/examples/helpers/layout.eco b/examples/helpers/layout.eco
@@ -0,0 +1,7 @@
+<html>
+  <head>
+  </head>
+  <body>
+      <%- @include @body %>
+  </body>
+</html>
diff --git a/examples/layout/app.coffee b/examples/layout/app.coffee
@@ -1,12 +1,7 @@
 mate = require '../../lib/coffeemate'
 
-# build your own layout structure
-mate.context.custom_render = (template_name) ->
-  @content = template_name
-  @render 'layout.eco'
-
 mate.get '/', ->
   @foo = 'bar'
-  @custom_render 'main.eco'
+  @render 'main'
 
 mate.listen 3000
diff --git a/examples/layout/layout.eco b/examples/layout/layout.eco
@@ -2,7 +2,7 @@
   <head></head>
   <body>
     <div>This is HEADER</div>
-    <div><%- @include @content %></div>
+    <div><%- @include @body %></div>
     <div>This is FOOTER</div>
   </body>
 </html>
diff --git a/examples/sandbox/base/index.coffee b/examples/sandbox/base/index.coffee
@@ -1,5 +1,3 @@
-mate = require('../../../lib/coffeemate').newInstance()
+mate = require '../../../lib/coffeemate'
 
-mate.get '/', -> @view 'home'
-
-module.exports = mate
+mate.get '/', -> @render 'base/index'
diff --git a/examples/sandbox/base/views/layout.eco b/examples/sandbox/base/views/layout.eco
diff --git a/examples/sandbox/comments/index.coffee b/examples/sandbox/comments/index.coffee
@@ -1,5 +1,3 @@
-mate = require('../../../lib/coffeemate').newInstance()
+mate = require '../../../lib/coffeemate'
 
-mate.get '/', -> @view 'list'
-
-module.exports = mate
+mate.get '/', -> @render 'comments/index', 'comment_layout'
diff --git a/examples/sandbox/comments/views/list.eco b/examples/sandbox/comments/views/list.eco
diff --git a/examples/sandbox/extensions.coffee b/examples/sandbox/extensions.coffee
diff --git a/examples/sandbox/index.coffee b/examples/sandbox/index.coffee
@@ -1,19 +1,15 @@
 mate = require '../../lib/coffeemate'
 
-# use some of connect middlewares
-mate.logger()
-mate.static("#{__dirname}/public")
-
-# import extensions
-require './extensions'
+# import configuration
+require './settings'
 
 # import sub applications
-mate.use '/base', require './base'
-mate.use '/posts', require './posts'
-mate.use '/comments', require './comments'
+mate.sub '/base', -> require './base'
+mate.sub '/posts', -> require './posts'
+mate.sub '/comments', -> require './comments'
 
 # redirect root
 mate.get '/', -> @redirect '/base'
-  
+
 # start the engines
-mate.listen 3000
+mate.listen 3000
diff --git a/examples/sandbox/posts/index.coffee b/examples/sandbox/posts/index.coffee
@@ -1,5 +1,3 @@
-mate = require('../../../lib/coffeemate').newInstance()
+mate = require '../../../lib/coffeemate'
 
-mate.get '/', -> @view 'list'
-
-module.exports = mate
+mate.get '/', -> @render 'posts/index'
diff --git a/examples/sandbox/server.js b/examples/sandbox/server.js
@@ -0,0 +1,2 @@
+require('coffee-script');
+module.exports = require('./index.coffee');
diff --git a/examples/sandbox/settings.coffee b/examples/sandbox/settings.coffee
@@ -0,0 +1,8 @@
+mate = require '../../lib/coffeemate'
+
+mate.options.renderDir = 'templates'
+mate.options.renderExt = '.html'
+
+# use some of connect middlewares
+mate.logger()
+mate.static("#{__dirname}/public")
diff --git a/examples/sandbox/base/views/home.eco → examples/sandbox/templates/base/index.html b/examples/sandbox/base/views/home.eco → examples/sandbox/templates/base/index.html
@@ -1,2 +1,2 @@
 <h1>Coffeemate Sandbox</h1>
-<a href="/posts">posts</a>
+<a href="/posts">posts</a>
diff --git a/examples/sandbox/templates/comment_layout.html b/examples/sandbox/templates/comment_layout.html
@@ -0,0 +1,18 @@
+<html>
+  <head>
+    <style type="text/css">
+      body {
+        background-color: #ff0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="header"><img src="coffeescript.png" alt="coffeescript" /></div>
+    <hr />
+    <div id="content">
+      <%- @include @body %>
+    </div>
+    <hr />
+    <div id="footer"><a href="/" title="home">home</a></div>
+  </body>
+</html>
diff --git a/examples/sandbox/templates/comments/index.html b/examples/sandbox/templates/comments/index.html
@@ -0,0 +1 @@
+<h1>Comment List</h1>
diff --git a/examples/sandbox/templates/layout.html b/examples/sandbox/templates/layout.html
@@ -0,0 +1,13 @@
+<html>
+  <head>
+  </head>
+  <body>
+    <div id="header"><img src="coffeescript.png" alt="coffeescript" /></div>
+    <hr />
+    <div id="content">
+      <%- @include @body %>
+    </div>
+    <hr />
+    <div id="footer"><a href="/" title="home">home</a></div>
+  </body>
+</html>
diff --git a/examples/sandbox/posts/views/list.eco → examples/sandbox/templates/posts/index.html b/examples/sandbox/posts/views/list.eco → examples/sandbox/templates/posts/index.html
diff --git a/examples/simple_auth/layout.eco b/examples/simple_auth/layout.eco
@@ -0,0 +1,7 @@
+<html>
+  <head>
+  </head>
+  <body>
+      <%- @include @body %>
+  </body>
+</html>
diff --git a/examples/templating/app.coffee b/examples/templating/app.coffee
@@ -2,6 +2,6 @@ mate = require '../../lib/coffeemate'
 
 mate.get '/:page?', ->
   @foo = 'bar'        # this is a context variable
-  @render 'main.eco'
+  @render 'main'
 
 mate.listen 3000
diff --git a/examples/templating/layout.eco b/examples/templating/layout.eco
@@ -0,0 +1,7 @@
+<html>
+  <head>
+  </head>
+  <body>
+      <%- @include @body %>
+  </body>
+</html>
diff --git a/examples/templating/main.eco b/examples/templating/main.eco
@@ -1,3 +1,3 @@
 <h1>this is main template for path: <%= @req.url %></h1>
 <div>This is foo: <%= @foo %></div>
-<div><%- @include 'nested.eco' %></div>
+<div><%- @include 'nested' %></div>
diff --git a/examples/templating/nested.eco b/examples/templating/nested.eco
@@ -1,3 +1,3 @@
 <h2>this is nested template</h2>
 <div>This is foo: <%= @foo %></div>
-<div><%- @include 'leaf.eco' %></div>
+<div><%- @include 'leaf' %></div>
diff --git a/examples/websockets/app.coffee b/examples/websockets/app.coffee
@@ -1,7 +1,9 @@
 mate = require '../../lib/coffeemate.coffee'
 
+mate.options.renderLayout = no
+
 mate.get '/', ->
-  @render 'main.eco'
+  @render 'main'
 
 mate.io.sockets.on 'connection', (socket, i=0) ->
   setInterval (-> socket.emit 'news', "Breaking news #{i++}"), 500