Merge branch 'master' into jasmine-migration

nrstott · May 31, 2013 · 30046b0 · 30046b0
2 parents 2d1b814 + cb8a5b5
commit 30046b0
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 22 deletions.
diff --git a/lib/bogart.js b/lib/bogart.js
@@ -11,7 +11,7 @@ var
   inherits     = require('util').inherits,
   EventEmitter = require('events').EventEmitter;
 
-exports.version = [0,4,2];
+exports.version = [0,4,3];
 
 exports.util = require('./util');
 
@@ -220,6 +220,24 @@ exports.start = function(jsgiApp, options) {
   return require("jsgi").start(jsgiApp, options);
 };
 
+function jsgiResponse(body, opts, defaultHeaders) {
+  defaultHeaders = defaultHeaders || {};
+
+  opts = opts || {};
+  opts.status = opts.status || 200;
+  opts.headers = opts.headers || {};
+
+  if (!Array.isArray(body) && !(typeof body.forEach === 'function')) {
+    body = [ body ];
+  }
+
+  return {
+    status: opts.status,
+    body: body,
+    headers: merge(defaultHeaders, opts.headers)
+  };
+}
+
 /**
  * Text response.  Bogart helper method to create a JSGI response.
  * Returns a default JSGI response with body containing the specified text, a status of 200,
@@ -228,12 +246,13 @@ exports.start = function(jsgiApp, options) {
  *
  * @param {String} txt  Text for the body of the response.
  */
-exports.text = function(txt) {
-  return {
-    status: 200,
-    body: [txt],
-    headers: { "content-type": "text", "content-length": Buffer.byteLength(txt, 'utf-8') }
-  };
+exports.text = function(txt, opts) {
+  txt = txt || '';
+
+  return jsgiResponse(txt, opts, {
+    'content-type': 'text',
+    'content-length': Buffer.byteLength(txt, 'utf-8')
+  });
 };
 
 /**
@@ -250,14 +269,12 @@ exports.text = function(txt) {
  * @type Object
  */ 
 exports.html = function(html, opts) {
-  opts = opts || {};
-  html = html || "";
-
-  return {
-    status: opts.status || 200,
-    body: [html],
-    headers: { "content-type": "text/html", "content-length": Buffer.byteLength(html, 'utf-8') }
-  };
+  html = html || '';
+
+  return jsgiResponse(html, opts, {
+    'content-type': 'text/html',
+    'content-length': Buffer.byteLength(html, 'utf-8')
+  });
 };
 
 /**

diff --git a/lib/middleware.js b/lib/middleware.js
@@ -115,7 +115,7 @@ exports.gzip = exports.Gzip = function(nextApp) {
 exports.methodOverride = exports.MethodOverride = function(nextApp) {
     return function(request) {
         if (request.body && typeof request.body == "object") {
-            if ((request.method == "POST") && (!request.headers["content-type"].match(/^multipart\/form-data/))) {
+            if ((request.method.toUpperCase() == "POST") && (!request.headers["content-type"].match(/^multipart\/form-data/))) {
                 var method = request.headers[HTTP_METHOD_OVERRIDE_HEADER] || request.body[METHOD_OVERRIDE_PARAM_KEY];
                 if (method && HTTP_METHODS[method.toUpperCase()] === true) {
                     request.env.original_method = request.method;
@@ -544,10 +544,7 @@ exports.facebook = function(config,nextApp) {
     var facebook_strategy = {
         authorizationURL: 'https://www.facebook.com/dialog/oauth',
         tokenURL: 'https://graph.facebook.com/oauth/access_token',
-        resourceURL: 'https://graph.facebook.com/me',                        
-        clientId: config.clientId,
-        clientSecret: config.clientSecret,
-        host: config.host,
+        resourceURL: 'https://graph.facebook.com/me',
         parse: function(body) {
             if (body){
                 o = JSON.parse(body);
@@ -573,7 +570,9 @@ exports.facebook = function(config,nextApp) {
         }
     };
 
-    return exports.oauth2(facebook_strategy, nextApp);
+    var oauth2Options = _.extend(facebook_strategy, config);
+
+    return exports.oauth2(oauth2Options, nextApp);
 }
 
 exports.session = exports.Session = require("./session/session").Session;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bogart",
     "description": "Fast JSGI web framework taking inspiration from Sinatra",
-    "version": "0.4.2",
+    "version": "0.4.3",
     "keywords": ["bogart", "framework", "sinatra", "REST"],
     "author": "Nathan Stott <nrstott@gmail.com>",
     "email": "nathan.stott@whiteboard-it.com",