Merge and use button instead of anchor.

- Add usage of button tag instead of anchor
- Update test
- Add tests to demonstrate additional classes
- Merge pull request [by niftylettuce and romanmt]

History.md

@@ -1,3 +1,10 @@
+0.1.0 / 2012-07-01
+==================
+	* Use button (<button>) instead of from anchor (<a>)
+	* Update tests
+	* Add tests to demonstrate additional classes
+	* Merge pull request [by niftylettuce and romanmt]
+
 0.0.9 / 2012-06-14
 ==================
 	* Update dev dependencies

index.coffee

@@ -6,7 +6,7 @@ module.exports = (req, res) ->
         len = types.length
 
         if !len
-            return ''
+            return '<div id=\"messages\"></div>';
 
         buf.push('<div id="messages">')
 
@@ -19,7 +19,7 @@ module.exports = (req, res) ->
                 for j in [0...msgs.length]
                     msg = msgs[j]
                     buf.push("<div class=\"alert alert-#{type}\">")
-                    buf.push("<a class=\"close\" data-dismiss=\"alert\">&times;</a>")
+                    buf.push("<button class=\"close\" data-dismiss=\"alert\">&times;</button>")
                     buf.push(msg)
                     buf.push("</div>")
         buf.push("</div>")

package.json

@@ -2,9 +2,6 @@
   , "description": "Express flash notification message rendering compatible with Twitter's Bootstrap v2.0+. Based on TJ Holowaychuk's express-messages."
   , "version": "0.1.0"
   , "author": "Jason Giedymin <jasong@apache.org>"
-  , "contributors": [
-      { "name": "Nick Baugh", "email": "niftylettuce@gmail.com" }
-    ]
   , "keywords": ["express", "bootstrap", "flash"]
   , "repository": "git://github.com/JasonGiedymin/express-messages-bootstrap"
   , "main": "index"

test/messages.test.js

@@ -22,6 +22,16 @@ module.exports = {
       req.flash('warning', 'This is a warning.');
       req.flash('success', 'This is success.');
 
+      req.flash('error fade in', 'This is an error.');
+      req.flash('info fade in', 'This is an info.');
+      req.flash('warning fade in', 'This is a warning.');
+      req.flash('success fade in', 'This is success.');
+
+      req.flash('error i-like-big-names-and-i-cannot-lie fight', 'This is an error.');
+      req.flash('info i-like-big-names-and-i-cannot-lie for-your-right', 'This is an info.');
+      req.flash('warning i-like-big-names-and-i-cannot-lie to', 'This is a warning.');
+      req.flash('success i-like-big-names-and-i-cannot-lie paaaaartay', 'This is success.');
+
       res.render('messages.ejs', {
         layout: false
       });
@@ -36,21 +46,56 @@ module.exports = {
     var html = [
     '<div id="messages">'
     ,'<div class="alert alert-error">'
-    ,'<a class="close" data-dismiss="alert">&times;</a>'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
     ,'This is an error.'
     ,'</div>'
     ,'<div class="alert alert-info">'
-    ,'<a class="close" data-dismiss="alert">&times;</a>'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
     ,'This is an info.'
     ,'</div>'
     ,'<div class="alert alert-warning">'
-    ,'<a class="close" data-dismiss="alert">&times;</a>'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
     ,'This is a warning.'
     ,'</div>'
     ,'<div class="alert alert-success">'
-    ,'<a class="close" data-dismiss="alert">&times;</a>'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
+    ,'This is success.'
+    ,'</div>'
+
+    ,'<div class="alert alert-error fade in">'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
+    ,'This is an error.'
+    ,'</div>'
+    ,'<div class="alert alert-info fade in">'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
+    ,'This is an info.'
+    ,'</div>'
+    ,'<div class="alert alert-warning fade in">'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
+    ,'This is a warning.'
+    ,'</div>'
+    ,'<div class="alert alert-success fade in">'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
     ,'This is success.'
     ,'</div>'
+
+    ,'<div class="alert alert-error i-like-big-names-and-i-cannot-lie fight">'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
+    ,'This is an error.'
+    ,'</div>'
+    ,'<div class="alert alert-info i-like-big-names-and-i-cannot-lie for-your-right">'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
+    ,'This is an info.'
+    ,'</div>'
+    ,'<div class="alert alert-warning i-like-big-names-and-i-cannot-lie to">'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
+    ,'This is a warning.'
+    ,'</div>'
+    ,'<div class="alert alert-success i-like-big-names-and-i-cannot-lie paaaaartay">'
+    ,'<button class="close" data-dismiss="alert">&times;</button>'
+    ,'This is success.'
+    ,'</div>'
+
     ,'</div>'
     ].join('\n');
 
@@ -59,6 +104,6 @@ module.exports = {
       { body: html });
     assert.response(app,
       { url: '/none' },
-      { body: '' });
+      { body: '<div id="messages"></div>' });
   }
 };