Merge branch 'master' into profile-fields

.gitignore

@@ -1,2 +1,6 @@
+# Mac OS X
 .DS_Store
+
+# Node.js
 node_modules
+npm-debug.log

.npmignore

@@ -1,8 +1,16 @@
-*.md
-.DS_Store
-.git*
+README.md
 Makefile
-docs/
+doc/
 examples/
-support/
 test/
+
+# Mac OS X
+.DS_Store
+
+# Node.js
+.npmignore
+node_modules/
+npm-debug.log
+
+# Git
+.git*

.travis.yml

@@ -2,3 +2,4 @@ language: "node_js"
 node_js:
   - 0.4
   - 0.6
+  - 0.8

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

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-facebook/*.js
-	dox \
-		--title Passport-Facebook \
-		--desc "Facebook authentication strategy for Passport" \
-		$(shell find lib/passport-facebook/* -type f) > $@
+hint: lint
+lint:
+	$(JSHINT) $(SOURCES)
 
-docclean:
-	rm -f docs/*.{1,html}
 
-.PHONY: test docs docclean
+.PHONY: test hint lint

examples/login/app.js

@@ -48,7 +48,7 @@ passport.use(new FacebookStrategy({
 
 
 
-var app = express.createServer();
+var app = express();
 
 // configure Express
 app.configure(function() {

examples/login/package.json

@@ -2,7 +2,7 @@
   "name": "passport-facebook-examples-login",
   "version": "0.0.0",
   "dependencies": {
-    "express": ">= 0.0.0",
+    "express": "3.x",
     "ejs": ">= 0.0.0",
     "passport": ">= 0.0.0",
     "passport-facebook": ">= 0.0.0"

package.json

@@ -2,14 +2,23 @@
   "name": "passport-facebook",
   "version": "0.1.4",
   "description": "Facebook authentication strategy for Passport.",
-  "author": { "name": "Jared Hanson", "email": "jaredhanson@gmail.com", "url": "http://www.jaredhanson.net/" },
+  "keywords": ["passport", "facebook", "auth", "authn", "authentication", "identity"],
   "repository": {
     "type": "git",
     "url": "git://github.com/jaredhanson/passport-facebook.git"
   },
   "bugs": {
     "url": "http://github.com/jaredhanson/passport-facebook/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-facebook",
   "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", "facebook", "auth", "authn", "authentication", "identity"]
+  "engines": { "node": ">= 0.4.0" }
 }