openhab-scripting 4.35.0 → 4.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a64a452ca8ff7c31d08ceed61a6e2d466250438365ea71c4de1c968b33198f8c
-  data.tar.gz: 31e41c724ad7b7871e913044259f5d3736130d5634d2f9301b98c7093b97f804
+  metadata.gz: 0f8ae7a88299903d5fe44ecc1a1bf2f16bdeb659545a567d1e86dfc908367694
+  data.tar.gz: 94db08cd7ee03e382db6d7b4ebed8b240ae4e354a7b62073b0a81cc1b7228cdd
 SHA512:
-  metadata.gz: 1cb0812ede637a43674c260dce7124a38fce48c0940cae506125f9c5d6c3ebc3fa08d229a92155060fc5eb816b9e946874cebbc6e0d9654b3405e75879b1dbfd
-  data.tar.gz: cf04212fd7483729494be64840f74c9d6d5241c35c87e4c46f7207c8a007a9d0c537a8379481172d8395cf27c74eae5764d2d2e65ef984d7478104778e19c4a0
+  metadata.gz: 6f8ea8b5f0ab16e602f002cf749102c4250bb3525fc6f7e18f11eafe294125d198d6a85c5565bfc29629024dad0f5823ef0a298e7e90f7aa776030b84df4a25f
+  data.tar.gz: 9a04fb5c20858fbe6b1e63dbdff39207f8de7a7809b26000eef663cc3ff146e75e9e6717df1e2485b087fe92736af248f9352085b472d64e931008d60b7eb89c

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

@@ -76,19 +76,15 @@ module OpenHAB
         private
 
         #
-        # Convert timestamp to ZonedDateTime if it's a TemporalAmount
+        # Convert timestamp to ZonedDateTime with duration negated to indicate a time in the past
         #
-        # @param [Object] timestamp to convert
+        # @param [Object] timestamp timestamp to convert
         #
         # @return [ZonedDateTime]
         #
         def to_zdt(timestamp)
-          if timestamp.is_a? Java::JavaTimeTemporal::TemporalAmount
-            logger.trace("Converting #{timestamp} (#{timestamp.class}) to ZonedDateTime")
-            Java::JavaTime::ZonedDateTime.now.minus(timestamp)
-          else
-            timestamp
-          end
+          timestamp = timestamp.negated if timestamp.is_a? Java::JavaTime::Duration
+          OpenHAB::DSL.to_zdt(timestamp)
         end
 
         #

data/lib/openhab/dsl/timers/timer.rb

@@ -29,7 +29,6 @@ module OpenHAB
       # @param [Duration] duration Duration until timer should fire
       # @param [Block] block Block to execute when timer fires
       #
-      # rubocop: disable Metrics/MethodLength
       def initialize(duration:, thread_locals: {}, &block)
         @duration = duration
         @thread_locals = thread_locals
@@ -39,15 +38,12 @@ module OpenHAB
         semaphore = Mutex.new
 
         semaphore.synchronize do
-          @timer = ScriptExecution.createTimer(
-            ZonedDateTime.now.plus(to_duration(@duration)), timer_block(semaphore, &block)
-          )
+          @timer = ScriptExecution.createTimer(OpenHAB::DSL.to_zdt(@duration), timer_block(semaphore, &block))
           @rule_timers = Thread.current[:rule_timers]
           super(@timer)
           Timers.timer_manager.add(self)
         end
       end
-      # rubocop: enable Metrics/MethodLength
 
       #
       # Reschedule timer
@@ -60,7 +56,7 @@ module OpenHAB
         duration ||= @duration
 
         Timers.timer_manager.add(self)
-        @timer.reschedule(ZonedDateTime.now.plus(to_duration(duration)))
+        @timer.reschedule(OpenHAB::DSL.to_zdt(duration))
       end
 
       #
@@ -92,26 +88,44 @@ module OpenHAB
           end
         }
       end
+    end
 
-      #
-      # Convert argument to a duration
-      #
-      # @param [Java::JavaTimeTemporal::TemporalAmount, #to_f, #to_i, nil] duration Duration
-      #
-      # @raise if duration cannot be used for a timer
-      #
-      # @return Argument converted to seconds if it responds to #to_f or #to_i, otherwise duration unchanged
-      #
-      def to_duration(duration)
-        if duration.nil? || duration.is_a?(Java::JavaTimeTemporal::TemporalAmount)
-          duration
-        elsif duration.respond_to?(:to_f)
-          duration.to_f.seconds
-        elsif duration.respond_to?(:to_i)
-          duration.to_i.seconds
-        else
-          raise ArgumentError, "Supplied argument '#{duration}' cannot be converted to a duration"
-        end
+    #
+    # Convert TemporalAmount (Duration), seconds (float, integer), and Ruby Time to ZonedDateTime
+    # Note: TemporalAmount is added to now
+    #
+    # @param [Object] timestamp to convert
+    #
+    # @return [ZonedDateTime]
+    #
+    def self.to_zdt(timestamp)
+      logger.trace("Converting #{timestamp} (#{timestamp.class}) to ZonedDateTime")
+      return unless timestamp
+
+      case timestamp
+      when Java::JavaTimeTemporal::TemporalAmount then ZonedDateTime.now.plus(timestamp)
+      when ZonedDateTime then timestamp
+      when Time then timestamp.to_java(ZonedDateTime)
+      else
+        to_zdt(seconds_to_duration(timestamp)) ||
+          raise(ArgumentError, 'Timestamp must be a ZonedDateTime, a Duration, a Numeric, or a Time object')
+      end
+    end
+
+    #
+    # Convert numeric seconds to a Duration object
+    #
+    # @param [Float, Integer] secs The number of seconds in integer or float
+    #
+    # @return [Duration]
+    #
+    def self.seconds_to_duration(secs)
+      return unless secs
+
+      if secs.respond_to?(:to_f)
+        secs.to_f.seconds
+      elsif secs.respond_to?(:to_i)
+        secs.to_i.seconds
       end
     end
   end

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.35.0
+  version: 4.36.0
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler