From 705e01625e2c5dfe0a7503fb1080a94a4f4f8466 Mon Sep 17 00:00:00 2001
From: Josh Hall-Bachner <jhallbachner@gmail.com>
Date: Mon, 3 Jun 2013 19:11:42 -0700
Subject: [PATCH 1/6] Added a method to send JSON-encoded data.

---
 Resources/views/layout.html.twig | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index 778ad81..0f25f43 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -16,6 +16,11 @@
         <div id="header">
             <a href=""><h1>{{ apiName }}</h1></a>
             <div id="sandbox_configuration">
+                content format:
+                <select id="content_format">
+                    <option value="x-www-form-urlencoded">Form Data</option>
+                    <option value="json">JSON</option>
+                </select>
                 request format:
                 <select id="request_format">
                     <option value="json"{{ defaultRequestFormat == 'json' ? ' selected' : '' }}>JSON</option>
@@ -161,6 +166,9 @@
                         headers['Accept'] = 'application/' + requestFormat;
                     }
 
+                    // set content format
+                    var contentFormat = $('#content_format').val();
+
                     // retrieve all the parameters to send
                     $('.parameters .tuple', $(this)).each(function() {
                         var key, value;
@@ -183,6 +191,10 @@
                         if (value) {
                             headers[key] = value;
                         }
+
+                        if(!('Content-type' in headers)) {
+                            headers['Content-type'] = 'application/'+contentFormat;
+                        }
                     });
 
                     // fix parameters in URL
@@ -207,21 +219,30 @@
                     var endpoint = '{{ app.request.getBaseUrl() }}';
                     {% else -%}
                     var endpoint = '{{ endpoint }}';
-                    {% endif -%} 
+                    {% endif -%}
                     if ($('#api_endpoint') && $('#api_endpoint').val() != null) {
                         endpoint = $('#api_endpoint').val();
                     }
 
+                    // prepare final parameters
+                    var body = params;
+                    if(contentFormat == 'json') {
+                        body = JSON.stringify(body);
+                    }
+                    var data = content.length ? content : body;
+
+                    console.log(contentFormat); console.log(data);
+
                     // and trigger the API call
                     $.ajax({
                         url: endpoint + url,
                         type: method,
-                        data: content.length ? content : params,
+                        data: data,
                         headers: headers,
                         crossDomain: true,
-                        beforeSend: function (xhr) { 
+                        beforeSend: function (xhr) {
                             if (authentication_delivery == 'http_basic') {
-                                xhr.setRequestHeader('Authorization', 'Basic ' + btoa($('#api_key').val() + ':' + $('#api_pass').val())); 
+                                xhr.setRequestHeader('Authorization', 'Basic ' + btoa($('#api_key').val() + ':' + $('#api_pass').val()));
                             }
                         },
                         complete: function(xhr) {
@@ -313,7 +334,7 @@
                 var api_key_parameter = '{{ authentication.name }}';
                 var search = window.location.search;
                 var api_key_start = search.indexOf(api_key_parameter) + api_key_parameter.length + 1;
-                
+
                 if (api_key_start > 0 ) {
                     var api_key_end = search.indexOf('&', api_key_start);
 

From a9f0613ceebd7c53a4c80e080a8a73a368b177c6 Mon Sep 17 00:00:00 2001
From: Josh Hall-Bachner <jhallbachner@gmail.com>
Date: Tue, 4 Jun 2013 15:30:07 -0700
Subject: [PATCH 2/6] Added a configuration parameter to determine the default
 body format.

---
 DependencyInjection/Configuration.php         |  4 ++++
 DependencyInjection/NelmioApiDocExtension.php |  1 +
 Formatter/HtmlFormatter.php                   | 14 +++++++++++
 Resources/config/formatters.xml               |  3 +++
 Resources/views/layout.html.twig              | 24 +++++++++----------
 5 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index ec79579..f049223 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -46,6 +46,10 @@ class Configuration implements ConfigurationInterface
                         ->scalarNode('enabled')->defaultTrue()->end()
                         ->scalarNode('endpoint')->defaultNull()->end()
                         ->scalarNode('accept_type')->defaultValue('')->end()
+                        ->enumNode('body_format')
+                            ->values(array('form', 'json'))
+                            ->defaultValue('form')
+                        ->end()
                         ->arrayNode('request_format')
                             ->addDefaultsIfNotSet()
                             ->children()
diff --git a/DependencyInjection/NelmioApiDocExtension.php b/DependencyInjection/NelmioApiDocExtension.php
index ce10263..d26a39d 100644
--- a/DependencyInjection/NelmioApiDocExtension.php
+++ b/DependencyInjection/NelmioApiDocExtension.php
@@ -34,6 +34,7 @@ class NelmioApiDocExtension extends Extension
         $container->setParameter('nelmio_api_doc.sandbox.endpoint', $config['sandbox']['endpoint']);
         $container->setParameter('nelmio_api_doc.sandbox.request_format.method', $config['sandbox']['request_format']['method']);
         $container->setParameter('nelmio_api_doc.sandbox.accept_type', $config['sandbox']['accept_type']);
+        $container->setParameter('nelmio_api_doc.sandbox.body_format', $config['sandbox']['body_format']);
         $container->setParameter('nelmio_api_doc.sandbox.request_format.default_format', $config['sandbox']['request_format']['default_format']);
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
diff --git a/Formatter/HtmlFormatter.php b/Formatter/HtmlFormatter.php
index d4520fc..750f82c 100644
--- a/Formatter/HtmlFormatter.php
+++ b/Formatter/HtmlFormatter.php
@@ -50,6 +50,11 @@ class HtmlFormatter extends AbstractFormatter
      */
     private $acceptType;
 
+    /**
+     * @var string
+     */
+    private $bodyFormat;
+
     /**
      * @var array
      */
@@ -108,6 +113,14 @@ class HtmlFormatter extends AbstractFormatter
         $this->acceptType = $acceptType;
     }
 
+    /**
+     * @param string $bodyFormat
+     */
+    public function setBodyFormat($bodyFormat)
+    {
+        $this->bodyFormat = $bodyFormat;
+    }
+
     /**
      * @param string $method
      */
@@ -179,6 +192,7 @@ class HtmlFormatter extends AbstractFormatter
             'enableSandbox'        => $this->enableSandbox,
             'requestFormatMethod'  => $this->requestFormatMethod,
             'acceptType'           => $this->acceptType,
+            'bodyFormat'           => $this->bodyFormat,
             'defaultRequestFormat' => $this->defaultRequestFormat,
             'date'                 => date(DATE_RFC822),
             'css'                  => file_get_contents(__DIR__ . '/../Resources/public/css/screen.css'),
diff --git a/Resources/config/formatters.xml b/Resources/config/formatters.xml
index 8a21d80..53c31be 100644
--- a/Resources/config/formatters.xml
+++ b/Resources/config/formatters.xml
@@ -49,6 +49,9 @@
             <call method="setAcceptType">
                 <argument>%nelmio_api_doc.sandbox.accept_type%</argument>
             </call>
+            <call method="setBodyFormat">
+                <argument>%nelmio_api_doc.sandbox.body_format%</argument>
+            </call>
             <call method="setAuthentication">
                 <argument>%nelmio_api_doc.sandbox.authentication%</argument>
             </call>
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index 0f25f43..7631331 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -16,10 +16,10 @@
         <div id="header">
             <a href=""><h1>{{ apiName }}</h1></a>
             <div id="sandbox_configuration">
-                content format:
-                <select id="content_format">
-                    <option value="x-www-form-urlencoded">Form Data</option>
-                    <option value="json">JSON</option>
+                body format:
+                <select id="body_format">
+                    <option value="x-www-form-urlencoded"{{ bodyFormat == 'form' ? ' selected' : '' }}>Form Data</option>
+                    <option value="json"{{ bodyFormat == 'json' ? ' selected' : '' }}>JSON</option>
                 </select>
                 request format:
                 <select id="request_format">
@@ -158,6 +158,7 @@
                         method = method.split('|').sort().pop();
                     }
 
+                    // set default requestFormat
                     var requestFormat = $('#request_format').val();
                     var requestFormatMethod = '{{ requestFormatMethod }}';
                     if (requestFormatMethod == 'format_param') {
@@ -166,8 +167,12 @@
                         headers['Accept'] = 'application/' + requestFormat;
                     }
 
-                    // set content format
-                    var contentFormat = $('#content_format').val();
+                    // set default bodyFormat
+                    var bodyFormat = $('#body_format').val();
+
+                    if(!('Content-type' in headers)) {
+                        headers['Content-type'] = 'application/'+bodyFormat;
+                    }
 
                     // retrieve all the parameters to send
                     $('.parameters .tuple', $(this)).each(function() {
@@ -192,9 +197,6 @@
                             headers[key] = value;
                         }
 
-                        if(!('Content-type' in headers)) {
-                            headers['Content-type'] = 'application/'+contentFormat;
-                        }
                     });
 
                     // fix parameters in URL
@@ -226,13 +228,11 @@
 
                     // prepare final parameters
                     var body = params;
-                    if(contentFormat == 'json') {
+                    if(bodyFormat == 'json') {
                         body = JSON.stringify(body);
                     }
                     var data = content.length ? content : body;
 
-                    console.log(contentFormat); console.log(data);
-
                     // and trigger the API call
                     $.ajax({
                         url: endpoint + url,

From defe9c0b36ec76fe0112406e09fd2e34930dba30 Mon Sep 17 00:00:00 2001
From: Josh Hall-Bachner <jhallbachner@gmail.com>
Date: Tue, 4 Jun 2013 15:52:27 -0700
Subject: [PATCH 3/6] Updated README to reflect additional parameter.

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 9ed3a02..ed38e28 100644
--- a/README.md
+++ b/README.md
@@ -259,6 +259,10 @@ configure this sandbox using the following parameters:
             enabled:  true # default: true, you can set this parameter to `false` to disable the sandbox
             endpoint: http://sandbox.example.com/ # default: /app_dev.php, use this parameter to define which URL to call through the sandbox
             accept_type: application/json # default null, if set, the value is automatically populated as the Accept header
+            body_format: form # default form, determines whether to send x-www-form-urlencoded data or json-encoded data in sandbox requests
+            request_format:
+                method: format_param # default format_param, alternately accept_header, decides how to request the response format
+                default_format: json # default json, alternately xml, determines which content format to request back by default
 
 The bundle provides a way to register multiple `input` parsers. The first parser that can handle the specified
 input is used, so you can configure their priorities via container tags. Here's an example parser service registration:

From c237d65bad62a75b37861a60fbf8c5715887184c Mon Sep 17 00:00:00 2001
From: Josh Hall-Bachner <jhallbachner@gmail.com>
Date: Wed, 5 Jun 2013 18:51:01 -0700
Subject: [PATCH 4/6] Added a helper method to enable deep encoding of nested
 parameters when encoding requests into JSON.

---
 Resources/views/layout.html.twig | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index 7631331..d84d412 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -92,6 +92,31 @@
                     toggleButtonText($btn);
                 };
 
+                var unflattenDict = function (body) {
+                    var found = true;
+                    while(found) {
+                        found = false;
+
+                        for (var key in body) {
+                            var okey;
+                            var value = body[key];
+                            var dictMatch = key.match(/^(.+)\[([^\]]+)\]$/);
+
+                            if(dictMatch) {
+                                found = true;
+                                okey = dictMatch[1];
+                                var subkey = dictMatch[2];
+                                body[okey] = body[okey] || {};
+                                body[okey][subkey] = value;
+                                delete body[key];
+                            } else {
+                                body[key] = value;
+                            }
+                        }
+                    }
+                    return body;
+                }
+
                 $('.tabs li').click(function() {
                     var contentGroup = $(this).parents('.content');
 
@@ -227,9 +252,12 @@
                     }
 
                     // prepare final parameters
-                    var body = params;
+                    var body = {};
                     if(bodyFormat == 'json') {
-                        body = JSON.stringify(body);
+                        body = unflattenDict(params);
+                        body = JSON.stringify(body); console.log(body);
+                    } else {
+                        body = params;
                     }
                     var data = content.length ? content : body;
 

From 6ba548e21e581c3f8aef952473b0f742699a9560 Mon Sep 17 00:00:00 2001
From: Josh Hall-Bachner <jhallbachner@gmail.com>
Date: Wed, 5 Jun 2013 19:20:12 -0700
Subject: [PATCH 5/6] Removed stray console.log

---
 Resources/views/layout.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index d84d412..bb9f0d9 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -255,7 +255,7 @@
                     var body = {};
                     if(bodyFormat == 'json') {
                         body = unflattenDict(params);
-                        body = JSON.stringify(body); console.log(body);
+                        body = JSON.stringify(body);
                     } else {
                         body = params;
                     }

From c5beab777fbc1a2dc6752e89d5000fa47f80ab14 Mon Sep 17 00:00:00 2001
From: Josh Hall-Bachner <jhallbachner@gmail.com>
Date: Fri, 14 Jun 2013 16:15:43 -0700
Subject: [PATCH 6/6] Fixed parameter encoding for GET requests.

---
 Resources/views/layout.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index bb9f0d9..50bb7ab 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -253,7 +253,7 @@
 
                     // prepare final parameters
                     var body = {};
-                    if(bodyFormat == 'json') {
+                    if(bodyFormat == 'json' && method != 'GET') {
                         body = unflattenDict(params);
                         body = JSON.stringify(body);
                     } else {