Yoji SHIDARA
null+****@clear*****
Tue Oct 2 11:27:05 JST 2012
Yoji SHIDARA 2012-10-02 11:27:05 +0900 (Tue, 02 Oct 2012) New Revision: f23a00bc1c4dde6385350abaebdabbb4d11781e4 https://github.com/groonga/gcs/commit/f23a00bc1c4dde6385350abaebdabbb4d11781e4 Log: Serve assets using connect-assetmanager Added files: lib/asset-manager.js Modified files: lib/server.js npm-shrinkwrap.json package.json views/index.jade Added: lib/asset-manager.js (+28 -0) 100644 =================================================================== --- /dev/null +++ lib/asset-manager.js 2012-10-02 11:27:05 +0900 (246d6cf) @@ -0,0 +1,28 @@ +var connectAssetManager = require('connect-assetmanager'); +var assetManagerGroups = { + 'css': { + 'route': /\/static\/css\/gcs\.min\.css/, + path: './public/css/', + dataType: 'css', + files: ['bootstrap.css', 'gcs.css'] + }, + 'js': { + 'route': /\/static\/js\/gcs\.min\.js/, + path: './public/js/', + dataType: 'javascript', + files: [ + 'lib/jquery-1.8.1.min.js', + 'lib/bootstrap.js', + 'lib/handlebars-1.0.rc.1.js', + 'lib/ember-latest.js', + 'lib/ember-data-latest.js', + + 'gcs/base.js', + 'gcs/controllers.js', + 'gcs/models.js', + 'gcs/router.js', + 'gcs/views.js' + ] + } +}; +exports.assetManager = connectAssetManager(assetManagerGroups); Modified: lib/server.js (+3 -0) =================================================================== --- lib/server.js 2012-10-02 04:23:35 +0900 (5cf0218) +++ lib/server.js 2012-10-02 11:27:05 +0900 (91ad0ba) @@ -3,6 +3,7 @@ var nroonga = require('./wrapped-nroonga'); var CLI = require(__dirname + '/../lib/command-line').CommandLineInterface; var api = require('./api'); var dashboard = require('./dashboard'); +var assetManager = require('./asset-manager').assetManager; exports.createServer = function (config) { if (!config.databasePath) config.databasePath = CLI.databasePath; @@ -11,9 +12,11 @@ exports.createServer = function (config) { var context = config.context || new nroonga.Context(config.databasePath); var application = express.createServer(); + application.use(express.bodyParser()); application.set('views', __dirname + '/../views'); application.use(express.static(__dirname + '/../public')); + application.use(assetManager); application.configure(function() { application.enable('jsonp callback'); Modified: npm-shrinkwrap.json (+33 -1) =================================================================== --- npm-shrinkwrap.json 2012-10-02 04:23:35 +0900 (ec69e09) +++ npm-shrinkwrap.json 2012-10-02 11:27:05 +0900 (58f604c) @@ -1,6 +1,6 @@ { "name": "gcs", - "version": "1.2.0", + "version": "1.3.0", "dependencies": { "commander": { "version": "1.0.1" @@ -100,6 +100,38 @@ "xmlbuilder": { "version": "0.3.11" }, + "connect-assetmanager": { + "version": "0.0.28", + "dependencies": { + "request": { + "version": "2.11.4", + "dependencies": { + "form-data": { + "version": "0.0.3", + "dependencies": { + "combined-stream": { + "version": "0.0.3", + "dependencies": { + "delayed-stream": { + "version": "0.0.5" + } + } + }, + "async": { + "version": "0.1.9" + } + } + }, + "mime": { + "version": "1.2.7" + } + } + }, + "step": { + "version": "0.0.5" + } + } + }, "chai": { "version": "1.2.0" }, Modified: package.json (+2 -1) =================================================================== --- package.json 2012-10-02 04:23:35 +0900 (c6724cc) +++ package.json 2012-10-02 11:27:05 +0900 (a5df6c8) @@ -27,7 +27,8 @@ "node-uuid": "", "nroonga": "", "xml2js": "", - "xmlbuilder": "" + "xmlbuilder": "", + "connect-assetmanager": "" }, "scripts": { "test": "NODE_ENV=test ./node_modules/.bin/mocha --reporter list --ui tdd", Modified: views/index.jade (+2 -12) =================================================================== --- views/index.jade 2012-10-02 04:23:35 +0900 (4739f2d) +++ views/index.jade 2012-10-02 11:27:05 +0900 (4048552) @@ -2,18 +2,8 @@ doctype 5 html head title Groonga CloudSearch - script(src="/js/lib/jquery-1.8.1.min.js", type="text/javascript") - script(src="/js/lib/runtime.min.js", type="text/javascript") - script(src="/js/lib/handlebars-1.0.rc.1.js", type="text/javascript") - script(src="/js/lib/ember-latest.js", type="text/javascript") - script(src="/js/lib/ember-data-latest.js", type="text/javascript") - script(src="/js/gcs/base.js", type="text/javascript") - script(src="/js/gcs/models.js", type="text/javascript") - script(src="/js/gcs/controllers.js", type="text/javascript") - script(src="/js/gcs/router.js", type="text/javascript") - script(src="/js/gcs/views.js", type="text/javascript") - link(href="/css/bootstrap.min.css", rel="stylesheet") - link(href="/css/gcs.css", rel="stylesheet") + script(src="/static/js/gcs.min.js", type="text/javascript") + link(href="/static/css/gcs.min.css", rel="stylesheet") script(data-template-name="application", type="text/x-handlebars") .navbar.navbar-fixed-top -------------- next part -------------- HTML����������������������������...下载
