try_api 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 860aaa1e334490b421992b9f123e32caf04f406f
-  data.tar.gz: 89e78551016578e27a3f086d8bd98136989a3b8c
+  metadata.gz: 9534478c173d1e484e488f3b934c964c7b23c4d6
+  data.tar.gz: 88e19a1d971b76301655d98ca866e4e4a652ff56
 SHA512:
-  metadata.gz: 3a67eccef62455f3301d6d989e33b4650e7a1e46733ecec4959723f4a77abf79990fd40e85eef24c30883f88af37e42a69b84e183220461e2109dd2058db42b1
-  data.tar.gz: e43ef7e91e2df474977d0610a8f498eaaa6bccd55c8fa4c3bf322124064c38dbacec0878b6df0dda6af69796bd3db8c6cba4415927a6bfbbc7951fa3746611a6
+  metadata.gz: 7388beb701f29e2285805c9b4c27e7cd32e2f939aa07402e66a06310ebbe0caceb228538c37405e06f7346dc044c483fdc703644d4b299a08c09b35de8a4310f
+  data.tar.gz: 58fd00c734499d5b93ca6bc80bd14f77941a219776ef112095174d2456fc92be158523a0d043ef011f803efa471e3c809b18a3d0dc45a7d754de4d27269584c9

data/app/assets/javascripts/try_api/application.js.coffee.erb

@@ -86,55 +86,35 @@ TryApiApp.controller 'HomeController', [
         header = this
         headers[header.name] = header.value
 
-      path = method.submit_path
+      path =  $scope.project.host
+      if $scope.project.port
+        path += ':' + $scope.project.port
+
+      path += '/' + method.submit_path
+
+      fd = new FormData
 
       switch method.method.toLowerCase()
-        when 'post'
-          fd = new FormData
+        when 'post', 'delete', 'put'
           fd.append 'a', 'a' # TODO sending empty array causes EOFError
 
           $.each method.parameters, (i) ->
             $scope.addParameterToForm fd, this
-
-          $http.post path, fd,
-            transformRequest: angular.identity
-            headers: headers
-          .success method.response_handler
-          .error method.response_handler
-        when 'delete'
-          url = ''
-
-          $.each method.parameters, (i) ->
-            url = $scope.addParameterToUrl(url, this)
-
-          $http.delete path + '?' + url,
-            transformRequest: angular.identity
-            headers: headers
-          .success method.response_handler
-          .error method.response_handler
         when 'get'
           url = ''
-
           $.each method.parameters, (i) ->
             url = $scope.addParameterToUrl(url, this)
-
-          $http.get path + '?' + url,
-            transformRequest: angular.identity
-            headers: headers
-          .success method.response_handler
-          .error method.response_handler
-        when 'put'
-          fd = new FormData
-          fd.append 'a', 'a' # TODO sending empty array causes EOFError
-
-          $.each method.parameters, (i) ->
-            $scope.addParameterToForm fd, this
-
-          $http.put path, fd,
-            transformRequest: angular.identity
-            headers: headers
-          .success method.response_handler
-          .error method.response_handler
+          path += '?' + url
+
+      $http({
+        url: path,
+        data: fd,
+        transformRequest: angular.identity,
+        headers: headers,
+        method: method.method.toLowerCase()
+      })
+        .success(method.response_handler)
+        .error(method.response_handler)
 
     $http.get('<%= TryApi::Engine.routes.url_helpers.projects_path %>').success (data) ->
       $scope.project = data.project
@@ -204,52 +184,61 @@ TryApiApp.controller 'HomeController', [
       if status = 422
         alert data.error
 
-    $scope.addParameterToForm = (form, parameter) -> # TODO implement multidimentional parameters
-      if parameter.type == 'array'
-        form.append 'a', 'a' # TODO sending empty array causes EOFError
-        $.each parameter.values, ->
-          value = this
-          $.each value, ->
-            subparameter = this
-            switch subparameter.type
-              when 'boolean'
-                form.append parameter.name + '[]' + subparameter.name, subparameter.value || false
-              else
-                form.append parameter.name + '[]' + subparameter.name, subparameter.value || ''
-      if parameter.type == 'object'
-        $.each parameter.values, ->
-          subparameter = this
-          switch subparameter.type
-            when 'boolean'
-              form.append parameter.name + '[' + subparameter.name + ']', subparameter.value || false
-            else
-              form.append parameter.name + '[' + subparameter.name + ']', subparameter.value || ''
+    $scope.pathBuild = (path, next) ->
+      if path
+        path += '[' + next + ']'
       else
-        switch parameter.type
-          when 'boolean'
-            form.append parameter.name, parameter.value || false
-          else
-            if parameter.value
-              form.append parameter.name, parameter.value || ''
-
-    $scope.addParameterToUrl = (url, parameter) ->
+        path = next
+      return path
+
+    $scope.addSampleParameterToForm = (form, parameter, path = '') ->
+      path = $scope.pathBuild path, parameter.name
+      switch parameter.type
+        when 'boolean'
+          form.append path, parameter.value || false
+        else
+          if parameter.value
+            form.append path, parameter.value || ''
+
+    $scope.addArrayToForm = (form, parameter, path = '') ->
+      form.append 'a', 'a' # TODO sending empty array causes EOFError
+      path = ($scope.pathBuild path, parameter.name) + '[]'
+      $.each parameter.values, ->
+        $.each this, ->
+          $scope.addParameterToForm form, this, path
+
+    $scope.addParameterToForm = (form, parameter, path = '') ->
       if parameter.type == 'array'
+        $scope.addArrayToForm form, parameter, path
+      if parameter.type == 'object'
+        path = $scope.pathBuild path, parameter.name
         $.each parameter.values, ->
-          value = this
-          $.each value, ->
-            subparameter = this
-            switch subparameter.type
-              when 'boolean'
-                url = url + parameter.name + '[]' + (subparameter.name || '') + '=' + (subparameter.value || false) + '&'
-              else
-                if subparameter.value
-                  url = url + parameter.name + '[]' + (subparameter.name || '') + '=' + subparameter.value + '&'
+          $scope.addParameterToForm form, this, path
       else
-        switch parameter.type
-          when 'boolean'
-            url = url + parameter.name + '=' + (parameter.value || false) + '&'
-          else
-            if parameter.value
-              url = url + parameter.name + '=' + parameter.value + '&'
+        $scope.addSampleParameterToForm form, parameter, path
+
+    $scope.addSampleParameterToUrl = (url, parameter, path = '') ->
+      path = ($scope.pathBuild path, parameter.name) + '='
+      switch parameter.type
+        when 'boolean'
+          url += path + (parameter.value || false) + '&'
+        else
+          if parameter.value
+            url += path + parameter.value + '&'
+      return url
+
+    $scope.addParameterToUrl = (url, parameter, path = '') ->
+      switch parameter.type
+        when 'array'
+          path = ($scope.pathBuild path, parameter.name) + '[]'
+          $.each parameter.values, ->
+            $.each this, ->
+              url = $scope.addParameterToUrl url, this, path
+        when 'object'
+          path = $scope.pathBuild path, parameter.name
+          $.each parameter.values, ->
+            url = $scope.addParameterToUrl url, this, path
+        else
+          url = $scope.addSampleParameterToUrl url, parameter, path
       return url
 ]

data/app/assets/javascripts/try_api/curl.directive.js

@@ -25,18 +25,65 @@ angular.module('TryApi').directive('curl', ['$filter', function($filter) {
                 })
             }
 
-            scope.curlString = 'curl -X ' + method + ' ' + scope.model.endpoint + '/' + scope.model.submit_path + headers.join('');
+            let params = '';
+            let urlParams = '';
 
             if(scope.model.parameters && scope.model.parameters.length > 0) {
-                if (formData) {
-                    scope.curlString += ' -c -include ' + scope.toFormDataKeys(scope.model.parameters);
+                if (scope.model.method == 'get') {
+                    urlParams += scope.toUrlParameters(scope.model.parameters);
+                }else if (formData) {
+                    params += ' -c -include ' + scope.toFormDataKeys(scope.model.parameters);
                 } else {
-                    scope.curlString += ' -d "' + JSON.stringify(scope.toJsonParameters(scope.model.parameters)).replace(/"/g, '\\"').replace(/,/g, ', ') + '"';
+                    params += ' -d "' + JSON.stringify(scope.toJsonParameters(scope.model.parameters)).replace(/"/g, '\\"').replace(/,/g, ', ') + '"';
                 }
             }
 
+            scope.curlString = 'curl -X ' + method + ' ' + headers.join('') + params + ' ' + scope.model.endpoint + '/' + scope.model.submit_path + urlParams;
+
         }, true)
 
+        scope.toUrlParameters = function(parameters,prefix,result){
+            if(!result)
+                result = [];
+
+            if(parameters && parameters.length > 0){
+                parameters.forEach(function(parameter){
+
+                    let name = '';
+
+                    if(prefix) {
+                        name = prefix + '[' + parameter.name + ']';
+                    }else{
+                        name = parameter.name;
+                    }
+
+                    if(parameter.type == 'array'){
+                        if(parameter.values && parameter.values.length > 0){
+                            let i = 0;
+                            parameter.values.forEach(function(value){
+                                let temp_parameters = [];
+                                for(let k in value){
+                                    temp_parameters.push(value[k]);
+                                }
+                                scope.toUrlParameters(temp_parameters, name + '[]', result);
+                                i++;
+                            })
+                        }
+                    }else{
+                        let value = '';
+
+                        if(parameter.type == 'image'){
+
+                        }else{
+                            value = parameter.value || '';
+                            result.push(name + '=' + value);
+                        }
+                    }
+                });
+            }
+            return '?' + result.join('&');
+        }
+
         scope.toFormDataKeys = function(parameters, prefix){
             let result = '';
 

data/app/assets/javascripts/try_api/param.directive.js.coffee

@@ -52,7 +52,7 @@ angular.module('TryApi').directive 'param', [
         '  <div class="row">' +
         '    <div class="col-md-4 text-right">' +
         '      <b>{{ parameter.name }}</b>' +
-        '      <span class="text-muted label label-warning">{{ parameter.type }}</span>' +
+        '      <span class="text-muted label label-warning">object</span>' +
         '    </div>' +
         '    <div class="col-md-8">' +
         '      <div class="text-muted small" ng-bind-html="getHtml(parameter.description)"></div>' +

data/app/assets/javascripts/try_api/paramsobject.directive.js.coffee

@@ -6,6 +6,28 @@ angular.module('TryApi').directive 'paramsobject', [
 
       scope.parameter.values = jQuery.extend(true, {}, scope.parameter.parameters)
 
+      if scope.parameter.custom
+
+        scope.new = {}
+
+        scope.checkDuplicate = () ->
+          duplicate = false
+          parameters = scope.parameter.parameters
+          $.each parameters, ->
+            if this.name == scope.new.name
+              duplicate = true
+              return false
+          return duplicate
+
+        scope.addItem = () ->
+          if scope.new.name && scope.new.type && !scope.checkDuplicate()
+            last = { name: scope.new.name, type: scope.new.type }
+            if last.type == 'object'
+              last.custom = true
+              last.parameters = []
+            scope.parameter.parameters.push(last)
+            scope.parameter.values[scope.parameter.parameters.length - 1] = last
+
     return {
       link: link
       restrict: 'A'
@@ -13,8 +35,19 @@ angular.module('TryApi').directive 'paramsobject', [
       scope:
         parameter: '=ngModel'
       template: '' +
-        '<div style="border: 1px solid lightgray; margin: 1px 1px 1px 10px">' +
+        '<div style="border: 1px solid lightgray; margin: 1px 1px 1px 10px; padding: 0 10px 10px">' +
         '  <div params ng-model="parameter.values"></div>' +
+        '</div>' +
+        '<div class="col-md-12" style="margin-top: 10px" ng-if="parameter.custom == true">' +
+        ' <div class="col-md-6">' +
+        '   <input type="text" ng-model="new.name" placeholder="field name">' +
+        ' </div>' +
+        ' <div class="col-md-6">' +
+        '   <input type="text" ng-model="new.type" placeholder="field type">' +
+        ' </div>' +
+        '</div>' +
+        '<div class="try-api-array-item try-api-array-item-add" style="margin-top: 50px" ng-click="addItem()" ng-if="parameter.custom == true">' +
+        '  <a>Add</a>' +
         '</div>'
     }
 ]

data/app/models/try_api/parameter.rb

@@ -4,6 +4,7 @@ module TryApi
     typesafe_accessor :type, String
     typesafe_accessor :parameters, Array, default: [], items_type: TryApi::Parameter
     typesafe_accessor :required, Boolean, default: true
+    typesafe_accessor :custom, Boolean, default: false, if: -> { self.type == 'object' }
     typesafe_accessor :description, String
   end
 end

data/lib/generators/try_api/templates/try_api/base.yml

@@ -126,14 +126,58 @@ menu_items:
           -
             name: 'array'
             type: 'array'
-            description: 'Yes! this is array which can include other sets of parameters. '
+            description: 'Yes! this is array which can include other sets of parameters.'
             parameters:
-               -
-                 name: 'id'
-                 type: 'integer'
+              -
+                name: 'id'
+                type: 'integer'
           -
             name: 'text'
             type: 'text'
+          -
+            name: 'object'
+            type: 'object'
+            parameters:
+              -
+                name: 'string'
+                type: 'string'
+              -
+                name: 'integer'
+                type: 'integer'
+              -
+                name: 'boolean'
+                type: 'boolean'
+              -
+                name: 'image'
+                type: 'image'
+              -
+                name: 'array'
+                type: 'array'
+                description: 'Yes! this is array which can include other sets of parameters.'
+                parameters:
+                  -
+                    name: 'id'
+                    type: 'integer'
+          -
+            name: 'custom_object'
+            type: 'object'
+            custom: true
+            description: 'Object with ability add fileds in real time.'
+            parameters:
+              -
+                name: 'string'
+                type: 'string'
+              -
+                name: 'integer'
+                type: 'integer'
+              -
+                name: 'array'
+                type: 'array'
+                description: 'Yes! this is array which can include other sets of parameters.'
+                parameters:
+                  -
+                    name: 'id'
+                    type: 'integer'
       -
         title: 'Endpoint with URL parameters.'
         path: '/search/:q'

data/lib/try_api/version.rb

@@ -1,3 +1,3 @@
 module TryApi
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: try_api
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Michael Skubenych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails