openhab-scripting 4.32.0 → 4.32.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 737517891b51326c4c0ab343c448cca3f07a4855ca44222a8564d107d5101cf4
-  data.tar.gz: 0cd4aea92b89e152c7bc7bb0b1e759a22609d833f1022510ec348ff4ad634812
+  metadata.gz: 7c1093824867216ac9015ebc8bba44843f327a03c5c896ae44e8c18a90d3ffba
+  data.tar.gz: b3496046440b79efbc9d8967634337dc8ee035f4e64d596eb64863f4d2f8e617
 SHA512:
-  metadata.gz: c479724e15cb266f9f797f2e6c5646384f089ff83164890cfd2c6924d1ec0b07011015d4195a4e6de30dfa06da8c2617d2528de4652f8432afd4b2cef4c9bb21
-  data.tar.gz: 6e52ab144a7ba4118c39b9d843ba33a16a9f66903b6f9cdd6fd1cb585febdc121b5934bdd59ae813422c2e6325755302a0285f002427258762ae275214f686ce
+  metadata.gz: b4267271e7c487fafc419b874b3a919026c21305c8449836427df7f54361299d91e2f22a26fe7533ca114630862e74e4c671f06828c9a591b485e53da6609eca
+  data.tar.gz: cf88fac5372d571b4e2d68f85e8c395488397b314c260957180d1f60173f082c47ebbbc3670b0daa3f5fed753ca4f11154d4c4f45f678aae573626719236d3d2

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

@@ -54,29 +54,6 @@ module OpenHAB
           super
         end
 
-        #
-        # Convert the ColorItem to a hash
-        # @param [:hsb, :rgb] format for hash
-        # @return [Hash] in requested format
-        def to_h(format = :hsb)
-          values = to_a(format)
-          keys = (format == :hsb ? %i[hue saturation brightness] : %i[red green blue])
-          keys.zip(values).to_h
-        end
-
-        #
-        # Convert the ColorItem to an array of values
-        # @param [:hsb, :rgb] format for elements in the array
-        # @return [Array] of ColorItem components in requested format
-        def to_a(format = :hsb)
-          case format
-          when :hsb then [hue, saturation, brightness]
-          when :rgb then [red, green, blue].map(&:to_byte)
-          else
-            raise ArgumentError, "Unsupported format #{format}"
-          end
-        end
-
         private
 
         # Mapping of hash values sets to conversion methods

data/lib/openhab/dsl/monkey_patch/actions/script_thing_actions.rb

@@ -9,12 +9,10 @@ module OpenHAB
       # Patches OpenHAB actions
       #
       module Actions
-        java_import Java::OrgOpenhabCoreAutomationModuleScriptInternalDefaultscope::ScriptThingActions
-
         #
         # MonkeyPatching ScriptThingActions
         #
-        class ScriptThingActions
+        class << $actions # rubocop:disable Style/GlobalVars
           field_reader :THING_ACTIONS_MAP
 
           #
@@ -23,7 +21,7 @@ module OpenHAB
           # @return [Set] of keys for defined actions in the form of 'scope-thing_uid'
           #
           def action_keys
-            ScriptThingActions.THING_ACTIONS_MAP.keys
+            self.class.THING_ACTIONS_MAP.keys
           end
         end
       end

data/lib/openhab/dsl/types/hsb_type.rb

@@ -105,13 +105,15 @@ module OpenHAB
         #
         #   nil is returned if the two values are incomparable
         #
-        def <=>(other)
+        def <=>(other) # rubocop:disable Metrics
           logger.trace("(#{self.class}) #{self} <=> #{other} (#{other.class})")
           if other.is_a?(Items::ColorItem) ||
              (other.is_a?(Items::GroupItem) && other.base_item.is_a?(ColorItem))
-            return false unless other.state?
+            return nil unless other.state?
 
             self <=> other.state
+          elsif other.is_a?(HSBType)
+            to_a <=> other.to_a
           elsif other.respond_to?(:to_str)
             self <=> HSBType.new(other)
           else
@@ -178,6 +180,29 @@ module OpenHAB
           "#{hue},#{saturation},#{brightness}"
         end
 
+        #
+        # Convert the ColorItem to a hash
+        # @param [:hsb, :rgb] format for hash
+        # @return [Hash] in requested format
+        def to_h(format = :hsb)
+          values = to_a(format)
+          keys = (format == :hsb ? %i[hue saturation brightness] : %i[red green blue])
+          keys.zip(values).to_h
+        end
+
+        #
+        # Convert the ColorItem to an array of values
+        # @param [:hsb, :rgb] format for elements in the array
+        # @return [Array] of ColorItem components in requested format
+        def to_a(format = :hsb)
+          case format
+          when :hsb then [hue, saturation, brightness]
+          when :rgb then [red, green, blue].map(&:to_byte)
+          else
+            raise ArgumentError, "Unsupported format #{format}"
+          end
+        end
+
         # @!attribute [r] saturation
         #   @return [PercentType]
 

data/lib/openhab/log/logger.rb

@@ -8,7 +8,8 @@ module OpenHAB
   #
   # Provides access to the OpenHAB logging using a Ruby logging methods
   #
-  module Log
+
+  module Core
     #
     # Ruby Logger that forwards messages at appropriate levels to OpenHAB Logger
     #
@@ -105,7 +106,9 @@ module OpenHAB
       #
       def log_exception(exception, rule_name)
         exception = clean_backtrace(exception)
-        error { "#{exception.message} (#{exception.class})\nIn rule: #{rule_name}\n#{exception.backtrace&.join("\n")}" }
+        error do
+          "#{exception.message} (#{exception.class})\nIn rule: #{rule_name}\n#{exception.backtrace&.join("\n")}"
+        end
       end
 
       private
@@ -152,6 +155,12 @@ module OpenHAB
         end
       end
     end
+  end
+
+  module Log
+    #
+    # Ruby Logger that forwards messages at appropriate levels to OpenHAB Logger
+    #
 
     # Logger caches
     @loggers = {}
@@ -180,7 +189,7 @@ module OpenHAB
         # of logger name requires lots of operations and logger
         # names for some objects are specific to the class
         logger_name = logger_name(object)
-        @loggers[logger_name] ||= Logger.new(logger_name)
+        @loggers[logger_name] ||= OpenHAB::Core::Logger.new(logger_name)
       end
 
       private

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.32.0
+  version: 4.32.3
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler