openhab-scripting 4.26.4 → 4.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd63a855a2b36bd98bbec644125c3d3969b5de15c34a6a068c1569be78af7df7
-  data.tar.gz: 742a8bc187187d0b3efec387286781464567bb87e77723b7c46a97fa5f5b3f82
+  metadata.gz: 16eb15617a1a088c561a6d12e1f6e2ba39459491c9e831933ff235d3177ba225
+  data.tar.gz: 40f21e9e4bb53c04f1bd9e4ee51b834756783218584f05728e26860eb95d491c
 SHA512:
-  metadata.gz: 7b70022cd9e0fdcc545611ca0a36b5a6122884b8cccfa1f1992cbec7b1d19b24cb86fa55e127b258500c318090dbf0bb9009d3916d32d61c0c2ca3f2e0edb290
-  data.tar.gz: cd6bcd955c3c853bc6e52cdd999e096ca5ecc78bbd61f1db4ff9426395220fe9156a8f458deee0637f85e1c6dc27f2e7b74c8835c2c984d84f2baa92c4a9eb65
+  metadata.gz: ac79f5e48d51ec69530c88fe05541e3c6051df205858371a5f450a226d680940058023cab20df0037c148293f60e9b85e20768669c48657ead01ee828097a16a
+  data.tar.gz: e8b218bdd0ecedbb3910c9859bb43e8f06c5372ffc7aa94a6fae0abe7f5defeff8d3a3f6fdee1af9337e8a2684ea2ce194d9e09344f5144650c38b1e91c9f9ea

data/lib/openhab/core/entity_lookup.rb

@@ -5,6 +5,7 @@ require 'java'
 require 'set'
 
 require 'openhab/log/logger'
+require_relative 'item_proxy'
 
 # Automation lookup and injection of OpenHab entities
 
@@ -91,7 +92,8 @@ module OpenHAB
       def self.lookup_item(name)
         logger.trace("Looking up item(#{name})")
         name = name.to_s if name.is_a? Symbol
-        $ir.get(name) # rubocop: disable Style/GlobalVars
+        item = $ir.get(name) # rubocop: disable Style/GlobalVars
+        ItemProxy.new(item) unless item.nil?
       end
     end
   end

data/lib/openhab/core/item_proxy.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'delegate'
+require 'forwardable'
+
+module OpenHAB
+  module Core
+    # Class is a proxy to underlying item
+    class ItemProxy < Delegator
+      extend Forwardable
+      def_delegators :__getobj__, :class, :is_a?, :kind_of?, :instance_of?
+
+      #
+      # Set the proxy item (called by super)
+      #
+      def __setobj__(item)
+        # Convert name to java version for faster lookups
+        @item_name = item.name.to_java
+      end
+
+      #
+      # Lookup item from item registry
+      #
+      def __getobj__
+        $ir.get(@item_name) # rubocop:disable Style/GlobalVars
+      end
+    end
+  end
+end

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

@@ -33,6 +33,13 @@ module OpenHAB
           def ACCEPTED_DATA_TYPES
             [org.openhab.core.types.UnDefType.java_class].freeze
           end
+
+          #
+          # Override to support ItemProxy
+          #
+          def ===(other)
+            other.instance_of?(self)
+          end
         end
         # rubocop:enable Naming/MethodName
 

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

@@ -6,11 +6,9 @@ require 'openhab/dsl/types/types'
 require_relative 'item_registry'
 
 require_relative 'generic_item'
-
 require_relative 'switch_item'
 require_relative 'date_time_item'
 require_relative 'dimmer_item'
-
 require_relative 'color_item'
 require_relative 'contact_item'
 require_relative 'group_item'

data/lib/openhab/dsl/states.rb

@@ -48,7 +48,9 @@ module OpenHAB
       # @return [StateStorage] item states
       #
       def store_states(*items)
-        items = items.flatten
+        items = items.flatten.map do |item|
+          item.respond_to?(:__getobj__) ? item.__getobj__ : item
+        end
         states = StateStorage.new(BusEvent.storeStates(*items).to_h)
         if block_given?
           yield

data/lib/openhab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.26.4
+  version: 4.27.0
 platform: ruby
 authors:
 - Brian O'Connell
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - lib/openhab.rb
 - lib/openhab/core/entity_lookup.rb
+- lib/openhab/core/item_proxy.rb
 - lib/openhab/core/load_path.rb
 - lib/openhab/core/openhab_setup.rb
 - lib/openhab/core/osgi.rb