Massive pull request

.gitignore

@@ -0,0 +1,4 @@
+node_modules
+scripts/scratch*
+test/integration/yaml_suite/log
+test/integration/yaml_suite/tests

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "spec/es_api"]
+	path = spec/es_api
+	url = [email protected]:elasticsearch/elasticsearch-rest-api-spec.git
+[submodule "es_api_spec"]
+	path = es_api_spec
+	url = [email protected]:elasticsearch/elasticsearch-rest-api-spec.git

.jshintrc

@@ -0,0 +1,28 @@
+{
+  "node": true,
+  "white": true,
+  "bitwise": false,
+  "curly": true,
+  "eqnull": true,
+  "eqeqeq": true,
+  "forin": true,
+  "immed": true,
+  "expr": true,
+  "indent": 2,
+  "latedef": "nofunc",
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "undef": true,
+  "quotmark": "single",
+  "plusplus": false,
+  "boss": true,
+  "trailing": true,
+  "laxbreak": true,
+  "laxcomma": true,
+  "validthis": true,
+  "sub": true,
+  "maxlen": 140,
+  "-W084": true,
+  "maxerr": 10
+}

.travis.yml

@@ -0,0 +1,9 @@
+language: node_js
+node_js:
+  - "0.11"
+  - "0.10"
+  - "0.8"
+services:
+  - elasticsearch
+before_script:
+  - npm install -g grunt-cli

Gruntfile.js

@@ -1,74 +1,243 @@
+/* jshint node:true */
 'use strict';
 
 module.exports = function (grunt) {
 
-  var pre = [
-    'src/pre.js',
-    'src/shared.js',
-    'src/serializer.js',
-    'src/serializer/*',
-    'src/selector.js',
-    'src/logger/*',
-    'src/transport.js'
-  ];
+  var _ = require('lodash');
+  var child_process = require('child_process');
 
-  var post = ['src/client.js','src/post.js'];
+  var sharedBrowserfyExclusions = [
+    'src/lib/connectors/http.js',
+    'src/lib/loggers/file.js',
+    'src/lib/loggers/stdio.js',
+    'src/lib/loggers/stream.js',
+    'src/lib/loggers/stream.js'
+  ];
 
   // Project configuration.
   grunt.initConfig({
+    distDir: 'dist',
     pkg: grunt.file.readJSON('package.json'),
     meta: {
       banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
         '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
         '<%= pkg.homepage ? " * " + pkg.homepage + "\\n" : "" %>' +
         ' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
-        ' Licensed <%= pkg.license %> */\n\n'
+        ' Licensed <%= pkg.license %> */\n' +
+        ' // built using browserify\n\n'
     },
-    concat: {
+    clean: {
+      dist: {
+        src: ['<%= distDir %>']
+      }
+    },
+    mochaTest: {
+      unit: [
+        'test/unit/**/*.test.js'
+      ],
+      yaml_suite: [
+        'test/integration/yaml_suite/index.js'
+      ],
       options: {
-        banner: '<%= meta.banner %>'
-      },
-      node: {
-        src: pre.concat(['src/transport/elasticsearch-node.js'],post),
-        dest: 'dist/elasticsearch-node.js'
+        colors: true,
+        require: 'should',
+        reporter: 'dot',
+        bail: true,
+        timeout: 11000
       }
-    },    
-    nodeunit: {
-      files: ['test/**/*.js']
     },
     jshint: {
-      files: ['Gruntfile.js', '<%= concat.node.dest %>', 'test/**/*.js' ],
+      source: {
+        src: [
+          'src/**/*.js',
+          'scripts/**/*.js',
+          'test/**/*.js -test/browser_integration/yaml_tests.js',
+          'Gruntfile.js'
+        ],
+        options: {
+          jshintrc: true
+        }
+      }
+    },
+    watch: {
+      source: {
+        files: [
+          'src/**/*',
+          'test/**/*',
+          'Gruntfile.js'
+        ],
+        tasks: [
+          'jshint:source'
+        ]
+      },
       options: {
-        bitwise: true,
-        curly: true,
-        eqeqeq: true,
-        immed: true,
-        indent: 2,
-        latedef: true,
-        newcap: true,
-        noarg: true,
-        sub: true,
-        undef: true,
-        boss: true,
-        eqnull: true,
-        globalstrict: true,
-        devel: true,
-        node: true,
-        globals: {
-          exports: true,
-          module: false
+        interupt: true
+      }
+    },
+    run: {
+      js_api: {
+        args: [
+          'scripts/generate/js_api'
+        ]
+      },
+      yaml_tests: {
+        args: [
+          'scripts/generate/yaml_tests'
+        ]
+      },
+      integration_server: {
+        args: [
+          'test/browser_integration/server.js'
+        ],
+        options: {
+          wait: false,
+          ready: /server listening/
+        }
+      }
+    },
+    browserify: {
+      client: {
+        files: {
+          '<%= distDir %>/elasticsearch.js': 'src/elasticsearch.js'
+        },
+        options: {
+          standalone: 'elasticsearch',
+          ignore: _.union(sharedBrowserfyExclusions, [
+            'src/lib/connectors/jquery.js',
+            'src/lib/connectors/angular.js'
+          ])
+        }
+      },
+      angular_client: {
+        files: {
+          '<%= distDir %>/elasticsearch.angular.js': ['src/elasticsearch.angular.js']
+        },
+        options: {
+          standalone: 'elasticsearch',
+          ignore: _.union(sharedBrowserfyExclusions, [
+            'src/lib/connectors/jquery.js',
+            'src/lib/connectors/xhr.js'
+          ])
+        }
+      },
+      yaml_suite: {
+        files: {
+          'test/browser_integration/yaml_tests.js': ['test/integration/yaml_suite/index.js']
+        },
+        options: {
+          external: [
+            'optimist'
+          ]
+        }
+      }
+    },
+    concat: {
+      dist_banners: {
+        files: {
+          '<%= distDir %>/elasticsearch.js': ['<%= distDir %>/elasticsearch.js'],
+          '<%= distDir %>/elasticsearch.angular.js': ['<%= distDir %>/elasticsearch.angular.js']
+        },
+        options: {
+          banner: '<%= meta.banner %>'
+        }
+      }
+    },
+    uglify: {
+      dist: {
+        files: {
+          '<%= distDir %>/elasticsearch.min.js': '<%= distDir %>/elasticsearch.js',
+          '<%= distDir %>/elasticsearch.angular.min.js': '<%= distDir %>/elasticsearch.angular.js'
+        },
+        options: {
+          report: 'min',
+          banner: '<%= meta.banner %>'
+        },
+        global_defs: {
+          process: {
+            browser: true
+          }
+        }
+      }
+    },
+    mocha: {
+      yaml_suite: {
+        options: {
+          // log: true,
+          run: true,
+          urls: [ 'http://localhost:8888' ],
+          timeout: 10e3,
+          '--web-security': false
         }
       }
     }
   });
 
   // load plugins
+  grunt.loadNpmTasks('grunt-run');
+  grunt.loadNpmTasks('grunt-open');
+  grunt.loadNpmTasks('grunt-mocha');
+  grunt.loadNpmTasks('grunt-browserify');
+  grunt.loadNpmTasks('grunt-mocha-test');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-nodeunit');
+  grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
-
   // Default task.
-  grunt.registerTask('default', ['concat','nodeunit','jshint']);
+  grunt.registerTask('default', [
+    /*jshint scripturl:true*/
+    'jshint',
+    'mochaTest:unit',
+    'build',
+    'mochaTest:yaml_suite',
+    // 'start:integration_server',
+    // 'mocha:yaml_suite' -- this will fail because of the way that PhantomJS handle's DELETE requests with body's
+  ]);
+
+  grunt.registerTask('build', [
+    'clean:dist',
+    'run:yaml_tests',
+    'run:js_api',
+    'browserify',
+    'uglify:dist',
+    'concat:dist_banners'
+  ]);
+
+  var browsers = {
+    safari: 'Safari',
+    chrome: 'Google Chrome',
+    firefox: 'Firefox'
+  };
+
+  Object.keys(browsers).forEach(function (browser) {
+    grunt.config.set('open_browser_tests.' + browser, {
+      appName: browsers[browser]
+    });
+    grunt.registerTask('browser_tests:' + browser, [
+      'build',
+      'run:integration_server',
+      'open_browser_tests:' + browser
+    ]);
+  });
+
+  grunt.registerMultiTask('open_browser_tests', function (host, port) {
+    host = host || 'localhost';
+    port = port || 9200;
+
+    var taskData = this.data;
+
+    grunt.task.requires('run:integration_server');
+
+    grunt.config.set('open.yaml_suite_' + this.target, {
+      path: 'http://localhost:8888?es_hostname=' + encodeURIComponent(host) + '&es_port=' + encodeURIComponent(port),
+      app: taskData.appName
+    });
+
+    grunt.task.run([
+      'open:yaml_suite_' + this.target,
+      'wait:integration_server'
+    ]);
+  });
 
-};
+};