From d145cc6f80d40cc16a67b208fc6a194a624bea9d Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Mon, 13 Jan 2014 13:24:01 -0300 Subject: [PATCH] configure environment for test in server bitcore.io. util find ref --- app/views/includes/head.jade | 6 +++--- config/env/test.js | 5 +++-- config/express.js | 8 ++++++-- package.json | 3 ++- public/js/controllers/blocks.js | 2 -- util/find_ref.sh | 33 +++++++++++++++++++++++++++++++++ 6 files changed, 47 insertions(+), 10 deletions(-) create mode 100755 util/find_ref.sh diff --git a/app/views/includes/head.jade b/app/views/includes/head.jade index 090c3e2c..624dd9da 100755 --- a/app/views/includes/head.jade +++ b/app/views/includes/head.jade @@ -3,13 +3,13 @@ head meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1') meta(name='viewport', content='width=device-width,initial-scale=1.0') - title Mystery + title= appName+' - '+title meta(http-equiv='Content-type', content='text/html;charset=UTF-8') meta(name="keywords", content="node.js, express, mongoose, mongodb, angularjs") meta(name="description", content="Mystery") link(href='/img/icons/favicon.ico', rel='shortcut icon', type='image/x-icon') - + link(rel='stylesheet', href='/lib/bootstrap/dist/css/bootstrap.min.css') link(rel='stylesheet', href='/css/common.css') - + diff --git a/config/env/test.js b/config/env/test.js index 902efe9d..f668acfd 100755 --- a/config/env/test.js +++ b/config/env/test.js @@ -1,16 +1,17 @@ 'use strict'; module.exports = { - db: "mongodb://localhost/mystery-dev", + db: "mongodb://localhost/mystery-test", app: { name: "Mystery - Test" }, + port: '3301', bitcoind: { user: 'mystery', pass: 'real_mystery', protocol: 'http', host: process.env.BITCOIND_HOST || '127.0.0.1', - port: process.env.BITCOIND_PORT || '8332', + port: process.env.BITCOIND_PORT || '18332', }, network: 'testnet', } diff --git a/config/express.js b/config/express.js index 1abe1908..a25db3b9 100644 --- a/config/express.js +++ b/config/express.js @@ -4,7 +4,8 @@ * Module dependencies. */ var express = require('express'), - config = require('./config'); + helpers = require('view-helpers'), + config = require('./config'); module.exports = function(app, passport, db) { app.set('showStackError', true); @@ -36,6 +37,9 @@ module.exports = function(app, passport, db) { app.use(express.json()); app.use(express.methodOverride()); + //dynamic helpers + app.use(helpers(config.app.name)); + //routes should be at the last app.use(app.router); @@ -66,4 +70,4 @@ module.exports = function(app, passport, db) { }); }); -}; \ No newline at end of file +}; diff --git a/package.json b/package.json index c9338fc8..aeb1fe56 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,8 @@ "grunt-concurrent": "~0.4.2", "grunt-nodemon": "~0.1.2", "grunt-mocha-test": "~0.8.1", - "should": "~2.1.1" + "should": "~2.1.1", + "view-helpers": "latest" }, "devDependencies": { "grunt-contrib-watch": "latest", diff --git a/public/js/controllers/blocks.js b/public/js/controllers/blocks.js index 7bb5c80b..d9dd958c 100644 --- a/public/js/controllers/blocks.js +++ b/public/js/controllers/blocks.js @@ -20,6 +20,4 @@ angular.module('mystery.blocks').controller('BlocksController', ['$scope', '$rou }); }; - // for avoid warning. please remove when you use Blocks - $scope.blocks = Blocks; }]); diff --git a/util/find_ref.sh b/util/find_ref.sh new file mode 100755 index 00000000..2656eb24 --- /dev/null +++ b/util/find_ref.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +FIND='find'; + +##if [[ "$OSTYPE" =~ "darwin" ]] +##then +## FIND='gfind' +##fi + + +if [ -z "$1" ] +then + echo "$0 : find functions references " + echo "Usage $0 function_name " + exit; +fi + +EXTRA='' + + +CMD="grep -rnH" + +if [ "$2" != '--nocolor' ] +then + CMD="$CMD --color=always" +fi + + +$FIND -L . -name \*.json -not -wholename \*node_modules\* -not -wholename \*public/lib\* -exec $CMD "$1" {} + \ + -o -name \*.html -not -wholename \*node_modules\* -not -wholename \*public/lib\* -exec $CMD "$1" {} + \ + -o -name \*.jade -not -wholename \*node_modules\* -not -wholename \*public/lib\* -exec $CMD "$1" {} + \ + -o -name \*.js -not -wholename \*node_modules\* -not -wholename \*public/lib\* -exec $CMD "$1" {} + +