Refactored project and app examples. Made jimi an npm package.

colingourlay · Jun 23, 2010 · a286a06 · a286a06
1 parent b554b25
commit a286a06
Show file tree

Hide file tree

Showing 29 changed files with 50 additions and 15 deletions.
diff --git a/apps/basic/app.js b/apps/basic/app.js
@@ -1,4 +1,4 @@
-var jimi = require('../../jimi/core');
+var jimi = require('jimi');
 
 url_mappings = require('./urls').mappings;
 

diff --git a/apps/basic/delay/views.js b/apps/basic/delay/views.js
@@ -1,4 +1,4 @@
-var jimi = require('../../../jimi/core');
+var jimi = require('jimi');
 
 exports.delayed = function(req, res, how_long) {
     setTimeout(function() {

diff --git a/apps/basic/today/views.js b/apps/basic/today/views.js
@@ -1,4 +1,4 @@
-var jimi = require('../../../jimi/core');
+var jimi = require('jimi');
 
 var now = new Date();
 var month_names = new Array("January", "February", "March", "April", "May",

diff --git a/apps/basic/urls.js b/apps/basic/urls.js
@@ -1,4 +1,4 @@
-var jimi = require('../../jimi/core');
+var jimi = require('jimi');
 var views = require('./views');
 
 var url_mappings = exports.mappings = [

diff --git a/apps/basic/views.js b/apps/basic/views.js
@@ -1,4 +1,4 @@
-var jimi = require('../../jimi/core');
+var jimi = require('jimi');
 
 exports.root = function(req, res) {
     jimi.respond(res, '<h1>jimi</h1> \

diff --git a/apps/templating/app.js b/apps/templating/app.js
@@ -1,4 +1,4 @@
-var jimi = require('../../jimi/core');
+var jimi = require('jimi');
 
 url_mappings = require('./urls').mappings;
 

diff --git a/apps/templating/delay/views.js b/apps/templating/delay/views.js
@@ -1,6 +1,6 @@
-var jimi = require('../../../jimi/core');
-var template_system = require('../../../jimi/template/template');
-var template_loader = require('../../../jimi/template/loader');
+var jimi = require('jimi');
+var template_system = require('jimi/template/template');
+var template_loader = require('jimi/template/loader');
 
 exports.delayed = function(req, res, how_long) {
     setTimeout(function() {

diff --git a/apps/templating/urls.js b/apps/templating/urls.js
@@ -1,4 +1,4 @@
-var jimi = require('../../jimi/core');
+var jimi = require('jimi');
 var views = require('./views');
 
 var url_mappings = exports.mappings = [

diff --git a/apps/templating/views.js b/apps/templating/views.js
@@ -1,6 +1,6 @@
-var jimi = require('../../jimi/core');
-var template_system = require('../../jimi/template/template');
-var template_loader = require('../../jimi/template/loader');
+var jimi = require('jimi');
+var template_system = require('jimi/template/template');
+var template_loader = require('jimi/template/loader');
 
 exports.root = function(req, res) {
     template_loader.set_path('templates');

diff --git a/jimi/core.js → lib/jimi.js b/jimi/core.js → lib/jimi.js
@@ -2,8 +2,7 @@ var http = require('http'),
     sys = require('sys'),
     fs = require('fs'),
     url = require('url'),
-    querystring = require('querystring')
-;
+    querystring = require('querystring');
 
 function extname(path) {
     var index = path.lastIndexOf('.');

diff --git a/jimi/template/load_tag_test.js → lib/template/load_tag_test.js b/jimi/template/load_tag_test.js → lib/template/load_tag_test.js
diff --git a/jimi/template/loader.js → lib/template/loader.js b/jimi/template/loader.js → lib/template/loader.js
diff --git a/jimi/template/template.js → lib/template/template.js b/jimi/template/template.js → lib/template/template.js
diff --git a/jimi/template/template.test.js → lib/template/template.test.js b/jimi/template/template.test.js → lib/template/template.test.js
diff --git a/jimi/template/template_defaults.js → lib/template/template_defaults.js b/jimi/template/template_defaults.js → lib/template/template_defaults.js
diff --git a/jimi/template/template_defaults.tags.test.js → lib/template/template_defaults.tags.test.js b/jimi/template/template_defaults.tags.test.js → lib/template/template_defaults.tags.test.js
diff --git a/jimi/template/template_defaults.test.js → lib/template/template_defaults.test.js b/jimi/template/template_defaults.test.js → lib/template/template_defaults.test.js
diff --git a/jimi/utils/date.js → lib/utils/date.js b/jimi/utils/date.js → lib/utils/date.js
diff --git a/jimi/utils/date.test.js → lib/utils/date.test.js b/jimi/utils/date.test.js → lib/utils/date.test.js
diff --git a/jimi/utils/html.js → lib/utils/html.js b/jimi/utils/html.js → lib/utils/html.js
diff --git a/jimi/utils/html.test.js → lib/utils/html.test.js b/jimi/utils/html.test.js → lib/utils/html.test.js
diff --git a/jimi/utils/iter.js → lib/utils/iter.js b/jimi/utils/iter.js → lib/utils/iter.js
diff --git a/jimi/utils/iter.test.js → lib/utils/iter.test.js b/jimi/utils/iter.test.js → lib/utils/iter.test.js
diff --git a/jimi/utils/object.js → lib/utils/object.js b/jimi/utils/object.js → lib/utils/object.js
diff --git a/jimi/utils/string.js → lib/utils/string.js b/jimi/utils/string.js → lib/utils/string.js
diff --git a/jimi/utils/string.test.js → lib/utils/string.test.js b/jimi/utils/string.test.js → lib/utils/string.test.js
diff --git a/jimi/utils/tags.js → lib/utils/tags.js b/jimi/utils/tags.js → lib/utils/tags.js
diff --git a/jimi/utils/test.js → lib/utils/test.js b/jimi/utils/test.js → lib/utils/test.js
diff --git a/package.json b/package.json
@@ -0,0 +1,36 @@
+{
+    "name" : "jimi",
+    "version" : "0.0.1",
+    "description" : "javascript web framework",
+    "maintainers": [
+        {
+            "name": "Colin Gourlay",
+            "email": "colin.j.gourlay@gmail.com",
+            "web": "http://colin-gourlay.com" 
+        } 
+    ],
+    "repositories": [
+        {
+            "type": "git",
+            "url": "http://github.com/colingourlay/jimi.git" 
+        } 
+    ],
+    "directories" : { "lib" : "./lib" },
+    "main" : "./lib/jimi",
+    "overlay" : {
+        "node" : {
+            "name" : "jimi",
+            "description" : "javascript web framework"
+        },
+        "npm" : {
+            "version" : "0.0.1",
+            "description" : "javascript web framework",
+            "engines" : [
+                "node >=0.1.95"
+            ]
+        },
+        "narwhal" : {
+            "description" : "javascript web framework"
+        }
+    }
+}