Skip to content

Commit

Permalink
Merge pull request #2 from ajuste/feature/overhaul
Browse files Browse the repository at this point in the history
Major overhaul to 1.0.0
  • Loading branch information
ajuste committed May 14, 2017
2 parents 3bf3bbb + ac65d80 commit d6b7df2
Show file tree
Hide file tree
Showing 29 changed files with 2,019 additions and 934 deletions.
1 change: 1 addition & 0 deletions .coveralls.yml
@@ -0,0 +1 @@
service_name: travis-ci
9 changes: 9 additions & 0 deletions .travis.yml
@@ -0,0 +1,9 @@
language: node_js
node_js:
- "4.1.2"
- "6.10.0"
- "7.0.0"
- "7.7.1"
script: npm test
sudo: false
after_success: 'npm run cover'
31 changes: 31 additions & 0 deletions Makefile
@@ -0,0 +1,31 @@
COFFEE = ./node_modules/coffee-script/bin/coffee

usage:
@echo ''
@echo 'make compile: Compile sources'
@echo 'make compile-tests: Compile test sources'
@echo ''

# --

# Compile sources
.PHONY: compile compile-tests
compile:
@$(COFFEE) --output ./lib --no-header --compile -b ./src

# Compile tests
compile-tests: compile
@$(COFFEE) --output ./test-compiled --no-header --compile -b ./test

# Run lint for coffeescript
run-coffee-lint:
./node_modules/coffeelint/bin/coffeelint src/ test/

test: compile-tests run-coffee-lint
./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha ./test-compiled/**/*.js

test-debug: compile-tests
./node_modules/mocha/bin/mocha --debug-brk ./test-compiled/**/*.js

cover:
cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
5 changes: 4 additions & 1 deletion README.md
@@ -1,2 +1,5 @@
# jaune-engine
[![Build Status](https://travis-ci.org/ajuste/jaune-web.svg?branch=master)](https://travis-ci.org/ajuste/jaune-web)
[![Coverage Status](https://coveralls.io/repos/ajuste/jaune-web/badge.svg?branch=master)](https://coveralls.io/r/ajuste/jaune-web?branch=master)

# jaune-web
web server based on nodejs
121 changes: 0 additions & 121 deletions lib/addon/gmaps.js

This file was deleted.

69 changes: 0 additions & 69 deletions lib/addon/staticIP.js

This file was deleted.

2 changes: 1 addition & 1 deletion lib/http/http-cache.js
Expand Up @@ -11,7 +11,7 @@ const _httpUtil = require("jaune-util").Util;
/**
* @constant {String} Section name for Http configuration
*/
const CONFIG_SECTION = "modules.http";
const CONFIG_SECTION = "jaune.http";

/**
* @class Http Class
Expand Down
4 changes: 4 additions & 0 deletions lib/http/http-util.js
Expand Up @@ -43,6 +43,10 @@ const _enums = {
* @constant {Number} Resource not found.
*/
NotFound : 404,
/**
* @constant {Number} Not Acceptable
*/
NotAcceptable: 406,
/**
* @constant {Number}Request too big.
*/
Expand Down
7 changes: 1 addition & 6 deletions lib/localization/index.js
@@ -1,6 +1 @@
const _extend = require("lodash").extend;
const _exports = {};

_extend(_exports, require("./locale"));

module.exports = _exports;
module.exports = require('./locale');

0 comments on commit d6b7df2

Please sign in to comment.