kennel 1.37.3 → 1.38.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ebcab578e988e97aa6d53ad570f6b8be214adb64f844d3afd6c5273c4382acfc
4
- data.tar.gz: f4467892f25a81d61ea87cddadf3aba60fc7539f6257885d3505907f23b4c31d
3
+ metadata.gz: da1d24aacbf462111912acfad39aed333b157db6bcc43bcd21f7edea8b5edf29
4
+ data.tar.gz: 4cefae45ad88fae1359711da380810c8a4353bd50c00a3d7f3fa7743596a56f7
5
5
  SHA512:
6
- metadata.gz: e3d90b3142907d5206379ab0826f40d36e7afdca45fe624ac5e13376da899951664a51948a48754d0dfb8325aa4ed0e8ee0cb050a92f716fecb7f5afe3b34360
7
- data.tar.gz: 4175e0c4c7846d263ba47c09e1f730cc4376f5d6bb75084df88928ec33ada8d5a00248a2a41278271d942f174d14bdd4966831a0edb18222904e02cbb99a102e
6
+ metadata.gz: 2ecfa0e9f8029cafcfff445ce1d8c90a7e04052b220fac668f4db2ac6c3b6840da4621a81995a9a1f1e3bbaa2478b48808f6fda8f57d10c778ba806eb41e2e35
7
+ data.tar.gz: f89fb05b7415a4e796df9edfc73f484ddbefa6cb3646c0dcf44948dd29c31732c847fc17e311a2c6d9c36cca2c65fb7264dc8fa7a98a5ed73dff921d78d7536d
@@ -47,6 +47,11 @@ module Kennel
47
47
  end
48
48
  end
49
49
 
50
+ # simplify template_variables to array of string when possible
51
+ if vars = data[:template_variables]
52
+ vars.map! { |v| v[:default] == "*" && v[:prefix] == v[:name] ? v[:name] : v }
53
+ end
54
+
50
55
  pretty = pretty_print(data).lstrip.gsub("\\#", "#")
51
56
  <<~RUBY
52
57
  #{model.name}.new(
@@ -68,6 +73,7 @@ module Kennel
68
73
  pretty = JSON.pretty_generate(v)
69
74
  .gsub(": null", ": nil")
70
75
  .gsub(/(^\s*)"([a-zA-Z][a-zA-Z\d_]*)":/, "\\1\\2:") # "foo": 1 -> foo: 1
76
+ .gsub(/: \[\n\s+\]/, ": []") # empty arrays on a single line
71
77
  .gsub(/^/, " ") # indent
72
78
 
73
79
  "\n#{pretty}\n "
@@ -77,7 +77,7 @@ module Kennel
77
77
  # check for bad variables
78
78
  # TODO: do the same check for apm_query and their group_by
79
79
  variables = (data[:template_variables] || []).map { |v| "$#{v.fetch(:name)}" }
80
- queries = data[:graphs].flat_map { |g| g[:definition][:requests].map { |r| r[:q] }.compact }
80
+ queries = data[:graphs].flat_map { |g| (g[:definition][:requests] || []).map { |r| r[:q] }.compact }
81
81
  bad = queries.grep_v(/(#{variables.map { |v| Regexp.escape(v) }.join("|")})\b/)
82
82
  if bad.any?
83
83
  invalid! "queries #{bad.join(", ")} must use the template variables #{variables.join(", ")}"
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Kennel
3
- VERSION = "1.37.3"
3
+ VERSION = "1.38.0"
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kennel
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.37.3
4
+ version: 1.38.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Grosser
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-06-03 00:00:00.000000000 Z
11
+ date: 2019-06-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday