openhab-scripting 2.22.0 → 2.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219fcaa44946f026fe4c8873e4c12ff6b44343b1abf63368134f26317ed7dc2a
-  data.tar.gz: 9b671ec4883980e7fbd21ead7e6f7e71bd2f60bc260ab41195879877df67e25e
+  metadata.gz: e2ae7c9c46b7dff785181b7846dc6e6e6b9f27d445d7f1b7cc108814e1e75531
+  data.tar.gz: fffb46ad699350c94c580a3cb8ee2545a3c7c5372a81d4c7dc867cb834ee33db
 SHA512:
-  metadata.gz: 3784775e6cb7847fbdab271de2363b781c34e9472c3a65e3694220f377f80ad6afc923a406e4e218605d140a95780bf22c9ed82a43ac9c69ecb2a32d5368728e
-  data.tar.gz: 0a4e16ce610516a48beec6cf1f951a64084c0f07557ec5f8ac72ab5e3245b315d8a223d4de6e943a6177a5b74e05431d2d68bf59ad37cf362e2455f386b6b38c
+  metadata.gz: 790a2b3838ce8847bf3dafe567336400c43dae0b9d638318c7c1d70539f60ed45714af3f376f2a93f27265b222dd35474b1fb477eb1c892258cea401ab3ff321
+  data.tar.gz: 5085945c207f2b00353ca899fab65a2e0990751c083b433729b22e3d798dac11b1a4e99a3d07fdaf6db439d5787e06b9d9a984661496b8a767d13d668f077b43

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

@@ -4,6 +4,7 @@ require 'forwardable'
 require 'java'
 require 'time'
 require 'openhab/dsl/types/datetime'
+require 'openhab/dsl/items/item_delegate'
 
 module OpenHAB
   module DSL
@@ -16,6 +17,7 @@ module OpenHAB
       class DateTimeItem
         extend Forwardable
         include Comparable
+        include OpenHAB::DSL::Items::ItemDelegate
 
         def_delegator :@datetime_item, :to_s
 
@@ -27,6 +29,8 @@ module OpenHAB
         #
         def initialize(datetime_item)
           @datetime_item = datetime_item
+          item_delegate { @datetime_item }
+          item_delegate { to_dt }
         end
 
         #
@@ -61,36 +65,6 @@ module OpenHAB
         def zone
           to_dt.zone if state?
         end
-
-        #
-        # Check if missing method can be delegated to other contained objects
-        #
-        # @param [String, Symbol] meth The method name to check for
-        #
-        # @return [Boolean] true if DateTimeItem or DateTime responds to the method, false otherwise
-        #
-        def respond_to_missing?(meth, *)
-          @datetime_item.respond_to?(meth) || to_dt.respond_to?(meth)
-        end
-
-        #
-        # Forward missing methods to the OpenHAB Item, or a DateTime object wrapping its state
-        #
-        # @param [String] meth method name
-        # @param [Array] args arguments for method
-        # @param [Proc] block <description>
-        #
-        # @return [Object] Value from delegated method in OpenHAB NumberItem
-        #
-        def method_missing(meth, *args, &block)
-          if @datetime_item.respond_to?(meth)
-            @datetime_item.__send__(meth, *args, &block)
-          elsif state?
-            to_dt.send(meth, *args, &block)
-          else
-            raise NoMethodError, "undefined method `#{meth}' for #{self.class}"
-          end
-        end
       end
     end
   end

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

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require 'java'
+require 'openhab/log/logger'
+
+module OpenHAB
+  module DSL
+    module Items
+      #
+      # Holds methods to delegate to items
+      #
+      module ItemDelegate
+        include OpenHAB::Log
+
+        #
+        # Delegates methods to the object returned from the supplied block if
+        #   they don't exist in the object this is included in.  If the supplied block returns nil, no delegation occurs
+        # If this item is called more than once delegation occurs in the order of invocation, i.e. the object returned
+        #   by the first block is delegated to if it responds to the missing method,
+        #   then the second block is processed, etc.
+        #
+        # @param [Proc] &delegate delgegate block
+        #
+        #
+        def item_delegate(&delegate)
+          @delegates ||= []
+          @delegates << delegate
+        end
+
+        #
+        # Delegate missing method calls to delegates supplied to item_delgate method
+        #  if no delegates exist or respond to missing method, super is invoked which will
+        #  throw the appropriate method missing error
+        #
+        # @param [String] meth misisng method
+        # @param [Array] *args Arguments to the missing method
+        # @param [Proc] &block supplied to the missing method
+        #
+        # @return [Object] Result of missing method invocation
+        #
+        def method_missing(meth, *args, &block)
+          logger.trace("Method (#{meth}) missing for item #{self.class}")
+          delegate = delegate_for(meth)
+          if delegate
+            logger.trace("Delegating #{meth} to #{delegate.class}")
+            delegate.__send__(meth, *args, &block)
+          else
+            super
+          end
+        end
+
+        #
+        # Checks if any of the supplied delgates respond to a specific method
+        #
+        # @param [String] meth method to check for
+        # @param [Boolean] _include_private if private methods should be checked
+        #
+        # @return [Boolean] True if any delegates respond to method, false otherwise
+        #
+        def respond_to_missing?(meth, _include_private = false)
+          logger.trace("Checking if (#{self.class}) responds to (#{meth})")
+          responds = !delegate_for(meth).nil?
+          logger.trace("(#{self.class}) responds to (#{meth}) (#{responds})")
+          responds
+        end
+
+        private
+
+        #
+        # Find a delegate for the supplied method
+        #
+        # @param [String] meth method to find delegate for
+        #
+        # @return [Boolean] True if any method responds to the supplied delegate, false otherwise
+        #
+        def delegate_for(meth)
+          (@delegates || []).each do |delegate_block|
+            delegate = delegate_block.call(meth)
+            logger.trace("Checking if delegate (#{delegate.class}) responds to (#{meth})")
+            if delegate.respond_to? meth
+              logger.trace("Delegate (#{delegate.class}) found for method (#{meth})")
+              return delegate
+            end
+          end
+          logger.trace("No delegate found for method (#{meth})")
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ require 'bigdecimal'
 require 'forwardable'
 require 'java'
 require 'openhab/dsl/types/quantity'
+require 'openhab/dsl/items/item_delegate'
 
 module OpenHAB
   module DSL
@@ -17,6 +18,8 @@ module OpenHAB
       class NumberItem < Numeric
         extend Forwardable
 
+        include OpenHAB::DSL::Items::ItemDelegate
+
         def_delegator :@number_item, :to_s
 
         java_import org.openhab.core.library.types.DecimalType
@@ -31,6 +34,7 @@ module OpenHAB
         #
         def initialize(number_item)
           @number_item = number_item
+          item_delegate { @number_item }
           super()
         end
 
@@ -146,40 +150,6 @@ module OpenHAB
           @number_item.dimension
         end
 
-        #
-        # Forward missing methods to Openhab Number Item if they are defined
-        #
-        # @param [String] meth method name
-        # @param [Array] args arguments for method
-        # @param [Proc] block <description>
-        #
-        # @return [Object] Value from delegated method in OpenHAB NumberItem
-        #
-        def method_missing(meth, *args, &block)
-          logger.trace("Method missing, performing dynamic lookup for: #{meth}")
-          if @number_item.respond_to?(meth)
-            @number_item.__send__(meth, *args, &block)
-          elsif ::Kernel.method_defined?(meth) || ::Kernel.private_method_defined?(meth)
-            ::Kernel.instance_method(meth).bind_call(self, *args, &block)
-          else
-            super(meth, *args, &block)
-          end
-        end
-
-        #
-        # Checks if this method responds to the missing method
-        #
-        # @param [String] method_name Name of the method to check
-        # @param [Boolean] _include_private boolean if private methods should be checked
-        #
-        # @return [Boolean] true if this object will respond to the supplied method, false otherwise
-        #
-        def respond_to_missing?(method_name, _include_private = false)
-          @number_item.respond_to?(method_name) ||
-            ::Kernel.method_defined?(method_name) ||
-            ::Kernel.private_method_defined?(method_name)
-        end
-
         %w[+ - * /].each do |operation|
           define_method(operation) do |other|
             logger.trace("Execution math operation '#{operation}' on #{inspect} with #{other.inspect}")

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

@@ -3,6 +3,7 @@
 require 'forwardable'
 require 'java'
 require 'openhab/dsl/items/item_command'
+require 'openhab/dsl/items/item_delegate'
 
 module OpenHAB
   module DSL
@@ -13,6 +14,7 @@ module OpenHAB
       class RollershutterItem < Numeric
         extend Forwardable
         extend OpenHAB::DSL::Items::ItemCommand
+        include OpenHAB::DSL::Items::ItemDelegate
         include Comparable
 
         def_delegator :@rollershutter_item, :to_s
@@ -35,6 +37,9 @@ module OpenHAB
           logger.trace("Wrapping #{rollershutter_item}")
           @rollershutter_item = rollershutter_item
 
+          item_delegate { @rollershutter_item }
+          item_delegate { position }
+
           super()
         end
 
@@ -79,19 +84,6 @@ module OpenHAB
           end
         end
 
-        #
-        # Case equality
-        #
-        # @param [Java::OrgOpenhabCoreLibraryTypes::UpDownType, Numeric] other Other object to compare against
-        #
-        # @return [Boolean] true if self can be defined as other, false otherwise
-        #
-        def ===(other)
-          super unless other.is_a? UpDownType
-
-          state.as(UpDownType).equals(other)
-        end
-
         #
         # Define math operations
         #
@@ -101,38 +93,6 @@ module OpenHAB
             left.send(operator, right)
           end
         end
-
-        #
-        # Checks if this method responds to the missing method
-        #
-        # @param [String] meth Name of the method to check
-        # @param [Boolean] _include_private boolean if private methods should be checked
-        #
-        # @return [Boolean] true if this object will respond to the supplied method, false otherwise
-        #
-        def respond_to_missing?(meth, _include_private = false)
-          @rollershutter_item.respond_to?(meth) || position.respond_to?(meth)
-        end
-
-        #
-        # Forward missing methods to Openhab RollershutterItem or the PercentType representing it's state
-        #   if they are defined
-        #
-        # @param [String] meth method name
-        # @param [Array] args arguments for method
-        # @param [Proc] block <description>
-        #
-        # @return [Object] Value from delegated method in OpenHAB NumberItem
-        #
-        def method_missing(meth, *args, &block)
-          if @rollershutter_item.respond_to?(meth)
-            @rollershutter_item.__send__(meth, *args, &block)
-          elsif position.respond_to?(meth)
-            position.__send__(meth, *args, &block)
-          else
-            raise NoMethodError, "No method `#{meth}' defined for #{self.class}"
-          end
-        end
       end
     end
   end

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

@@ -3,6 +3,7 @@
 require 'bigdecimal'
 require 'forwardable'
 require 'java'
+require 'openhab/dsl/items/item_delegate'
 
 module OpenHAB
   module DSL
@@ -12,7 +13,9 @@ module OpenHAB
       #
       class StringItem
         extend Forwardable
+
         include Comparable
+        include OpenHAB::DSL::Items::ItemDelegate
 
         # @return [Regex] Regular expression matching blank strings
         BLANK_RE = /\A[[:space:]]*\z/.freeze
@@ -27,6 +30,10 @@ module OpenHAB
         #
         def initialize(string_item)
           @string_item = string_item
+
+          item_delegate { @string_item }
+          item_delegate { @string_item.state&.to_full_string&.to_s }
+
           super()
         end
 
@@ -78,42 +85,6 @@ module OpenHAB
             @string_item.state <=> other
           end
         end
-
-        #
-        # Forward missing methods to Openhab String Item or String representation of the item if they are defined
-        #
-        # @param [String] meth method name
-        # @param [Array] args arguments for method
-        # @param [Proc] block <description>
-        #
-        # @return [Object] Value from delegated method in OpenHAB StringItem or Ruby String
-        #
-        def method_missing(meth, *args, &block)
-          if @string_item.respond_to?(meth)
-            @string_item.__send__(meth, *args, &block)
-          elsif @string_item.state&.to_full_string&.to_s.respond_to?(meth)
-            @string_item.state.to_full_string.to_s.__send__(meth, *args, &block)
-          elsif ::Kernel.method_defined?(meth) || ::Kernel.private_method_defined?(meth)
-            ::Kernel.instance_method(meth).bind_call(self, *args, &block)
-          else
-            super(meth, *args, &block)
-          end
-        end
-
-        #
-        # Checks if this method responds to the missing method
-        #
-        # @param [String] method_name Name of the method to check
-        # @param [Boolean] _include_private boolean if private methods should be checked
-        #
-        # @return [Boolean] true if this object will respond to the supplied method, false otherwise
-        #
-        def respond_to_missing?(method_name, _include_private = false)
-          @string_item.respond_to?(method_name) ||
-            @string_item.state&.to_full_string&.to_s.respond_to?(method_name) ||
-            ::Kernel.method_defined?(method_name) ||
-            ::Kernel.private_method_defined?(method_name)
-        end
       end
     end
   end

data/lib/openhab/dsl/monkey_patch/events/events.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'openhab/dsl/monkey_patch/events/item_state'
+require 'openhab/dsl/monkey_patch/events/item_event'
 require 'openhab/dsl/monkey_patch/events/item_state_changed'
 require 'openhab/dsl/monkey_patch/events/thing_status_info'
 require 'openhab/dsl/monkey_patch/events/item_command'

data/lib/openhab/dsl/monkey_patch/events/item_event.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'java'
+
+module OpenHAB
+  module DSL
+    module MonkeyPatch
+      #
+      # Patches OpenHAB events
+      #
+      module Events
+        java_import Java::OrgOpenhabCoreItemsEvents::ItemEvent
+
+        #
+        # MonkeyPatch to add item
+        #
+        class ItemEvent
+          #
+          # Return a decorated item
+          #
+          def item
+            OpenHAB::Core::EntityLookup.lookup_item(item_name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/monkey_patch/events/item_state.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'java'
+
+module OpenHAB
+  module DSL
+    module MonkeyPatch
+      #
+      # Patches OpenHAB events
+      #
+      module Events
+        java_import Java::OrgOpenhabCoreItemsEvents::ItemStateEvent
+
+        #
+        # MonkeyPatch with ruby style accessors
+        #
+        class ItemStateEvent
+          alias state item_state
+        end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/monkey_patch/events/item_state_changed.rb

@@ -15,17 +15,6 @@ module OpenHAB
         # MonkeyPatch with ruby style accessors
         #
         class ItemStateChangedEvent
-          #
-          # Get the item that caused the state change
-          #
-          # @return [Item] Item that caused state change
-          #
-          def item
-            # rubocop:disable Style/GlobalVars
-            $ir.get(item_name)
-            # rubocop:enable Style/GlobalVars
-          end
-
           alias state item_state
           alias last old_item_state
         end

data/lib/openhab/dsl/monkey_patch/items/dimmer_item.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'java'
+require 'openhab/dsl/items/item_command'
+require 'forwardable'
 
 module OpenHAB
   module DSL
@@ -25,31 +27,13 @@ module OpenHAB
           java_import Java::OrgOpenhabCoreLibraryTypes::DecimalType
           java_import Java::OrgOpenhabCoreLibraryTypes::IncreaseDecreaseType
 
-          #
-          # Add the current dimmer value to the supplied object
-          #
-          # @param [Object] other object to add the dimmer value to
-          #
-          # @return [Integer] Current dimmer value plus value of supplied object
-          #
-          def +(other)
-            return unless state?
+          extend Forwardable
+          extend OpenHAB::DSL::Items::ItemCommand
 
-            state.to_big_decimal.intValue + other
-          end
+          item_state Java::OrgOpenhabCoreLibraryTypes::OnOffType
+          item_command Java::OrgOpenhabCoreLibraryTypes::IncreaseDecreaseType
 
-          #
-          # Subtract the supplied object from the current value of the dimmer
-          #
-          # @param [Object] other object to subtract from the dimmer value
-          #
-          # @return [Integer] Current dimmer value minus value of supplied object
-          #
-          def -(other)
-            return unless state?
-
-            state.to_big_decimal.intValue - other
-          end
+          def_delegator :state, :to_s
 
           #
           # Dim the dimmer
@@ -59,17 +43,9 @@ module OpenHAB
           # @return [Integer] level target for dimmer
           #
           def dim(amount = 1)
-            return unless state?
-
-            target = [state.to_big_decimal.intValue - amount, 0].max
-
-            if amount == 1
-              command(IncreaseDecreaseType::DECREASE)
-            else
-              command(target)
-            end
-
-            target
+            [state&.to_big_decimal&.intValue&.-(amount), 0].compact
+                                                           .max
+                                                           .tap { |target| command(target) }
           end
 
           #
@@ -80,16 +56,7 @@ module OpenHAB
           # @return [Integer] level target for dimmer
           #
           def brighten(amount = 1)
-            return unless state?
-
-            target = state.to_big_decimal.intValue + amount
-
-            if amount == 1
-              command(IncreaseDecreaseType::INCREASE)
-            else
-              command(target)
-            end
-            target
+            state&.to_big_decimal&.intValue&.+(amount)&.tap { |target| command(target) }
           end
 
           #
@@ -120,10 +87,8 @@ module OpenHAB
           def coerce(other)
             logger.trace("Coercing #{self} as a request from  #{other.class}")
             case other
-            when Numeric
-              [other, state.to_big_decimal.to_d]
-            else
-              [other, state]
+            when Numeric then [other, state.to_big_decimal.to_d]
+            else [other, state]
             end
           end
 
@@ -140,6 +105,16 @@ module OpenHAB
             (self <=> other).zero?
           end
 
+          #
+          # Define math operations
+          #
+          %i[+ - / *].each do |operator|
+            define_method(operator) do |other|
+              right, left = coerce(other)
+              left.send(operator, right)
+            end
+          end
+
           #
           # Check if dimmer has a state and state is not zero
           #
@@ -159,33 +134,6 @@ module OpenHAB
           end
 
           alias to_int to_i
-
-          #
-          # Return the string representation of the dimmer item
-          #
-          # @return [String] String version of the dimmer value
-          #
-          def to_s
-            to_i.to_s
-          end
-
-          #
-          # Check if dimmer is on
-          #
-          # @return [Boolean] True if item is not UNDEF or NULL and has a value greater than 0
-          #
-          def on?
-            state&.to_big_decimal&.intValue&.positive?
-          end
-
-          #
-          # Check if dimmer is off
-          #
-          # @return [Boolean] True if item is not UNDEF or NULL and has a state of 0
-          #
-          def off?
-            state&.to_big_decimal&.intValue&.zero?
-          end
         end
       end
     end

data/lib/openhab/dsl/monkey_patch/items/metadata.rb

@@ -29,7 +29,7 @@ module OpenHAB
             def_delegator :@metadata, :value
 
             def initialize(metadata: nil, key: nil, value: nil, config: nil)
-              @metadata = metadata || Metadata.new(key || MetadataKey.new('', ''), value, config)
+              @metadata = metadata || Metadata.new(key || MetadataKey.new('', ''), value&.to_s, config)
               super(@metadata&.configuration)
             end
 
@@ -60,9 +60,7 @@ module OpenHAB
             # @return [Java::Org::openhab::core::items::Metadata] the old metadata
             #
             def value=(value)
-              raise ArgumentError, 'Value must be a string' unless value.is_a? String
-
-              metadata = Metadata.new(@metadata&.uID, value, @metadata&.configuration)
+              metadata = Metadata.new(@metadata&.uID, value&.to_s, @metadata&.configuration)
               NamespaceAccessor.registry.update(metadata) if @metadata&.uID
             end
 
@@ -125,7 +123,7 @@ module OpenHAB
               meta_value, configuration = update_from_value(value)
 
               key = MetadataKey.new(namespace, @item_name)
-              metadata = Metadata.new(key, meta_value, configuration)
+              metadata = Metadata.new(key, meta_value&.to_s, configuration)
               # registry.get can be omitted, but registry.update will log a warning for nonexistent metadata
               if NamespaceAccessor.registry.get(key)
                 NamespaceAccessor.registry.update(metadata)

data/lib/openhab/dsl/monkey_patch/items/persistence.rb

@@ -8,7 +8,23 @@ module OpenHAB
         # Persistence extension for Items
         #
         module Persistence
-          %w[persist last_update].each do |method|
+          # All persistence methods that could return a Quantity
+          QUANTITY_METHODS = %i[average_since
+                                delta_since
+                                deviation_since
+                                sum_since
+                                variance_since].freeze
+
+          # All persistence methods that require a timestamp
+          PERSISTENCE_METHODS = (QUANTITY_METHODS +
+                                %i[changed_since
+                                   evolution_rate
+                                   historic_state
+                                   maximum_since
+                                   minimum_since
+                                   updated_since]).freeze
+
+          %i[persist last_update].each do |method|
             define_method(method) do |service = nil|
               service ||= persistence_service
               PersistenceExtensions.public_send(method, self, service&.to_s)
@@ -31,35 +47,48 @@ module OpenHAB
             PersistenceExtensions.previous_state(self, skip_equal, service&.to_s)
           end
 
-          %w[
-            average_since
-            changed_since
-            delta_since
-            deviation_since
-            evolution_rate
-            historic_state
-            maximum_since
-            minimum_since
-            sum_since
-            updated_since
-            variance_since
-          ].each do |method|
+          PERSISTENCE_METHODS.each do |method|
             define_method(method) do |timestamp, service = nil|
               service ||= persistence_service
-              if timestamp.is_a? Java::JavaTimeTemporal::TemporalAmount
-                timestamp = Java::JavaTime::ZonedDateTime.now.minus(timestamp)
-              end
-              result = PersistenceExtensions.public_send(method, self, timestamp, service&.to_s)
-              if result.is_a?(Java::OrgOpenhabCoreLibraryTypes::DecimalType) && respond_to?(:unit) && unit
-                Quantity.new(Java::OrgOpenhabCoreLibraryTypes::QuantityType.new(result.to_big_decimal, unit))
-              else
-                result
-              end
+              result = PersistenceExtensions.public_send(method, self, to_zdt(timestamp), service&.to_s)
+              QUANTITY_METHODS.include?(method) ? quantify(result) : result
             end
           end
 
           private
 
+          #
+          # Convert timestamp to ZonedDateTime if it's a TemporalAmount
+          #
+          # @param [Object] timestamp to convert
+          #
+          # @return [ZonedDateTime]
+          #
+          def to_zdt(timestamp)
+            if timestamp.is_a? Java::JavaTimeTemporal::TemporalAmount
+              logger.trace("Converting #{timestamp} (#{timestamp.class}) to ZonedDateTime")
+              Java::JavaTime::ZonedDateTime.now.minus(timestamp)
+            else
+              timestamp
+            end
+          end
+
+          #
+          # Convert value to Quantity if it is a DecimalType and a unit is defined
+          #
+          # @param [Object] value The value to convert
+          #
+          # @return [Object] Quantity or the original value
+          #
+          def quantify(value)
+            if value.is_a?(Java::OrgOpenhabCoreLibraryTypes::DecimalType) && respond_to?(:unit) && unit
+              logger.trace("Unitizing #{value} with unit #{unit}")
+              Quantity.new(Java::OrgOpenhabCoreLibraryTypes::QuantityType.new(value.to_big_decimal, unit))
+            else
+              value
+            end
+          end
+
           #
           # Get the specified persistence service from the current thread local variable
           #

data/lib/openhab/dsl/rules/automation_rule.rb

@@ -100,8 +100,7 @@ module OpenHAB
         # @return [Boolean] True if the rule should execute, false if trigger guard prevents execution
         #
         def check_trigger_guards(trigger_delay, inputs)
-          old_state = inputs['oldState']
-          new_state = inputs['newState']
+          new_state, old_state = retrieve_states(inputs)
           if check_from(trigger_delay, old_state)
             return true if check_to(trigger_delay, new_state)
 
@@ -113,6 +112,32 @@ module OpenHAB
           end
         end
 
+        #
+        # Rerieve the newState and oldState, alternatively newStatus and oldStatus
+        # from the input map
+        #
+        # @param [Map] inputs OpenHAB map object describing rule trigger
+        #
+        # @return [Array] An array of the values for [newState, oldState] or [newStatus, oldStatus]
+        #
+        def retrieve_states(inputs)
+          old_state = inputs['oldState'] || thing_status_to_sym(inputs['oldStatus'])
+          new_state = inputs['newState'] || thing_status_to_sym(inputs['newStatus'])
+
+          [new_state, old_state]
+        end
+
+        #
+        # Converts a ThingStatus object to a ruby Symbol
+        #
+        # @param [Java::OrgOpenhabCoreThing::ThingStatus] status A ThingStatus instance
+        #
+        # @return [Symbol] A corresponding symbol, in lower case
+        #
+        def thing_status_to_sym(status)
+          status&.to_s&.downcase&.to_sym
+        end
+
         #
         # Check the from state against the trigger delay
         #
@@ -174,7 +199,7 @@ module OpenHAB
             queue = create_queue(inputs)
             process_queue(queue, mod, inputs)
           end
-          trigger_delay.tracking_to = inputs['newState']
+          trigger_delay.tracking_to, = retrieve_states(inputs)
         end
 
         #
@@ -186,7 +211,7 @@ module OpenHAB
         #
         #
         def process_active_timer(inputs, mod, trigger_delay)
-          state = inputs['newState']
+          state, = retrieve_states(inputs)
           if state == trigger_delay.tracking_to
             logger.trace("Item changed to #{state} for #{trigger_delay}, rescheduling timer.")
             trigger_delay.timer.reschedule(ZonedDateTime.now.plus(trigger_delay.duration))
@@ -218,21 +243,6 @@ module OpenHAB
           false
         end
 
-        #
-        # Patch event to decorate event.item with our item wrapper
-        #
-        # @param [OpenHAB Event] event patch
-        #
-        def decorate_event_item(event)
-          return if event.nil?
-
-          class << event
-            def item
-              OpenHAB::Core::EntityLookup.lookup_item(item_name)
-            end
-          end
-        end
-
         #
         # Process the run queue
         #
@@ -262,7 +272,6 @@ module OpenHAB
         #
         #
         def process_otherwise_task(event, task)
-          decorate_event_item(event)
           logger.trace { "Executing rule '#{name}' otherwise block with event(#{event})" }
           task.block.call(event)
         end
@@ -289,9 +298,10 @@ module OpenHAB
         #
         #
         def process_trigger_task(event, task)
-          triggering_item = OpenHAB::Core::EntityLookup.lookup_item(event&.itemName)
-          logger.trace { "Executing rule '#{name}' trigger block with item (#{triggering_item})" }
-          task.block.call(triggering_item) if triggering_item
+          return unless event&.item
+
+          logger.trace { "Executing rule '#{name}' trigger block with item (#{event.item})" }
+          task.block.call(event.item)
         end
 
         #
@@ -302,7 +312,6 @@ module OpenHAB
         #
         #
         def process_run_task(event, task)
-          decorate_event_item(event)
           logger.trace { "Executing rule '#{name}' run block with event(#{event})" }
           task.block.call(event)
         end

data/lib/openhab/dsl/rules/triggers/changed.rb

@@ -58,16 +58,8 @@ module OpenHAB
         # @return [Array] Array of current TriggerDelay objects
         #
         def changed_wait(item, duration:, to: nil, from: nil)
-          # If GroupItems specified, use the group state trigger instead
-          if item.is_a? GroupItems
-            config = { 'groupName' => item.group.name }
-            trigger = Trigger::GROUP_STATE_CHANGE
-          else
-            config = { 'itemName' => item.name }
-            trigger = Trigger::ITEM_STATE_CHANGE
-          end
-          logger.trace("Creating Changed Wait Change Trigger for #{config}")
-          trigger = append_trigger(trigger, config)
+          trigger = create_changed_trigger(item, nil, nil)
+          logger.trace("Creating Changed Wait Change Trigger for #{item}")
           @trigger_delays[trigger.id] = TriggerDelay.new(to: to, from: from, duration: duration)
         end
 

data/lib/openhab/version.rb

@@ -5,5 +5,5 @@
 #
 module OpenHAB
   # @return [String] Version of OpenHAB helper libraries
-  VERSION = '2.22.0'
+  VERSION = '2.23.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 2.23.3
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -41,6 +41,7 @@ files:
 - lib/openhab/dsl/group.rb
 - lib/openhab/dsl/items/datetime_item.rb
 - lib/openhab/dsl/items/item_command.rb
+- lib/openhab/dsl/items/item_delegate.rb
 - lib/openhab/dsl/items/items.rb
 - lib/openhab/dsl/items/number_item.rb
 - lib/openhab/dsl/items/rollershutter_item.rb
@@ -49,6 +50,8 @@ files:
 - lib/openhab/dsl/monkey_patch/actions/script_thing_actions.rb
 - lib/openhab/dsl/monkey_patch/events/events.rb
 - lib/openhab/dsl/monkey_patch/events/item_command.rb
+- lib/openhab/dsl/monkey_patch/events/item_event.rb
+- lib/openhab/dsl/monkey_patch/events/item_state.rb
 - lib/openhab/dsl/monkey_patch/events/item_state_changed.rb
 - lib/openhab/dsl/monkey_patch/events/thing_status_info.rb
 - lib/openhab/dsl/monkey_patch/items/contact_item.rb