kennel 1.8.3 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59fe17a63e746b5fbb0eea29538ca8ade0a27622af5ed0fa5efb64f7696398c3
-  data.tar.gz: 738a1e4812523a39217ae695aa33b4f10508c9def87d776da2575275b230114f
+  metadata.gz: f12b86071e1e495725a1f4fe210c0a51ed8503bc8c1f8fdeae9cb3d1703335fd
+  data.tar.gz: cf352fce060f9547781ec6faae4387bb3e8e1486f6499e0f2841fe0b287f6460
 SHA512:
-  metadata.gz: 24436ff45b17584d7cb999c85b58b5c21eae3eace37df622f93e9088164f12adb6fa156c9decbc3bc13b75d425cf8d331988a84b073a538d9226ec9e94b290f7
-  data.tar.gz: bdd2f5d1fd851b502a8a7da48b2820d1aa329a9b4d721708341177d9a41c42b0d8bb1d17e9226fb5e06d1c8ea033deaabaea5eb32bd928da4217cf1e89fa4805
+  metadata.gz: 52f1e980cb83c6249c03c455bb72b0d3675ac8d37088cf403a634b21d01546a9cab9ffc530045ef8d847b11bebd744a2234d23ceba84614f2d09ecf3296b1875
+  data.tar.gz: 7429f9056cefd2a83b21b810e8aae07033d10d61daee7d8b141e9c9a838b218ec513889cb4c8727508470ada5a1dab3e4ff07a5fe293773323512bab6a2342c1

data/lib/kennel/models/base.rb

@@ -79,8 +79,7 @@ module Kennel
 
         READONLY_ATTRIBUTES.each { |k| actual.delete k }
 
-        diff = HashDiff.diff(actual, expected, use_lcs: false)
-        diff if diff.any?
+        HashDiff.diff(actual, expected, use_lcs: false)
       end
 
       def tracking_id

data/lib/kennel/models/dash.rb

@@ -71,7 +71,7 @@ module Kennel
 
         # check for fields that are unsettable
         data[:graphs].each do |g|
-          if g.dig(:definition, :status)
+          if g[:definition].key?(:status)
             raise "#{tracking_id} remove definition status, it is unsettable and will always produce a diff"
           end
         end

data/lib/kennel/models/screen.rb

@@ -3,8 +3,14 @@ module Kennel
   module Models
     class Screen < Base
       include TemplateVariables
+      include OptionalValidations
 
       API_LIST_INCOMPLETE = true
+      REQUEST_DEFAULTS = {
+        style: { width: "normal", palette: "dog_classic", type: "solid" },
+        conditional_formats: [],
+        aggregator: "avg"
+      }.freeze
 
       settings :id, :board_title, :description, :widgets, :kennel_id
 
@@ -34,6 +40,9 @@ module Kennel
           widgets: render_widgets,
           template_variables: render_template_variables
         }
+
+        validate_json(@json) if validate
+
         @json
       end
 
@@ -51,14 +60,29 @@ module Kennel
         actual.delete(:board_bgtype)
         actual.delete(:height)
         actual.delete(:width)
+        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]
 
-          # board_id is a copied value, can ignore
-          w.delete :board_id
+          w.delete :board_id # copied value, can ignore
+          w.delete :isShared # copied value, can ignore
+        end
+
+        # discard styles/conditional_formats/aggregator if nothing would change when we applied (both are default or nil)
+        as_json[:widgets].each_with_index do |e_w, wi|
+          (e_w.dig(:tile_def, :requests) || []).each_with_index do |e_r, ri|
+            next unless a_r = actual.dig(:widgets, wi, :tile_def, :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
+            end
+          end
         end
+
         super
       end
 
@@ -68,14 +92,23 @@ module Kennel
 
       private
 
+      def validate_json(data)
+        # check for fields that are unsettable
+        data[:widgets].each do |w|
+          [:isShared, :board_id].each do |ignored|
+            if w.key?(ignored)
+              raise "#{tracking_id} remove definition #{ignored}, it is unsettable and will always produce a diff"
+            end
+          end
+        end
+      end
+
       def render_widgets
         widgets.map do |widget|
           widget = widget_defaults(widget[:type]).merge(widget)
           if tile = widget[:tile_def]
-            tile.fetch(:requests).each { |r| r[:conditional_formats] ||= [] }
             tile[:autoscale] = true unless widget[:tile_def].key?(:autoscale)
           end
-          widget.delete :board_id
           widget
         end
       end

data/lib/kennel/syncer.rb

@@ -67,7 +67,8 @@ module Kennel
 
             if e = delete_matching_expected(a)
               fill_details(a, cache) if e.class::API_LIST_INCOMPLETE
-              if diff = e.diff(a)
+              diff = e.diff(a)
+              if diff.any?
                 @update << [id, e, a, diff]
               end
             elsif tracking_id(a) # was previously managed

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday