Skip to content

Commit

Permalink
Merge d977f68 into a70de3d
Browse files Browse the repository at this point in the history
  • Loading branch information
Planeshifter committed May 25, 2015
2 parents a70de3d + d977f68 commit d704c95
Show file tree
Hide file tree
Showing 10 changed files with 76 additions and 57 deletions.
1 change: 1 addition & 0 deletions .gitattributes
@@ -0,0 +1 @@
* text=auto
14 changes: 14 additions & 0 deletions .jshintignore
@@ -0,0 +1,14 @@

# Directories #
###############
build/
reports/
dist/

# Node.js #
###########
/node_modules/

# Git #
#######
.git*
2 changes: 2 additions & 0 deletions .npmignore
Expand Up @@ -13,6 +13,7 @@ examples/
reports/
support/
test/
benchmark/

# Node.js #
###########
Expand Down Expand Up @@ -46,5 +47,6 @@ Desktop.ini
# Utilities #
#############
.jshintrc
.jshintignore
.travis.yml
.editorconfig
11 changes: 9 additions & 2 deletions .travis.yml
@@ -1,5 +1,12 @@
language: node_js
node_js:
- "0.10"
- '0.12'
- '0.11'
- '0.10'
- '0.8'
- 'iojs'
before_install:
- npm update -g npm
after_script:
- npm run coveralls
- npm run coveralls

4 changes: 2 additions & 2 deletions LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Rebekah Smith.
Copyright (c) 2014-2015 The Compute.io Authors. All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
34 changes: 27 additions & 7 deletions Makefile
Expand Up @@ -5,32 +5,42 @@
# Set the node.js environment to test:
NODE_ENV ?= test

# Kernel name:
KERNEL ?= $(shell uname -s)

ifeq ($(KERNEL), Darwin)
OPEN ?= open
else
OPEN ?= xdg-open
endif

# NOTES #

NOTES ?= 'TODO|FIXME'
NOTES ?= 'TODO|FIXME|WARNING|HACK|NOTE'


# MOCHA #

# Specify the test framework bin locations:
MOCHA ?= ./node_modules/.bin/mocha
_MOCHA ?= ./node_modules/.bin/_mocha

# Specify the mocha reporter:
MOCHA_REPORTER ?= spec


# ISTANBUL #

# Istanbul configuration:
ISTANBUL ?= ./node_modules/.bin/istanbul
ISTANBUL_OUT ?= ./reports/coverage
ISTANBUL_REPORT ?= lcov
ISTANBUL_LCOV_INFO_PATH ?= $(ISTANBUL_OUT)/lcov.info
ISTANBUL_HTML_REPORT_PATH ?= $(ISTANBUL_OUT)/lcov-report/index.html


# JSHINT #

JSHINT ?= ./node_modules/.bin/jshint
JSHINT_REPORTER ?= ./node_modules/jshint-stylish/stylish.js



# FILES #

Expand Down Expand Up @@ -96,9 +106,20 @@ test-istanbul-mocha: node_modules
view-cov: view-istanbul-report

view-istanbul-report:
open $(ISTANBUL_HTML_REPORT_PATH)
$(OPEN) $(ISTANBUL_HTML_REPORT_PATH)


# LINT #

.PHONY: lint lint-jshint

lint: lint-jshint

lint-jshint: node_modules
$(JSHINT) \
--reporter $(JSHINT_REPORTER) \
./


# NODE #

Expand All @@ -117,7 +138,6 @@ clean-node:


# CLEAN #

.PHONY: clean

clean:
Expand Down
9 changes: 4 additions & 5 deletions README.md
Expand Up @@ -16,7 +16,6 @@ For use in the browser, use [browserify](https://github.com/substack/node-browse

## Usage

To use the module,

``` javascript
var midhinge = require( 'compute-midhinge' );
Expand Down Expand Up @@ -73,7 +72,7 @@ If provided an unsorted input `array`, the function is `O( N log(N) )`, where `N

### Unit

Unit tests use the [Mocha](http://visionmedia.github.io/mocha) test framework with [Chai](http://chaijs.com) assertions. To run the tests, execute the following command in the top-level application directory:
Unit tests use the [Mocha](http://mochajs.org) test framework with [Chai](http://chaijs.com) assertions. To run the tests, execute the following command in the top-level application directory:

``` bash
$ make test
Expand All @@ -97,15 +96,15 @@ $ make view-cov
```


---
## License

[MIT license](http://opensource.org/licenses/MIT).
[MIT license](http://opensource.org/licenses/MIT).


---
## Copyright

Copyright © 2014. Rebekah Smith.
Copyright © 2014-2015. The Compute.io Authors.


[npm-image]: http://img.shields.io/npm/v/compute-midhinge.svg
Expand Down
37 changes: 5 additions & 32 deletions lib/index.js
@@ -1,36 +1,9 @@
/**
*
* COMPUTE: midhinge
*
*
* DESCRIPTION:
* - Computes the midhinge of a numeric array.
*
*
* NOTES:
* [1]
*
*
* TODO:
* [1]
*
*
* LICENSE:
* MIT
*
* Copyright (c) 2014. Rebekah Smith.
*
*
* AUTHOR:
* Rebekah Smith. rebekahjs17@gmail.com. 2014.
*
*/

'use strict';

// MODULES //

var isObject = require( 'validate.io-object' ),
var isArray = require( 'validate.io-array' ),
isObject = require( 'validate.io-object' ),
quantile = require( 'compute-quantile' );


Expand Down Expand Up @@ -61,12 +34,12 @@ function ascending( a, b ) {
* @returns {Number} midhinge
*/
function midhinge( arr, opts ) {
if ( !Array.isArray( arr ) ) {
throw new TypeError( 'midhinge()::invalid input argument. Must provide an array.' );
if ( !isArray( arr ) ) {
throw new TypeError( 'midhinge()::invalid input argument. Must provide an array. Value: `' + arr + '`.' );
}
if ( arguments.length > 1 ) {
if ( !isObject( opts ) ) {
throw new TypeError( 'midhinge()::invalid input argument. Options should be an object.' );
throw new TypeError( 'midhinge()::invalid input argument. Options should be an object. Value: `' + opts + '`.' );
}
} else {
opts = {
Expand Down
20 changes: 11 additions & 9 deletions package.json
Expand Up @@ -14,6 +14,10 @@
{
"name": "Athan Reines",
"email": "kgryte@gmail.com"
},
{
"name": "Philipp Burckhardt",
"email": "pburckhardt@outlook.com"
}
],
"scripts": {
Expand Down Expand Up @@ -44,18 +48,16 @@
},
"dependencies": {
"compute-quantile": "^1.0.0",
"validate.io-array": "^1.0.5",
"validate.io-object": "^1.0.0"
},
"devDependencies": {
"chai": "1.x.x",
"mocha": "1.x.x",
"chai": "2.x.x",
"mocha": "2.x.x",
"coveralls": "^2.11.1",
"istanbul": "^0.3.0"
"istanbul": "^0.3.0",
"jshint": "2.x.x",
"jshint-stylish": "^1.0.0"
},
"licenses": [
{
"type": "MIT",
"url": "http://www.opensource.org/licenses/MIT"
}
]
"license": "MIT"
}
1 change: 1 addition & 0 deletions test/test.js
@@ -1,3 +1,4 @@
/* global describe, it, require */
'use strict';

// MODULES //
Expand Down

0 comments on commit d704c95

Please sign in to comment.