openhab-scripting 2.13.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e3db2fe066cd7fe8c314eda96c2ce182611c1af9be801fb179896eaeebbca6e
-  data.tar.gz: a91ab773ddff831028cf3ef9839cca92f8772f3e9c10eb6c49d610282a4f998b
+  metadata.gz: '089e0d97f175f04c563675de122c80d0f5988be5ea38be8833736e4e73341a75'
+  data.tar.gz: 4b98810dd2e4f01772272fc10e457b57e81ade54c19b1dc59a72afd85c368b5a
 SHA512:
-  metadata.gz: a7ada2d4a291c47f44531f47e7556799c800f83ec9fa2d23d3cd708ddba11bd958a84d0df74c999ca49e0f14f5f9067a7a5c7d5ac766bab31bdc5e969bab236f
-  data.tar.gz: b06aae6303a62bf4b53144c9cf0e1ad0d2457be0a76e1930f1558d156259ccd1dbe89ed9a1121c1ffb0a728052665c57cc5736ed1932d78cc61ff88bbdcc2c24
+  metadata.gz: 67abc23128c151fdeb509f7a6c770696e0221b6a41a6e8af36628c891aa959c72e7ed7123d1e6d9711da3fe862eba2adaac9e3692e1026193cc7638e11de926a
+  data.tar.gz: 4348d10e590f9e8179c3559c05ae2417cd9a75150d069e98f1566316e60a5d5ed12b4057b0d67272e97d92c813cbf337c97dac8d69b1cc5538b06576aa3084f7

data/lib/openhab/core/dsl/monkey_patch/ruby/number.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'core/duration'
-
 module OpenHAB
   module Core
     module DSL
@@ -14,44 +12,18 @@ module OpenHAB
             include OpenHAB::Core
 
             #
-            # Create Duration with unit of seconds
-            #
-            # @return [OpenHAB::Core::Duration] Duration with number of seconds from self
-            #
-            def seconds
-              Duration.new(temporal_unit: :SECONDS, amount: self)
-            end
-
-            #
-            # Create Duration with unit of milliseconds
-            #
-            # @return [OpenHAB::Core::Duration] Duration with number of milliseconds from self
-            #
-            def milliseconds
-              Duration.new(temporal_unit: :MILLISECONDS, amount: self)
-            end
-
-            #
-            # Create Duration with unit of minutes
-            #
-            # @return [OpenHAB::Core::Duration] Duration with number of minutes from self
-            #
-            def minutes
-              Duration.new(temporal_unit: :MINUTES, amount: self)
-            end
-
-            #
-            # Create Duration with unit of hours
+            # Create Duration with the specified unit
             #
-            # @return [OpenHAB::Core::Duration] Duration with number of hours from self
+            # @return [Java::JavaTime::Duration] Duration with number of units from self
             #
-            def hours
-              Duration.new(temporal_unit: :HOURS, amount: self)
+            %w[millis seconds minutes hours].each do |unit|
+              define_method(unit) { Java::JavaTime::Duration.public_send("of_#{unit}", self) }
             end
 
             alias second seconds
-            alias millisecond milliseconds
-            alias ms milliseconds
+            alias millisecond millis
+            alias milliseconds millis
+            alias ms millis
             alias minute minutes
             alias hour hours
           end

data/lib/openhab/core/dsl/rule/cron.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'java'
-require 'core/duration'
 require 'core/dsl/time_of_day'
 require 'core/cron'
 
@@ -64,8 +63,10 @@ module OpenHAB
               expression_map = EXPRESSION_MAP[value]
               expression_map = at_condition(expression_map, at) if at
               cron(map_to_cron(expression_map))
-            when Duration
-              cron(map_to_cron(value.cron_map))
+            when Java::JavaTime::Duration
+              raise ArgumentError, '"at" cannot be used with duration' if at
+
+              cron(map_to_cron(duration_to_map(value)))
             else
               raise ArgumentExpression, 'Unknown interval' unless expression_map
             end
@@ -93,6 +94,28 @@ module OpenHAB
             %i[second minute hour dom month dow].map { |field| map.fetch(field) }.join(' ')
           end
 
+          #
+          # Convert a Java Duration to a map for the map_to_cron method
+          #
+          # @param duration [Java::JavaTime::Duration] The duration object
+          #
+          # @return [Hash] a map suitable for map_to_cron
+          #
+          def duration_to_map(duration)
+            if duration.to_millis_part.zero? && duration.to_nanos_part.zero? && duration.to_days.zero?
+              %i[second minute hour].each do |unit|
+                to_unit_part = duration.public_send("to_#{unit}s_part")
+                next unless to_unit_part.positive?
+
+                to_unit = duration.public_send("to_#{unit}s")
+                break unless to_unit_part == to_unit
+
+                return EXPRESSION_MAP[unit].merge(unit => "*/#{to_unit}")
+              end
+            end
+            raise ArgumentError, "Cron Expression not supported for duration: #{duration}"
+          end
+
           #
           # If an at time is provided, parse that and merge the new fields into the expression.
           #

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

@@ -274,7 +274,7 @@ module OpenHAB
                   process_trigger_delay(mod, inputs)
                 else
                   logger.trace("Item changed to #{state} for #{trigger_delay}, rescheduling timer.")
-                  trigger_delay.timer.reschedule(ZonedDateTime.now.plus(Java::JavaTime::Duration.ofMillis(duration.to_ms)))
+                  trigger_delay.timer.reschedule(ZonedDateTime.now.plus(duration))
                 end
               end
             else

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

@@ -4,8 +4,6 @@ require 'java'
 require 'delegate'
 require 'forwardable'
 
-require 'core/duration'
-
 module OpenHAB
   module Core
     module DSL
@@ -49,7 +47,7 @@ module OpenHAB
 
             semaphore.synchronize do
               @timer = ScriptExecution.createTimer(
-                ZonedDateTime.now.plus(Java::JavaTime::Duration.ofMillis(@duration.to_ms)), @block
+                ZonedDateTime.now.plus(@duration), @block
               )
               super(@timer)
             end
@@ -64,7 +62,7 @@ module OpenHAB
           #
           def reschedule(duration = nil)
             duration ||= @duration
-            @timer.reschedule(ZonedDateTime.now.plus(Java::JavaTime::Duration.ofMillis(duration.to_ms)))
+            @timer.reschedule(ZonedDateTime.now.plus(duration))
           end
         end
 

data/lib/openhab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - Brian O'Connell
@@ -76,7 +76,6 @@ files:
 - lib/openhab/core/dsl/timers.rb
 - lib/openhab/core/dsl/types/quantity.rb
 - lib/openhab/core/dsl/units.rb
-- lib/openhab/core/duration.rb
 - lib/openhab/core/log.rb
 - lib/openhab/core/patch_load_path.rb
 - lib/openhab/core/startup_delay.rb

data/lib/openhab/core/duration.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-require 'openhab/core/cron'
-
-module OpenHAB
-  module Core
-    #
-    # This class represents a duration of time
-    #
-    class Duration
-      include OpenHAB::Core::Cron
-
-      # @return [Array] of supported temperal units (milliseconds, seconds, minutes and hours)
-      TEMPORAL_UNITS = %i[MILLISECONDS SECONDS MINUTES HOURS].freeze
-
-      #
-      # Create a new Duration object
-      #
-      # @param [Symbol] temporal_unit Unit for duration
-      # @param [Integer] amount of that unit
-      #
-      def initialize(temporal_unit:, amount:)
-        unless TEMPORAL_UNITS.include? temporal_unit
-          raise ArgumentError,
-                "Unexpected Temporal Unit: #{temporal_unit}"
-        end
-
-        @temporal_unit = temporal_unit
-        @amount = amount
-      end
-
-      #
-      # Return a map
-      #
-      # @return [Map] Map with fields representing this duration @see OpenHAB::Core::Cron
-      #
-      def cron_map
-        case @temporal_unit
-        when :SECONDS
-          cron_expression_map.merge(second: "*/#{@amount}")
-        when :MINUTES
-          cron_expression_map.merge(minute: "*/#{@amount}")
-        when :HOURS
-          cron_expression_map.merge(hour: "*/#{@amount}")
-        else
-          raise ArgumentError, "Cron Expression not supported for temporal unit: #{temporal_unit}"
-        end
-      end
-
-      #
-      # Convert the duration to milliseconds
-      #
-      # @return [Integer] Duration in milliseconds
-      #
-      def to_ms
-        case @temporal_unit
-        when :MILLISECONDS
-          @amount
-        when :SECONDS
-          @amount * 1000
-        when :MINUTES
-          @amount * 1000 * 60
-        when :HOURS
-          @amount * 1000 * 60 * 60
-        end
-      end
-
-      #
-      # Return a string representation of the duration
-      #
-      # @return [String] Duration in string
-      #
-      def to_s
-        "#{@amount} #{(@amount == 1) ? @temporal_unit.to_s.downcase.delete_suffix('s') : @temporal_unit.to_s.downcase}"
-      end
-    end
-  end
-end