openhab-scripting 5.7.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b3b636fb3b4c119d2ed6a5d6b81bedd731456c750d28f4e16f602d75778e7c
-  data.tar.gz: 673ed9dc1dfba2e38e1a57b01468c3a6d74a3a3fd0141c5bd9f51bc25d84e634
+  metadata.gz: 00dfdfae614d0fc89c09ddfe86b16c4d0b41e94bc1c2e73889eb359ff09ada3c
+  data.tar.gz: ecafc5d2f33cf0b0015ac9e8c59449a57488e4f18316bd584e8dfe028d5ec4c7
 SHA512:
-  metadata.gz: 5974cf573c9fe03b1cd8df81cd312a6be70e3175c1a157d19db5dee17db2ecf8afae6619b5a3f81f91a2fce1834c7c24f7fbc7a6bf3166e60106050892d4f9ca
-  data.tar.gz: 9cced687ace50ae3bcab50ee9ad421e9bd34cabf5338b7d927c4415f540148bf2f8033f8e72b43814a0b8a94ad399b3119a3b3ea953a1215fbc8be3e915a77f5
+  metadata.gz: eff4e5471afb074c92cd7d3fc01d9070a80db680ed79c4814dc8b88e14eb67c8f9215a77f80c6b1a9a5eb6f4e220b6ce5e38ba01f0287779821db918f81c0fef
+  data.tar.gz: f187e831d86e87fe4a2e91b311f8bdd3c4e046e9107054ff74c91cdf7644d4fa303d86d8abf3c5f80e8e8cb1762f5c436b89e3e841a86ef05af351c6f0d6abbb

data/lib/openhab/core/actions/http.rb

@@ -3,6 +3,17 @@
 module OpenHAB
   module Core
     module Actions
+      #
+      # The HTTP actions allow you to send HTTP requests and receive the response.
+      #
+      # @example
+      #   # Send a GET request
+      #   headers = {
+      #     "User-Agent": "JRuby/1.2.3", # enclose in quotes if the key contains dashes
+      #     Accept: "application/json",
+      #   }
+      #   response = HTTP.send_http_get_request("http://example.com/list", headers: headers)
+      #
       # @see https://www.openhab.org/docs/configuration/actions.html#http-actions HTTP Actions
       class HTTP
         class << self
@@ -10,7 +21,8 @@ module OpenHAB
           # Sends an HTTP GET request and returns the result as a String.
           #
           # @param [String] url
-          # @param [Hash<String, String>] headers
+          # @param [Hash<String, String>, Hash<Symbol, String>] headers
+          #   A hash of headers to send with the request. Symbolic keys will be converted to strings.
           # @param [Duration, int, nil] timeout Timeout (in milliseconds, if given as an Integer)
           # @return [String] the response body
           # @return [nil] if an error occurred
@@ -19,7 +31,7 @@ module OpenHAB
             timeout ||= 5_000
             timeout = timeout.to_millis if timeout.is_a?(Duration)
 
-            sendHttpGetRequest(url, headers, timeout)
+            sendHttpGetRequest(url, headers.transform_keys(&:to_s), timeout)
           end
 
           #
@@ -28,7 +40,8 @@ module OpenHAB
           # @param [String] url
           # @param [String] content_type
           # @param [String] content
-          # @param [Hash<String, String>] headers
+          # @param [Hash<String, String>, Hash<Symbol, String>] headers
+          #   A hash of headers to send with the request. Symbolic keys will be converted to strings.
           # @param [Duration, int, nil] timeout Timeout (in milliseconds, if given as an Integer)
           # @return [String] the response body
           # @return [nil] if an error occurred
@@ -37,7 +50,7 @@ module OpenHAB
             timeout ||= 1_000
             timeout = timeout.to_millis if timeout.is_a?(Duration)
 
-            sendHttpPutRequest(url, content_type, content, headers, timeout)
+            sendHttpPutRequest(url, content_type, content, headers.transform_keys(&:to_s), timeout)
           end
 
           #
@@ -46,7 +59,8 @@ module OpenHAB
           # @param [String] url
           # @param [String] content_type
           # @param [String] content
-          # @param [Hash<String, String>] headers
+          # @param [Hash<String, String>, Hash<Symbol, String>] headers
+          #   A hash of headers to send with the request. Symbolic keys will be converted to strings.
           # @param [Duration, int, nil] timeout Timeout (in milliseconds, if given as an Integer)
           # @return [String] the response body
           # @return [nil] if an error occurred
@@ -55,14 +69,16 @@ module OpenHAB
             timeout ||= 1_000
             timeout = timeout.to_millis if timeout.is_a?(Duration)
 
-            sendHttpPostRequest(url, content_type, content, headers, timeout)
+            sendHttpPostRequest(url, content_type, content, headers.transform_keys(&:to_s), timeout)
           end
 
           #
           # Sends an HTTP DELETE request and returns the result as a String.
           #
           # @param [String] url
-          # @param [Hash<String, String>] headers
+          # @param [Hash<String, String>, Hash<Symbol, String>] headers
+          #   A hash of headers to send with the request. Keys are strings or symbols, values are strings.
+          #   Underscores in symbolic keys are replaced with dashes.
           # @param [Duration, int, nil] timeout Timeout (in milliseconds, if given as an Integer)
           # @return [String] the response body
           # @return [nil] if an error occurred
@@ -71,7 +87,7 @@ module OpenHAB
             timeout ||= 1_000
             timeout = timeout.to_millis if timeout.is_a?(Duration)
 
-            sendHttpDeleteRequest(url, headers, timeout)
+            sendHttpDeleteRequest(url, headers.transform_keys(&:to_s), timeout)
           end
         end
       end

data/lib/openhab/core/emulate_hash.rb

@@ -103,7 +103,12 @@ module OpenHAB
       def merge!(*others, &block)
         return self if others.empty?
 
-        replace(merge(*others, &block))
+        # don't call replace here so we don't touch other keys
+        others.shift.merge(*others, &block).each do |key, value|
+          value = yield key, self[key], value if key?(key) && block
+          store(key, value)
+        end
+        self
       end
       alias_method :update, :merge!
 

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

@@ -106,6 +106,9 @@ module OpenHAB
           alias_method :to_s, :inspect
         end
 
+        # @!attribute [r] function
+        # @return [GroupFunction] Returns the function of this GroupItem
+
         # Override because we want to send them to the base item if possible
         %i[command update].each do |method|
           define_method(method) do |command|
@@ -152,6 +155,19 @@ module OpenHAB
           RUBY
         end
 
+        #
+        # Compares all attributes of the item with another item.
+        #
+        # @param other [Item] The item to compare with
+        # @return [true,false] true if all attributes are equal, false otherwise
+        #
+        # @!visibility private
+        def config_eql?(other)
+          return false unless super
+
+          base_item&.type == other.base_item&.type && function&.inspect == other.function&.inspect
+        end
+
         private
 
         # Add base type and function details

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

@@ -264,12 +264,17 @@ module OpenHAB
         #
         # @return [Array<Thing>] An array of things or an empty array
         def things
-          registry = Things::Links::Provider.registry
-          channels = registry.get_bound_channels(name).to_a
-          channels.map(&:thing_uid).uniq.map { |tuid| EntityLookup.lookup_thing(tuid) }.compact
+          Things::Links::Provider.registry.get_bound_things(name).map { |thing| Things::Proxy.new(thing) }
         end
         alias_method :all_linked_things, :things
 
+        # Returns all of the item's links (channels and link configurations).
+        #
+        # @return [Array<ItemChannelLink>] An array of ItemChannelLink or an empty array
+        def links
+          Things::Links::Provider.registry.get_links(name)
+        end
+
         # @return [String]
         def inspect
           s = "#<OpenHAB::Core::Items::#{type}Item#{type_details} #{name} #{label.inspect} state=#{raw_state.inspect}"
@@ -281,11 +286,28 @@ module OpenHAB
           "#{s}>"
         end
 
-        # @return [org.openhab.core.common.registry.Provider]
+        # @return [org.openhab.core.common.registry.Provider, nil]
         def provider
           Provider.registry.provider_for(self)
         end
 
+        #
+        # Compares all attributes except metadata and channels/links of the item with another item.
+        #
+        # @param other [Item] The item to compare with
+        # @return [true,false] true if all attributes are equal, false otherwise
+        #
+        # @!visibility private
+        def config_eql?(other)
+          # GenericItem#equals checks whether other has the same name and class
+          return false unless equals(other)
+
+          %i[label category tags group_names].all? do |method|
+            # Don't use #send here. It is defined in GenericItem for sending commands
+            public_send(method) == other.public_send(method)
+          end
+        end
+
         def_type_predicate(:color)
         def_type_predicate(:contact)
         def_type_predicate(:date_time)

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

@@ -13,6 +13,11 @@ module OpenHAB
         #
         # All keys are converted to strings.
         #
+        # As a special case, a #== comparison can be done against a [value, config] array.
+        # @example
+        #   MyItem.metadata[:namespace] = "value", { key: "value" }
+        #   MyItem.metadata[:namespace] == ["value", { "key" => "value" }] #=> true
+        #
         # @!attribute [rw] value
         #   @return [String] The main value for the metadata namespace.
         # @!attribute [r] namespace
@@ -88,7 +93,7 @@ module OpenHAB
             return unless attached?
 
             javaify
-            provider.update(@metadata)
+            provider!.update(@metadata)
           end
 
           # @!visibility private
@@ -96,12 +101,12 @@ module OpenHAB
             return unless attached?
 
             javaify
-            (p = provider).get(uid) ? p.update(@metadata) : p.add(@metadata)
+            (p = provider!).get(uid) ? p.update(@metadata) : p.add(@metadata)
           end
 
           # @!visibility private
           def remove
-            provider.remove(uid)
+            provider!.remove(uid)
           end
 
           # @!visibility private
@@ -149,6 +154,8 @@ module OpenHAB
               return configuration == other.configuration
             elsif value.empty? && other.respond_to?(:to_hash)
               return configuration == other.to_hash
+            elsif other.is_a?(Array)
+              return other == [value, configuration]
             end
             false
           end
@@ -213,12 +220,17 @@ module OpenHAB
             [value, to_h].inspect
           end
 
+          # @return [org.openhab.core.common.registry.Provider, nil]
+          def provider
+            Provider.registry.provider_for(uid)
+          end
+
           #
           # @raise [FrozenError] 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
+          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),
@@ -226,10 +238,10 @@ module OpenHAB
             )
 
             if attached?
-              provider = Provider.registry.provider_for(uid)
+              provider = self.provider
               return preferred_provider unless provider
 
-              unless provider.is_a?(org.openhab.core.common.registry.ManagedProvider)
+              unless provider.is_a?(ManagedProvider)
                 raise FrozenError, "Cannot modify metadata from provider #{provider.inspect} for #{uid}."
               end
 

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

@@ -48,6 +48,11 @@ module OpenHAB
           super
         end
 
+        # @!visibility private
+        def config_eql?(other)
+          super && dimension == other.dimension
+        end
+
         protected
 
         # Adds the unit dimension

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

@@ -45,13 +45,19 @@ module OpenHAB
         # Enter the Item Builder DSL.
         #
         # @param (see Core::Provider.current)
+        # @param update [true, false]  Update existing items with the same name.
+        #   When false, an error will be raised if an item with the same name already exists.
         # @yield Block executed in the context of a {DSL::Items::Builder}
         # @return [Object] The return value of the block.
+        # @raise [ArgumentError] if an item with the same name already exists and `update` is false.
+        # @raise [FrozenError] if `update` is true but the existing item with the same name
+        #   wasn't created by the current provider.
         #
         # @see DSL::Items::Builder
         #
-        def build(preferred_provider = nil, &block)
-          DSL::Items::BaseBuilderDSL.new(preferred_provider).instance_eval_with_dummy_items(&block)
+        def build(preferred_provider = nil, update: true, &block)
+          DSL::Items::BaseBuilderDSL.new(preferred_provider, update: update)
+                                    .instance_eval_with_dummy_items(&block)
         end
 
         #

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

@@ -311,9 +311,14 @@ module OpenHAB
               synonyms = Array.wrap(synonyms).map { |s| s.to_s.strip }
 
               tags.map do |name, parent|
-                parent = lookup(parent) unless parent.is_a?(SemanticTag)
+                unless parent.is_a?(SemanticTag)
+                  parent_tag = lookup(parent)
+                  raise ArgumentError, "Unknown parent: #{parent}" unless parent_tag
+
+                  parent = parent_tag
+                end
+
                 next if lookup(name)
-                next unless parent
 
                 new_tag = org.openhab.core.semantics.SemanticTagImpl.new("#{parent.uid}_#{name}",
                                                                          label,
@@ -323,6 +328,44 @@ module OpenHAB
                 lookup(name)
               end.compact
             end
+
+            #
+            # Removes custom semantic tags.
+            #
+            # @param [SemanticTag, String, Symbol] tags Custom Semantic Tags to remove.
+            #   The built in Semantic Tags cannot be removed.
+            # @param [true, false] recursive Remove all children of the given tags.
+            #
+            # @return [Array<SemanticTag>] An array of tags successfully removed.
+            # @raise [ArgumentError] if any of the tags have children
+            # @raise [FrozenError] if any of the tags are not custom tags
+            #
+            # @since openHAB 4.0
+            #
+            def remove(*tags, recursive: false)
+              tags.flat_map do |tag|
+                tag = lookup(tag) unless tag.is_a?(SemanticTag)
+                next unless tag
+
+                provider = Provider.registry.provider_for(tag)
+                unless provider.is_a?(ManagedProvider)
+                  raise FrozenError, "Cannot remove item #{tag} from non-managed provider #{provider.inspect}"
+                end
+
+                children = []
+                Provider.registry.providers.grep(ManagedProvider).each do |managed_provider|
+                  managed_provider.all.each do |existing_tag|
+                    next unless existing_tag.parent_uid == tag.uid
+                    raise ArgumentError, "Cannot remove #{tag} because it has children" unless recursive
+
+                    children += remove(existing_tag, recursive: recursive)
+                  end
+                end
+
+                remove_const(tag.name) if provider.remove(tag.uid) && const_defined?(tag.name)
+                [tag] + children
+              end.compact
+            end
           end
         end
 

data/lib/openhab/core/registry.rb

@@ -20,12 +20,20 @@ module OpenHAB
       def provider_for(key)
         elementReadLock.lock
         if key.is_a?(org.openhab.core.common.registry.Identifiable)
-          element = key
-        else
-          return nil unless (element = identifierToElement[key])
-        end
+          return unless (provider = elementToProvider[key])
+
+          # The HashMap lookup above uses java's hashCode() which has been overridden
+          # by GenericItem and ThingImpl to return object's uid, e.g. item's name, thing uid
+          # so it will return a provider even for an unmanaged object having the same uid
+          # as an existing managed object.
 
-        elementToProvider[element]
+          # So take an extra step to verify that the provider really holds the given instance.
+          # by using equal? to compare the object's identity.
+          # Only ManagedProviders have a #get method to look up the object by uid.
+          provider if !provider.is_a?(ManagedProvider) || provider.get(key.uid).equal?(key)
+        elsif (element = identifierToElement[key])
+          elementToProvider[element]
+        end
       ensure
         elementReadLock.unlock
       end

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

@@ -57,6 +57,7 @@ module OpenHAB
         #
         # Enter the Sitemap Builder DSL.
         #
+        # @param update [true, false]  When true, existing sitemaps with the same name will be updated.
         # @yield Block executed in the context of a {DSL::Sitemaps::Builder}
         # @return [void]
         #
@@ -70,20 +71,20 @@ module OpenHAB
         #           frame label: "Main Floor" do
         #             text item: MainFloor_AmbTemp
         #             switch item: MainFloorThermostat_TargetMode, label: "Mode", mappings: %w[off auto cool heat]
-        #             setpoint item: MainFloorThermostate_SetPoint, label: "Set Point", visibility: "MainFloorThermostat_TargetMode!=off"
+        #             setpoint item: MainFloorThermostat_SetPoint, label: "Set Point", visibility: "MainFloorThermostat_TargetMode!=off"
         #           end
         #           frame label: "Basement" do
         #             text item: Basement_AmbTemp
         #             switch item: BasementThermostat_TargetMode, label: "Mode", mappings: { OFF: "off", COOL: "cool", HEAT: "heat" }
-        #             setpoint item: BasementThermostate_SetPoint, label: "Set Point", visibility: "BasementThermostat_TargetMode!=off"
+        #             setpoint item: BasementThermostat_SetPoint, label: "Set Point", visibility: "BasementThermostat_TargetMode!=off"
         #           end
         #         end
         #       end
         #     end
         #   end
         #
-        def build(&block)
-          DSL::Sitemaps::Builder.new(self).instance_eval(&block)
+        def build(update: true, &block)
+          DSL::Sitemaps::Builder.new(self, update: update).instance_eval(&block)
         end
         # rubocop:enable Layout/LineLength
 
@@ -123,7 +124,7 @@ module OpenHAB
           @listeners.each { |l| l.model_changed(element.name, org.openhab.core.model.core.EventType::REMOVED) }
         end
 
-        def notify_listeners_about_updated_element(element)
+        def notify_listeners_about_updated_element(_old_element, element)
           @listeners.each { |l| l.model_changed(element.name, org.openhab.core.model.core.EventType::MODIFIED) }
         end
       end

data/lib/openhab/core/things/links/provider.rb

@@ -24,13 +24,11 @@ module OpenHAB
             end
 
             # @!visibility private
-            def link(item, channel, config = {})
+            def create_link(item, channel, config = {})
               config = Configuration.new(config.transform_keys(&:to_s))
               channel = ChannelUID.new(channel) if channel.is_a?(String)
               channel = channel.uid if channel.is_a?(Channel)
-              link = org.openhab.core.thing.link.ItemChannelLink.new(item.name, channel, config)
-
-              current.add(link)
+              org.openhab.core.thing.link.ItemChannelLink.new(item.name, channel, config)
             end
           end
 

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

@@ -39,11 +39,17 @@ module OpenHAB
         #
         # Enter the Thing Builder DSL.
         # @param (see Core::Provider.current)
+        # @param update [true, false]
+        #   When true, existing things with the same name will be redefined if they're different.
+        #   When false, an error will be raised if a thing with the same uid already exists.
         # @yield Block executed in the context of a {DSL::Things::Builder}.
         # @return [Object] The result of the block.
+        # @raise [ArgumentError] if a thing with the same uid already exists and `update` is false.
+        # @raise [FrozenError] if `update` is true but the existing thing with the same uid
+        #   wasn't created by the current provider.
         #
-        def build(preferred_provider = nil, &block)
-          DSL::Things::Builder.new(preferred_provider).instance_eval(&block)
+        def build(preferred_provider = nil, update: true, &block)
+          DSL::Things::Builder.new(preferred_provider, update: update).instance_eval(&block)
         end
 
         #

data/lib/openhab/core/things/thing.rb

@@ -35,7 +35,7 @@ module OpenHAB
       #   @return [org.openhab.core.thing.ThingStatus]
       #
       # @!attribute [r] channels
-      #   @return [ChannelArray]
+      #   @return [ChannelsArray]
       #
       # @!attribute [r] uid
       #   Return the UID.
@@ -174,6 +174,11 @@ module OpenHAB
           uid.to_s
         end
 
+        # @return [org.openhab.core.common.registry.Provider, nil]
+        def provider
+          Provider.registry.provider_for(uid)
+        end
+
         #
         # Fetches the actions available for this thing.
         #
@@ -192,6 +197,16 @@ module OpenHAB
           $actions.get(scope || uid.binding_id, uid.to_s)
         end
 
+        #
+        # Compares all attributes of the thing with another thing.
+        #
+        # @param other [Thing] The thing to compare with
+        # @return [true,false] true if all attributes are equal, false otherwise
+        #
+        def config_eql?(other)
+          %i[uid label channels bridge_uid location configuration].all? { |method| send(method) == other.send(method) }
+        end
+
         #
         # Delegate missing methods to the thing's default actions scope.
         #

data/lib/openhab/core/timer.rb

@@ -49,7 +49,8 @@ module OpenHAB
         @id = id
         @thread_locals = thread_locals
         @block = block
-        @timer = ScriptExecution.create_timer(1.minute.from_now) { execute }
+        timer_identifier = block.source_location.join(":")
+        @timer = ScriptExecution.create_timer(timer_identifier, 1.minute.from_now) { execute }
         reschedule!(@time)
       end
 

data/lib/openhab/core/types/point_type.rb

@@ -80,19 +80,19 @@ module OpenHAB
         # @!attribute [r] latitude
         # @return [QuantityType]
         def latitude
-          QuantityType.new(raw_latitude.to_big_decimal, SIUnits::DEGREE_ANGLE)
+          QuantityType.new(raw_latitude.to_big_decimal, Units::DEGREE_ANGLE)
         end
 
         # @!attribute [r] longitude
         # @return [QuantityType]
         def longitude
-          QuantityType.new(raw_longitude.to_big_decimal, SIUnits::DEGREE_ANGLE)
+          QuantityType.new(raw_longitude.to_big_decimal, Units::DEGREE_ANGLE)
         end
 
         # @!attribute [r] altitude
         # @return [QuantityType]
         def altitude
-          QuantityType.new(raw_altitude.to_big_decimal, Units::METRE)
+          QuantityType.new(raw_altitude.to_big_decimal, SIUnits::METRE)
         end
 
         #

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

@@ -118,23 +118,68 @@ module OpenHAB
         class ProviderWrapper
           attr_reader :provider
 
-          def initialize(provider)
+          def initialize(provider, update:)
             @provider = provider
+            @update = update
           end
 
           # @!visibility private
           def add(builder)
-            item = builder.build
-            provider.add(item)
+            if DSL.items.key?(builder.name)
+              raise ArgumentError, "Item #{builder.name} already exists" unless @update
+
+              # Use provider.get because openHAB's ManagedProvider does not support the #[] method.
+              unless (old_item = provider.get(builder.name))
+                raise FrozenError, "Item #{builder.name} is managed by #{DSL.items[builder.name].provider}"
+              end
+
+              item = builder.build
+              if item.config_eql?(old_item)
+                logger.debug { "Not replacing existing item #{item.uid} because it is identical" }
+                item = old_item
+              else
+                logger.debug { "Replacing existing item #{item.uid} because it is not identical" }
+                provider.update(item)
+              end
+              item.metadata.merge!(builder.metadata)
+              item.metadata
+                  .reject { |namespace, _| builder.metadata.key?(namespace) }
+                  .each do |namespace, metadata|
+                item.metadata.delete(namespace) if metadata.provider == Core::Items::Metadata::Provider.current
+              end
+            else
+              item = builder.build
+              item.metadata.merge!(builder.metadata)
+              provider.add(item)
+            end
+
+            item.update(builder.state) unless builder.state.nil?
+
             # make sure to add the item to the registry before linking it
-            builder.channels.each do |(channel, config)|
+            provider = Core::Things::Links::Provider.current
+            channel_uids = builder.channels.to_set do |(channel, config)|
+              # fill in partial channel names from group's thing id
               if !channel.include?(":") &&
                  (group = builder.groups.find { |g| g.is_a?(GroupItemBuilder) && g.thing })
                 thing = group.thing
                 channel = "#{thing}:#{channel}"
               end
-              Core::Things::Links::Provider.link(item, channel, config)
+
+              new_link = Core::Things::Links::Provider.create_link(item, channel, config)
+              if !(current_link = provider.get(new_link.uid))
+                provider.add(new_link)
+              elsif current_link.configuration != config
+                provider.update(new_link)
+              end
+
+              new_link.linked_uid
+            end
+
+            # remove links not in the new item
+            provider.all.each do |link|
+              provider.remove(link.uid) if link.item_name == item.name && !channel_uids.include?(link.linked_uid)
             end
+
             item
           end
         end
@@ -143,13 +188,15 @@ module OpenHAB
         # @return [org.openhab.core.items.ItemProvider]
         attr_reader :provider
 
-        def initialize(provider)
-          @provider = ProviderWrapper.new(Core::Items::Provider.current(provider))
+        def initialize(provider, update:)
+          @provider = ProviderWrapper.new(Core::Items::Provider.current(provider), update: update)
         end
       end
 
       # The ItemBuilder DSL allows you to customize an Item
       class ItemBuilder
+        include Core::EntityLookup
+
         # The type of this item
         # @example
         #   type #=> :switch
@@ -181,7 +228,7 @@ module OpenHAB
         # @return [String, nil]
         attr_accessor :format
         # The icon to be associated with the item
-        # @return [Symbol, nil]
+        # @return [Symbol, String, nil]
         attr_accessor :icon
         # Groups to which this item should be added
         # @return [Array<String, GroupItem>]
@@ -237,10 +284,11 @@ module OpenHAB
           end
         end
 
-        # @param dimension [Symbol, nil] The unit dimension for a {NumberItem} (see {ItemBuilder#dimension})
+        # @param dimension [Symbol, String, nil] The unit dimension for a {NumberItem} (see {ItemBuilder#dimension})
+        #   Note the dimension must be properly capitalized.
         # @param unit [Symbol, String, nil] The unit for a {NumberItem} (see {ItemBuilder#unit})
         # @param format [String, nil] The formatting pattern for the item's state (see {ItemBuilder#format})
-        # @param icon [Symbol, nil] The icon to be associated with the item (see {ItemBuilder#icon})
+        # @param icon [Symbol, String, nil] The icon to be associated with the item (see {ItemBuilder#icon})
         # @param group [String,
         #   GroupItem,
         #   GroupItemBuilder,
@@ -259,9 +307,10 @@ module OpenHAB
         #        Fluent alias for `tag`.
         # @param autoupdate [true, false, nil] Autoupdate setting (see {ItemBuilder#autoupdate})
         # @param thing [String, Core::Things::Thing, Core::Things::ThingUID, nil]
-        #   A Thing to be used as the base for the channel
-        # @param channel [String, Core::Things::ChannelUID, nil] Channel to link the item to
-        # @param expire [String] An expiration specification.
+        #   A Thing to be used as the base for the channel.
+        # @param channel [String, Symbol, Core::Things::ChannelUID, Core::Things::Channel, nil]
+        #   Channel to link the item to (see {ItemBuilder#channel}).
+        # @param expire [String] An expiration specification (see {ItemBuilder#expire}).
         # @param alexa [String, Symbol, Array<(String, Hash<String, Object>)>, nil]
         #   Alexa metadata (see {ItemBuilder#alexa})
         # @param ga [String, Symbol, Array<(String, Hash<String, Object>)>, nil]
@@ -292,7 +341,16 @@ module OpenHAB
                        metadata: nil,
                        state: nil)
           raise ArgumentError, "`name` cannot be nil" if name.nil?
-          raise ArgumentError, "`dimension` can only be specified with NumberItem" if dimension && type != :number
+
+          if dimension
+            raise ArgumentError, "`dimension` can only be specified with NumberItem" unless type == :number
+
+            begin
+              org.openhab.core.types.util.UnitUtils.parse_dimension(dimension.to_s)
+            rescue java.lang.IllegalArgumentException
+              raise ArgumentError, "Invalid dimension '#{dimension}'"
+            end
+          end
 
           name = name.name if name.respond_to?(:name)
           if provider.is_a?(GroupItemBuilder)
@@ -413,6 +471,8 @@ module OpenHAB
         #
         # Add a channel link to this item.
         #
+        # @param channel [String, Symbol, Core::Things::ChannelUID, Core::Things::Channel]
+        #   Channel to link the item to. When thing is set, this can be a relative channel name.
         # @param config [Hash] Additional configuration, such as profile
         # @return [void]
         #
@@ -423,16 +483,27 @@ module OpenHAB
         #     end
         #   end
         #
+        # @example Relative channel name
+        #   items.build do
+        #     switch_item Bedroom_Light, thing: "mqtt:topic:bedroom-light", channel: :power
+        #   end
+        #
         def channel(channel, config = {})
+          channel = channel.to_s
           channel = "#{@thing}:#{channel}" if @thing && !channel.include?(":")
           @channels << [channel, config]
         end
 
         #
-        # @!method expire(command: nil, state: nil)
+        # @!method expire(duration, command: nil, state: nil, ignore_state_updates: nil, ignore_commands: nil)
         #
         # Configure item expiration
         #
+        # @param duration [String, Duration, nil] Duration after which the command or state should be applied
+        # @param command [String, nil] Command to send on expiration
+        # @param state [String, nil] State to set on expiration
+        # @param ignore_state_updates [true, false] When true, state updates will not reset the expire timer
+        # @param ignore_commands [true, false] When true, commands will not reset the expire timer
         # @return [void]
         #
         # @example Get the current expire setting
@@ -448,7 +519,12 @@ module OpenHAB
         #   expire 5.minutes, state: NULL
         # @example Send a command on expiration
         #   expire 5.minutes, command: OFF
-        def expire(*args, command: nil, state: nil)
+        # @example Specify the duration and command in the same string
+        #   expire "5h,command=OFF"
+        # @example Set the expire configuration
+        #   expire 5.minutes, ignore_state_updates: true
+        #
+        def expire(*args, command: nil, state: nil, ignore_state_updates: nil, ignore_commands: nil)
           unless (0..2).cover?(args.length)
             raise ArgumentError,
                   "wrong number of arguments (given #{args.length}, expected 0..2)"
@@ -463,9 +539,14 @@ module OpenHAB
 
           duration = duration.to_s[2..].downcase if duration.is_a?(Duration)
           state = "'#{state}'" if state.respond_to?(:to_str) && type == :string
-          @expire = duration
-          @expire += ",state=#{state}" if state
-          @expire += ",command=#{command}" if command
+
+          value = duration
+          value += ",state=#{state}" if state
+          value += ",command=#{command}" if command
+
+          config = { ignoreStateUpdates: ignore_state_updates, ignoreCommands: ignore_commands }
+          config.compact!
+          @expire = [value, config]
         end
 
         # @!attribute [w] unit
@@ -513,12 +594,10 @@ module OpenHAB
           tags.each do |tag|
             item.add_tag(tag)
           end
-          item.metadata.merge!(metadata)
-          item.metadata["autoupdate"] = autoupdate.to_s unless autoupdate.nil?
-          item.metadata["expire"] = expire if expire
-          item.metadata["stateDescription"] = { "pattern" => format } if format
-          item.metadata["unit"] = unit if unit
-          item.state = item.format_update(state) unless state.nil?
+          metadata["autoupdate"] = autoupdate.to_s unless autoupdate.nil?
+          metadata["expire"] = expire if expire
+          metadata["stateDescription"] = { "pattern" => format } if format
+          metadata["unit"] = unit if unit
           item
         end
 
@@ -567,7 +646,7 @@ module OpenHAB
 
           class_eval <<~RUBY, __FILE__, __LINE__ + 1
             def #{m}(*args, groups: nil, **kwargs)  # def dimmer_item(*args, groups: nil, **kwargs)
-              groups ||= []                         #   groups ||= []
+              groups = Array.wrap(groups)           #   groups = Array.wrap(groups)
               groups << self                        #   groups << self
               super                                 #   super
             end                                     # end

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

@@ -12,8 +12,9 @@ module OpenHAB
       # Base sitemap builder DSL
       class Builder
         # @!visibility private
-        def initialize(provider)
+        def initialize(provider, update:)
           @provider = provider
+          @update = update
         end
 
         # (see SitemapBuilder#initialize)
@@ -23,8 +24,12 @@ module OpenHAB
         def sitemap(name, label = nil, icon: nil, &block)
           sitemap = SitemapBuilder.new(name, label, icon: icon)
           sitemap.instance_eval_with_dummy_items(&block) if block
-          @provider.add(sitemap.build)
-          sitemap
+          sitemap = sitemap.build
+          if @update && @provider.get(sitemap.uid)
+            @provider.update(sitemap)
+          else
+            @provider.add(sitemap)
+          end
         end
       end
 

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

@@ -22,7 +22,7 @@ module OpenHAB
       #     payloadNotAvailable: "offline"
       #   }
       #   things.build do
-      #     thing("mqtt:topic:my-switch", "My Switch", bridge: "mqtt:bridge:mosquitto", config: thing_config) do
+      #     thing("mqtt:topic:my-switch", "My Switch", bridge: "mqtt:broker:mosquitto", config: thing_config) do
       #       channel("switch1", "switch", config: {
       #         stateTopic: "stat/my-switch/switch1/state", commandTopic: "cmnd/my-switch/switch1/command"
       #       })
@@ -40,8 +40,9 @@ module OpenHAB
         # @return [org.openhab.core.thing.ManagedThingProvider]
         attr_reader :provider
 
-        def initialize(provider)
+        def initialize(provider, update: false)
           @provider = Core::Things::Provider.current(provider)
+          @update = update
         end
 
         # Create a new Bridge
@@ -61,10 +62,27 @@ module OpenHAB
         def build(klass, *args, **kwargs, &block)
           builder = klass.new(*args, **kwargs)
           builder.instance_eval(&block) if block
-          thing = provider.add(builder.build)
-          thing = Core::Things::Proxy.new(thing)
+          thing = builder.build
+
+          if DSL.things.key?(thing.uid)
+            raise ArgumentError, "Thing #{thing.uid} already exists" unless @update
+
+            unless (old_thing = provider.get(thing.uid))
+              raise FrozenError, "Thing #{thing.uid} is managed by #{thing.provider}"
+            end
+
+            if thing.config_eql?(old_thing)
+              logger.debug { "Not replacing existing thing #{thing.uid}" }
+              thing = old_thing
+            else
+              provider.update(thing)
+            end
+          else
+            provider.add(thing)
+          end
           thing.enable(enabled: builder.enabled) unless builder.enabled.nil?
-          thing
+
+          Core::Things::Proxy.new(thing)
         end
       end
 
@@ -176,10 +194,11 @@ module OpenHAB
 
         # Add an explicitly configured channel to this item
         # @see ChannelBuilder#initialize
+        # @return [Core::Things::Channel]
         def channel(*args, **kwargs, &block)
           channel = ChannelBuilder.new(*args, thing: self, **kwargs)
           channel.instance_eval(&block) if block
-          @channels << channel.build
+          channel.build.tap { |c| @channels << c }
         end
 
         # @!visibility private
@@ -195,6 +214,7 @@ module OpenHAB
           builder = org.openhab.core.thing.binding.builder.ThingBuilder
                        .create(thing_type_uid, uid)
                        .with_label(label)
+                       .with_location(location)
                        .with_configuration(configuration)
                        .with_bridge(bridge_uid)
                        .with_channels(channels)
@@ -209,9 +229,7 @@ module OpenHAB
             builder.with_properties(thing_type.properties)
           end
 
-          thing = builder.build
-          Core::Things.manager.set_enabled(uid, enabled) unless enabled.nil?
-          thing
+          builder.build
         end
 
         private

data/lib/openhab/dsl/version.rb

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

data/lib/openhab/log.rb

@@ -2,6 +2,8 @@
 
 require "forwardable"
 
+$ctx ||= nil
+
 module OpenHAB
   # rubocop:disable Layout/LineLength
 
@@ -83,8 +85,8 @@ module OpenHAB
         when String
           name = object
         when :main
-          name = "#{Logger::PREFIX}.#{rules_file.tr_s(":", "_")
-                                   .gsub(/[^A-Za-z0-9_.-]/, "")}"
+          name = "#{Logger::PREFIX}.#{rules_file.tr_s(":", "_").gsub(/[^A-Za-z0-9_.-]/, "")}"
+          name = "#{name}.#{$ctx["ruleUID"]}" if $ctx&.key?("ruleUID")
           return @loggers[name] ||= BiLogger.new(Logger.new(name))
         end
 

data/lib/openhab/rspec/helpers.rb

@@ -231,14 +231,6 @@ module OpenHAB
 
         rs = OSGi.service("org.openhab.core.service.ReadyService")
 
-        # Add a fake automation:scriptEngineFactories to satisfy startlevel 30
-        begin
-          sef_marker = org.openhab.core.automation.module.script.internal.ScriptEngineFactoryBundleTracker::READY_MARKER
-          rs.mark_ready(sef_marker)
-        rescue NameError
-          # @deprecated OH3.4 NOOP - the ScriptEngineFactoryBundleTracker doesn't exist in OH3
-        end
-
         # wait for the rule engine
         filter = org.openhab.core.service.ReadyMarkerFilter.new
                     .with_type(org.openhab.core.service.StartLevelService::STARTLEVEL_MARKER_TYPE)

data/lib/openhab/rspec/karaf.rb

@@ -327,6 +327,7 @@ module OpenHAB
         org.openhab.core.io.monitor
         org.openhab.core.io.rest
         org.openhab.core.io.rest.sse
+        org.eclipse.jetty.http2.hpack
       ].freeze
       private_constant :ALLOWED_BUNDLES
 
@@ -742,6 +743,8 @@ module OpenHAB
 
         startlevels = File.read(config_file)
         startlevels.sub!(",rules:refresh,rules:dslprovider", "")
+        startlevels.sub!(",automation:scriptEngineFactories", "") # since OH4
+        startlevels.sub!("dsl:rules,", "") # since OH41-snapshot
 
         target_file = "#{oh_userdata}/services.cfg"
         target_file_contents = File.read(target_file) if File.exist?(target_file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.7.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Brian O'Connell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler