openhab-scripting 4.6.2 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 287e243222ea07f7a3157b208722d47f489f14456713ad86401292f6b2fda942
-  data.tar.gz: 44968c29cf24415646ebb27ce64c3894966c4e9f9707edcd303eb89d4a4b1f04
+  metadata.gz: c0e7aabfc4cdcd9a89787c861b639e087f903e9f499db1e24d1b67b0baea71eb
+  data.tar.gz: d590f67786a6499e17afc791fe18564223d13a0792d649494b197daf2c688536
 SHA512:
-  metadata.gz: 12ce91f43449208a374b04ab92171a93c4ab3b68f2fee8ce7f948f7bf21f2be4a8d967b8f5758be957f5ca36cac831ebcb5f184204d650ed50d1fb345b1c2f7a
-  data.tar.gz: d7da5a64ab6aef028308a998ea83a77da1d77d12cbccb24c34875f6e51a9c6360e204efd75287de4d4f1fbc17b9bcd722057da227821f519452945fb17fd1666
+  metadata.gz: 91b26707cfa19145ad2d38587e476057a9ae7f8ac3c77a7a3c237f119c257ccbec79419fd77cd9b61656da8c6c18ff35be4ad14a1ea1d674ee3f28e26cc412aa
+  data.tar.gz: d168357490983f4ce8a5d3152394cf5c982270ae110d829096a32d9637dfc2c99a453a82783b4e5ba9300f5832632bedb88a077654623a43b8a0228bfe07cf40

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

@@ -25,6 +25,7 @@ module OpenHAB
           extend Forwardable
 
           def_delegator :@metadata, :value
+          def_delegator :__getobj__, :to_h, :to_hash
 
           def initialize(metadata: nil, key: nil, value: nil, config: nil)
             @metadata = metadata || Metadata.new(key || MetadataKey.new('', ''), value&.to_s, config)
@@ -68,6 +69,7 @@ module OpenHAB
           # @return [Java::Org::openhab::core::items::Metadata] the old metadata
           #
           def config=(config)
+            config = config.to_hash if config.respond_to?(:to_hash)
             raise ArgumentError, 'Configuration must be a hash' unless config.is_a? Hash
 
             metadata = Metadata.new(@metadata&.uID, @metadata&.value, config)
@@ -158,7 +160,7 @@ module OpenHAB
             meta_value, configuration = update_from_value(value)
 
             key = MetadataKey.new(namespace, @item_name)
-            metadata = Metadata.new(key, meta_value&.to_s, configuration)
+            metadata = Metadata.new(key, meta_value&.to_s, configuration.to_h)
             # registry.get can be omitted, but registry.update will log a warning for nonexistent metadata
             if NamespaceAccessor.registry.get(key)
               NamespaceAccessor.registry.update(metadata)

data/lib/openhab/dsl/rules/rule.rb

@@ -45,7 +45,7 @@ module OpenHAB
       #
       def logger
         if @rule_name
-          Log.logger(@rule_name.chomp.gsub(/\s+/, '_'))
+          Log.logger_for(@rule_name.chomp.gsub(/\s+/, '_'))
         else
           super
         end

data/lib/openhab/dsl/rules/rule_config.rb

@@ -127,7 +127,7 @@ module OpenHAB
         #
         def logger
           if name
-            Log.logger(name.chomp.gsub(/\s+/, '_'))
+            Log.logger_for(name.chomp.gsub(/\s+/, '_'))
           else
             super
           end

data/lib/openhab/dsl/rules/triggers/changed.rb

@@ -39,7 +39,7 @@ module OpenHAB
             else
               # Place in array and flatten to support multiple to elements or single or nil
               [to].flatten.each do |to_state|
-                create_changed_trigger(item, from, to_state)
+                [from].flatten.each { |from_state| create_changed_trigger(item, from_state, to_state) }
               end
             end
           end

data/lib/openhab/log/logger.rb

@@ -137,31 +137,36 @@ module OpenHAB
     # @return [Logger] for the current class
     #
     def logger
-      Log.logger(self.class.name)
+      Log.logger(self.class)
     end
 
     class << self
       #
       # Injects a logger into the base class
       #
-      # @param [String] name of the logger
+      # @param [Class] class the logger is for
       #
       # @return [Logger] for the supplied name
       #
-      def logger(name)
-        name ||= self.class.name
+      def logger(klass)
+        if klass.respond_to?(:java_class) &&
+           klass.java_class &&
+           !klass.java_class.name.start_with?('org.jruby.Ruby')
+          klass = klass.java_class
+        end
+        name = klass.name
         @loggers[name] ||= Log.logger_for(name)
       end
 
       #
       # Configure a logger for the supplied class name
       #
-      # @param [String] classname to configure logger for
+      # @param [String] name to configure logger for
       #
       # @return [Logger] for the supplied classname
       #
-      def logger_for(classname)
-        configure_logger_for(classname)
+      def logger_for(name)
+        configure_logger_for(name)
       end
 
       private
@@ -173,10 +178,10 @@ module OpenHAB
       #
       # @return [Logger] Logger for the supplied classname
       #
-      def configure_logger_for(classname)
+      def configure_logger_for(name)
         log_prefix = Configuration.log_prefix
-        log_prefix += if classname
-                        ".#{classname}"
+        log_prefix += if name
+                        ".#{name}"
                       else
                         ".#{log_caller}"
                       end
@@ -207,7 +212,7 @@ module OpenHAB
     def self.included(base)
       class << base
         def logger
-          Log.logger(self.class.name)
+          Log.logger(self)
         end
       end
     end

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.7.0
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-24 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler