consul-templaterb 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b7cce156473c1c3cba5d028f352aef6a9463fc24b328f51585cd80c2b42e0d
-  data.tar.gz: 6fb08ec94eddac3b5e051359039ce1ec0a87593ecb32a91ab8b3b38fbf5f687f
+  metadata.gz: 9ecbf300312175e355f65232450dc9303db8bbb1d2d2af473480a2fde3997112
+  data.tar.gz: 08abe3b2ef2e812810e88d29db8a44c1191af395a3e5b94c91a9d2a54b0c5906
 SHA512:
-  metadata.gz: 8a0ce21b647df4eaf71b3d1a6b5c791213cc5b9e0e224719aa27c49522e8a462f1a2ebfdc714af9ebd5d0d134d30662d1893c9dd7dd109a4fb1cabbde630a039
-  data.tar.gz: cad4a025f9df51b3f4544efd1a560d64b226f334056e5015e4aea5c9b38eb87d9a1265a5a755dacd1f902a338ef27a3441b472e68d672da29ea641b0ad81c2ee
+  metadata.gz: 8042decc8b615eff3080f06330347f6596f7fbdb5b8e732eaf9afc00b79a7b2ddffb161d3c9c63d986f7eed2d54a467cca0d39d9ee247af65edad71453fcbaf5
+  data.tar.gz: b88e62b6884d6dfc3e0dad669943124e6ec0c28af3da482c6a9614f2b23325bd9d57fe9afeb0ebd08c57808a62003ab3a4dd4cb4da1b008043ec865bf49e054f

data/.gitignore

@@ -27,3 +27,12 @@ samples/consul-ui/common/*.html
 .rspec_status
 # Mac OS
 .DS_Store
+
+# IntelliJ project files 
+*.iml
+*.iws
+*.ipr
+.idea/
+
+# Misc
+*.swp

data/CHANGELOG.md

@@ -4,7 +4,18 @@
 
 IMPROVEMENTS:
 
-## 1.2.0 (May 17, 2018)
+## 1.2.1 (May 28, 2018)
+
+BUG FIXES:
+
+ * cache for service was not properly taken into account
+
+IMPROVEMENTS:
+
+ * consul-ui now shows the number of service filetered
+ * service.Meta is an object not an array when null (Consul < 1.1)
+
+## 1.2.0 (May 25, 2018)
 
 IMPROVEMENTS:
 

data/lib/consul/async/consul_template.rb

@@ -296,6 +296,7 @@ module Consul
           new_res << ServiceInstance.new(v)
         end
         @cached_result = new_res
+        @cached_json = result.json
         new_res
       end
     end

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.2.1'.freeze
   end
 end

data/samples/consul-ui/consul-services-ui.html.erb

@@ -11,7 +11,12 @@
                 Show Tags
               </label>
             </div>
+            <div class="input-group">
             <input id="service-filter" type="text" placeholder="filter by name or tags" class="form-control" />
+              <div class="input-group-append">
+                <span class="input-group-text" id="service-counter"></span>
+              </div>
+            </div>
           </div>
           <div id="service-wrapper" >
             <ul id="service-list" class="list-group">

data/samples/consul-ui/consul_template.json.erb

@@ -81,7 +81,7 @@
       server = { frontend_id: "backend_http__#{service_name}",
                  id:      snode['Service']['ID'],
                  name:    snode['Node']['Node'],
-                 sMeta:   meta ? meta : [],
+                 sMeta:   meta ? meta : {},
                  addr:    snode.service_address,
                  port:    snode['Service']['Port'],
                  tags:    snode['Service']['Tags'],

data/samples/consul-ui/css/style.css

@@ -67,7 +67,7 @@ h2 .fas:hover {
 }
 
 .progress-status {
-  transition: background-color .16s linear;
+  transition: background-color .16s linear, width .16s linear;
   cursor: pointer;
 }
 

data/samples/consul-ui/js/service.js

@@ -7,6 +7,8 @@ class ConsulService {
     this.serviceFilter.keyup(this.filterService);
     this.refresh = parseInt(refresh);
     this.filterStatus = null;
+    this.serviceFilterCounter = $("#service-counter");
+    this.serviceFilterCount = 0;
     this.showTags($('#showTagsInList').checked)
   }
 
@@ -47,6 +49,8 @@ class ConsulService {
   }
 
   reloadServiceList() {
+    this.serviceList.html('');
+    this.serviceFilterCount = 0;
     for (var serviceName in this.data.services) {
       var service = this.data.services[serviceName];
       var serviceStatus = buildServiceStatus(service);
@@ -69,18 +73,24 @@ class ConsulService {
       }
       listItem += '</div>'
       listItem += '</button>';
+      this.serviceFilterCount += 1;
       this.serviceList.append(listItem);
     }
+    this.serviceFilterCounter.html(this.serviceFilterCount);
     resizeWrapper('service-wrapper', 'service-list');
+    this.filterService();
   }
 
-  filterService(e) {
-    var filter = new RegExp(e.target.value);
+  filterService() {
+    var filter = new RegExp(consulService.serviceFilter.val());
+    consulService.serviceFilterCount = 0;
     consulService.serviceList.children('button').each(function (){
       if($(this).html().match(filter)) {
         var ui = $(this).closest( "button" )
         ui.removeClass('d-none');
         ui.addClass('d-block');
+        consulService.serviceFilterCount += 1;
+        consulService.serviceFilterCounter.html(consulService.serviceFilterCount);
       } else {
         var ui = $(this).closest( "button" )
         ui.removeClass('d-block');

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request