kennel 1.40.0 → 1.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48d299703094c1309aec2c1e902a6c0e8a37174395a9fccd233cf72f3b75b255
-  data.tar.gz: 72f45df5f14f29c97f4a906d6f59cc9a70acc26040fed0a36520e8c675dbacb0
+  metadata.gz: 8fd1df00b8cba5414b3c34f245b8c67c7263faf63440400850762406b999517d
+  data.tar.gz: 81c1c103f5792d68999531e09b2198d803ea0ec4085c8ca18d7b5871981da980
 SHA512:
-  metadata.gz: ef6beaa1c5ffa0c2b1c6d534e1fd30cd3276d29bf1a16074e06f1499b76466b187c0694e5bc50ca9c9e8bb814cccfec05f477bee16b15b34067df3c78c83d2d3
-  data.tar.gz: eeabb869d2528613cbb1d18b92fe603404c160fc88212b76f97a02d4a77e8262b930fde867ae3fb33e13c0ce330b8998d5494ee233655b294b37461d6e10e5f3
+  metadata.gz: d684a807b876bbe5e438d6fb3a8f5d1de4797c9b81fe4545d2bf2eb2aecd69a3f50e0adf0437b5952ffc4a83de05a090874a30e5bf2764c6cd37f48a136e5628
+  data.tar.gz: 870ec2d6580e31f437f07bf21c2becc36b2bc1926e523a054bde905f86754f5e7c4fcab2914f7d3c107b96e1f8c7992931a1e8997b5dd5a4cad0cf54a13ebb44

data/lib/kennel/models/dashboard.rb

@@ -13,16 +13,22 @@ module Kennel
       REQUEST_DEFAULTS = {
         style: { line_width: "normal", palette: "dog_classic", line_type: "solid" }
       }.freeze
+      SUPPORTED_DEFINITION_OPTIONS = [:events, :markers, :precision].freeze
 
-      settings :id, :title, :description, :widgets, :kennel_id, :layout_type
+      settings :id, :title, :description, :definitions, :widgets, :kennel_id, :layout_type
 
       defaults(
         description: -> { "" },
+        definitions: -> { [] },
         widgets: -> { [] },
         id: -> { nil }
       )
 
       class << self
+        def api_resource
+          "dashboard"
+        end
+
         def normalize(expected, actual)
           super
 
@@ -56,10 +62,6 @@ module Kennel
         super(*args)
       end
 
-      def self.api_resource
-        "dashboard"
-      end
-
       def as_json
         return @json if @json
         @json = {
@@ -67,7 +69,7 @@ module Kennel
           title: "#{title}#{LOCK}",
           description: description,
           template_variables: render_template_variables,
-          widgets: widgets
+          widgets: render_definitions + widgets
         }
 
         @json[:id] = id if id
@@ -88,6 +90,26 @@ module Kennel
 
         validate_template_variables data, :widgets
       end
+
+      def render_definitions
+        definitions.map do |title, type, display_type, queries, options = {}, ignored = nil|
+          # validate inputs
+          if ignored || (!title || !type || !queries || !options.is_a?(Hash))
+            raise ArgumentError, "Expected exactly 5 arguments for each definition (title, type, display_type, queries, options)"
+          end
+          if (SUPPORTED_DEFINITION_OPTIONS | options.keys) != SUPPORTED_DEFINITION_OPTIONS
+            raise ArgumentError, "Supported options are: #{SUPPORTED_DEFINITION_OPTIONS.map(&:inspect).join(", ")}"
+          end
+
+          # build definition
+          requests = Array(queries).map do |q|
+            request = { q: q }
+            request[:display_type] = display_type if display_type
+            request
+          end
+          { definition: { title: title, type: type, requests: requests, **options } }
+        end
+      end
     end
   end
 end

data/lib/kennel/version.rb

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

metadata

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