openhab-scripting 4.8.2 → 4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04e0efcb683ac15c3b82af5e7837412e84b1038a822468de155b5825068e9593
-  data.tar.gz: 8b2da1406b372c7164a47d3fec3ac5da4d35af8ee3ceb207148f977ad1cab91d
+  metadata.gz: 6f20bdd4334857cc9d65e95a218f509f90dd6f5b68d7acf550671f942385a426
+  data.tar.gz: a0bcdfba1ab5328f14b52ca16d9e56555fef6f479626aab11f655229a0c4f81a
 SHA512:
-  metadata.gz: 2227a683fa379ca71f96cb1fd5ca0944906a7f94f3413d7d775a0082a99a62f53631215272db38c3ce85984e4ffcbe382d882ab3a3c76a7c06adac69354854e5
-  data.tar.gz: 91b9855912c8b309b01369f833a1c89845708c61beaf655d08965ab09dd5e0231eec4a6d508f9941934e9b4c8cda36c8ea88db74e7dbbfb9880f8cf233afc65d
+  metadata.gz: dd22e0e28fce41231eb34a2e0ed4c567b2457584f40852f9af7d684de6d981094bb8da5771b616191827fb42817e32cda3796b97aba8730de38fb95a80bb51b3
+  data.tar.gz: 00aeb56148a1c1117724515596a6ccdf8112246de26418b0ab0e978b75f2efc7766e545458e663a66f196d391c5eb9a281432d9aba6b5ef9b49250e1eae3702e

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

@@ -31,18 +31,18 @@ module OpenHAB
         # @return [Trigger] OpenHAB trigger
         #
         def changed(*items, to: nil, from: nil, for: nil)
-          separate_groups(items).each do |item|
+          separate_groups(items).map do |item|
             logger.trace("Creating changed trigger for entity(#{item}), to(#{to}), from(#{from})")
             # for is a reserved word in ruby, so use local_variable_get :for
             if (wait_duration = binding.local_variable_get(:for))
               changed_wait(item, to: to, from: from, duration: wait_duration)
             else
               # Place in array and flatten to support multiple to elements or single or nil
-              [to].flatten.each do |to_state|
-                [from].flatten.each { |from_state| create_changed_trigger(item, from_state, to_state) }
+              [to].flatten.map do |to_state|
+                [from].flatten.map { |from_state| create_changed_trigger(item, from_state, to_state) }
               end
             end
-          end
+          end.flatten
         end
 
         private
@@ -55,12 +55,13 @@ module OpenHAB
         # @param [Item State] to OpenHAB Item State item or group needs to change to
         # @param [Item State] from OpenHAB Item State item or group needs to be coming from
         #
-        # @return [Array] Array of current TriggerDelay objects
+        # @return [Trigger] OpenHAB trigger
         #
         def changed_wait(item, duration:, to: nil, from: nil)
           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)
+          trigger
         end
 
         #

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

@@ -22,14 +22,14 @@ module OpenHAB
         #
         #
         def received_command(*items, command: nil, commands: nil)
-          separate_groups(items).each do |item|
+          separate_groups(items).map do |item|
             logger.trace("Creating received command trigger for item(#{item})"\
                          "command(#{command}) commands(#{commands})")
 
             # Combine command and commands, doing union so only a single nil will be in the combined array.
             combined_commands = combine_commands(command, commands)
             create_received_trigger(combined_commands, item)
-          end
+          end.flatten
         end
 
         private
@@ -42,7 +42,7 @@ module OpenHAB
         #
         #
         def create_received_trigger(commands, item)
-          commands.each do |command|
+          commands.map do |command|
             if item.is_a? OpenHAB::DSL::Items::GroupItem::GroupMembers
               config, trigger = create_group_command_trigger(item)
             else

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

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

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.8.2
+  version: 4.8.3
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-30 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler