openhab-scripting 2.23.1 → 2.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1af0c9d15b41ac54e58540ccab079a6c084931abf80f5add687511d332d3afa2
-  data.tar.gz: 5e3c341ecf96ab4fb11b6ca6cefae01a27dc02b2498e9e3896ef4683baa3f6e5
+  metadata.gz: 9ee0da4d4273752f4a2e7b0239c09f379f74acbc05edc3f3d10690a923c3d90a
+  data.tar.gz: b807d26604402500b68ebbfc5b4a5afe6a4c65c963a3d1a3f625a703957239f9
 SHA512:
-  metadata.gz: e0238451b9d78d45c225f98ede7b86580e26c7c3edfc7681f6942b7f5a7c4dbfb67f98c5c76ccf8a437cfa779bfa2eb9b0c8639b1c4a24206b99b8ca80a3803f
-  data.tar.gz: 616d30281aef1da66964cba5d1c6365b24939f4fbec3070e4251551e3c8c7552191835da12e4795d5698e9671add7739a411e53e7b347de65a8b4a9c0fb249a0
+  metadata.gz: e9770cad933c03a36f70d320b04e43d9f9394e15da250a1be849a1669a7a863371cac83774d48f76f3dd44c97176b5ccac180f62167adf13c0b316ab431ee41e
+  data.tar.gz: add9dc156271bbec0918744355bf1362e387f3ce4792be28470abc57c03fd0a7e83acf69798bddfb8f142841dd202fa8df65bbb6c85f222bb8f58302f1686062

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'openhab/dsl/monkey_patch/events/item_state'
+require 'openhab/dsl/monkey_patch/events/item_event'
 require 'openhab/dsl/monkey_patch/events/item_state_changed'
 require 'openhab/dsl/monkey_patch/events/thing_status_info'
 require 'openhab/dsl/monkey_patch/events/item_command'

data/lib/openhab/dsl/monkey_patch/events/item_event.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'java'
+
+module OpenHAB
+  module DSL
+    module MonkeyPatch
+      #
+      # Patches OpenHAB events
+      #
+      module Events
+        java_import Java::OrgOpenhabCoreItemsEvents::ItemEvent
+
+        #
+        # MonkeyPatch to add item
+        #
+        class ItemEvent
+          #
+          # Return a decorated item
+          #
+          def item
+            OpenHAB::Core::EntityLookup.lookup_item(item_name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/monkey_patch/events/item_state_changed.rb

@@ -15,17 +15,6 @@ module OpenHAB
         # MonkeyPatch with ruby style accessors
         #
         class ItemStateChangedEvent
-          #
-          # Get the item that caused the state change
-          #
-          # @return [Item] Item that caused state change
-          #
-          def item
-            # rubocop:disable Style/GlobalVars
-            $ir.get(item_name)
-            # rubocop:enable Style/GlobalVars
-          end
-
           alias state item_state
           alias last old_item_state
         end

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

@@ -243,21 +243,6 @@ module OpenHAB
           false
         end
 
-        #
-        # Patch event to decorate event.item with our item wrapper
-        #
-        # @param [OpenHAB Event] event patch
-        #
-        def decorate_event_item(event)
-          return if event.nil?
-
-          class << event
-            def item
-              OpenHAB::Core::EntityLookup.lookup_item(item_name)
-            end
-          end
-        end
-
         #
         # Process the run queue
         #
@@ -287,7 +272,6 @@ module OpenHAB
         #
         #
         def process_otherwise_task(event, task)
-          decorate_event_item(event)
           logger.trace { "Executing rule '#{name}' otherwise block with event(#{event})" }
           task.block.call(event)
         end
@@ -314,9 +298,10 @@ module OpenHAB
         #
         #
         def process_trigger_task(event, task)
-          triggering_item = OpenHAB::Core::EntityLookup.lookup_item(event&.itemName)
-          logger.trace { "Executing rule '#{name}' trigger block with item (#{triggering_item})" }
-          task.block.call(triggering_item) if triggering_item
+          return unless event&.item
+
+          logger.trace { "Executing rule '#{name}' trigger block with item (#{event.item})" }
+          task.block.call(event.item)
         end
 
         #
@@ -327,7 +312,6 @@ module OpenHAB
         #
         #
         def process_run_task(event, task)
-          decorate_event_item(event)
           logger.trace { "Executing rule '#{name}' run block with event(#{event})" }
           task.block.call(event)
         end

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 2.23.1
+  version: 2.23.2
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,6 +50,7 @@ files:
 - lib/openhab/dsl/monkey_patch/actions/script_thing_actions.rb
 - lib/openhab/dsl/monkey_patch/events/events.rb
 - lib/openhab/dsl/monkey_patch/events/item_command.rb
+- lib/openhab/dsl/monkey_patch/events/item_event.rb
 - lib/openhab/dsl/monkey_patch/events/item_state.rb
 - lib/openhab/dsl/monkey_patch/events/item_state_changed.rb
 - lib/openhab/dsl/monkey_patch/events/thing_status_info.rb