openhab-scripting 5.27.0 → 5.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59deb6289921c0c6d35579783efbb35f75ceac9ff24922e0f74d6652ef575b59
-  data.tar.gz: 260ee0993a3ab89775d9b5a2e8f3e40f295dd16ad8f0adf3b003b521cb08a12e
+  metadata.gz: 5e0abb8ef69de3f3ee26fa45213d2d9afa55f4b4816cde92ab6dd68ea9f95ad5
+  data.tar.gz: bcb8c93446e87d55b2d07cfa24762b684e313f2f546c77bfa1b946c227061a00
 SHA512:
-  metadata.gz: 127b6e33961395b973b8aa543940502530101f30e15526aa598b574e8d3a05ec82c65d79fd0d0d6176a2aa57aed8f244fbd480c76457e3440f94503f92028530
-  data.tar.gz: 4949521fcc45fdb1dba17a09c960d4a5e7afd2c964328a9fd8b66b11ac2c773c7e413e6ec2d797f9e6d9f8e9130297c9700af4d46bf968ec064b0dfa2ea6eb32
+  metadata.gz: ec47bcf9491772968a8f6ca7ac5853ed403986d75eb1ae69f92f43ada70af126552abec30af4a7d02bd5cf63daaf4ce5d7b9b86433899f1161e72e5807f6c06e
+  data.tar.gz: ad58da972b4b1bbf34e4a9e0af7bc56f8debec4126ce64e1c8133b6d1dd10d584c3c7344bb9740be56977f5c948a6ccb6db055a0179fd4fb84d77d53e88e36e1

data/lib/openhab/core/provider.rb

@@ -213,8 +213,18 @@ module OpenHAB
         old
       end
 
+      # @!visibility private
+      def clear
+        elements = @elements
+        @elements = java.util.concurrent.ConcurrentHashMap.new
+        elements.each_value do |v|
+          notify_listeners_about_removed_element(v)
+        end
+      end
+
       # @!visibility private
       def unregister
+        clear
         # @deprecated OH3.4 safe navigation only required for missing Semantics registry
         self.class.registry&.remove_provider(self)
       end

data/lib/openhab/core/sitemaps/provider.rb

@@ -47,6 +47,7 @@ module OpenHAB
         # rubocop:enable Naming/MethodName
 
         # @!visibility private
+        # Override this because we don't have a registry
         def unregister
           clear
           @registration.unregister
@@ -140,16 +141,6 @@ module OpenHAB
           end
         end
 
-        # For use in specs
-        # @!visibility private
-        def clear
-          elements = @elements
-          @elements = java.util.concurrent.ConcurrentHashMap.new
-          elements.each_value do |v|
-            notify_listeners_about_removed_element(v)
-          end
-        end
-
         #
         # Notify listeners about updated sitemap
         #

data/lib/openhab/core/types/date_time_type.rb

@@ -26,36 +26,20 @@ module OpenHAB
           include Comparable
         end
 
-        #
-        # Regex expression to identify strings defining a time in hours, minutes and optionally seconds
-        #
-        TIME_ONLY_REGEX = /\A(?<hours>\d\d):(?<minutes>\d\d)(?<seconds>:\d\d)?\Z/.freeze
-
-        #
-        # Regex expression to identify strings defining a time in year, month, and day
-        #
-        DATE_ONLY_REGEX = /\A\d{4}-\d\d-\d\d\Z/.freeze
-        private_constant :TIME_ONLY_REGEX, :DATE_ONLY_REGEX
-
         class << self
           #
-          # Parses a String representing a time into a {DateTimeType}. First tries to parse it
-          #   using Java's parser, then falls back to the Ruby `Time.parse`.
+          # Parse a time string into a {DateTimeType}.
           #
-          # @param [String] time_string
+          # @note openHAB's DateTimeType.new(String) constructor will parse time-only strings and fill in `1970-01-01`
+          #   as the date, whereas this method will use the current date.
           #
+          # @param (see DSL#try_parse_time_like)
           # @return [DateTimeType]
           #
           def parse(time_string)
-            time_string = "#{time_string}Z" if TIME_ONLY_REGEX.match?(time_string)
-            DateTimeType.new(time_string)
-          rescue java.lang.StringIndexOutOfBoundsException, java.lang.IllegalArgumentException => e
-            # Try Ruby's Time.parse if DateTimeType parser fails
-            begin
-              DateTimeType.new(::Time.parse(time_string).to_zoned_date_time)
-            rescue ArgumentError
-              raise ArgumentError, e.message
-            end
+            DateTimeType.new(DSL.try_parse_time_like(time_string).to_zoned_date_time)
+          rescue ArgumentError
+            raise ArgumentError, e.message
           end
         end
 

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.27.0"
+    VERSION = "5.27.1"
   end
 end

data/lib/openhab/dsl.rb

@@ -1072,6 +1072,16 @@ module OpenHAB
       Thread.current[:openhab_holiday_file] = file
     end
 
+    #
+    # @param [String] string Date/time string to parse.
+    #   The string can be in any format recognized by:
+    #   - {OpenHAB::CoreExt::Java::LocalTime.parse LocalTime.parse}
+    #   - {OpenHAB::CoreExt::Java::LocalDate.parse LocalDate.parse}
+    #   - {OpenHAB::CoreExt::Java::MonthDay.parse MonthDay.parse}, e.g. "12-25"
+    #   - {OpenHAB::CoreExt::Java::ZonedDateTime.parse ZonedDateTime.parse}
+    #   - [Time.parse](https://rubyapi.org/o/time#method-c-parse), e.g. "2021-01-01 12:00:", or "3:30pm"
+    # @return [LocalTime, LocalDate, MonthDay, ZonedDateTime, Time] the parsed date/time
+    #
     # @!visibility private
     def try_parse_time_like(string)
       return string unless string.is_a?(String)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.27.0
+  version: 5.27.1
 platform: ruby
 authors:
 - Brian O'Connell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-08 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler