diff --git a/LICENSE b/LICENSE index 74524ce..ec885b5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ (The MIT License) -Copyright (c) 2011 Jared Hanson +Copyright (c) 2011-2013 Jared Hanson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/Makefile b/Makefile index c055b26..cfb2f3b 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,24 @@ -NODE = node -TEST = ./node_modules/.bin/vows +SOURCES = lib/**/*.js + +# ============================================================================== +# Node Tests +# ============================================================================== + +VOWS = ./node_modules/.bin/vows TESTS ?= test/*-test.js test: - @NODE_ENV=test NODE_PATH=lib $(TEST) $(TEST_FLAGS) $(TESTS) + @NODE_ENV=test NODE_PATH=lib $(VOWS) $(TESTS) + +# ============================================================================== +# Static Analysis +# ============================================================================== -docs: docs/api.html +JSHINT = jshint -docs/api.html: lib/passport-tumblr/*.js - dox \ - --title Passport-Tumblr \ - --desc "Tumblr authentication strategy for Passport" \ - $(shell find lib/passport-tumblr/* -type f) > $@ +hint: lint +lint: + $(JSHINT) $(SOURCES) -docclean: - rm -f docs/*.{1,html} -.PHONY: test docs docclean +.PHONY: test hint lint diff --git a/README.md b/README.md index 9cbc5da..ba720ac 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ unobtrusively integrated into any application or framework that supports [Connect](http://www.senchalabs.org/connect/)-style middleware, including [Express](http://expressjs.com/). -## Installation +## Install $ npm install passport-tumblr @@ -43,11 +43,7 @@ For example, as route middleware in an [Express](http://expressjs.com/) application: app.get('/auth/tumblr', - passport.authenticate('tumblr'), - function(req, res){ - // The request will be redirected to Tumblr for authentication, so this - // function will not be called. - }); + passport.authenticate('tumblr')); app.get('/auth/tumblr/callback', passport.authenticate('tumblr', { failureRedirect: '/login' }), @@ -73,23 +69,6 @@ For a complete, working example, refer to the [login example](https://github.com ## License -(The MIT License) - -Copyright (c) 2011 Jared Hanson - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +[The MIT License](http://opensource.org/licenses/MIT) -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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. +Copyright (c) 2011-2013 Jared Hanson <[http://jaredhanson.net/](http://jaredhanson.net/)> diff --git a/package.json b/package.json index 2ea5454..ac0cb12 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "passport-tumblr", "version": "0.1.2", "description": "Tumblr authentication strategy for Passport.", - "author": { "name": "Jared Hanson", "email": "jaredhanson@gmail.com", "url": "http://www.jaredhanson.net/" }, + "keywords": ["passport", "tumblr", "auth", "authn", "authentication", "identity"] "repository": { "type": "git", "url": "git://github.com/jaredhanson/passport-tumblr.git" @@ -10,6 +10,15 @@ "bugs": { "url": "http://github.com/jaredhanson/passport-tumblr/issues" }, + "author": { + "name": "Jared Hanson", + "email": "jaredhanson@gmail.com", + "url": "http://www.jaredhanson.net/" + }, + "licenses": [ { + "type": "MIT", + "url": "http://www.opensource.org/licenses/MIT" + } ], "main": "./lib/passport-tumblr", "dependencies": { "pkginfo": "0.2.x", @@ -21,10 +30,5 @@ "scripts": { "test": "NODE_PATH=lib node_modules/.bin/vows test/*-test.js" }, - "engines": { "node": ">= 0.4.0" }, - "licenses": [ { - "type": "MIT", - "url": "http://www.opensource.org/licenses/MIT" - } ], - "keywords": ["passport", "tumblr", "auth", "authn", "authentication", "identity"] + "engines": { "node": ">= 0.4.0" } }