try_api 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32074ebd9d31c8c9b026592f11a07272f11398f
-  data.tar.gz: 2c7987599b29f291c9778f32e703c007b2362287
+  metadata.gz: c2ecbc0b9fe2f833f16c373593fd4b7d3082d30e
+  data.tar.gz: ae4f6997359ec3c60ffbdb2f4dc882ae8452a567
 SHA512:
-  metadata.gz: 265fec214f540c1685c8bdfe4220673563b3f54f46fcb2e2f4f27a58878e9723bdec8f88ca32ed3777cb6c790878c515865a85806c08d7e453e38956c46c8407
-  data.tar.gz: 921d2c59c66956e30bdcd21a03070a24834b2079099e3ba669951e7b15fe33ca39a12fd8e8c6116b92d9f50b14d5ba521ffbc64c660eeac826acb61a58454977
+  metadata.gz: 4673b1f0d0df87785799af919b2a7982038b6313ec6489096992e6bb426408c2b18285d57ceda82c34d355cd4051ca29e36a050a33529c8c760d6f97ec88ef91
+  data.tar.gz: 282f6fdbdcefcdb69b3ef7eaec7ce7649bb247f517b5376771e3a0c1b2f3542c4b07a90051328f14c029c5301c14e1e3207e448cfffea8ef06a05e50783fc847

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

@@ -9,6 +9,7 @@
 #= require try_api/param.directive
 #= require try_api/paramsarray.directive
 #= require try_api/image.directive
+#= require try_api/url.directive
 
 $ ->
   $('pre code').each (i, block) ->
@@ -34,11 +35,8 @@ $ ->
 TryApiApp = angular.module('TryApiApp', [
   'ui.bootstrap'
   'ngAnimate'
-  'formInput.image'
+  'TryApi'
   'angular-ladda'
-  'param'
-  'params'
-  'paramsarray'
   'hljs'
 ])
 TryApiApp.config [
@@ -128,7 +126,6 @@ TryApiApp.controller 'HomeController', [
           method.submit = ->
             method.pending = true
             headers = {'Content-Type': undefined}
-            path = data.project.api_prefix + method.path
 
             $.each method.headers, (i)->
               header = this
@@ -141,13 +138,13 @@ TryApiApp.controller 'HomeController', [
                 $.each method.parameters, (i) ->
                   $scope.addParameterToForm fd, this
 
-                $http.post path, fd,
+                $http.post method.submit_path, fd,
                   transformRequest: angular.identity
                   headers: headers
                 .success method.response_handler
                 .error method.response_handler
               when 'delete'
-                $http.delete path,
+                $http.delete method.submit_path,
                   transformRequest: angular.identity
                   headers: headers
                 .success method.response_handler
@@ -159,7 +156,7 @@ TryApiApp.controller 'HomeController', [
                   parameter = this
                   fd = fd + parameter.name + '=' + (parameter.value || '') + '&'
 
-                $http.get path + '?' + fd,
+                $http.get method.submit_path + '?' + fd,
                   transformRequest: angular.identity
                   headers: headers
                 .success method.response_handler
@@ -170,7 +167,7 @@ TryApiApp.controller 'HomeController', [
                 $.each method.parameters, (i) ->
                   $scope.addParameterToForm fd, this
 
-                $http.put path, fd,
+                $http.put method.submit_path, fd,
                   transformRequest: angular.identity
                   headers: headers
                 .success method.response_handler

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

@@ -1,8 +1,6 @@
 'use strict';
 
-angular.module('formInput.image', []);
-
-angular.module('formInput.image').directive('image', ['$filter', function($filter) {
+angular.module('TryApi').directive('image', ['$filter', function($filter) {
 
     function link(scope, element, attributes, ctrl) {
 

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

@@ -1,5 +1,4 @@
-angular.module 'param', []
-angular.module('param').directive 'param', [
+angular.module('TryApi').directive 'param', [
   '$filter',
   '$sce'
   ($filter, $sce) ->

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

@@ -1,5 +1,5 @@
-angular.module 'params', []
-angular.module('params').directive 'params', [
+angular.module 'TryApi', []
+angular.module('TryApi').directive 'params', [
   () ->
 
     link = (scope, element, attrs, ctrl) ->

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

@@ -1,5 +1,4 @@
-angular.module 'paramsarray', []
-angular.module('paramsarray').directive 'paramsarray', [
+angular.module('TryApi').directive 'paramsarray', [
   '$filter'
   ($filter) ->
 

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

@@ -0,0 +1,40 @@
+angular.module('TryApi').directive 'url', [
+  '$filter',
+  '$sce'
+  ($filter, $sce) ->
+
+    link = (scope, element, attrs, ctrl) ->
+
+      scope.isParameter = (value) ->
+        if value
+          return value.indexOf(':') != -1
+        else
+          return false
+
+      scope.parts = scope.pattern.split('/').filter(Boolean).map (i)->
+        value = if scope.isParameter(i) then '' else i
+        {
+          value: value,
+          placeholder: i
+        }
+
+      scope.$watch 'parts', ->
+        scope.url = scope.parts.map((i)->
+          i.value
+        ).join('/')
+      , true
+
+    return {
+      link: link
+      restrict: 'A'
+      require: 'ngModel'
+      scope:
+        url: '=ngModel'
+        pattern: '=pattern'
+      template: '<span ng-repeat="part in parts track by $index">' +
+        '/' +
+        '<span ng-if="!isParameter(part.placeholder)">{{ part.value }}</span>' +
+        '<input ng-if="isParameter(part.placeholder)" ng-model="part.value" placeholder="{{ part.placeholder }}"/>' +
+        '</span>'
+    }
+]

data/app/models/try_api/base.rb

@@ -40,10 +40,13 @@ module TryApi
       result.with_indifferent_access
     end
 
-    @@instance_count = 0
+    @@instances_count = 0
 
-    def id
-      @id ||= @@instance_count += 1
+    attr_accessor :id
+
+    def initialize()
+      super
+      self.id = @@instances_count += 1
     end
   end
 end

data/app/views/try_api/pages/index.html

@@ -36,7 +36,7 @@
                 <div class="col-md-6 method-try"><h4>{{ method.title }}</h4>
                     <h4>
                         <div class="label label-info">{{ method.method }}</div>
-                        {{ method.local_path }}
+                        <span url=true ng-model="method.submit_path" pattern="method.local_path"></span>
                     </h4>
                     <div ng-if="method.headers.length &gt; 0"><label>Headers:</label>
                         <div class="row parameter" ng-repeat="header in method.headers">
@@ -65,7 +65,7 @@
                         </div>
                         <br/>
                         <div class="label">Data:</div>
-                        <div hljs="" hljs-language="json" hljs-source="method.response.data"></div>
+                        <div hljs="" hljs-language="" hljs-source="method.response.data"></div>
                         <br/>
                         <div class="label">Headers:</div>
                         <div hljs="" hljs-language="json" hljs-source="method.response.headers"></div>

data/lib/try_api/version.rb

@@ -1,3 +1,3 @@
 module TryApi
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: try_api
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Mykhaylo Skubenych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -253,6 +253,7 @@ files:
 - app/assets/javascripts/try_api/param.directive.js.coffee
 - app/assets/javascripts/try_api/params.directive.js.coffee
 - app/assets/javascripts/try_api/paramsarray.directive.js.coffee
+- app/assets/javascripts/try_api/url.directive.js.coffee
 - app/assets/stylesheets/try_api/application.css.sass
 - app/controllers/try_api/application_controller.rb
 - app/controllers/try_api/pages_controller.rb