openhab-scripting 2.16.1 → 2.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15fe5aa4e28a32decf98e69c4565e8bb9667e40c34e9d06e1a314423ce7256d
-  data.tar.gz: 50099ece4197b4ed58d48b75ca454f5c0e44e158464ae74730848da919d5b292
+  metadata.gz: 7471d207d040d9fb085fa45e4f6be88f7ad9d99b0987b6a6845f2bb85c8bf5ab
+  data.tar.gz: b000d8e9397d5556c4387f09e1ec247ccd8303cfa83b27722737e38324ac91b6
 SHA512:
-  metadata.gz: 43375143a4d64557961a18e653b1fb75c164c2becdb57464ed5ba71200b9110a11d13d0a1c8f0fa493efcaea51e234257f07c622dd3672c79c48f9b4bd6b7d35
-  data.tar.gz: 002cd1958a0102b1a5a975a17ff98a64d57b529fb2255118d232572a4a20e75d9ddbbef51a50cb927e4e85a4cc6ef4d05e7cf64e16f4730885619a55f34afea4
+  metadata.gz: 13d1994d629262afc44f8c8e62c965e65e383e91224b8fbd12d83f9ec61fa707a0655060c805e3342b373adc5d3034f1744defca1803f84d52190aab055cd8de
+  data.tar.gz: 368969daaa876bdebbd0b60b8818f9da333c2c6d9df96fa7f00abf99df4891f32cd2151d576a6819c2213630fd1ccf3e1a81a1ddc5aa48d2bfe20be776a3c91a

data/lib/openhab/core/dsl/entities.rb

@@ -27,6 +27,7 @@ end
 #
 module EntityLookup
   include Logging
+
   #
   # Decorate items with Ruby wrappers
   #
@@ -34,26 +35,32 @@ module EntityLookup
   #
   # @return [Array] Array of decorated items
   #
-  # rubocop: disable Metrics/MethodLength
-  # Disabled line length - case dispatch pattern
   def self.decorate_items(*items)
-    items.flatten.map do |item|
-      case item
-      when GroupItem
-        decorate_group(item)
-      when Java::Org.openhab.core.library.items::NumberItem
-        OpenHAB::Core::DSL::Items::NumberItem.new(item)
-      when Java::Org.openhab.core.library.items::StringItem
-        OpenHAB::Core::DSL::Items::StringItem.new(item)
-      else
-        item
-      end
+    items.flatten.map { |item| decorate_item(item) }
+  end
+
+  #
+  # Decorate item with Ruby wrappers
+  #
+  # @param [Object] item the item object to decorate
+  #
+  # @return [Object] the ruby wrapper for the item
+  #
+  def self.decorate_item(item)
+    case item
+    when GroupItem
+      decorate_group(item)
+    when Java::Org.openhab.core.library.items::NumberItem
+      OpenHAB::Core::DSL::Items::NumberItem.new(item)
+    when Java::Org.openhab.core.library.items::StringItem
+      OpenHAB::Core::DSL::Items::StringItem.new(item)
+    else
+      item
     end
   end
-  # rubocop: enable Metrics/MethodLength
 
   #
-  # Loops up a Thing in the OpenHAB registry replacing '_' with ':'
+  # Looks up a Thing in the OpenHAB registry replacing '_' with ':'
   #
   # @param [String] name of Thing to lookup in Thing registry
   #
@@ -86,7 +93,7 @@ module EntityLookup
     # rubocop: disable Style/GlobalVars
     item = $ir.get(name)
     # rubocop: enable Style/GlobalVars
-    EntityLookup.decorate_items(item).first
+    EntityLookup.decorate_item(item)
   end
 
   #

data/lib/openhab/core/dsl/group.rb

@@ -86,6 +86,15 @@ module OpenHAB
           def to_s
             "[#{map(&:to_s).join(',')}]"
           end
+
+          #
+          # Get an ID for the group, using the label if set, otherwise group name
+          #
+          # @return [String] label if set otherwise name
+          #
+          def id
+            label || name
+          end
         end
       end
     end

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

@@ -21,7 +21,7 @@ module OpenHAB
             # rubocop: disable Style/GlobalVars
             item = $ir.getItem(name)
             # rubocop: enable Style/GlobalVars
-            item.is_a?(GroupItem) ? nil : item
+            item.is_a?(GroupItem) ? nil : EntityLookup.decorate_item(item)
           rescue Java::OrgOpenhabCoreItems::ItemNotFoundException
             nil
           end

data/lib/openhab/core/dsl/rule/automation_rule.rb

@@ -221,20 +221,18 @@ module OpenHAB
           end
 
           #
-          # Patch event to include event.item when it doesn't exist
-          # This is to patch a bug see https://github.com/boc-tothefuture/openhab-jruby/issues/75
-          # It may be fixed in the openhab core in the future, in which case, this patch will no longer be necessary
+          # Patch event to decorate event.item with our item wrapper
           #
-          # @param [OpenHAB Event] event to check for item accessor
-          # @param [OpenHAB Event Inputs] inputs inputs to running rule
+          # @param [OpenHAB Event] event patch
           #
-          def add_event_item(event, inputs)
-            return if event.nil? || defined?(event.item)
+          def decorate_event_item(event)
+            return if event.nil?
 
             class << event
-              attr_accessor :item
+              def item
+                EntityLookup.lookup_item(item_name)
+              end
             end
-            event.item = inputs&.dig('triggeringItem')
           end
 
           #
@@ -266,6 +264,7 @@ 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
@@ -292,9 +291,7 @@ module OpenHAB
           #
           #
           def process_trigger_task(event, task)
-            # rubocop: disable Style/GlobalVars
-            triggering_item = $ir.get(event&.itemName)
-            # rubocop: enable Style/GlobalVars
+            triggering_item = EntityLookup.lookup_item(event&.itemName)
             logger.trace { "Executing rule '#{name}' trigger block with item (#{triggering_item})" }
             task.block.call(triggering_item) if triggering_item
           end
@@ -307,8 +304,8 @@ module OpenHAB
           # @param [Run] task to execute
           #
           #
-          def process_run_task(event, inputs, task)
-            add_event_item(event, inputs)
+          def process_run_task(event, _inputs, 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.16.1'
+  VERSION = '2.16.2'
 end

metadata

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