openhab-scripting 4.10.1 → 4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d06a02d7b0f2d02ed4e0ac6fdb06b61ef109b2eacb68cbc4c84c4ca766b94b9b
-  data.tar.gz: 69863d7d2d8a7c1f578a5eceeb949aa19ff09d23e1e7910aafad54f69eab3661
+  metadata.gz: 3264a393d9e32d434336802a9dcfd97f2d296b1f54cb3060650fd29ab7103b91
+  data.tar.gz: 786046dd908aaa43250b374947b01dcbfb7455eb72105b504bb29e0cffe48545
 SHA512:
-  metadata.gz: 9bb723993916a3382b1795526c9b2373cc7017f8983e04e388c8fc655a427607eeb2564cf973769d0852306207c52b7540c4298034482b23cc6d9cfd588c7b8d
-  data.tar.gz: 234f9e2fc4752707ec7e4290745cca0eececfcbd0bb868feff6cb44850ff97df5eca6f0c2d755a350063aa7e8475db698d6efe9fd617d76f6971f33b77474ce7
+  metadata.gz: d7c4684def0b1c2dd97d9bce9f191bcfb58c5e3bf07313916d240385dc0d891f987b30d92c38f27578e432e10c8318e2167dd92942f6b6d426e77e1d7c3f2be4
+  data.tar.gz: '058b81f95f7d86e8cf35a30f8576679c49fab4181a1f7e1634f9d5997cb45a6f96c4cf35efc00627d954d4a71c2626bd4a82df527c0233685fd9c2e52061f6f6'

data/lib/openhab/dsl/between.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative 'time/time_of_day'
+require_relative 'time/month_day'
+
+module OpenHAB
+  module DSL
+    # Supports between range syntax
+    module Between
+      # Creates a range that can be compared against time of day/month days or strings
+      # to see if they are within the range
+      # @since 2.4.0
+      # @return Range object representing a TimeOfDay Range
+      def between(range)
+        raise ArgumentError, 'Supplied object must be a range' unless range.is_a? Range
+
+        return OpenHAB::DSL::Between::MonthDayRange.range(range) if OpenHAB::DSL::Between::MonthDayRange.range?(range)
+
+        OpenHAB::DSL::Between::TimeOfDay.between(range)
+      end
+    end
+  end
+end

data/lib/openhab/dsl/dsl.rb

@@ -15,7 +15,7 @@ require 'openhab/dsl/actions'
 require 'openhab/dsl/timers'
 require 'openhab/dsl/group'
 require 'openhab/dsl/things'
-require 'openhab/dsl/time_of_day'
+require 'openhab/dsl/between'
 require 'openhab/dsl/gems'
 require 'openhab/dsl/persistence'
 require 'openhab/dsl/units'
@@ -31,6 +31,7 @@ module OpenHAB
     # rubocop:disable Metrics/MethodLength
     def self.extended(base)
       base.send :include, OpenHAB::DSL::Actions
+      base.send :include, OpenHAB::DSL::Between
       base.send :include, OpenHAB::DSL::Groups
       base.send :include, OpenHAB::DSL::Items
       base.send :include, OpenHAB::DSL::Persistence
@@ -39,7 +40,7 @@ module OpenHAB
       base.send :include, OpenHAB::DSL::States
       base.send :include, OpenHAB::DSL::Things
       base.send :include, OpenHAB::DSL::Timers
-      base.send :include, OpenHAB::DSL::TimeOfDay
+      base.send :include, OpenHAB::DSL::Between
       base.send :include, OpenHAB::DSL::Types
       base.send :include, OpenHAB::DSL::Units
     end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'openhab/dsl/time_of_day'
-
 require_relative 'numeric_item'
 
 module OpenHAB

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

@@ -4,6 +4,7 @@ require 'java'
 require 'set'
 require 'openhab/core/thread_local'
 require 'openhab/log/logger'
+require 'openhab/dsl/between'
 
 require_relative 'item_event'
 
@@ -22,7 +23,7 @@ module OpenHAB
       class AutomationRule < Java::OrgOpenhabCoreAutomationModuleScriptRulesupportSharedSimple::SimpleRule
         include OpenHAB::Log
         include OpenHAB::Core::ThreadLocal
-        include OpenHAB::DSL::TimeOfDay
+        include OpenHAB::DSL::Between
         java_import java.time.ZonedDateTime
 
         #
@@ -42,7 +43,7 @@ module OpenHAB
           @run_queue = config.run
           @guard = config.guard
           between = config.between&.yield_self { between(config.between) }
-          @between = between || OpenHAB::DSL::TimeOfDay::ALL_DAY
+          @between = between || OpenHAB::DSL::Between::ALL_DAY
           # Convert between to correct range or nil if not set
           @trigger_delays = config.trigger_delays
           @attachments = config.attachments

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

@@ -10,7 +10,7 @@ require 'openhab/dsl/rules/triggers/command'
 require 'openhab/dsl/rules/triggers/updated'
 require 'openhab/dsl/rules/guard'
 require 'openhab/core/entity_lookup'
-require 'openhab/dsl/time_of_day'
+require 'openhab/dsl/between'
 require 'openhab/dsl/dsl'
 require 'openhab/dsl/timers'
 

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'java'
-require 'openhab/dsl/time_of_day'
 
 module OpenHAB
   module DSL

data/lib/openhab/dsl/time/month_day.rb

@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+module OpenHAB
+  module DSL
+    # Support for time related functions
+    module Between
+      # Manages Month Day Ranges
+      module MonthDayRange
+        include OpenHAB::Log
+
+        java_import java.time.Year
+
+        # Lambdas are used to calculate the year for the month day
+        # which must happen during evaluation time to support that rules
+        # creation and evaluation for execution are done in distinct phases
+        @current_year = -> { return Year.now }
+        @next_year = -> { return Year.now.plus_years(1) }
+
+        class << self
+          attr_reader :current_year, :next_year
+        end
+
+        # Creates a range that can be compared against MonthDay objects, strings
+        # or anything responding to 'to_date' to see if they are within the range
+        # @return Range object representing a MonthDay Range
+        # rubocop:disable Metrics/AbcSize
+        # Range method cannot be broken up cleaner
+        def self.range(range)
+          logger.trace "Creating MonthDay range from #{range}"
+          raise ArgumentError, 'Supplied object must be a range' unless range.is_a? Range
+
+          start = MonthDay.parse(range.begin)
+          ending = MonthDay.parse(range.end)
+
+          logger.trace "Month Day Range Start(#{start}) - End (#{ending})"
+
+          # Wrap to next year if ending day of month is before starting day of month
+          ending_year = ending < start ? next_year : current_year
+
+          start_range = MonthDayRangeElement.new(month_day: start, year: current_year)
+          ending_range = MonthDayRangeElement.new(month_day: ending, year: ending_year)
+          range.exclude_end? ? (start_range...ending_range) : (start_range..ending_range)
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        # Checks if supplied range can be converted to a month day range
+        # @param [Range] range to check begin and end values of
+        # @return [Boolean] Returns true if supplied range can be converted to a month day range
+        def self.range?(range)
+          return false unless range.is_a? Range
+
+          MonthDay.day_of_month?(range.begin) && MonthDay.day_of_month?(range.end)
+        end
+
+        # Represents a range element for a MonthDay object
+        # The LocalDate (MonthDay + Year) is dynamically calculated to allow for
+        # being used as a guard during rule evaluation
+        class MonthDayRangeElement
+          include Comparable
+          include OpenHAB::Log
+          java_import java.time.LocalDate
+          java_import java.time.Year
+
+          # Create a new MonthDayRange element
+          # @param [MonthDay] MonthDay element
+          # @param [Lambda] year lambda to calculate year to convert MonthDay to LocalDate
+          #
+          def initialize(month_day:, year:)
+            @month_day = month_day
+            @year = year
+          end
+
+          # Convert into a LocalDate using year lambda supplied in initializer
+          def to_local_date
+            @year.call.at_month_day(@month_day)
+          end
+
+          # Returns the MonthDay advanced by 1 day
+          # Required by Range class
+          def succ
+            next_date = to_local_date.plus_days(1)
+            # Handle rollover to next year
+            year = -> { Year.from(next_date) }
+            MonthDayRangeElement.new(month_day: MonthDay.from(next_date), year: year)
+          end
+
+          # Compare MonthDayRangeElement to other objects as required by Range class
+          # rubocop:disable Metrics/AbcSize
+          # Case statement needs to work against multiple types
+          def <=>(other)
+            case other
+            when LocalDate then to_local_date.compare_to(other)
+            when Date then self.<=>(LocalDate.of(other.year, other.month, other.day))
+            when MonthDay then self.<=>(MonthDayRange.current_year.call.at_month_day(other))
+            else
+              return self.<=>(other.to_local_date) if other.respond_to? :to_local_date
+              return self.<=>(other.to_date) if other.respond_to? :to_date
+
+              raise "Unable to convert #{other.class} to compare to MonthDay"
+            end
+          end
+          # rubocop:enable Metrics/AbcSize
+        end
+      end
+
+      java_import java.time.MonthDay
+      # Extend MonthDay java object with some helper methods
+      class MonthDay
+        include OpenHAB::Log
+        # Parse MonthDay string as defined with by Monthday class without leading double dash "--"
+        def self.parse(string)
+          ##          string = "--#{string}" unless string.to_s.start_with? '--'
+          java_send :parse, [java.lang.CharSequence], "--#{string}"
+        end
+
+        # Can the supplied object be parsed into a MonthDay
+        def self.day_of_month?(obj)
+          /^-*[01][0-9]-[0-3]\d$/.match? obj.to_s
+        end
+
+        # Remove -- from MonthDay string representation
+        def to_s
+          to_string.delete_prefix('--')
+        end
+
+        # Extends MonthDay comparison to support Strings
+        # Necessary to support mixed ranges of Strings and MonthDay types
+        # @return [Number, nil] -1,0,1 if other MonthDay is less than, equal to, or greater than this MonthDay
+        def <=>(other)
+          case other
+          when String
+            self.<=>(MonthDay.parse(other))
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/openhab/dsl/{time_of_day.rb → time/time_of_day.rb}

@@ -10,7 +10,7 @@ module OpenHAB
     # Times without specific dates e.g. 6:00:00
     # @author Brian O'Connell
     # @since 0.0.1
-    module TimeOfDay
+    module Between
       java_import java.time.LocalTime
       java_import java.time.format.DateTimeFormatterBuilder
       java_import java.util.Locale
@@ -123,6 +123,41 @@ module OpenHAB
             -(other <=> self)
           end
         end
+
+        # Creates a range that can be compared against time of day objects or strings
+        # to see if they are within the range
+        # @since 2.4.0
+        # @return Range object representing a TimeOfDay Range
+        def self.between(range)
+          raise ArgumentError, 'Supplied object must be a range' unless range.is_a? Range
+
+          start = to_time_of_day(range.begin)
+          ending = to_time_of_day(range.end)
+
+          start_sod = start.local_time.to_second_of_day
+          ending_sod = ending.local_time.to_second_of_day
+          ending_sod += TimeOfDayRangeElement::NUM_SECONDS_IN_DAY if ending_sod < start_sod
+
+          start_range = TimeOfDayRangeElement.new(sod: start_sod, range_begin: start_sod)
+          ending_range = TimeOfDayRangeElement.new(sod: ending_sod, range_begin: start_sod)
+          range.exclude_end? ? (start_range...ending_range) : (start_range..ending_range)
+        end
+
+        #
+        # Convert object to TimeOfDay object
+        #
+        # @param [Object] object TimeOfDay or String to be converted
+        #
+        # @return [TimeOfDay] TimeOfDay created from supplied object
+        #
+        def self.to_time_of_day(object)
+          case object
+          when String then TimeOfDay.parse(object)
+          when Time, OpenHAB::DSL::Types::DateTimeType, OpenHAB::DSL::Items::DateTimeItem
+            TimeOfDay.new(h: object.hour, m: object.min, s: object.sec)
+          else object
+          end
+        end
       end
 
       # Modules that refines the Ruby Range object cover? and include? methods to support TimeOfDay ranges
@@ -168,17 +203,20 @@ module OpenHAB
         #
         # @return [Integer] seconds of day represented by supplied object
         #
+        # rubocop:disable Metrics/AbcSize
+        # case statement needs to compare against multiple types
         def to_second_of_day(object)
           case object
           when TimeOfDay then adjust_second_of_day(object.local_time.to_second_of_day)
           when String then adjust_second_of_day(TimeOfDay.parse(object).local_time.to_second_of_day)
-          when Time, OpenHAB::DSL::Types::DateTimeType, OpenHAB::DSL::Items::DateTimeItem
+          when ::Time, OpenHAB::DSL::Types::DateTimeType, OpenHAB::DSL::Items::DateTimeItem
             adjust_second_of_day(TimeOfDay.new(h: object.hour, m: object.min, s: object.sec)
             .local_time.to_second_of_day)
           when TimeOfDayRangeElement then object.sod
-          else raise ArgumentError, 'Supplied argument cannot be converted into Time Of Day Object'
+          else raise ArgumentError, "Supplied argument #{object.class} cannot be converted into Time Of Day Object"
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         def adjust_second_of_day(second_of_day)
           second_of_day += NUM_SECONDS_IN_DAY if second_of_day < @range_begin
@@ -186,46 +224,9 @@ module OpenHAB
         end
       end
 
-      # Creates a range that can be compared against time of day objects or strings
-      # to see if they are within the range
-      # @since 2.4.0
-      # @return Range object representing a TimeOfDay Range
-      module_function
-
-      def between(range)
-        raise ArgumentError, 'Supplied object must be a range' unless range.is_a? Range
-
-        start = to_time_of_day(range.begin)
-        ending = to_time_of_day(range.end)
-
-        start_sod = start.local_time.to_second_of_day
-        ending_sod = ending.local_time.to_second_of_day
-        ending_sod += TimeOfDayRangeElement::NUM_SECONDS_IN_DAY if ending_sod < start_sod
-
-        start_range = TimeOfDayRangeElement.new(sod: start_sod, range_begin: start_sod)
-        ending_range = TimeOfDayRangeElement.new(sod: ending_sod, range_begin: start_sod)
-        range.exclude_end? ? (start_range...ending_range) : (start_range..ending_range)
-      end
-
-      #
-      # Convert object to TimeOfDay object
-      #
-      # @param [Object] object TimeOfDay or String to be converted
-      #
-      # @return [TimeOfDay] TimeOfDay created from supplied object
-      #
-      private_class_method def to_time_of_day(object)
-        case object
-        when String then TimeOfDay.parse(object)
-        when Time, OpenHAB::DSL::Types::DateTimeType, OpenHAB::DSL::Items::DateTimeItem
-          TimeOfDay.new(h: object.hour, m: object.min, s: object.sec)
-        else object
-        end
-      end
-
       MIDNIGHT = TimeOfDay.midnight
       NOON = TimeOfDay.noon
-      ALL_DAY = between(TimeOfDay.new(h: 0, m: 0, s: 0)..TimeOfDay.new(h: 23, m: 59, s: 59))
+      ALL_DAY = TimeOfDay.between(TimeOfDay.new(h: 0, m: 0, s: 0)..TimeOfDay.new(h: 23, m: 59, s: 59))
     end
   end
 end

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

@@ -59,6 +59,10 @@ module OpenHAB
         # @return [Timer] Rescheduled timer instances
         #
         def reschedule(duration = nil)
+          unless duration.nil? || duration.is_a?(Java::JavaTimeTemporal::TemporalAmount)
+            raise ArgumentError, 'Supplied argument must be a duration'
+          end
+
           duration ||= @duration
           Timers.timer_manager.add(self)
           @timer.reschedule(ZonedDateTime.now.plus(duration))

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

@@ -59,7 +59,7 @@ module OpenHAB
           rescue java.lang.StringIndexOutOfBoundsException, java.lang.IllegalArgumentException
             # Try ruby's Time.parse if OpenHAB's DateTimeType parser fails
             begin
-              DateTimeType.new(Time.parse(time_string))
+              DateTimeType.new(::Time.parse(time_string))
             rescue ArgumentError
               raise ArgumentError, "Unable to parse #{time_string} into a DateTimeType"
             end
@@ -194,7 +194,7 @@ module OpenHAB
         # @return [Time] A Time object representing the same instant and timezone
         #
         def to_time
-          Time.at(to_i, nsec, :nsec).localtime(utc_offset)
+          ::Time.at(to_i, nsec, :nsec).localtime(utc_offset)
         end
 
         #
@@ -256,7 +256,7 @@ module OpenHAB
         # @!visibility private
         def respond_to_missing?(method, _include_private = false)
           return true if zoned_date_time.respond_to?(method)
-          return true if Time.instance_methods.include?(method.to_sym)
+          return true if ::Time.instance_methods.include?(method.to_sym)
 
           super
         end
@@ -267,7 +267,7 @@ module OpenHAB
         #
         def method_missing(method, *args, &block)
           return zoned_date_time.send(method, *args, &block) if zoned_date_time.respond_to?(method)
-          return to_time.send(method, *args, &block) if Time.instance_methods.include?(method.to_sym)
+          return to_time.send(method, *args, &block) if ::Time.instance_methods.include?(method.to_sym)
 
           super
         end

data/lib/openhab/version.rb

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

data/lib/openhab.rb

@@ -19,7 +19,6 @@ module OpenHAB
   # @param [Object] base Object to decorate with DSL and helper methods
   #
   #
-  # rubocop:disable  Metrics/MethodLength
   # Number of extensions and includes requires more lines
   def self.extended(base)
     OpenHAB::Core.wait_till_openhab_ready
@@ -27,16 +26,14 @@ module OpenHAB
     base.extend OpenHAB::Core::ScriptHandling
     base.extend OpenHAB::Core::EntityLookup
     base.extend OpenHAB::DSL
-    base.extend OpenHAB::DSL::TimeOfDay
+    base.extend OpenHAB::DSL::Between
 
-    base.send :include, OpenHAB::DSL::TimeOfDay
     base.send :include, OpenHAB::DSL::Items
     base.send :include, OpenHAB::DSL::Types
     logger.info "OpenHAB JRuby Scripting Library Version #{OpenHAB::VERSION} Loaded"
 
     OpenHAB::Core.add_rubylib_to_load_path
   end
-  # rubocop:enable  Metrics/MethodLength
 end
 
 # Extend caller with OpenHAB methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.10.1
+  version: 4.11.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2021-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,7 @@ files:
 - lib/openhab/core/script_handling.rb
 - lib/openhab/core/thread_local.rb
 - lib/openhab/dsl/actions.rb
+- lib/openhab/dsl/between.rb
 - lib/openhab/dsl/dsl.rb
 - lib/openhab/dsl/gems.rb
 - lib/openhab/dsl/group.rb
@@ -106,7 +107,8 @@ files:
 - lib/openhab/dsl/rules/triggers/updated.rb
 - lib/openhab/dsl/states.rb
 - lib/openhab/dsl/things.rb
-- lib/openhab/dsl/time_of_day.rb
+- lib/openhab/dsl/time/month_day.rb
+- lib/openhab/dsl/time/time_of_day.rb
 - lib/openhab/dsl/timers.rb
 - lib/openhab/dsl/timers/manager.rb
 - lib/openhab/dsl/timers/reentrant_timer.rb