kennel 1.38.0 → 1.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da1d24aacbf462111912acfad39aed333b157db6bcc43bcd21f7edea8b5edf29
-  data.tar.gz: 4cefae45ad88fae1359711da380810c8a4353bd50c00a3d7f3fa7743596a56f7
+  metadata.gz: 4ff03815a21fb7a0850ac598043a687268e63b596d33d4b3a741c75f5b11fe87
+  data.tar.gz: 2570ed375f81545c1eb4b251e2f35f3abbfc4c7779191917f5ba87dae65ad7d7
 SHA512:
-  metadata.gz: 2ecfa0e9f8029cafcfff445ce1d8c90a7e04052b220fac668f4db2ac6c3b6840da4621a81995a9a1f1e3bbaa2478b48808f6fda8f57d10c778ba806eb41e2e35
-  data.tar.gz: f89fb05b7415a4e796df9edfc73f484ddbefa6cb3646c0dcf44948dd29c31732c847fc17e311a2c6d9c36cca2c65fb7264dc8fa7a98a5ed73dff921d78d7536d
+  metadata.gz: 01a572db1d8b0313833197af3dbb3c86226b0b9903d8593beb237868ee7c9d9ceeb62c69cbd9ea4d77257c08a89758f21b63439a78c9bd5044a31ad0c2d2a901
+  data.tar.gz: 61c71ec73f73fa2a81415a2167eb97f1638692d3e1e91ae9c910a741a1d3bd9e8685ba5eb92c7971a8c15647f41d8746312bd370532d48d73ece8ed848b07c2b

data/lib/kennel/models/base.rb

@@ -69,15 +69,18 @@ module Kennel
 
         # discard styles/conditional_formats/aggregator if nothing would change when we applied (both are default or nil)
         def ignore_request_defaults(expected, actual, level1, level2)
-          (actual[level1] || []).each_with_index do |a_w, wi|
-            a_r = a_w.dig(level2, :requests) || []
-            e_r = expected.dig(level1, wi, level2, :requests) || []
+          actual = actual[level1] || {}
+          expected = expected[level1] || {}
+          [expected.size.to_i, actual.size.to_i].max.times do |i|
+            a_r = actual.dig(i, level2, :requests) || []
+            e_r = expected.dig(i, level2, :requests) || []
             ignore_defaults e_r, a_r, REQUEST_DEFAULTS
           end
         end
 
         def ignore_defaults(expected, actual, defaults)
-          (expected || []).each_with_index do |e, i|
+          [expected&.size.to_i, actual&.size.to_i].max.times do |i|
+            e = expected[i] || {}
             a = actual[i] || {}
             ignore_default(e, a, defaults)
           end

data/lib/kennel/models/dash.rb

@@ -11,7 +11,7 @@ module Kennel
       DEFINITION_DEFAULTS = { autoscale: true }.freeze
       DASH_DEFAULTS = { template_variables: [] }.freeze
 
-      settings :id, :title, :description, :graphs, :kennel_id, :graphs, :definitions
+      settings :id, :title, :description, :graphs, :kennel_id, :definitions
 
       defaults(
         id: -> { nil },
@@ -53,13 +53,14 @@ module Kennel
         actual[:template_variables] ||= [] # is nil when it never had template variables
         ignore_default expected, actual, DASH_DEFAULTS
 
-        (actual[:graphs] || {}).each do |g|
-          g[:definition].delete(:status)
-        end
+        graphs = actual[:graphs] || []
+
+        graphs.each { |g| g[:definition].delete(:status) }
+
         ignore_request_defaults expected, actual, :graphs, :definition
 
-        (actual[:graphs] || []).each_with_index do |a_g, i|
-          a_d = a_g[:definition] || {}
+        graphs.each_with_index do |a_g, i|
+          a_d = a_g[:definition]
           e_d = expected.dig(:graphs, i, :definition) || {}
           ignore_default e_d, a_d, DEFINITION_DEFAULTS
         end

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.38.0"
+  VERSION = "1.39.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.38.0
+  version: 1.39.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday