openhab-scripting 2.19.0 → 2.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64cbcfa58ba3a4d63a88514b61fdbe811a317e3902c61e16119e0d97a89a3523
-  data.tar.gz: 075ca2dbc459da17c0c2f13b6a05bf6c8ffb829b5d0f96965b449820db59b216
+  metadata.gz: c8d7de90fee54798d88e51a4ea9f7ac6437852d7c4eb5da2b847700f0dedd5de
+  data.tar.gz: 9a91e9a2ee0d977f4e2a0dd9b0ba50b1db89c71554596bfd8ca86bd9ec168d68
 SHA512:
-  metadata.gz: 4ae006b45842d227600eaaeb094285800bddf16935388d6c686112c31bd596ddc8d7fa53eebc6d1b83c0e4053c379662fbfcebab441794bdc183143c27004f92
-  data.tar.gz: 0506ac926852a72f400d8c47d701205e27a22b3514878a366eba39812b5226358c1a5e11a95bce3376b03fef2adceac9ccc1f76e5d3dca0a079b2883d565e8ea
+  metadata.gz: 1d956f08c8884347de414eb9de04a69184c9d95a39c35bd0ff8685ceefb28efe64945a944a87efd11da16f5dceda77be453693b84cc816a7541e3e923b218479
+  data.tar.gz: ab3fd69c22c115a03848b112922f9b489d69c35a1bac3040ef40c9a73ffa8540e73318011768647fe0793a197973239e028949126a83ed233340efbeb667f490

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

@@ -101,10 +101,10 @@ module OpenHAB
           #
           # Get the string representation of the state of the item
           #
-          # @return [String] State of the item as a string if not UNDEF or NULL, nil otherwise
+          # @return [String] State of the item as a string
           #
           def to_s
-            state&.to_s
+            method(:state).super_method.call.to_s # call the super state to include UNDEF/NULL
           end
 
           #

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

@@ -134,6 +134,18 @@ module OpenHAB
               end
             end
 
+            #
+            # Implements Hash#dig-like functionaity to metadata
+            #
+            # @param [String] key The first key
+            # @param [Array<String, Symbol>] keys More keys to dig deeper
+            #
+            # @return [OpenHAB::DSL::MonkeyPatch::Items::MetadataItem], or nil if the namespace doesn't exist
+            #
+            def dig(key, *keys)
+              keys.empty? ? self[key]&.value : self[key]&.dig(*keys)
+            end
+
             #
             # Enumerates through all the namespaces
             #

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

@@ -70,7 +70,7 @@ module OpenHAB
         def create_queue(inputs)
           case check_guards(event: inputs&.dig('event'))
           when true
-            @run_queue.dup
+            @run_queue.dup.grep_v(RuleConfig::Otherwise)
           when false
             @run_queue.dup.grep(RuleConfig::Otherwise)
           end
@@ -145,16 +145,14 @@ module OpenHAB
         #
         #
         def process_trigger_delay(trigger_delay, mod, inputs)
-          if check_trigger_guards(trigger_delay, inputs)
+          if trigger_delay.timer_active?
+            process_active_timer(inputs, mod, trigger_delay)
+          elsif check_trigger_guards(trigger_delay, inputs)
             logger.trace("Trigger Guards Matched for #{trigger_delay}, delaying rule execution")
             # Add timer and attach timer to delay object, and also state being tracked to so timer can be cancelled if
             #   state changes
             # Also another timer should not be created if changed to same value again but instead rescheduled
-            if trigger_delay.timer_active?
-              process_active_timer(inputs, mod, trigger_delay)
-            else
-              create_trigger_delay_timer(inputs, mod, trigger_delay)
-            end
+            create_trigger_delay_timer(inputs, mod, trigger_delay)
           else
             logger.trace("Trigger Guards did not match for #{trigger_delay}, ignoring trigger.")
           end
@@ -173,7 +171,8 @@ module OpenHAB
           trigger_delay.timer = after(trigger_delay.duration) do
             logger.trace("Delay Complete for #{trigger_delay}, executing rule")
             trigger_delay.timer = nil
-            process_queue(@run_queue.dup, mod, inputs)
+            queue = create_queue(inputs)
+            process_queue(queue, mod, inputs)
           end
           trigger_delay.tracking_to = inputs['newState']
         end

data/lib/openhab/version.rb

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

metadata

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