openhab-jrubyscripting 5.0.0.rc1 → 5.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd7a4eed6a2398fd34734d9b3dc15a8f5e2bcc74f7309aede27be29501c21698
-  data.tar.gz: a1f70554ada415e7de0325ea259ac9edcad48355ef6000a4877057fa06b343ce
+  metadata.gz: ce249607265a008aa969e2edbd56302edd70a67a01dfebaec9ad67b7e5f1ad27
+  data.tar.gz: ac0c8d25509a8be8374a3f15fecd2e575da8cb08b82268aef41414f64f7a3b38
 SHA512:
-  metadata.gz: f27aa8940df9441a5318c32d1c0d84f15fdd70b2336cf95dd09383b73b97d14bbc7c924ba3e3df24f48d5f289d410ec1d6d0df9f99a40141ac34d88152e9a76a
-  data.tar.gz: c369de38091c4486a492b88ef990537b5a4cc667becca6be5a99a56227a8a2b0339b14e9ce1e11e6e73b56d8b055d3876917916ee7ec52b66c5b23e85b33a95b
+  metadata.gz: 7c082f0949b6bc55ebf48b1489eade3f6bbcf25181d6741e29697dbb5ef5221abf583c78fb8ad46596b5ea10957e9d4b5d2d5dfe35097eea004f005d06683d48
+  data.tar.gz: ee7e740d0dd1233462521313c31145971bed68e2830c765bad27b8762d064bdf154993a2d733fc7743240bd55aec9e0eecd8cb4f2d569dbd0c599e765140cd06

data/lib/openhab/core/entity_lookup.rb

@@ -72,7 +72,7 @@ module OpenHAB
         logger.trace("Looking up thing '#{uid}'")
         uid = uid.to_s if uid.is_a?(Symbol)
 
-        uid = generate_thing_uid(uid) unless uid.is_a?(org.openhab.core.thing.ThingUID)
+        uid = Things::ThingUID.new(uid) unless uid.is_a?(Things::ThingUID)
         thing = $things.get(uid)
         return unless thing
 
@@ -117,17 +117,6 @@ module OpenHAB
         item = $ir.get(name)
         Items::Proxy.new(item) unless item.nil?
       end
-
-      #
-      # Returns a ThingUID given a string like object
-      #
-      # @!visibility private
-      #
-      # @return [Things::ThingUID]
-      #
-      def self.generate_thing_uid(uid)
-        org.openhab.core.thing.ThingUID.new(*uid.split(":"))
-      end
     end
   end
 end

data/lib/openhab/core/items/generic_item.rb

@@ -65,16 +65,23 @@ module OpenHAB
         #
         # Send a command to this item
         #
+        # When this method is chained after the {OpenHAB::DSL::Items::Ensure::Ensurable#ensure ensure}
+        # method, or issued inside an {OpenHAB::DSL.ensure_states ensure_states} block,
+        # the command will only be sent if the item is not already in the same state.
+        #
         # @param [Command] command command to send to the item
-        # @return [self]
+        # @return [self, nil] nil when `ensure` is in effect and the item was already in the same state,
+        #   otherwise the item.
         #
-        # @see DSL::Items::TimedCommand#command
+        # @see DSL::Items::TimedCommand#command Timed Command
+        # @see OpenHAB::DSL.ensure_states ensure_states
+        # @see DSL::Items::Ensure::Ensurable#ensure ensure
         #
         def command(command)
           command = format_command(command)
           logger.trace "Sending Command #{command} to #{name}"
-          org.openhab.core.model.script.actions.BusEvent.sendCommand(self, command)
-          self
+          $events.send_command(self, command)
+          Proxy.new(self)
         end
 
         # not an alias to allow easier stubbing and overriding
@@ -88,13 +95,14 @@ module OpenHAB
         # Send an update to this item
         #
         # @param [State] state
-        # @return [self]
+        # @return [self, nil] nil when `ensure` is in effect and the item was already in the same state,
+        #   otherwise the item.
         #
         def update(state)
           state = format_update(state)
           logger.trace "Sending Update #{state} to #{name}"
-          org.openhab.core.model.script.actions.BusEvent.postUpdate(self, state)
-          self
+          $events.post_update(self, state)
+          Proxy.new(self)
         end
 
         #

data/lib/openhab/core/items/metadata/hash.rb

@@ -15,6 +15,8 @@ module OpenHAB
         #
         # @!attribute [rw] value
         #   @return [String] The main value for the metadata namespace.
+        # @!attribute [r] namespace
+        #   @return [String]
         #
         class Hash
           java_import org.openhab.core.items.Metadata
@@ -24,7 +26,7 @@ module OpenHAB
 
           extend Forwardable
           def_delegators :@metadata, :configuration, :hash, :to_s, :uid, :value
-          protected :configuration
+          private :configuration
 
           # @!method to_hash
           #   Implicit conversion to {::Hash}.
@@ -35,6 +37,9 @@ module OpenHAB
           # still others (mutators) must be manually implemented below.
           def_delegators :configuration,
                          :any?,
+                         :compact,
+                         :compare_by_identity?,
+                         :deconstruct_keys,
                          :default,
                          :default_proc,
                          :each,
@@ -45,6 +50,8 @@ module OpenHAB
                          :filter,
                          :flatten,
                          :has_value?,
+                         :invert,
+                         :key,
                          :keys,
                          :length,
                          :rassoc,
@@ -55,8 +62,12 @@ module OpenHAB
                          :to_a,
                          :to_h,
                          :to_hash,
+                         :transform_keys,
+                         :transform_values,
+                         :values,
                          :value?
-          def_delegators :to_h, :invert, :merge, :transform_keys, :transform_values
+
+          def_delegator :uid, :namespace
 
           class << self
             # @!visibility private
@@ -72,7 +83,7 @@ module OpenHAB
 
                         [value.first, (value.last || {}).transform_keys(&:to_s)]
                       when ::Hash then ["", value.transform_keys(&:to_s)]
-                      else [value, {}]
+                      else [value.to_s, {}]
                       end
               new(Metadata.new(org.openhab.core.items.MetadataKey.new(namespace.to_s, item_name), *value))
             end
@@ -84,7 +95,7 @@ module OpenHAB
           end
 
           # @!visibility private
-          def initialize(metadata)
+          def initialize(metadata = nil)
             @metadata = metadata
           end
 
@@ -108,13 +119,24 @@ module OpenHAB
           end
 
           # @!visibility private
-          def create
-            NamespaceHash.registry.add(@metadata) if attached?
+          def commit
+            return unless attached?
+
+            javaify
+            provider.update(@metadata)
           end
 
           # @!visibility private
-          def commit
-            NamespaceHash.registry.update(@metadata) if attached?
+          def create_or_update
+            return unless attached?
+
+            javaify
+            (p = provider).get(uid) ? p.update(@metadata) : p.add(@metadata)
+          end
+
+          # @!visibility private
+          def remove
+            provider.remove(uid)
           end
 
           # @!visibility private
@@ -141,7 +163,7 @@ module OpenHAB
               return false unless value == other.value
             end
 
-            to_h < other
+            configuration < other
           end
 
           # @!visibility private
@@ -151,7 +173,7 @@ module OpenHAB
               return false unless value == other.value
             end
 
-            to_h <= other
+            configuration <= other
           end
 
           # @!visibility private
@@ -161,7 +183,7 @@ module OpenHAB
 
               return configuration == other.configuration
             elsif value.empty? && other.respond_to?(:to_hash)
-              return configuration.to_h == other.to_hash
+              return configuration == other.to_hash
             end
             false
           end
@@ -173,7 +195,7 @@ module OpenHAB
               return false unless value == other.value
             end
 
-            to_h > other
+            configuration > other
           end
 
           # @!visibility private
@@ -183,7 +205,7 @@ module OpenHAB
               return false unless value == other.value
             end
 
-            to_h >= other
+            configuration >= other
           end
 
           # @!visibility private
@@ -211,13 +233,9 @@ module OpenHAB
             replace({})
           end
 
-          # @!visibility private
-          alias_method :compact, :to_h
-
           # @!visibility private
           def compact!
-            # no action; impossible to have nil keys
-            self
+            replace(compact)
           end
 
           # @!visibility private
@@ -225,16 +243,6 @@ module OpenHAB
             raise NotImplementedError
           end
 
-          # @!visibility private
-          def compare_by_identity?
-            false
-          end
-
-          # @!visibility private
-          def deconstruct_keys
-            self
-          end
-
           # @!visibility private
           def default=(*)
             raise NotImplementedError
@@ -289,11 +297,6 @@ module OpenHAB
             self
           end
 
-          # @!visibility private
-          def key(value)
-            rassoc(value)&.first
-          end
-
           # @!visibility private
           def key?(key)
             configuration.key?(key.to_s)
@@ -345,7 +348,7 @@ module OpenHAB
 
           # @!visibility private
           def slice(*keys)
-            to_h.slice(*keys.map(&:to_s))
+            configuration.slice(*keys.map(&:to_s))
           end
 
           # @!visibility private
@@ -365,11 +368,6 @@ module OpenHAB
             replace(transform_values(&block))
           end
 
-          # @!visibility private
-          def values
-            configuration.values.to_a
-          end
-
           # @!visibility private
           def values_at(*keys)
             configuration.values_at(*keys.map(&:to_s))
@@ -383,6 +381,50 @@ module OpenHAB
             [value, to_h].inspect
           end
           alias_method :to_s, :inspect
+
+          #
+          # @raise [RuntimeError] if the provider is not a
+          #   {org.openhab.core.common.registry.ManagedProvider ManagedProvider} that can be updated.
+          # @return [org.openhab.core.common.registry.ManagedProvider]
+          #
+          def provider
+            preferred_provider = Provider.current(
+              Thread.current[:openhab_providers]&.dig(:metadata_items, uid.item_name) ||
+                Thread.current[:openhab_providers]&.dig(:metadata_namespaces, uid.namespace),
+              self
+            )
+
+            if attached?
+              provider = Provider.registry.provider_for(uid)
+              return preferred_provider unless provider
+
+              unless provider.is_a?(org.openhab.core.common.registry.ManagedProvider)
+                raise FrozenError, "Cannot modify metadata from provider #{provider.inspect}"
+              end
+
+              if preferred_provider != provider
+                logger.warn("Provider #{preferred_provider.inspect} cannot be used with #{uid}; " \
+                            "reverting to provider #{provider.inspect}. " \
+                            "This may cause unexpected issues, like metadata persisting that you did not expect to.")
+                preferred_provider = provider
+              end
+
+            end
+            preferred_provider
+          end
+
+          private
+
+          #
+          # @see https://github.com/openhab/openhab-core/issues/3169
+          #
+          # in the meantime, force the serialization round-trip right now
+          #
+          def javaify
+            mapper = Provider.registry.managed_provider.get.storage.entityMapper
+
+            @metadata = mapper.from_json(mapper.to_json_tree(@metadata), Metadata.java_class)
+          end
         end
       end
     end

data/lib/openhab/core/items/metadata/namespace_hash.rb

@@ -96,12 +96,7 @@ module OpenHAB
             metadata = Hash.from_item(@item_name, namespace, value)
             return @hash[metadata.uid.namespace] = metadata unless attached? # rubocop:disable Lint/ReturnInVoidContext
 
-            # registry.get can be omitted, but registry.update will log a warning for nonexistent metadata
-            if self.class.registry.managed_provider.get.get(metadata.uid)
-              metadata.commit
-            else
-              metadata.create
-            end
+            metadata.create_or_update
             metadata # rubocop:disable Lint/Void
           end
           alias_method :store, :[]=
@@ -117,7 +112,11 @@ module OpenHAB
           # @!visibility private
           def clear
             if attached?
-              self.class.registry.remove_item_metadata(@item_name)
+              provider = Provider.current(Thread.current[:openhab_providers]&.dig(:metadata_items, @item_name))
+              provider.remove_item_metadata(@item_name)
+              Thread.current[:openhab_providers]&.[](:metadata_namespaces)&.each_value do |namespace_provider|
+                Provider.current(namespace_provider).remove_item_metadata(@item_name)
+              end
             else
               @hash.clear
             end
@@ -171,11 +170,10 @@ module OpenHAB
 
           # @!visibility private
           def delete(namespace, &block)
-            namespace = namespace.to_s
-
-            return @hash.delete(namespace, &block) unless attached?
+            return @hash.delete(namespace.to_s, &block) unless attached?
 
-            r = self.class.registry.remove(MetadataKey.new(namespace, @item_name))
+            metadata = Hash.from_item(@item_name, namespace, nil)
+            r = metadata.remove
             return yield(namespace) if block && !r
 
             Hash.new(r) if r
@@ -208,7 +206,7 @@ module OpenHAB
             return @hash.each(&block) unless attached?
             return to_enum(:each) unless block
 
-            self.class.registry.all.each do |meta|
+            Provider.registry.all.each do |meta|
               yield meta.uid.namespace, Hash.new(meta) if meta.uid.item_name == @item_name
             end
             self
@@ -220,7 +218,7 @@ module OpenHAB
             return @hash.each_key(&block) unless attached?
             return to_enum(:each_key) unless block
 
-            self.class.registry.all.each do |meta|
+            Provider.registry.all.each do |meta|
               yield meta.uid.namespace if meta.uid.item_name == @item_name
             end
             self
@@ -231,7 +229,7 @@ module OpenHAB
             return @hash.each_value(&block) unless attached?
             return to_enum(:each_value) unless block_given?
 
-            self.class.registry.all.each do |meta|
+            Provider.registry.all.each do |meta|
               yield Hash.new(meta) if meta.uid.item_name == @item_name
             end
             self
@@ -241,7 +239,7 @@ module OpenHAB
           def empty?
             return @hash.empty? unless attached?
 
-            self.class.registry.all.each do |meta|
+            Provider.registry.all.each do |meta|
               return false if meta.uid.item_name == @item_name
             end
             true
@@ -263,7 +261,7 @@ module OpenHAB
             end
 
             logger.trace("Getting metadata for item: #{@item_name}, namespace '#{key}'")
-            if (m = self.class.registry.get(MetadataKey.new(key, @item_name)))
+            if (m = Provider.registry.get(MetadataKey.new(key, @item_name)))
               Hash.new(m)
             elsif block
               yield key
@@ -280,7 +278,7 @@ module OpenHAB
 
             keys.each_with_object([]) do |key, res|
               key = key.to_s
-              if (m = self.class.registry.get(MetadataKey.new(key, @item_name)))
+              if (m = Provider.registry.get(MetadataKey.new(key, @item_name)))
                 res << Hash.new(m)
               elsif block_given?
                 res << yield(key)
@@ -307,7 +305,7 @@ module OpenHAB
             key = key.to_s
             return @hash.key?(key) unless attached?
 
-            !self.class.registry.get(MetadataKey.new(key, @item_name)).nil?
+            !Provider.registry.get(MetadataKey.new(key, @item_name)).nil?
           end
           alias_method :has_key?, :key?
           alias_method :member?, :key?
@@ -373,7 +371,7 @@ module OpenHAB
 
             keys = keys.to_set
             r = {}
-            self.class.registry.all.each do |meta|
+            Provider.registry.all.each do |meta|
               if meta.uid.item_name == @item_name && keys.include?(meta.uid.namespace)
                 r[meta.uid.namespace] =
                   Hash.new(meta)

data/lib/openhab/core/items/metadata/provider.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module Core
+    module Items
+      module Metadata
+        #
+        # Provides metadata created in Ruby to openHAB
+        #
+        class Provider < Core::Provider
+          include org.openhab.core.items.ManagedMetadataProvider
+
+          class << self
+            #
+            # The Metadata registry
+            #
+            # @return [org.openhab.core.items.MetadataRegistry]
+            #
+            def registry
+              @registry ||= OSGi.service("org.openhab.core.items.MetadataRegistry")
+            end
+          end
+
+          # see Hash#javaify
+          registry.managed_provider.get.class.field_reader :storage
+          registry.managed_provider.get.storage.class.field_reader :entityMapper
+
+          #
+          # Removes all metadata of a given item.
+          #
+          # @param [String] item_name
+          # @return [void]
+          #
+          def remove_item_metadata(item_name)
+            @elements.delete_if do |k, v|
+              next unless k.item_name == item_name
+
+              notify_listeners_about_removed_element(v)
+              true
+            end
+            nil
+          end
+          alias_method :removeItemMetadata, :remove_item_metadata
+        end
+      end
+    end
+  end
+end

data/lib/openhab/core/items/persistence.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "delegate"
+
 require_relative "generic_item"
 
 module OpenHAB

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module Core
+    module Items
+      #
+      # Provides {GenericItem Items} created in Ruby to openHAB
+      #
+      class Provider < Core::Provider
+        include org.openhab.core.items.ItemProvider
+
+        class << self
+          #
+          # The Item registry
+          #
+          # @return [org.openhab.core.items.ItemRegistry]
+          #
+          def registry
+            $ir
+          end
+        end
+
+        #
+        # Remove an item from this provider
+        #
+        # @param [String] item_name
+        # @param [true, false] recursive
+        # @return [GenericItem, nil] The removed item, if found.
+        #
+        def remove(item_name, recursive = false) # rubocop:disable Style/OptionalBooleanParameter matches Java method
+          return nil unless @elements.key?(item_name)
+
+          item = super(item_name)
+          item.members.each { |member| remove(member.name, true) } if recursive && item.is_a?(GroupItem)
+          item
+        end
+      end
+    end
+  end
+end

data/lib/openhab/core/items/proxy.rb

@@ -53,6 +53,16 @@ module OpenHAB
 
           super
         end
+
+        #
+        # Non equality comparison
+        #
+        # @return [true, false]
+        #
+        # @!visibility private
+        def !=(other)
+          !(self == other) # rubocop:disable Style/InverseMethods
+        end
       end
     end
   end

data/lib/openhab/core/items/registry.rb

@@ -32,6 +32,8 @@ module OpenHAB
           !$ir.getItems(name).empty?
         end
         alias_method :include?, :key?
+        # @deprecated
+        alias_method :has_key?, :key?
 
         # Explicit conversion to array
         # @return [Array]
@@ -39,26 +41,33 @@ module OpenHAB
           $ir.items.map { |item| Proxy.new(item) }
         end
 
+        #
         # Enter the Item Builder DSL.
+        #
+        # @param (see Core::Provider.current)
         # @yield Block executed in the context of a {DSL::Items::Builder}
         # @return [Object] The return value of the block.
-        def build(&block)
-          DSL::Items::BaseBuilderDSL.new.instance_eval(&block)
+        #
+        def build(preferred_provider = nil, &block)
+          DSL::Items::BaseBuilderDSL.new(preferred_provider).instance_eval(&block)
         end
 
+        #
         # Remove an item.
         #
-        # The item must have either been created by this script, or be a
-        # managed item (typically created in the UI).
+        # The item must be a managed item (typically created by Ruby or in the UI).
         #
+        # @param [String, GenericItem] item_name
         # @param recursive [true, false] Remove the item's members if it's a group
         # @return [GenericItem, nil] The removed item, if found.
         def remove(item_name, recursive: false)
           item_name = item_name.name if item_name.is_a?(GenericItem)
-          result = DSL::Items::ItemProvider.instance.remove(item_name, recursive: recursive)
-          return result if result
+          provider = Provider.registry.provider_for(item_name)
+          unless provider.is_a?(org.openhab.core.common.registry.ManagedProvider)
+            raise "Cannot remove item #{item_name} from non-managed provider #{provider.inspect}"
+          end
 
-          $ir.remove(item_name, recursive)
+          provider.remove(item_name, recursive)
         end
       end
     end

data/lib/openhab/core/items/semantics/enumerable.rb

@@ -72,15 +72,17 @@ module Enumerable
   # @!group Items State and Command Methods
 
   # Send a command to every item in the collection
-  # @return [self]
+  # @return [self, nil] nil when `ensure` is in effect and all the items were already in the same state,
+  #   otherwise self
   def command(command)
-    each { |i| i.command(command) }
+    self if count { |i| i.command(command) }.positive?
   end
 
   # Update the state of every item in the collection
-  # @return [self]
+  # @return [self, nil] nil when `ensure` is in effect and all the items were already in the same state,
+  #   otherwise self
   def update(state)
-    each { |i| i.update(state) }
+    self if count { |i| i.update(state) }.positive?
   end
 
   # @!method refresh

data/lib/openhab/core/items/state_storage.rb

@@ -18,7 +18,7 @@ module OpenHAB
         #
         # @!visibility private
         def self.from_items(*items)
-          StateStorage.new(org.openhab.core.model.script.actions.BusEvent.store_states(*items).to_h)
+          StateStorage.new($events.store_states(*items).to_h)
         end
 
         #
@@ -27,7 +27,7 @@ module OpenHAB
         # @return [void]
         #
         def restore
-          org.openhab.core.model.script.actions.BusEvent.restore_states(to_h)
+          $events.restore_states(to_h)
         end
 
         #
@@ -36,7 +36,7 @@ module OpenHAB
         # @return [void]
         #
         def restore_changes
-          org.openhab.core.model.script.actions.BusEvent.restore_states(select { |item, value| item.state != value })
+          $events.restore_states(select { |item, value| item.state != value })
         end
 
         #

data/lib/openhab/core/profile_factory.rb

@@ -87,6 +87,8 @@ module OpenHAB
           DSL::ThreadLocal.thread_local(**@thread_locals) do
             @block.call(event, **kwargs)
           rescue Exception => e
+            raise if defined?(::RSpec)
+
             @block.binding.eval("self").logger.log_exception(e)
           end
         end
@@ -113,6 +115,6 @@ module OpenHAB
     end
 
     registration = OSGi.register_service(ProfileFactory.instance)
-    ScriptHandlingCallbacks.script_unloaded_hooks << -> { registration.unregister }
+    ScriptHandling.script_unloaded { registration.unregister }
   end
 end