openhab-scripting 5.38.2 → 5.38.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e5c451235909f43f9b0b0a82f80a501f0a978d65f52d3bc8dcf8ae5e74fd5e
-  data.tar.gz: 57633cd38589cc8e9bd8d11c0bccf66761cdf0aaaffcdde4b6c77ee9388df527
+  metadata.gz: 5d7aee54d03e87992e3febb4d12eef831d42156837dcd7b8ed61e09edbf78a3d
+  data.tar.gz: c9a792688e50984ef7463eb6e49abbfbdbccd4ab619d704b3d4eca0537f7a5f7
 SHA512:
-  metadata.gz: 67035be352872b9eb97049875648d7e3c5c190e8ea10ee6eb580f039266746f927d24b51844c022c19e75dadd20baaf23450fb35d34d6df43b5046f7cf4fedc9
-  data.tar.gz: 74be0ee645c5ba2b480250a5dd3db36773596bb8aec3e0e27b5e96b48da765e4cf5a544d1ae4613ac761c6662e17bde7b1c5bce34038c212080f682dda64508d
+  metadata.gz: 3e23bd7be96cbaf3e3b6ad00d731562f2059e1f2061f5e34f2bf25ef1087b06ccd77bc916ecb8b2aff55ce6de75cb24feac730fa2a2171f444e518ac1688c1a7
+  data.tar.gz: '0149d4812c49c7bdd7ae5b7919deeccc068bfc1acf42b94c8962e67a8657252f55269648706759f9f55cb7e73573314273b73f9a6af7b2264111c8c87874c5b1'

data/lib/openhab/console/irb.rb

@@ -2,10 +2,10 @@
 
 require "openhab/console/stdio"
 
-gem "irb", "~> 1.15"
-
 require "irb"
 
+raise "IRB Version 1.14 or later is required." unless Gem::Version.new(IRB::VERSION) >= Gem::Version.new("1.14")
+
 module OpenHAB
   # @!visibility private
   module Console

data/lib/openhab/core/events/abstract_event.rb

@@ -8,10 +8,30 @@ module OpenHAB
       # Add attachments event data.
       class AbstractEvent
         # @return [Object]
-        attr_accessor :attachment
+        attr_reader :attachment
 
         # @return [Hash]
-        attr_accessor :inputs
+        attr_reader :inputs
+
+        # @!visibility private
+        def attachment=(value)
+          # Disable "instance vars on non-persistent Java type"
+          original_verbose = $VERBOSE
+          $VERBOSE = nil
+          @attachment = value
+        ensure
+          $VERBOSE = original_verbose
+        end
+
+        # @!visibility private
+        def inputs=(value)
+          # Disable "instance vars on non-persistent Java type"
+          original_verbose = $VERBOSE
+          $VERBOSE = nil
+          @inputs = value
+        ensure
+          $VERBOSE = original_verbose
+        end
 
         # @!attribute [r] source
         # @return [String] The component that sent the event.
@@ -24,7 +44,12 @@ module OpenHAB
         #
         def payload
           require "json"
+          # Disable "instance vars on non-persistent Java type"
+          original_verbose = $VERBOSE
+          $VERBOSE = nil
           @payload ||= JSON.parse(get_payload, symbolize_names: true) unless get_payload.empty?
+        ensure
+          $VERBOSE = original_verbose
         end
 
         # @return [String]

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "base64"
 require "pathname"
 require "net/http"
 require "marcel"

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

@@ -25,10 +25,10 @@ module OpenHAB
               OpenHAB::OSGi.service("org.openhab.core.io.rest.sse.internal.SseItemStatesEventBuilder")&.tap do |builder|
                 m = builder.class.java_class.get_declared_method("getDisplayState", Item, java.util.Locale)
                 m.accessible = true
-                builder.instance_variable_set(:@getDisplayState, m)
                 # Disable "singleton on non-persistent Java type"
                 original_verbose = $VERBOSE
                 $VERBOSE = nil
+                builder.instance_variable_set(:@getDisplayState, m)
                 def builder.get_display_state(item)
                   @getDisplayState.invoke(self, item, nil)
                 end
@@ -390,7 +390,7 @@ module OpenHAB
         #   # Item1's metadata after: {"namespace2"=>["value", {"config1"=>"foo", "config2"=>"bar"}], "namespace"=>["value", {"config1"=>"foo", "config2"=>"bar"}]}
         #
         def metadata
-          @metadata ||= Metadata::NamespaceHash.new(name)
+          Metadata::NamespaceHash.new(name)
         end
         # rubocop:enable Layout/LineLength
 

data/lib/openhab/core/things/profile_callback.rb

@@ -8,16 +8,23 @@ module OpenHAB
       # and channels.
       #
       module ProfileCallback
+        class << self
+          # @!visibility private
+          def dummy_channel_item(accepted_item_type)
+            @dummy_channel_items[accepted_item_type]
+          end
+        end
+        @dummy_channel_items = Hash.new do |hash, key|
+          hash[key] = DSL::Items::ItemBuilder.item_factory.create_item(key, "")
+        end
+
         #
         # Forward the given command to the respective thing handler.
         #
         # @param [Command] command
         #
         def handle_command(command)
-          unless instance_variable_defined?(:@dummy_channel_item)
-            @dummy_channel_item = DSL::Items::ItemBuilder.item_factory.create_item(link.channel.accepted_item_type, "")
-          end
-          command = @dummy_channel_item.format_command(command) if @dummy_channel_item
+          command = ProfileCallback.dummy_channel_item(link.channel.accepted_item_type)&.format_command(command)
           super
         end
 

data/lib/openhab/core/value_cache.rb

@@ -175,7 +175,7 @@ module OpenHAB
 
       # @see https://docs.ruby-lang.org/en/master/Hash.html#method-i-to_proc Hash#to_proc
       def to_proc
-        @to_proc ||= ->(k) { self[k] }
+        ->(k) { self[k] }
       end
 
       # @see https://docs.ruby-lang.org/en/master/Hash.html#method-i-values_at Hash#values_at

data/lib/openhab/core_ext/java/list.rb

@@ -87,9 +87,9 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
   def delete_if
     raise NotImplementedError unless block_given?
 
-    it = list_iterator
-    while it.has_next? # rubocop:disable Style/WhileUntilModifier
-      it.remove if yield(it.next)
+    itr = list_iterator
+    while itr.has_next? # rubocop:disable Style/WhileUntilModifier
+      itr.remove if yield(itr.next)
     end
     self
   end
@@ -160,17 +160,17 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
     start = range.begin
     start = 0 if start.negative?
     start = length if start > length
-    it = list_iterator(start)
+    itr = list_iterator(start)
 
-    while range.cover?(it.next_index)
-      break if range.end.nil? && !it.has_next?
+    while range.cover?(itr.next_index)
+      break if range.end.nil? && !itr.has_next?
 
-      obj = yield(it.next_index) if block_given?
-      if it.has_next?
-        it.next
-        it.set(obj)
+      obj = yield(itr.next_index) if block_given?
+      if itr.has_next?
+        itr.next
+        itr.set(obj)
       else
-        it.add(obj)
+        itr.add(obj)
       end
     end
 
@@ -183,22 +183,22 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
             "wrong number of arguments calling `flatten` (given #{args.length}, expect 0..1)"
     end
 
-    it = list_iterator
+    itr = list_iterator
 
     args = [args.first - 1] unless args.empty?
     done = args.first == 0 # rubocop:disable Style/NumericPredicate
 
     changed = false
-    while it.has_next?
-      element = it.next
+    while itr.has_next?
+      element = itr.next
       next unless element.respond_to?(:to_ary)
 
       changed = true
-      it.remove
+      itr.remove
       arr = element.to_ary
       arr = arr.flatten(*args) unless done
       arr.each do |e|
-        it.add(e)
+        itr.add(e)
       end
     end
     changed ? self : nil
@@ -223,9 +223,9 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
   def keep_if?
     raise NotImplementedError unless block_given?
 
-    it = list_iterator
-    while it.has_next? # rubocop:disable Style/WhileUntilModifier
-      it.remove unless yield(it.next)
+    itr = list_iterator
+    while itr.has_next? # rubocop:disable Style/WhileUntilModifier
+      itr.remove unless yield(itr.next)
     end
     self
   end
@@ -257,10 +257,10 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
     count = args.first
     start = [length - count, 0].max
     result = self[start..-1].to_a # rubocop:disable Style/SlicingWithRange
-    it = list_iterator(start)
-    while it.has_next?
-      it.next
-      it.remove
+    itr = list_iterator(start)
+    while itr.has_next?
+      itr.next
+      itr.remove
     end
     result
   end
@@ -278,12 +278,12 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
   def reject!
     raise NotImplementedError unless block_given?
 
-    it = list_iterator
+    itr = list_iterator
     changed = false
-    while it.has_next
-      if yield(it.next)
+    while itr.has_next
+      if yield(itr.next)
         changed = true
-        it.remove
+        itr.remove
       end
     end
     self if changed
@@ -319,12 +319,12 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
   def select!
     raise NotImplementedError unless block_given?
 
-    it = list_iterator
+    itr = list_iterator
     changed = false
-    while it.has_next?
-      unless yield(it.next)
+    while itr.has_next?
+      unless yield(itr.next)
         changed = true
-        it.remove
+        itr.remove
       end
     end
     self if changed
@@ -344,12 +344,12 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
 
     count = args.first
     result = self[0...count].to_a
-    it = list_iterator
+    itr = list_iterator
     count.times do
-      break unless it.has_next?
+      break unless itr.has_next?
 
-      it.next
-      it.remove
+      itr.next
+      itr.remove
     end
     result
   end
@@ -377,10 +377,10 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
 
     result = slice(*args).to_a
 
-    it = list_iterator(start)
+    itr = list_iterator(start)
     result.length.times do
-      it.next
-      it.remove
+      itr.next
+      itr.remove
     end
     result
   end
@@ -395,14 +395,14 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
   def uniq!
     seen = Set.new
 
-    it = list_iterator
+    itr = list_iterator
     changed = false
-    while it.has_next?
-      n = it.next
+    while itr.has_next?
+      n = itr.next
       n = yield(n) if block_given?
       if seen.include?(n)
         changed = true
-        it.remove
+        itr.remove
       end
       seen << n
     end

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.38.2"
+    VERSION = "5.38.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.38.2
+  version: 5.38.3
 platform: ruby
 authors:
 - Brian O'Connell
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.2'
 - !ruby/object:Gem::Dependency
   name: cuke_linter
   requirement: !ruby/object:Gem::Requirement