kennel 2.22.2 → 2.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 371dd82c75198714d213f7aae056198d110a862559e7c7f880aa3d94049590fa
-  data.tar.gz: b68693df3582c1c0344454af713c155210b9a477c311edff0278fd68134fc8f5
+  metadata.gz: 614aead22d9d8cbf26ce1ebc7d479bb31f639218975724c8d49788205498fc80
+  data.tar.gz: c74efdd742433b316e89ea90d9bb454995ae6dde9e718058a29291c69f430947
 SHA512:
-  metadata.gz: 56020b989084f93c418ac3afc2a03fafea9eb2e0b9d9d760c7b06a152556d67f884d523b38c9178b8777edc5c09faff5d465dffd846e2b56cbb5652b106fd53d
-  data.tar.gz: a10a1fb9a3b35bccde14f09a154b42f65f360d8887a0886df1fe73846d026df3a58f877ca247e7e7f572769cce0d0334a4a6f2e41edca26a98fdb0a11eb1d563
+  metadata.gz: 5e64729084251aede67228e6d2b610b2dd5a689a574ec47417aaceb31f14d1df6e7cb47b795108763ba0b28498d7db0b97aee5f1ad115949736ce74274b7f5b0
+  data.tar.gz: bfc68b6992bf396e488b46ce309aab911bd6650fa5c7e8577e7632d18ec1175053f85e89db458b9e7278d560e54a27b05fc3dd2eb830bc9a81089c8d80d62bf9

data/lib/kennel/api.rb

@@ -103,10 +103,11 @@ module Kennel
       end
     end
 
-    # yield each widget with a key built from its (optional) group title and its own title
+    # yield each widget with a key built from its group optional title/position and its own title/position
     def each_widget_with_key(widgets, prefix: nil, &block)
-      widgets.each do |widget|
+      widgets.each_with_index do |widget, i|
         title = widget.dig(:definition, :title)
+        title = i.to_s if title.to_s.empty?
         key = [prefix, title].compact.join("-")
         yield key, widget
         if (nested = widget.dig(:definition, :widgets))

data/lib/kennel/importer.rb

@@ -161,7 +161,7 @@ module Kennel
 
       sort_hash(hash).map do |k, v|
         pretty_value =
-          if v.is_a?(Hash) || (v.is_a?(Array) && !v.all? { |e| e.is_a?(String) })
+          if v.is_a?(Hash) || (v.is_a?(Array) && !v.all?(String))
             # update answer here when changing https://stackoverflow.com/questions/8842546/best-way-to-pretty-print-a-hash
             # (exclude last indent gsub)
             pretty = JSON.pretty_generate(v)

data/lib/kennel/models/project.rb

@@ -32,7 +32,7 @@ module Kennel
 
       def validated_parts
         all = filter_parts(parts)
-        unless all.is_a?(Array) && all.all? { |part| part.is_a?(Record) }
+        unless all.is_a?(Array) && all.all?(Record)
           raise "Project #{kennel_id} #parts must return an array of Records"
         end
 

data/lib/kennel/parts_serializer.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require "etc"
+require "parallel"
 
 module Kennel
   class PartsSerializer
@@ -29,20 +31,32 @@ module Kennel
     attr_reader :filter
 
     def write_changed(parts)
-      used = []
-      changed = []
+      paths_used = []
+      to_generate = []
 
-      Utils.parallel(parts, max: 2) do |part|
+      parts.each do |part|
         path = path_for_tracking_id(part.tracking_id)
 
         # match paths returned from existing_files_and_folders
-        used << File.dirname(path) # we have 1 level of sub folders, so this is enough
-        used << path
+        paths_used << File.dirname(path) # we have 1 level of sub folders, so this is enough
+        paths_used << path
 
         content = part.as_json.merge(api_resource: part.class.api_resource)
-        changed << path if write_file_if_necessary(path, content)
+        to_generate << [path, content]
+      end
+
+      paths_changed = generate_and_write(to_generate)
+
+      [paths_used, paths_changed]
+    end
+
+    # JSON.pretty_generate is CPU-bound and threads are limited by the GVL, so we fork
+    def generate_and_write(to_generate)
+      chunks = to_generate.each_slice(100) # processing 1-by-1 would be slow
+
+      Parallel.flat_map(chunks, exit!: true) do |chunk|
+        chunk.filter_map { |path, content| path if write_file_if_necessary(path, content) }
       end
-      [used, changed]
     end
 
     def existing_files_and_folders

data/lib/kennel/template_variables.rb

@@ -38,8 +38,22 @@ module Kennel
 
     def widget_queries(widget)
       requests = widget.dig(:definition, :requests) || []
-      return requests.values.map { |r| r[:q] } if requests.is_a?(Hash) # hostmap widgets have hash requests
+      return hostmap_queries(requests) if requests.is_a?(Hash) # hostmap widgets have hash requests
       requests.flat_map { |r| r[:q] || r[:queries]&.map { |q| q[:query] } } # old format with q: or queries: [{query:}]
     end
+
+    # hostmap requests nest queries at varying depth, for example
+    # { fill: { q: "..." } } or { fill: { queries: [{ search: { query: "..." } }] }, request_type: "hosts" }
+    def hostmap_queries(node)
+      case node
+      when Hash
+        query = node[:q] || node[:query]
+        [*query, *hostmap_queries(node.except(:q, :query).values)]
+      when Array
+        node.flat_map { |v| hostmap_queries(v) }
+      else
+        [] # scalar leaves like request_type: "hosts"
+      end
+    end
   end
 end

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -43,9 +43,14 @@ module Teams
 end
 
 module Kennel
-  UnresolvableIdError = Class.new(StandardError)
-  DisallowedUpdateError = Class.new(StandardError)
-  GenerationAbortedError = Class.new(StandardError)
+  class UnresolvableIdError < StandardError
+  end
+
+  class DisallowedUpdateError < StandardError
+  end
+
+  class GenerationAbortedError < StandardError
+  end
 
   class << self
     attr_accessor :in, :out, :err

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 2.22.2
+  version: 2.23.0
 platform: ruby
 authors:
 - Michael Grosser
@@ -65,6 +65,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement