chore(browserify): remove dependency on require-directory for helpers

Author: ahmadnassri

src/index.js

@@ -4,7 +4,7 @@ var debug = require('debug')('httpsnippet')
 var es = require('event-stream')
 var MultiPartForm = require('form-data')
 var qs = require('querystring')
-var helpers = require('./helpers')
+var reducer = require('./helpers/reducer')
 var targets = require('./targets')
 var url = require('url')
 var util = require('util')
@@ -64,7 +64,7 @@ HTTPSnippet.prototype.prepare = function (request) {
   if (request.queryString && request.queryString.length) {
     debug('queryString found, constructing queryString pair map')
 
-    request.queryObj = request.queryString.reduce(helpers.reducer, {})
+    request.queryObj = request.queryString.reduce(reducer, {})
   }
 
   // construct headers objects
@@ -128,7 +128,7 @@ HTTPSnippet.prototype.prepare = function (request) {
       if (!request.postData.params) {
         request.postData.text = ''
       } else {
-        request.postData.paramsObj = request.postData.params.reduce(helpers.reducer, {})
+        request.postData.paramsObj = request.postData.params.reduce(reducer, {})
 
         // always overwrite
         request.postData.text = qs.stringify(request.postData.paramsObj)

src/targets/shell/httpie.js

@@ -11,7 +11,7 @@
 'use strict'
 
 var util = require('util')
-var helpers = require('../../helpers/shell')
+var shell = require('../../helpers/shell')
 var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
@@ -80,17 +80,17 @@ module.exports = function (source, options) {
 
       if (util.isArray(value)) {
         value.forEach(function (val) {
-          code.push('%s==%s', name, helpers.quote(val))
+          code.push('%s==%s', name, shell.quote(val))
         })
       } else {
-        code.push('%s==%s', name, helpers.quote(value))
+        code.push('%s==%s', name, shell.quote(value))
       }
     })
   }
 
   // construct headers
   Object.keys(source.allHeaders).sort().forEach(function (key) {
-    code.push('%s:%s', key, helpers.quote(source.allHeaders[key]))
+    code.push('%s:%s', key, shell.quote(source.allHeaders[key]))
   })
 
   if (source.postData.mimeType === 'application/x-www-form-urlencoded') {
@@ -99,17 +99,17 @@ module.exports = function (source, options) {
       flags.push(opts.short ? '-f' : '--form')
 
       source.postData.params.forEach(function (param) {
-        code.push('%s=%s', param.name, helpers.quote(param.value))
+        code.push('%s=%s', param.name, shell.quote(param.value))
       })
     }
   } else {
     raw = true
   }
 
-  code.unshift('http %s%s %s', flags.length ? flags.join(' ') + ' ' : '', source.method, helpers.quote(opts.queryParams ? source.url : source.fullUrl))
+  code.unshift('http %s%s %s', flags.length ? flags.join(' ') + ' ' : '', source.method, shell.quote(opts.queryParams ? source.url : source.fullUrl))
 
   if (raw && source.postData.text) {
-    code.unshift('echo %s | ', helpers.quote(source.postData.text))
+    code.unshift('echo %s | ', shell.quote(source.postData.text))
   }
 
   return code.join()

test/reducer.js

@@ -0,0 +1,38 @@
+/* global describe, it */
+
+'use strict'
+
+var reducer = require('../src/helpers/reducer')
+
+require('should')
+
+describe('Reducer', function () {
+  it('should convert array object pair to key-value object', function (done) {
+    var query = [
+      {name: 'key', value: 'value'},
+      {name: 'foo', value: 'bar'}
+    ]
+
+    var obj = query.reduce(reducer, {})
+
+    obj.should.be.an.Object
+    obj.should.eql({key: 'value', foo: 'bar'})
+
+    done()
+  })
+
+  it('should convert multi-dimensional arrays to key=[array] object', function (done) {
+    var query = [
+      {name: 'key', value: 'value'},
+      {name: 'foo', value: 'bar1'},
+      {name: 'foo', value: 'bar2'}
+    ]
+
+    var obj = query.reduce(reducer, {})
+
+    obj.should.be.an.Object
+    obj.should.eql({key: 'value', foo: ['bar1', 'bar2']})
+
+    done()
+  })
+})