openhab-scripting 4.11.0 → 4.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4fc0e817de7a0a8ef1892e7e397552afb897bc45983935a73ab39f03975733
-  data.tar.gz: 756291721126083940a335788551a7d1bafdd7643b0bd4cd5cb3bedb7b576ae0
+  metadata.gz: f6e235cb755ab3a382e6c26092492655347aeb90fb93b4449c64c7ae78b084ba
+  data.tar.gz: 6c595a32a957415cee2e0588bc1dd044f797c9b9c678ea4c130ac37f80d72f0b
 SHA512:
-  metadata.gz: 58b0de14c919cdc09bef1d8f37c782052a8a36740feddf797e2a8d38a112b334d795a270b757dbae3938269faf29b117aceb303de2c3878da608214aeb25e7fc
-  data.tar.gz: a0079a59f25d709814f20527045d7b7c57f4b7c702f3618c616be56117e60b7e0920d023d19d2752556f41f2a85b3e617280e00176a2d60513bef07a0067e882
+  metadata.gz: 7641e9056c5a0b2d4e004a585bfddf5fb4c51f4228f3df9dacea2b4af3efcb7a48ca0a38214d92a6571bf5de481dae49a7c62582f917a2226d211b8070ffeac6
+  data.tar.gz: 7cd6598c839a75c773b92000660663f2abcee197a128b66323cdcfbd3c0ca887d813fcee0eb207e112e0e19d502919ec938e822fcf8543edcd1d481edd682bfc

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

@@ -29,7 +29,7 @@ module OpenHAB
 
           def initialize(metadata: nil, key: nil, value: nil, config: nil)
             @metadata = metadata || Metadata.new(key || MetadataKey.new('', ''), value&.to_s, config)
-            super(to_ruby(@metadata&.configuration))
+            super(MetadataItem.to_ruby(@metadata&.configuration))
           end
 
           #
@@ -86,8 +86,6 @@ module OpenHAB
             [@metadata&.value, @metadata&.configuration || {}]
           end
 
-          private
-
           #
           # Recursively convert the supplied Hash object into a Ruby Hash and recreate the keys and values
           #
@@ -95,7 +93,7 @@ module OpenHAB
           #
           # @return [Hash] The converted hash
           #
-          def to_ruby_hash(hash)
+          def self.to_ruby_hash(hash)
             return unless hash.respond_to? :each_with_object
 
             hash.each_with_object({}) { |(key, value), ruby_hash| ruby_hash[to_ruby(key)] = to_ruby(value) }
@@ -108,14 +106,14 @@ module OpenHAB
           #
           # @return [Array] The converted array
           #
-          def to_ruby_array(array)
+          def self.to_ruby_array(array)
             return unless array.respond_to? :each_with_object
 
             array.each_with_object([]) { |value, ruby_array| ruby_array << to_ruby(value) }
           end
 
           # Convert the given object to Ruby equivalent
-          def to_ruby(value)
+          def self.to_ruby(value)
             case value
             when Hash, Java::JavaUtil::Map then to_ruby_hash(value)
             when Array, Java::JavaUtil::List then to_ruby_array(value)
@@ -188,7 +186,9 @@ module OpenHAB
             return unless block_given?
 
             NamespaceAccessor.registry.getAll.each do |meta|
-              yield meta.uID.namespace, meta.value, meta.configuration if meta.uID.itemName == @item_name
+              if meta.uID.itemName == @item_name
+                yield meta.uID.namespace, MetadataItem.to_ruby(meta.value), MetadataItem.to_ruby(meta.configuration)
+              end
             end
           end
 

data/lib/openhab/dsl/timers.rb

@@ -58,11 +58,11 @@ module OpenHAB
         timer = @timer_manager.reentrant_timer(id: id, &block)
         if timer
           logger.trace("Reentrant timer found - #{timer}")
-          timer.reschedule
+          timer.cancel
         else
           logger.trace('No reentrant timer found, creating new timer')
-          ReentrantTimer.new(duration: duration, id: id, &block)
         end
+        ReentrantTimer.new(duration: duration, id: id, &block)
       end
     end
   end

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

@@ -50,6 +50,9 @@ module OpenHAB
         def <=>(other) # rubocop:disable Metrics
           logger.trace("(#{self.class}) #{self} <=> #{other} (#{other.class})")
           if other.is_a?(self.class)
+            return unitize(other.unit).compare_to(other) if unit == ONE
+            return compare_to(other.unitize(unit)) if other.unit == ONE
+
             compare_to(other)
           elsif other.is_a?(Items::NumericItem) ||
                 (other.is_a?(Items::GroupItem) && other.base_item.is_a?(NumericItem))

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.12.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2021-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,15 +152,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: JRuby Helper Libraries for OpenHAB Scripting