openhab-scripting 5.47.3 → 5.47.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd2aa14f2bc1f8ac43aa9cd55dd95c24395367e95f16732b3911d77d707e12d
-  data.tar.gz: 35b524b0b291fd2fdec0f25290274be648697860e17df54ad8c06e0f643fbc0f
+  metadata.gz: d22421ade202e53be08b9511bcacdeb16b8242587999d8b9a017f928748318cd
+  data.tar.gz: 6c4e7e8d938b2c6c62c41a8bb1baf5b10470f73fe371f0e2130fc09bf1c09124
 SHA512:
-  metadata.gz: 12f55e491a8c72447d539c45ddd74db196c80c92bbec37e0f0aa0277b53633f14c78d15634b5814b75fd715844096d53f324d443806e0d5f30895addc50c44b2
-  data.tar.gz: 3eec0b52f59468f948ee68269d47a3d537ff425795f018f6ed4dd493c6caf8912482125db293ef1f9aac571c93b3a02fd084417f0a6a9a1aafd2bbb7dd25bbd7
+  metadata.gz: d338d71faf5eb7adf46c4b787a3202bcf33c5705541727b40d669331e3d85266464681842439e9a5f1fa79f4b5bd1b527b549c2a266f06b7f90ec8ac31a57a9c
+  data.tar.gz: 34bd14d2816fc2350fbce61f65d891d10b098f0014d09f113ec0ee85347bfed2ec35255fd836d6894db0b1d283315d5da75d74a1e4bb0f4d4ddcdaffd61b84dc

data/lib/openhab/core/proxy.rb

@@ -66,6 +66,7 @@ module OpenHAB
         def subscribed_event_types
           @event_types.to_set
         end
+        alias_method :getSubscribedEventTypes, :subscribed_event_types # rubocop:disable Naming/MethodName
 
         # @return [org.openhab.core.events.EventFilter, nil]
         def event_filter

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/model.rb

@@ -61,70 +61,6 @@ module OpenHAB
 
           def value = "#{sign}#{state}"
         end
-
-        module Provider
-          def self.prepended(klass)
-            klass.include org.openhab.core.model.sitemap.SitemapProvider
-          end
-
-          SUFFIX = ".sitemap"
-          private_constant :SUFFIX
-
-          def getSitemap = get # rubocop:disable Naming/MethodName
-
-          # rubocop:disable Naming/MethodName
-          def getSitemapNames
-            @elements.key_set
-          end
-
-          def addModelChangeListener(listener)
-            @listeners.add(listener)
-          end
-
-          def removeModelChangeListener(listener)
-            @listeners.remove(listener)
-          end
-          # rubocop:enable Naming/MethodName
-
-          def unregister
-            clear
-            @registration.unregister
-          end
-
-          def update(sitemap)
-            if sitemap.respond_to?(:to_str)
-              sitemap = get(sitemap).tap do |obj|
-                raise ArgumentError, "Sitemap #{sitemap} not found" unless obj
-              end
-            end
-            super
-          end
-
-          def remove(sitemap)
-            sitemap = sitemap.uid if sitemap.respond_to?(:uid)
-            super
-          end
-
-          private
-
-          def notify_listeners_about_added_element(element)
-            model_name = "#{element.name}#{SUFFIX}"
-            @listeners.each do |listener|
-              listener.modelChanged(model_name, org.openhab.core.model.core.EventType::ADDED)
-              listener.modelChanged(model_name, org.openhab.core.model.core.EventType::MODIFIED)
-            end
-          end
-
-          def notify_listeners_about_removed_element(element)
-            model_name = "#{element.name}#{SUFFIX}"
-            @listeners.each { |listener| listener.modelChanged(model_name, org.openhab.core.model.core.EventType::REMOVED) }
-          end
-
-          def notify_listeners_about_updated_element(_old_element, element)
-            model_name = "#{element.name}#{SUFFIX}"
-            @listeners.each { |listener| listener.modelChanged(model_name, org.openhab.core.model.core.EventType::MODIFIED) }
-          end
-        end
       end
     end
   end

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

@@ -37,18 +37,80 @@ 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
           require_relative "model"
 
-          prepend Model::Provider
-        end
+          include org.openhab.core.model.sitemap.SitemapProvider
+
+          SUFFIX = ".sitemap"
+          private_constant :SUFFIX
+
+          # rubocop:disable Naming/MethodName
+
+          # @!visibility private
+          def addModelChangeListener(listener)
+            @listeners.add(listener)
+          end
+
+          # @!visibility private
+          def removeModelChangeListener(listener)
+            @listeners.remove(listener)
+          end
+          # rubocop:enable Naming/MethodName
 
-        alias_method :getSitemap, :get # rubocop:disable Naming/MethodName
+          def unregister
+            clear
+            @registration.unregister
+          end
+
+          # @!visibility private
+          def update(sitemap)
+            if sitemap.respond_to?(:to_str)
+              sitemap = get(sitemap).tap do |obj|
+                raise ArgumentError, "Sitemap #{sitemap} not found" unless obj
+              end
+            end
+            super
+          end
+
+          # @!visibility private
+          def remove(sitemap)
+            sitemap = sitemap.uid if sitemap.respond_to?(:uid)
+            super
+          end
+
+          private
+
+          def notify_listeners_about_added_element(element)
+            model_name = "#{element.name}#{SUFFIX}"
+            @listeners.each do |listener|
+              listener.modelChanged(model_name, org.openhab.core.model.core.EventType::ADDED)
+              listener.modelChanged(model_name, org.openhab.core.model.core.EventType::MODIFIED)
+            end
+          end
+
+          def notify_listeners_about_removed_element(element)
+            model_name = "#{element.name}#{SUFFIX}"
+            @listeners.each { |listener| listener.modelChanged(model_name, org.openhab.core.model.core.EventType::REMOVED) }
+          end
+
+          def notify_listeners_about_updated_element(_old_element, element)
+            model_name = "#{element.name}#{SUFFIX}"
+            @listeners.each { |listener| listener.modelChanged(model_name, org.openhab.core.model.core.EventType::MODIFIED) }
+          end
+
+          public
+
+        end
 
         # rubocop:disable Naming/MethodName
+        alias_method :getSitemap, :get
+
         # @!visibility private
         def getSitemapNames
           @elements.key_set

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.3"
+    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.3
+  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: []