openhab-scripting 2.22.0 → 2.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219fcaa44946f026fe4c8873e4c12ff6b44343b1abf63368134f26317ed7dc2a
-  data.tar.gz: 9b671ec4883980e7fbd21ead7e6f7e71bd2f60bc260ab41195879877df67e25e
+  metadata.gz: 854569a4ecda01dc3fb8dc2e12f66147248a2aafffdbbdbabe5d0e750b6849cc
+  data.tar.gz: 1bf8451a6c8d1dd556472ffa0ceb210e34b9db1b0af6a652bdb336182abb7f20
 SHA512:
-  metadata.gz: 3784775e6cb7847fbdab271de2363b781c34e9472c3a65e3694220f377f80ad6afc923a406e4e218605d140a95780bf22c9ed82a43ac9c69ecb2a32d5368728e
-  data.tar.gz: 0a4e16ce610516a48beec6cf1f951a64084c0f07557ec5f8ac72ab5e3245b315d8a223d4de6e943a6177a5b74e05431d2d68bf59ad37cf362e2455f386b6b38c
+  metadata.gz: 4cb862c98031f4d62d1366dbfaf4a9370103687ad06ab930db77dba32af5623337652d9264f09f28622c12b14314902d1a5ea3b58fffec4cfa2fdd086c3bab31
+  data.tar.gz: 2044c8d3cee633c59b9368889c7995b4533b29add5d36e97dc3b8400706229c0afd133121b816fd8b4f53886b86e82b281f9dbe659e104c859bec212f6f5e1d8

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

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.22.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 2.22.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler