openhab-scripting 5.47.4 → 5.47.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5278818a9473735ac2ae2c0b85d09df5f5c5b9bc196915cde58fda8ff36fb604
-  data.tar.gz: d7daf509023b161958993d172cfbf77c5db589735c9b5340243d01cb26674e90
+  metadata.gz: d22421ade202e53be08b9511bcacdeb16b8242587999d8b9a017f928748318cd
+  data.tar.gz: 6c4e7e8d938b2c6c62c41a8bb1baf5b10470f73fe371f0e2130fc09bf1c09124
 SHA512:
-  metadata.gz: 2b173a5be4a3c72e93c12f98de780a9e8d6211182a706f0a66003ff776d9db97d4f91a04282bcb9db6b6a224de76e08b4d33bb54ce9aef4d1ae020339237c737
-  data.tar.gz: 8b1a93d407a4a69faeceb40be50ef09654b7c95c8ceec213f6bac104041e33e72689e73b6a5a2dad20c19367131ec6aa4276d9b62c8e76510c2c42d560aca670
+  metadata.gz: d338d71faf5eb7adf46c4b787a3202bcf33c5705541727b40d669331e3d85266464681842439e9a5f1fa79f4b5bd1b527b549c2a266f06b7f90ec8ac31a57a9c
+  data.tar.gz: 34bd14d2816fc2350fbce61f65d891d10b098f0014d09f113ec0ee85347bfed2ec35255fd836d6894db0b1d283315d5da75d74a1e4bb0f4d4ddcdaffd61b84dc

data/lib/openhab/core/sitemaps/linkable_widget.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module Core
+    module Sitemaps
+      # @interface
+      java_import org.openhab.core.sitemap.LinkableWidget
+
+      # @since openHAB 5.2.0
+      module LinkableWidget
+        # @!parse
+        #   include Widget
+
+        # @!attribute [r] widgets
+        # @return [<Widget>]
+
+        private
+
+        def inspect_details
+          children_count = widgets.size
+          " (#{children_count} child#{"ren" if children_count != 1})" if children_count.positive?
+        end
+      end
+    end
+  end
+end

data/lib/openhab/core/sitemaps/provider.rb

@@ -37,7 +37,9 @@ module OpenHAB
 
         # @deprecated OH 5.2: remove the non-registry branch when dropping OH 5.1
         if registry
+          require_relative "linkable_widget"
           require_relative "sitemap"
+          require_relative "widget"
 
           include org.openhab.core.sitemap.registry.SitemapProvider
         else

data/lib/openhab/core/sitemaps/sitemap.rb

@@ -5,6 +5,32 @@ module OpenHAB
     module Sitemaps
       # @interface
       java_import org.openhab.core.sitemap.Sitemap
+
+      # @since openHAB 5.2.0
+      module Sitemap
+        # @!attribute [r] name
+        # @return [String]
+
+        # @!attribute [r] label
+        # @return [String, nil]
+
+        # @!attribute [r] icon
+        # @return [String, nil]
+
+        # @!attribute [r] widgets
+        # @return [<Widget>]
+
+        # @return [String]
+        def to_s
+          r = "#<OpenHAB::Core::Sitemaps::Sitemap #{name}"
+          r += " #{label.inspect}" if label
+          r += " icon=#{icon.inspect}" if icon
+          children_count = widgets.size
+          r += " (#{children_count} child#{"ren" if children_count != 1})" if children_count.positive?
+          "#{r}>"
+        end
+        alias_method :inspect, :to_s
+      end
     end
   end
 end

data/lib/openhab/core/sitemaps/widget.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module Core
+    module Sitemaps
+      # @interface
+      java_import org.openhab.core.sitemap.Widget
+
+      # @since openHAB 5.2.0
+      module Widget
+        # @!attribute [r] item
+        # @return [String, nil]
+
+        # @!attribute [r] label
+        # @return [String, nil]
+
+        # @!attribute [r] icon
+        # @return [String, nil]
+
+        # @!attribute [r] widget_type
+        # @return [String]
+
+        # @return [String]
+        def to_s
+          r = "#<OpenHAB::Core::Sitemaps::#{widget_type}"
+          r += " #{label.inspect}" if label
+          r += " item=#{item}" if item
+          r += inspect_details.to_s
+          "#{r}>"
+        end
+        alias_method :inspect, :to_s
+
+        private
+
+        def inspect_details; end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/sitemaps/builder.rb

@@ -1170,7 +1170,10 @@ module OpenHAB
           widget = super
 
           children.each do |child|
-            widget.widgets.add(child.build)
+            child = child.build
+            # @deprecated OH 5.2: Remove conditional when dropping OH 5.1
+            child.parent = widget if child.respond_to?(:parent=)
+            widget.widgets.add(child)
           end
 
           widget

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.47.4"
+    VERSION = "5.47.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.47.4
+  version: 5.47.5
 platform: ruby
 authors:
 - Brian O'Connell
@@ -173,10 +173,12 @@ files:
 - lib/openhab/core/rules/tagged_array.rb
 - lib/openhab/core/script_handling.rb
 - lib/openhab/core/sitemaps/compatibility.rb
+- lib/openhab/core/sitemaps/linkable_widget.rb
 - lib/openhab/core/sitemaps/model.rb
 - lib/openhab/core/sitemaps/provider.rb
 - lib/openhab/core/sitemaps/registry.rb
 - lib/openhab/core/sitemaps/sitemap.rb
+- lib/openhab/core/sitemaps/widget.rb
 - lib/openhab/core/things.rb
 - lib/openhab/core/things/abstract_description_type.rb
 - lib/openhab/core/things/channel.rb
@@ -358,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []