openhab-scripting 3.9.2 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56b3593e694d3bc367977cdd3514712c452977d4644cb59610e3e25e4c7e651b
-  data.tar.gz: 0c45d6f6c9c4e493f7baca477e88cb8ec0ab3a3325fad60926d987875711ef62
+  metadata.gz: 4028b9fda2ff3ffa7005f730d7b876e136cf4c3dacc66f0f8950077c4a8f5ab9
+  data.tar.gz: dc819dea7d3f573299934da843ddadc597f98f59165426e6c88e321a1fd93200
 SHA512:
-  metadata.gz: 806e64e7bb07ff62fb8d99b3ad10505733340482b28c3c9e867b08fe0e40c2a43de586b56ca019cbc5b2408b57b4175c947e54d4020b20c6a8494791ab62cfc5
-  data.tar.gz: 7285604ad3b6898441b7290143893d7488414ef91809b676639fb0ad100049305d15e48c95e1d6ad0afe4f98541d7c5e0f55070157b8675c5839cc2fe8b441fd
+  metadata.gz: 2839736ff1c0d15c6622e679e7ada29d6f34afe5bae7d9fa375ebe34e809b14eb0f54b447d95ff7548b3f97786f0c7f6f979cd8ce796fa84bdbb1b60312a7e73
+  data.tar.gz: 45b0ca416f63b8971fdd4f7ee7d86c449ac44b0d0acdf6a1ce6955d604c04bf12788900a180fde7ec49d9fafe8aa5a5b6a8d4271cc5a72ab4440ddbe9e7a2b8a

data/lib/openhab/core/entity_lookup.rb

@@ -129,7 +129,7 @@ module OpenHAB
         # Thing UIDs have at least 3 segements
         return if name.count('_') < 3
 
-        name = name.gsub('_', ':')
+        name = name.tr('_', ':')
         # rubocop: disable Style/GlobalVars
         $things.get(Java::OrgOpenhabCoreThing::ThingUID.new(name))
         # rubocop: enable Style/GlobalVars

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

@@ -13,7 +13,9 @@ module OpenHAB
       #
       # Class for indicating to triggers that a group trigger should be used
       #
-      class GroupMembers < SimpleDelegator
+      class GroupMembers
+        include Enumerable
+
         attr_reader :group
 
         #
@@ -23,8 +25,24 @@ module OpenHAB
         #
         def initialize(group_item)
           @group = group_item
-          super(OpenHAB::Core::EntityLookup.decorate_items(@group.members.to_a))
         end
+
+        # Calls the given block once for each group member, passing that
+        # item as a parameter. Returns self.
+        #
+        # If no block is given, an Enumerator is returned.
+        def each(&block)
+          to_a.each(&block)
+          self
+        end
+
+        # explicit conversion to array
+        # more efficient than letting Enumerable do it
+        def to_a
+          OpenHAB::Core::EntityLookup.decorate_items(group.members.to_a)
+        end
+        # implicitly convertible to array
+        alias to_ary to_a
       end
 
       #
@@ -68,12 +86,13 @@ module OpenHAB
         def members
           GroupMembers.new(@group_item)
         end
+        alias items members
 
         #
         # Iterates through the direct members of the Group
         #
         def each(&block)
-          OpenHAB::Core::EntityLookup.decorate_items(@group_item.members.to_a).each(&block)
+          members.each(&block)
         end
 
         #

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

@@ -2,6 +2,7 @@
 
 require 'java'
 require 'openhab/log/logger'
+require 'openhab/dsl/monkey_patch/events/item_command'
 
 module OpenHAB
   module DSL
@@ -28,7 +29,7 @@ module OpenHAB
           command_enum.values.each do |command|
             command_method = command.to_s.downcase
             command_method = methods.transform_keys(&:to_sym).fetch(command_method.to_sym, command_method)
-            logger.trace("Creating command method (#{command_method}) for #{self.class}")
+            logger.trace("Creating command method (#{command_method}) for #{self}")
             define_method(command_method) do
               self.command(command)
             end
@@ -54,7 +55,7 @@ module OpenHAB
           command_enum.values.each do |command|
             status_method = "#{command.to_s.downcase}?"
             status_method = methods.transform_keys(&:to_sym).fetch(status_method.to_sym, status_method)
-            logger.trace("Creating status method (#{status_method}) for #{self.class}")
+            logger.trace("Creating status method (#{status_method}) for #{self}")
             define_method(status_method) do
               state? && state.as(command_enum) == command
             end
@@ -70,7 +71,7 @@ module OpenHAB
         # @param [Hash] optional hash in which if a generated method name mactches a key, the value of that key
         #   will be used as the method name instead, for example `:play? => :playing?`
         #
-        def item_type(item_class, methods = {})
+        def item_type(item_class, methods = {}) # rubocop:disable Metrics/MethodLength
           item_class.field_reader(:ACCEPTED_DATA_TYPES)
           item_class.field_reader(:ACCEPTED_COMMAND_TYPES)
           item_class.ACCEPTED_DATA_TYPES.select(&:is_enum)
@@ -78,7 +79,10 @@ module OpenHAB
                     .each { |type| item_state(type.ruby_class, methods) }
           item_class.ACCEPTED_COMMAND_TYPES.select(&:is_enum)
                     .grep_v(UnDefType)
-                    .each { |type| item_command(type.ruby_class, methods) }
+                    .each do |type|
+                      item_command(type.ruby_class, methods)
+                      MonkeyPatch::Events::ItemCommandEvent.def_enum_predicates(type.ruby_class)
+                    end
         end
       end
     end

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

@@ -2,6 +2,7 @@
 
 require 'java'
 require 'openhab/core/entity_lookup'
+require 'singleton'
 
 module OpenHAB
   module DSL
@@ -12,11 +13,14 @@ module OpenHAB
       #
       # Delegates to underlying set of all OpenHAB Items, provides convenience methods
       #
-      class Items < SimpleDelegator
+      class Items
+        include Enumerable
+        include Singleton
+
         # Fetches the named item from the the ItemRegistry
         # @param [String] name
         # @return Item from registry, nil if item missing or requested item is a Group Type
-        def[](name)
+        def [](name)
           OpenHAB::Core::EntityLookup.lookup_item(name)
         rescue Java::OrgOpenhabCoreItems::ItemNotFoundException
           nil
@@ -26,19 +30,35 @@ module OpenHAB
         # @param name [String] Item name to check
         # @return [Boolean] true if the item exists, false otherwise
         def include?(name)
-          # rubocop: disable Style/GlobalVars
-          !$ir.getItems(name).empty?
-          # rubocop: enable Style/GlobalVars
+          !$ir.getItems(name).empty? # rubocop: disable Style/GlobalVars
         end
         alias key? include?
+
+        # Calls the given block once for each Item, passing that Item as a
+        # parameter. Returns self.
+        #
+        # If no block is given, an Enumerator is returned.
+        def each(&block)
+          # ideally we would do this lazily, but until ruby 2.7
+          # there's no #eager method to convert back to a non-lazy
+          # enumerator
+          to_a.each(&block)
+        end
+
+        # explicit conversion to array
+        # more efficient than letting Enumerable do it
+        def to_a
+          items = $ir.items.grep_v(Java::OrgOpenhabCoreItems::GroupItem) # rubocop:disable Style/GlobalVars
+          OpenHAB::Core::EntityLookup.decorate_items(items)
+        end
+        # implicitly convertible to array
+        alias to_ary to_a
       end
 
       # Fetches all non-group items from the item registry
       # @return [OpenHAB::DSL::Items::Items]
       def items
-        # rubocop: disable Style/GlobalVars
-        Items.new(OpenHAB::Core::EntityLookup.decorate_items($ir.items.grep_v(Java::OrgOpenhabCoreItems::GroupItem)))
-        # rubocop: enable Style/GlobalVars
+        Items.instance
       end
     end
   end

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

@@ -15,7 +15,26 @@ module OpenHAB
         # Monkey patch with ruby style accesors
         #
         class ItemCommandEvent
+          include Log
+
           alias command item_command
+
+          #
+          # For every value in the supplied enumeration create a corresponding method mapped to the lowercase
+          # string representation of the enum value For example, an enum with values of STOP and START
+          # would create methods stop? and start? that check if the command is corresponding STOP and START type
+          #
+          # @param [Java::JavaLang::Enum] command_enum Enumeration to create commands for
+          #
+          def self.def_enum_predicates(command_enum)
+            command_enum.values.each do |command| # rubocop:disable Style/HashEachMethods : Java enum does not have each_value
+              command_method = "#{command.to_s.downcase}?"
+              logger.trace("Creating predicate method (#{command_method}) for #{self}")
+              define_method(command_method) do
+                self.command == command
+              end
+            end
+          end
         end
       end
     end

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

@@ -10,12 +10,51 @@ module OpenHAB
       #
       module Events
         java_import Java::OrgOpenhabCoreItemsEvents::ItemStateEvent
+        java_import Java::OrgOpenhabCoreTypes::UnDefType
+
+        # Helpers common to ItemStateEvent and ItemStateChangedEvent
+        module ItemStateUnDefTypeHelpers
+          #
+          # Check if the state == UNDEF
+          #
+          # @return [Boolean] True if the state is UNDEF, false otherwise
+          #
+          def undef?
+            item_state == UnDefType::UNDEF
+          end
+
+          #
+          # Check if the state == NULL
+          #
+          # @return [Boolean] True if the state is NULL, false otherwise
+          def null?
+            item_state == UnDefType::NULL
+          end
+
+          #
+          # Check if the state is defined (not UNDEF or NULL)
+          #
+          # @return [Boolean] True if state is not UNDEF or NULL
+          #
+          def state?
+            undef? == false && null? == false
+          end
+
+          #
+          # Get the item state
+          #
+          # @return [State] OpenHAB state if state is not UNDEF or NULL, nil otherwise
+          #
+          def state
+            item_state if state?
+          end
+        end
 
         #
         # MonkeyPatch with ruby style accessors
         #
         class ItemStateEvent
-          alias state item_state
+          include ItemStateUnDefTypeHelpers
         end
       end
     end

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

@@ -10,13 +10,50 @@ module OpenHAB
       #
       module Events
         java_import Java::OrgOpenhabCoreItemsEvents::ItemStateChangedEvent
+        java_import Java::OrgOpenhabCoreTypes::UnDefType
 
         #
         # MonkeyPatch with ruby style accessors
         #
         class ItemStateChangedEvent
-          alias state item_state
-          alias last old_item_state
+          include ItemStateUnDefTypeHelpers
+
+          #
+          # Check if state was == UNDEF
+          #
+          # @return [Boolean] True if the state is UNDEF, false otherwise
+          #
+          def was_undef?
+            old_item_state == UnDefType::UNDEF
+          end
+
+          #
+          # Check if state was == NULL
+          #
+          # @return [Boolean] True if the state is NULL, false otherwise
+          def was_null?
+            old_item_state == UnDefType::NULL
+          end
+
+          #
+          # Check if state was defined (not UNDEF or NULL)
+          #
+          # @return [Boolean] True if state is not UNDEF or NULL
+          #
+          def was?
+            was_undef? == false && was_null? == false
+          end
+
+          #
+          # Get the previous item state
+          #
+          # @return [State] OpenHAB state if state was not UNDEF or NULL, nil otherwise
+          #
+          def was
+            old_item_state if was?
+          end
+
+          alias last was
         end
       end
     end

data/lib/openhab/dsl/monkey_patch/types/increase_decrease_type.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'java'
+
+module OpenHAB
+  module DSL
+    module MonkeyPatch
+      #
+      # Patches OpenHAB types
+      #
+      module Types
+        java_import Java::OrgOpenhabCoreLibraryTypes::IncreaseDecreaseType
+
+        #
+        # Monkey patch for DSL use
+        #
+        class IncreaseDecreaseType
+          alias inspect to_s
+        end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/monkey_patch/types/next_previous_type.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'java'
+
+module OpenHAB
+  module DSL
+    module MonkeyPatch
+      #
+      # Patches OpenHAB types
+      #
+      module Types
+        java_import Java::OrgOpenhabCoreLibraryTypes::NextPreviousType
+
+        #
+        # Monkey patch for DSL use
+        #
+        class NextPreviousType
+          alias inspect to_s
+        end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/monkey_patch/types/on_off_type.rb

@@ -33,16 +33,9 @@ module OpenHAB
           #  nil if object cannot be compared
           #
           def ===(other)
-            # A case statement here causes and infinite loop
-            # rubocop:disable Style/CaseLikeIf
-            if self == ON
-              other.on? if other.respond_to? :on?
-            elsif self == OFF
-              other.off? if other.respond_to?('off?')
-            else
-              false
-            end
-            # rubocop:enable Style/CaseLikeIf
+            (on? && other.respond_to?(:on?) && other.on?) ||
+              (off? && other.respond_to?(:off?) && other.off?) ||
+              super
           end
 
           #
@@ -59,6 +52,26 @@ module OpenHAB
               super
             end
           end
+
+          #
+          # Check if the state is ON
+          #
+          # @return [Boolean] true if ON, false otherwise
+          #
+          def on?
+            self == ON
+          end
+
+          #
+          # Check if the state is OFF
+          #
+          # @return [Boolean] true if OFF, false otherwise
+          #
+          def off?
+            self == OFF
+          end
+
+          alias inspect to_s
         end
       end
     end

data/lib/openhab/dsl/monkey_patch/types/open_closed_type.rb

@@ -25,13 +25,9 @@ module OpenHAB
           # @return [Boolean] True if the other object is a ContactItem and has the same state
           #
           def ===(other)
-            if other.respond_to?(:state)
-              self == other.state
-            elsif other.is_a? OpenClosedType
-              self == other
-            else
+            (open? && other.respond_to?(:open?) && other.open?) ||
+              (closed? && other.respond_to?(:closed?) && other.closed?) ||
               super
-            end
           end
 
           #
@@ -48,6 +44,26 @@ module OpenHAB
               super
             end
           end
+
+          #
+          # Check if the state is OPEN
+          #
+          # @return [Boolean] true if OPEN, false otherwise
+          #
+          def open?
+            self == OPEN
+          end
+
+          #
+          # Check if the state is CLOSED
+          #
+          # @return [Boolean] true if CLOSED, false otherwise
+          #
+          def closed?
+            self == CLOSED
+          end
+
+          alias inspect to_s
         end
       end
     end

data/lib/openhab/dsl/monkey_patch/types/percent_type.rb

@@ -25,6 +25,51 @@ module OpenHAB
             super
           end
           # rubocop:enable Lint/UselessMethodDefinition
+
+          #
+          # Provide details about PercentType object
+          #
+          # @return [String] Representing details about the PercentType object
+          #
+          def inspect
+            "#{to_string}%"
+          end
+
+          #
+          # Check if the state is ON
+          #
+          # @return [Boolean] true if ON, false otherwise
+          #
+          def on?
+            as(OnOffType).on?
+          end
+
+          #
+          # Check if the state is OFF
+          #
+          # @return [Boolean] true if OFF, false otherwise
+          #
+          def off?
+            as(OnOffType).off?
+          end
+
+          #
+          # Check if the state is UP
+          #
+          # @return [Boolean] true if UP, false otherwise
+          #
+          def up?
+            !!as(UpDownType)&.up?
+          end
+
+          #
+          # Check if the state is DOWN
+          #
+          # @return [Boolean] true if DOWN, false otherwise
+          #
+          def down?
+            !!as(UpDownType)&.down?
+          end
         end
       end
     end

data/lib/openhab/dsl/monkey_patch/types/play_pause_type.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'java'
+
+module OpenHAB
+  module DSL
+    module MonkeyPatch
+      #
+      # Patches OpenHAB types
+      #
+      module Types
+        java_import Java::OrgOpenhabCoreLibraryTypes::PlayPauseType
+
+        #
+        # Monkey patch for DSL use
+        #
+        class PlayPauseType
+          alias inspect to_s
+        end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/monkey_patch/types/refresh_type.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'java'
+
+module OpenHAB
+  module DSL
+    module MonkeyPatch
+      #
+      # Patches OpenHAB types
+      #
+      module Types
+        java_import Java::OrgOpenhabCoreTypes::RefreshType
+
+        #
+        # Monkey patch for DSL use
+        #
+        class RefreshType
+          alias inspect to_s
+        end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/monkey_patch/types/rewind_fastforward_type.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'java'
+
+module OpenHAB
+  module DSL
+    module MonkeyPatch
+      #
+      # Patches OpenHAB types
+      #
+      module Types
+        java_import Java::OrgOpenhabCoreLibraryTypes::RewindFastforwardType
+
+        #
+        # Monkey patch for DSL use
+        #
+        class RewindFastforwardType
+          alias inspect to_s
+        end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/monkey_patch/types/stop_move_type.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'java'
+
+module OpenHAB
+  module DSL
+    module MonkeyPatch
+      #
+      # Patches OpenHAB types
+      #
+      module Types
+        java_import Java::OrgOpenhabCoreLibraryTypes::StopMoveType
+
+        #
+        # Monkey patch for DSL use
+        #
+        class StopMoveType
+          alias inspect to_s
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,12 @@
 require 'openhab/dsl/monkey_patch/types/open_closed_type'
 require 'openhab/dsl/monkey_patch/types/on_off_type'
 require 'openhab/dsl/monkey_patch/types/decimal_type'
+require 'openhab/dsl/monkey_patch/types/increase_decrease_type'
+require 'openhab/dsl/monkey_patch/types/next_previous_type'
 require 'openhab/dsl/monkey_patch/types/percent_type'
+require 'openhab/dsl/monkey_patch/types/play_pause_type'
 require 'openhab/dsl/monkey_patch/types/quantity_type'
+require 'openhab/dsl/monkey_patch/types/refresh_type'
+require 'openhab/dsl/monkey_patch/types/rewind_fastforward_type'
+require 'openhab/dsl/monkey_patch/types/stop_move_type'
 require 'openhab/dsl/monkey_patch/types/up_down_type'

data/lib/openhab/dsl/monkey_patch/types/up_down_type.rb

@@ -45,6 +45,26 @@ module OpenHAB
               super
             end
           end
+
+          #
+          # Check if the state is UP
+          #
+          # @return [Boolean] true if UP, false otherwise
+          #
+          def up?
+            self == UP
+          end
+
+          #
+          # Check if the state is DOWN
+          #
+          # @return [Boolean] true if DOWN, false otherwise
+          #
+          def down?
+            self == DOWN
+          end
+
+          alias inspect to_s
         end
       end
     end

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

@@ -22,7 +22,7 @@ module OpenHAB
         #
         #
         def received_command(*items, command: nil, commands: nil)
-          separate_groups(items).flatten.each do |item|
+          separate_groups(items).each do |item|
             logger.trace("Creating received command trigger for item(#{item})"\
                          "command(#{command}) commands(#{commands})")
 

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

@@ -61,9 +61,13 @@ module OpenHAB
         # @return [Array] A new flat array with any GroupMembers object left intact
         #
         def separate_groups(item_array)
-          return item_array if item_array.grep(Array).length.zero?
+          # we want to support anything that can be flattened... i.e. responds to to_ary
+          # we want to be more lenient than only things that are currently Array,
+          # but Enumerable is too lenient because Array#flatten won't traverse interior
+          # Enumerables
+          return item_array unless item_array.find { |item| item.respond_to?(:to_ary) }
 
-          groups, items = item_array.partition { |item| item.is_a? OpenHAB::DSL::Items::GroupItem::GroupMembers }
+          groups, items = item_array.partition { |item| item.is_a?(OpenHAB::DSL::Items::GroupItem::GroupMembers) }
           groups + separate_groups(items.flatten(1))
         end
 

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

@@ -20,7 +20,7 @@ module OpenHAB
         # @return [Trigger] Trigger for updated entity
         #
         def updated(*items, to: nil)
-          separate_groups(items).flatten.each do |item|
+          separate_groups(items).each do |item|
             logger.trace("Creating updated trigger for item(#{item}) to(#{to})")
             [to].flatten.each do |to_state|
               trigger, config = create_update_trigger(item, to_state)

data/lib/openhab/dsl/things.rb

@@ -4,6 +4,7 @@ require 'java'
 require 'openhab/log/logger'
 require 'openhab/dsl/actions'
 require 'delegate'
+require 'singleton'
 
 module OpenHAB
   module DSL
@@ -76,32 +77,54 @@ module OpenHAB
       #
       # Wraps all Things in a delegator to underlying set and provides lookup method
       #
-      class Things < SimpleDelegator
+      class Things
         java_import org.openhab.core.thing.ThingUID
 
+        include Enumerable
+        include Singleton
+
         # Gets a specific thing by name in the format binding_id:type_id:thing_id
         # @return Thing specified by name or nil if name does not exist in thing registry
-        def[](uid)
+        def [](uid)
           thing_uid = ThingUID.new(*uid.split(':'))
-          # rubocop: disable Style/GlobalVars
-          thing = $things.get(thing_uid)
-          # rubocop: enable Style/GlobalVars
+          thing = $things.get(thing_uid) # rubocop: disable Style/GlobalVars
           return unless thing
 
           logger.trace("Retrieved Thing(#{thing}) from registry for uid: #{uid}")
           Thing.new(thing)
         end
+
+        alias include? []
+        alias key? []
+
+        # Calls the given block once for each Thing, passing that Thing as a
+        # parameter. Returns self.
+        #
+        # If no block is given, an Enumerator is returned.
+        def each(&block)
+          # ideally we would do this lazily, but until ruby 2.7
+          # there's no #eager method to convert back to a non-lazy
+          # enumerator
+          to_a.each(&block)
+          self
+        end
+
+        # explicit conversion to array
+        # more efficient than letting Enumerable do it
+        def to_a
+          $things.getAll.map { |thing| Thing.new(thing) } # rubocop: disable Style/GlobalVars
+        end
+        # implicitly convertible to array
+        alias to_ary to_a
       end
 
       #
       # Get all things known to OpenHAB
       #
-      # @return [Set] of all Thing objects known to openhab
+      # @return [Things] all Thing objects known to OpenHAB
       #
       def things
-        # rubocop: disable Style/GlobalVars
-        Things.new($things.getAll.map { |thing| Thing.new(thing) }.to_set)
-        # rubocop: enable Style/GlobalVars
+        Things.instance
       end
     end
   end

data/lib/openhab/dsl/timers.rb

@@ -31,14 +31,14 @@ module OpenHAB
         # @param [Duration] duration Duration until timer should fire
         # @param [Block] block Block to execute when timer fires
         #
-        def initialize(duration:, &block)
+        def initialize(duration:)
           @duration = duration
 
           # A semaphore is used to prevent a race condition in which calling the block from the timer thread
           # occurs before the @timer variable can be set resulting in @timer being nil
           semaphore = Mutex.new
 
-          timer_block = proc { semaphore.synchronize { block.call(self) } }
+          timer_block = proc { semaphore.synchronize { yield(self) } }
 
           semaphore.synchronize do
             @timer = ScriptExecution.createTimer(

data/lib/openhab/dsl/types/datetime.rb

@@ -81,7 +81,7 @@ module OpenHAB
 
           case other
           when TimeOfDay::TimeOfDay, TimeOfDay::TimeOfDayRangeElement then to_tod <=> other
-          when String then self <=> DateTime.parse(DATE_ONLY_REGEX =~ other ? "#{other}'T'00:00:00#{zone}" : other)
+          when String then self <=> DateTime.parse(DATE_ONLY_REGEX.match?(other) ? "#{other}'T'00:00:00#{zone}" : other)
           else
             self <=> DateTime.from(other)
           end
@@ -120,7 +120,7 @@ module OpenHAB
           when Numeric then DateTime.from(to_time - other)
           when String
             dt = DateTime.parse(other)
-            TIME_ONLY_REGEX =~ other ? self - dt.to_f : time_diff(dt)
+            TIME_ONLY_REGEX.match?(other) ? self - dt.to_f : time_diff(dt)
           when Duration then DateTime.new(zoned_date_time.minus(other))
           when Time, DateTime, DateTimeType, DateTimeItem then time_diff(other)
           end
@@ -298,7 +298,7 @@ module OpenHAB
         # @return [Java::org::openhab::core::library::types::DateTimeType] Object representing the same time
         #
         def self.parse(time_string)
-          time_string += 'Z' if TIME_ONLY_REGEX =~ time_string
+          time_string += 'Z' if TIME_ONLY_REGEX.match?(time_string)
           DateTime.new(DateTimeType.new(time_string))
         rescue Java::JavaLang::StringIndexOutOfBoundsException, Java::JavaLang::IllegalArgumentException
           # Try ruby's Time.parse if OpenHAB's DateTimeType parser fails

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 4.0.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,10 +84,16 @@ files:
 - lib/openhab/dsl/monkey_patch/ruby/string.rb
 - lib/openhab/dsl/monkey_patch/ruby/time.rb
 - lib/openhab/dsl/monkey_patch/types/decimal_type.rb
+- lib/openhab/dsl/monkey_patch/types/increase_decrease_type.rb
+- lib/openhab/dsl/monkey_patch/types/next_previous_type.rb
 - lib/openhab/dsl/monkey_patch/types/on_off_type.rb
 - lib/openhab/dsl/monkey_patch/types/open_closed_type.rb
 - lib/openhab/dsl/monkey_patch/types/percent_type.rb
+- lib/openhab/dsl/monkey_patch/types/play_pause_type.rb
 - lib/openhab/dsl/monkey_patch/types/quantity_type.rb
+- lib/openhab/dsl/monkey_patch/types/refresh_type.rb
+- lib/openhab/dsl/monkey_patch/types/rewind_fastforward_type.rb
+- lib/openhab/dsl/monkey_patch/types/stop_move_type.rb
 - lib/openhab/dsl/monkey_patch/types/types.rb
 - lib/openhab/dsl/monkey_patch/types/up_down_type.rb
 - lib/openhab/dsl/persistence.rb