openhab-scripting 4.32.1 → 4.32.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89c274fd9901e8ccc5d1890a7cf41dbf17ab6d79eb2b798b4e86dde9101cdd11
-  data.tar.gz: dea8df6ebfb5b572745df0f4ab2b33ac251d74f0fe694ca4759e227f0588b4c3
+  metadata.gz: 5b99944ff8d378d0c6b9dbcffa3de3e1d8337625aea405841edad758b9595450
+  data.tar.gz: 2cbdc97d7d8b425c32a5b3b030f6f35d0103df2c230ecffb175b58c4a7b27edf
 SHA512:
-  metadata.gz: 7ddee7681015930c085afe7fa68a6c6b913e414097d8da32ed9519b2d701ad71699f9bc585186f9cf229fb67633f3781995b04099290b67dd781ba9d5e167e93
-  data.tar.gz: a8d606a0b5c1fe02822955ad03fd6affbf111a774581cb1706ab7661af874ef907004c73e21bfa445f16780e27f65090b140ab83487b3dc2b6729ac1fba01b03
+  metadata.gz: e3dc7186b93fab441e08fc2c0c6f0a3c4df5d20429168a6ad5d62f221260ee338fe87d8f980d30f8127fb4f671baa93727606c57665ae0a1c8e2d4a346a19336
+  data.tar.gz: 9a9987c6560789e8a4f6e9ff419618b5493a526e6c5b662bb83919d928b08f5623e1108f2bb28e82ecba26b55372b05c8bb629f867be332f01f409874fc23bb0

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/on_off_type.rb

@@ -20,8 +20,7 @@ module OpenHAB
         # Invert the type
         # @return [OnOffType] +OFF+ if +ON+, +ON+ if +OFF+
         def !
-          return OFF if on?
-          return ON if off?
+          on? ? OFF : ON
         end
       end
     end

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.1'
+  VERSION = '4.32.4'
 end

metadata

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