openhab-scripting 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beab2ee97613a8a2016969c8410f4abcddc9c780ad16c5683e382bee28526122
-  data.tar.gz: 33f9ecf81357a4812e59188ad3d3f5b7ef034e79e874ec942e3bc880352853d4
+  metadata.gz: f4238eb3161f714b74aed518a4a3e6d02f2aeed634fc21d7276df152f8aeead8
+  data.tar.gz: 57666ad4b06970ea2859ab252a19b5801c34657025e11becb766ad2876157a1b
 SHA512:
-  metadata.gz: 97b3a91ecda58df5763a79b6f9d0c3020f7064774e84f62c3716cbb6fc441a0848dee14778126f01cde1ca327e0c5413ea3f5e37e3b3fda1a0d5e432bfe36007
-  data.tar.gz: cece3de478210c8236d6d74a04af2edb1efe136bf4e380f86225df8b76b7b7edf3fcf83fde9dcc376dbcbcc62e443bbd5719cbb2efdc2949249467f06fa677ae
+  metadata.gz: 4617faef054fc5f6e388314ff2ab46c1a80ad525fb576fb1d2d2a89bde37f5f420a3ca77000da6bf62546f8b3ab2ba77d24ab271c9ea2c232c02d547677ad61f
+  data.tar.gz: bf889c204885dc28b6416138d8cba0d116e8d3c408bfd2720b481f47820ea51bb5e067c1492df352db13e2e0267b4f647b48ed3d68591a5a8d444972640d6270

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

@@ -29,6 +29,7 @@ module OpenHAB
           set_name(config.name)
           set_description(config.description)
           set_triggers(config.triggers)
+          @run_context = config.caller
           @run_queue = config.run
           @guard = config.guard
           between = config.between&.yield_self { between(config.between) }
@@ -288,7 +289,7 @@ module OpenHAB
         #
         def process_otherwise_task(event, task)
           logger.trace { "Executing rule '#{name}' otherwise block with event(#{event})" }
-          task.block.call(event)
+          @run_context.instance_exec(event, &task.block)
         end
 
         #
@@ -316,7 +317,7 @@ module OpenHAB
           return unless event&.item
 
           logger.trace { "Executing rule '#{name}' trigger block with item (#{event.item})" }
-          task.block.call(event.item)
+          @run_context.instance_exec(event.item, &task.block)
         end
 
         #
@@ -328,7 +329,7 @@ module OpenHAB
         #
         def process_run_task(event, task)
           logger.trace { "Executing rule '#{name}' run block with event(#{event})" }
-          task.block.call(event)
+          @run_context.instance_exec(event, &task.block)
         end
 
         #

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

@@ -23,10 +23,11 @@ module OpenHAB
       def rule(rule_name, &block)
         @rule_name = rule_name
         config = RuleConfig.new(rule_name, block.binding)
-        config.instance_eval(&block)
+        config.instance_exec(config, &block)
         config.guard = Guard::Guard.new(only_if: config.only_if, not_if: config.not_if)
         logger.trace { config.inspect }
         process_rule_config(config)
+        config
       rescue StandardError => e
         re_raise_with_backtrace(e)
       end

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

@@ -40,6 +40,9 @@ module OpenHAB
         # @return [Array] Of trigger guards
         attr_accessor :guard
 
+        # @return [Object] object that invoked rule method
+        attr_accessor :caller
+
         #
         # Struct holding a run block
         #

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler