openhab-scripting 4.8.5 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b14c62e681500abaa99858522f7592e0a4d93f6966a5cf8e99157b0944cbe6
-  data.tar.gz: 071556f83604d539af3620a0796eef993edfc0bb224ad3dd08cf7d5a71e9d593
+  metadata.gz: 18381f7d16d590838748802e7535c611279c6b251fc5f782f9f11247f856074b
+  data.tar.gz: 1f339a40040d41445020eb2a460269eba1088554034a064c1a335e2e85f17be4
 SHA512:
-  metadata.gz: '01429a840f1af1e81886988f00ad628fa01dd7a7423ef2e20c59eb1d40822b573115d12a0c8c6fc093012ad29a70666bf280de52a789a8dc8cf6b0c7d2eb1867'
-  data.tar.gz: 28aab00e8742851f08fee9535b39c913f78f4c7200f2bdbd8788e4d6c8ac8ae6f202a7f3e4675e0e02af2bbc953b6a10114b93987eff5c6ec37e1d6ad0f8ddeb
+  metadata.gz: 3611a93e20e13b0c5a63354e8c1082466f279e7a9b83b5c352a2b357e09f45411035c6bb1baa79575f1c7e9480ae66a9f651a635dba3130b791dcdf9eb3c4f32
+  data.tar.gz: 69f57f2931d50f868742682fa8d400348dc93670dd8ba6f6172477bbc02d9e297203d6466030c52d6055cae740b1fa8f05e8889faf7bef655d650105587ccfc5

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

@@ -13,13 +13,13 @@ module OpenHAB
         include OpenHAB::DSL::Rules::Property
 
         prop_array(:only_if) do |item|
-          unless item.is_a?(Proc) || item.respond_to?(:truthy?)
+          unless item.is_a?(Proc) || [item].flatten.all? { |it| it.respond_to?(:truthy?) }
             raise ArgumentError, "Object passed to only_if must respond_to 'truthy?'"
           end
         end
 
         prop_array(:not_if) do |item|
-          unless item.is_a?(Proc) || item.respond_to?(:truthy?)
+          unless item.is_a?(Proc) || [item].flatten.all? { |it| it.respond_to?(:truthy?) }
             raise ArgumentError, "Object passed to not_if must respond_to 'truthy?'"
           end
         end
@@ -113,7 +113,7 @@ module OpenHAB
           # @return [Boolean] True if criteria are satisfied, false otherwise
           #
           def process_not_if(event, items, procs)
-            items.none?(&:truthy?) && procs.none? { |proc| proc.call(event) }
+            items.flatten.none?(&:truthy?) && procs.none? { |proc| proc.call(event) }
           end
 
           #
@@ -126,7 +126,7 @@ module OpenHAB
           # @return [Boolean] True if criteria are satisfied, false otherwise
           #
           def process_only_if(event, items, procs)
-            items.all?(&:truthy?) && procs.all? { |proc| proc.call(event) }
+            items.flatten.all?(&:truthy?) && procs.all? { |proc| proc.call(event) }
           end
         end
       end

data/lib/openhab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.8.5
+  version: 4.9.0
 platform: ruby
 authors:
 - Brian O'Connell