Update curl command constructor

chao · Mar 21, 2014 · baf5dfa · baf5dfa
1 parent 32052e9
commit baf5dfa
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 11 deletions.
diff --git a/content/js/restclient.curl.js b/content/js/restclient.curl.js
@@ -30,15 +30,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 restclient.curl = {
   constructCommand: function(request){
-    //console.log(request);
-    var headersStrings = "";
-    for(var i=0, header; header = request.headers[i]; i++) {
-      headersStrings += " -H '"+ header[0] + ':' + header[1] + "'";
+    var curl = 'curl';
+    if(typeof request.headers !== 'undefined') {
+      var headersStrings = "";
+      for(var i=0, header; header = request.headers[i]; i++) {
+        headersStrings += " -H '"+ header[0] + ':' + header[1] + "'";
+      }
+      curl += ' -i ' + headersStrings;
     }
-    var body = '';
-    if(request.body != ''){
-      body = " -d '" + request.body + "' ";
+    if(typeof request.method !== 'undefined')
+      curl += ' -X ' + request.method;
+
+    if(typeof request.body !== 'undefined' && request.body !== '') {
+      curl += " -d '" + request.body + "' ";
+      //TODO escape special chars
     }
-    return 'curl -i ' + headersStrings +  ' -X ' + request.method + body +" '" +  request.url + "'" ;
+
+    if(typeof request.url !== 'undefined') {
+      curl += " '" + request.url + "'";
+    }
+    return curl;
   }
 }
diff --git a/content/js/restclient.main.js b/content/js/restclient.main.js
@@ -604,7 +604,11 @@ restclient.main = {
             }
           }
         });
-      }  
+      }
+
+      var request = restclient.main.getRequest();
+      var curl = restclient.curl.constructCommand(request);
+      $('#modal-bookmark-request [name="saved-curl"]').val(curl);
     }).on('hide', function() {
       $('#modal-bookmark-request [name="saved-request-name"]').val('');
       $('#modal-bookmark-request [name="saved-request-label"]').tagsinput('removeAll');

diff --git a/content/js/restclient.sqlite.js b/content/js/restclient.sqlite.js
@@ -37,6 +37,7 @@ restclient.sqlite = {
                 requestUrl TEXT NOT NULL, \
                 requestMethod TEXT NOT NULL, \
                 request TEXT NOT NULL, \
+                curl TEXT NOT NULL, \
                 creationTime INTEGER NOT NULL, \
                 lastAccess INTEGER NOT NULL",
     labels: " labelName TEXT NOT NULL, \
@@ -59,7 +60,7 @@ restclient.sqlite = {
     getRequestsByName: 'SELECT * FROM requests WHERE requestName = :requestName',
     getRequestsByLabels: 'SELECT * FROM requests WHERE uuid IN (SELECT uuid FROM labels WHERE labelName IN (placeholder) group by uuid having count(uuid) = :num) ORDER BY creationTime DESC, lastAccess DESC',
     getRequestByUUID: 'SELECT * FROM requests WHERE uuid = :uuid',
-    newRequests: 'INSERT INTO requests (uuid, requestName, favorite, requestUrl, requestMethod, request, creationTime, lastAccess) VALUES (:uuid, :requestName, :favorite, :requestUrl, :requestMethod, :request, :creationTime, :lastAccess)',
+    newRequests: 'INSERT INTO requests (uuid, requestName, favorite, requestUrl, requestMethod, request, curl, creationTime, lastAccess) VALUES (:uuid, :requestName, :favorite, :requestUrl, :requestMethod, :request, :curl, :creationTime, :lastAccess)',
     findRequestsByKeyword: 'SELECT * FROM requests WHERE requestName LIKE :word OR requestUrl LIKE :word ORDER BY creationTime DESC, lastAccess DESC',
     findRequestsByKeywordAndLabels: 'SELECT * FROM requests WHERE (requestName LIKE :word OR requestUrl LIKE :word) AND uuid IN (SELECT uuid FROM labels WHERE labelName IN (placeholder) group by uuid having count(uuid) = :num) ORDER BY creationTime DESC, lastAccess DESC',
     removeRequests: 'DELETE FROM requests WHERE uuid = :uuid',
@@ -227,6 +228,7 @@ restclient.sqlite = {
     favorite = favorite || 0;
     labels = labels || [];
     labels = _.uniq(labels);
+    var curl = restclient.curl.constructCommand(request);
     try{
       var stmt = restclient.sqlite.getStatement('newRequests');
       var params = stmt.newBindingParamsArray(),
@@ -238,6 +240,7 @@ restclient.sqlite = {
       binding.bindByName("requestUrl", request.url);
       binding.bindByName("requestMethod", request.method);
       binding.bindByName("request", JSON.stringify(request));
+      binding.bindByName("curl", curl);
       binding.bindByName("creationTime", creationTime);
       binding.bindByName("lastAccess", creationTime);
 

diff --git a/content/restclient.html b/content/restclient.html
@@ -289,7 +289,12 @@ <h3 class="title">Bookmark This Request</h3>
           <p class="help-block hide">Please give this request a name for future usage.</p>
         </div>
       </div>
-
+      <div class="control-group">
+        <label class="control-label" for="saved-curl">Curl Command</label>
+        <div class="controls">
+          <textarea name="saved-curl" rows="3" class="span3" readonly></textarea>
+        </div>
+      </div>
       <div class="control-group">
         <label class="control-label" for="saved-request-label">Label</label>
         <div class="controls">

diff --git a/content/tests/index.html b/content/tests/index.html
@@ -11,6 +11,7 @@
   <script src="../js/restclient.js"></script>
   <script src="../js/restclient.helper.js"></script>
   <script src="../js/restclient.oauth.js"></script>
+  <script src="../js/restclient.curl.js"></script>
   <script src="../js/restclient.sqlite.js"></script>
   <script src="../js/underscore.js"></script>
   <!-- unit tests -->