kennel 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f3b1eb54a6d3249228c90e6313b1b014ce75463da52f3bf9a242ab81aa45b84
-  data.tar.gz: 1e2650fc9d44b68e91336afea05f711b90bca96bb571be027404ad103d94043b
+  metadata.gz: 212069a8189feba7b905038e769d4e246442ad121bc5300fa05896424fa93acc
+  data.tar.gz: e7af63be1ade43d44bcc730c40e30028ba41515fe6256d0cff7ffb0b97409907
 SHA512:
-  metadata.gz: 603e35948978e66351219b4b34d3ae35ef3d95a48f77a6ebed8fdc167edcba73ebf2be8910779ce62354f2ce34df9a457a882aaef18aac938e58ed6792476482
-  data.tar.gz: 37c00fd53b6767e7f49592eb6f46d63e13289bf64fac7dbbb339a22cb12b51f7bddd2d0a685c95968dda972cb0d1e3a4a0c188ad40a7b52a1b92d5ea4298e73b
+  metadata.gz: 5f11b3467b839e3f13c788e1ce94879cc1b5e83bf5b721be83741482d9aaa405240410c639074ee08fea6f282e9396a500c8cbe11453b15eaa2185616635686e
+  data.tar.gz: a3155e7bd8819e2afeb8e3621b197a83c90d55a3a80a7a5d9ea2641f2de251a258979c7c986552c4cdd99657b3aa0801990479aa1bcec755b0714a126f239767

data/lib/kennel/models/base.rb

@@ -104,13 +104,19 @@ 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)
         expected[level1].each_with_index do |e_w, wi|
-          (e_w.dig(level2, :requests) || []).each_with_index do |e_r, ri|
-            next unless a_r = actual.dig(level1, wi, level2, :requests, ri) # skip newly added widgets/requests
-            REQUEST_DEFAULTS.each do |key, default|
-              if [a_r, e_r].all? { |r| r[key].nil? || r[key] == default }
-                a_r.delete(key)
-                e_r.delete(key)
-              end
+          e_r = e_w.dig(level2, :requests) || []
+          a_r = actual.dig(level1, wi, 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|
+          next unless a = actual[i] # skip newly added
+          defaults.each do |key, default|
+            if [a, e].all? { |r| r[key].nil? || r[key] == default }
+              a.delete(key)
+              e.delete(key)
             end
           end
         end

data/lib/kennel/models/screen.rb

@@ -6,6 +6,11 @@ module Kennel
       include OptionalValidations
 
       API_LIST_INCOMPLETE = true
+      COPIED_WIDGET_VALUES = [:board_id, :isShared].freeze
+      WIDGET_DEFAULTS = {
+        time: {},
+        timeframe: "1h"
+      }.freeze
 
       settings :id, :board_title, :description, :widgets, :kennel_id
 
@@ -58,13 +63,15 @@ module Kennel
         actual.delete(:showGlobalTimeOnboarding)
         actual[:template_variables] ||= []
         (actual[:widgets] || []).each do |w|
-          # api randomly returns time.live_span or timeframe
-          w[:timeframe] = w.delete(:time)[:live_span] if w[:time]
+          # api randomly returns time.live_span or timeframe or empty time hash
+          if w.dig(:time, :live_span)
+            w[:timeframe] = w[:time].delete(:live_span)
+          end
 
-          w.delete :board_id # copied value, can ignore
-          w.delete :isShared # copied value, can ignore
+          COPIED_WIDGET_VALUES.each { |v| w.delete v }
         end
 
+        ignore_defaults as_json[:widgets], actual[:widgets], WIDGET_DEFAULTS
         ignore_request_defaults as_json, actual, :widgets, :tile_def
 
         super
@@ -79,7 +86,7 @@ module Kennel
       def validate_json(data)
         # check for fields that are unsettable
         data[:widgets].each do |w|
-          [:isShared, :board_id].each do |ignored|
+          COPIED_WIDGET_VALUES.each do |ignored|
             if w.key?(ignored)
               invalid! "remove definition #{ignored}, it is unsettable and will always produce a diff"
             end
@@ -119,8 +126,7 @@ module Kennel
             {
               title: true,
               legend: false,
-              legend_size: "0",
-              timeframe: "1h"
+              legend_size: "0"
             }
           else
             {}

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday