Rust reqwest: Use method names directly for known methods

Author: Dhwaneet Bhatt

codegens/rust-reqwest/lib/reqwest.js

@@ -1,7 +1,8 @@
 const _ = require('lodash'),
   sanitizeOptions = require('./util/sanitize').sanitizeOptions,
   { parseHeader, parseBody } = require('./util/parseRequest'),
-  { addDefaultContentType, formatFormData } = require('./util/formatRequest');
+  { addDefaultContentType, formatFormData } = require('./util/formatRequest'),
+  ALLOWED_METHODS = ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS', 'CONNECT', 'PATH', 'TRACE'];
 
 /**
  * Returns snippet for Rust reqwest by parsing data from Postman-SDK request object
@@ -36,9 +37,17 @@ function makeSnippet (request, indentation, options) {
   snippet += headerSnippet;
   snippet += bodySnippet;
 
-  // Create the request and add headers and body
-  let requestSnippet = `${indentation}let method = "${request.method}";\n`;
-  requestSnippet += `${indentation}let request = client.request(reqwest::Method::from_bytes(method.as_bytes())?, `;
+  // Use short method name if possible
+  let requestSnippet = '';
+  if (ALLOWED_METHODS.includes(request.method)) {
+    requestSnippet += `${indentation}let request = client.request(reqwest::Method::${request.method}, `;
+  }
+  else {
+    requestSnippet += `${indentation}let method = "${request.method}";\n`;
+    requestSnippet += `${indentation}let request = client.request(reqwest::Method::from_bytes(method.as_bytes())?, `;
+  }
+
+  // Add headers and body
   requestSnippet += `"${request.url.toString()}")\n`;
   requestSnippet += requestHeaderSnippet;
   requestSnippet += requestBodySnippet;

codegens/rust-reqwest/test/unit/convert.test.js

@@ -16,8 +16,11 @@ describe('Rust reqwest converter', function () {
           'raw': 'http://postman-echo.com/get',
           'protocol': 'http',
           'host': [
-            'google',
+            'postman-echo',
             'com'
+          ],
+          'path': [
+            'get'
           ]
         }
       }),
@@ -39,8 +42,11 @@ describe('Rust reqwest converter', function () {
           'raw': 'http://postman-echo.com/get',
           'protocol': 'http',
           'host': [
-            'google',
+            'postman-echo',
             'com'
+          ],
+          'path': [
+            'get'
           ]
         }
       }),
@@ -54,4 +60,61 @@ describe('Rust reqwest converter', function () {
     });
   });
 
+  it('should use the method name directly if it is part of allowed methods', function () {
+    ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS', 'CONNECT', 'PATH', 'TRACE'].forEach(function (method) {
+      const request = new sdk.Request({
+          'method': method,
+          'header': [],
+          'url': {
+            'raw': 'http://postman-echo.com/get',
+            'protocol': 'http',
+            'host': [
+              'postman-echo',
+              'com'
+            ],
+            'path': [
+              'get'
+            ]
+          }
+        }),
+        options = {};
+      convert(request, options, function (error, snippet) {
+        if (error) {
+          expect.fail(null, null, error);
+        }
+        expect(snippet).to.be.a('string');
+        expect(snippet).to.include(`let request = client.request(reqwest::Method::${method}`);
+      });
+    });
+  });
+
+  it('should use the method name using bytes if it not part of the allowed list', function () {
+    ['PROPFIND', 'PURGE', 'LOCK', 'UNLOCK', 'LINK', 'UNLINK', 'COPY'].forEach(function (method) {
+      const request = new sdk.Request({
+          'method': method,
+          'header': [],
+          'url': {
+            'raw': 'http://postman-echo.com/get',
+            'protocol': 'http',
+            'host': [
+              'postman-echo',
+              'com'
+            ],
+            'path': [
+              'get'
+            ]
+          }
+        }),
+        options = {};
+      convert(request, options, function (error, snippet) {
+        if (error) {
+          expect.fail(null, null, error);
+        }
+        expect(snippet).to.be.a('string');
+        expect(snippet).to.include(`let method = "${method}"`);
+        expect(snippet).to.include('let request = client.request(reqwest::Method::from_bytes(method.as_bytes())?');
+      });
+    });
+  });
+
 });