openhab-scripting 5.47.3 → 5.47.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd2aa14f2bc1f8ac43aa9cd55dd95c24395367e95f16732b3911d77d707e12d
-  data.tar.gz: 35b524b0b291fd2fdec0f25290274be648697860e17df54ad8c06e0f643fbc0f
+  metadata.gz: 5278818a9473735ac2ae2c0b85d09df5f5c5b9bc196915cde58fda8ff36fb604
+  data.tar.gz: d7daf509023b161958993d172cfbf77c5db589735c9b5340243d01cb26674e90
 SHA512:
-  metadata.gz: 12f55e491a8c72447d539c45ddd74db196c80c92bbec37e0f0aa0277b53633f14c78d15634b5814b75fd715844096d53f324d443806e0d5f30895addc50c44b2
-  data.tar.gz: 3eec0b52f59468f948ee68269d47a3d537ff425795f018f6ed4dd493c6caf8912482125db293ef1f9aac571c93b3a02fd084417f0a6a9a1aafd2bbb7dd25bbd7
+  metadata.gz: 2b173a5be4a3c72e93c12f98de780a9e8d6211182a706f0a66003ff776d9db97d4f91a04282bcb9db6b6a224de76e08b4d33bb54ce9aef4d1ae020339237c737
+  data.tar.gz: 8b1a93d407a4a69faeceb40be50ef09654b7c95c8ceec213f6bac104041e33e72689e73b6a5a2dad20c19367131ec6aa4276d9b62c8e76510c2c42d560aca670

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/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

@@ -43,12 +43,72 @@ module OpenHAB
         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/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.4"
   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.4
 platform: ruby
 authors:
 - Brian O'Connell