From d17217929a1c89a1231eea23374ff85abe158931 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Sat, 21 Dec 2013 00:36:41 -0700
Subject: [PATCH] updated the grunt tasks, and the jquery connector will now
 properly parse json response bodies

---
 grunt/browser_clients.js     | 19 +++++++++++++------
 grunt/config/compress.js     | 27 +++++++++++++++------------
 grunt/config/copy.js         |  8 ++++++++
 src/lib/connectors/jquery.js |  4 +++-
 4 files changed, 39 insertions(+), 19 deletions(-)
 create mode 100644 grunt/config/copy.js

diff --git a/grunt/browser_clients.js b/grunt/browser_clients.js
index 8ba97272f..ddc62124f 100644
--- a/grunt/browser_clients.js
+++ b/grunt/browser_clients.js
@@ -1,30 +1,37 @@
 module.exports = function (grunt) {
   grunt.registerTask('browser_clients:test', [
     'build',
+    'browserify:yaml_tests',
     'run:browser_unit_tests',
     'run:browser_integration_tests'
   ]);
 
   grunt.registerTask('browser_clients:build', [
     'clean:dist',
-    'browserify',
+    'browserify:browser_client',
+    'browserify:angular_client',
+    'browserify:jquery_client',
     'uglify:dist',
     'concat:dist_banners'
   ]);
 
-  grunt.registerTask('browser_clients:publish', [
+  grunt.registerTask('browser_clients:distribute', [
+    'clean:dist',
     'browser_clients:build',
-    'compress:dist_zip',
-    'compress:dist_tarball',
+    'copy:dist_to_named_dir',
+    'compress:master_zip',
+    'compress:master_tarball',
     's3:latest'
   ]);
 
   grunt.registerTask('browser_clients:release', [
     'prompt:confirm_release',
     '__check_for_confirmation',
+    'clean:dist',
     'browser_clients:build',
-    'compress:dist_zip',
-    'compress:dist_tarball',
+    'copy:dist_to_named_dir',
+    'compress:release_zip',
+    'compress:release_tarball',
     's3:release'
   ]);
 
diff --git a/grunt/config/compress.js b/grunt/config/compress.js
index b6290139d..9a76e8b26 100644
--- a/grunt/config/compress.js
+++ b/grunt/config/compress.js
@@ -1,14 +1,17 @@
+// make it dry
+function archive(out) {
+  return {
+    cwd: '<%= distDir %>',
+    src: 'elasticsearch-js',
+    options: {
+      archive: '<%= distDir %>/archives/' + out
+    }
+  };
+}
+
 module.exports = {
-  dist_zip: {
-    src: '<%= distDir %>/*.js',
-    options: {
-      archive: '<%= distDir %>/archives/elasticsearch-js.zip'
-    }
-  },
-  dist_tarball: {
-    src: '<%= distDir %>/*.js',
-    options: {
-      archive: '<%= distDir %>/archives/elasticsearch-js.tar.gz'
-    }
-  }
+  master_zip:       archive('elasticsearch-js-master.zip'),
+  master_tarball:   archive('elasticsearch-js-master.tar.gz'),
+  release_zip:      archive('elasticsearch-js-<%= package.version %>.zip'),
+  release_tarball:  archive('elasticsearch-js-<%= package.version %>.tar.gz')
 };
\ No newline at end of file
diff --git a/grunt/config/copy.js b/grunt/config/copy.js
new file mode 100644
index 000000000..27dc96de8
--- /dev/null
+++ b/grunt/config/copy.js
@@ -0,0 +1,8 @@
+module.exports = {
+  dist_to_named_dir: {
+    cwd: '<%= distDir %>',
+    src: '*.js',
+    dest: '<%= distDir %>/elasticsearch-js/',
+    expand: true
+  }
+};
\ No newline at end of file
diff --git a/src/lib/connectors/jquery.js b/src/lib/connectors/jquery.js
index d0f2219bb..7525e7a62 100644
--- a/src/lib/connectors/jquery.js
+++ b/src/lib/connectors/jquery.js
@@ -34,7 +34,9 @@ JqueryConnector.prototype.request = function (params, cb) {
 
   var jqXHR = jQuery.ajax(ajax)
     .done(function (data, textStatus, jqXHR) {
-      cb(null, data, jqXHR.statusCode(), jqXHR.getAllResponseHeaders());
+      cb(null, data, jqXHR.statusCode(), {
+        'content-type': jqXHR.getResponseHeader('content-type')
+      });
     })
     .fail(function (jqXHR, textStatus, err) {
       cb(new ConnectionFault(err && err.message));