openhab-scripting 5.7.0 → 5.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b3b636fb3b4c119d2ed6a5d6b81bedd731456c750d28f4e16f602d75778e7c
-  data.tar.gz: 673ed9dc1dfba2e38e1a57b01468c3a6d74a3a3fd0141c5bd9f51bc25d84e634
+  metadata.gz: 951ad54507dbf4b297d59534c124c21bbf6f6b7a02e4c3fa967a5290aac9968e
+  data.tar.gz: d4b33c4b8cdf237c6bdc1c2b99b87459f913f2d787423f261677d469d9629df3
 SHA512:
-  metadata.gz: 5974cf573c9fe03b1cd8df81cd312a6be70e3175c1a157d19db5dee17db2ecf8afae6619b5a3f81f91a2fce1834c7c24f7fbc7a6bf3166e60106050892d4f9ca
-  data.tar.gz: 9cced687ace50ae3bcab50ee9ad421e9bd34cabf5338b7d927c4415f540148bf2f8033f8e72b43814a0b8a94ad399b3119a3b3ea953a1215fbc8be3e915a77f5
+  metadata.gz: f26471513aca95dcb0266ffca7176ee57980cbea404c8290c095642c4851954e4d870232507cbea34c6b6c4a940da84d6681944ee039199c3fcc766bdd64a598
+  data.tar.gz: 0c6e9e9cf72ee4a1935c399c235256144b0c6fbbb7bc0eb3f07a81405f3e52cc0193a1856ec910212f963c37208cb29191bbe90d143bf822bfc2c987828de47d

data/lib/openhab/core/actions/http.rb

@@ -3,6 +3,17 @@
 module OpenHAB
   module Core
     module Actions
+      #
+      # The HTTP actions allow you to send HTTP requests and receive the response.
+      #
+      # @example
+      #   # Send a GET request
+      #   headers = {
+      #     "User-Agent": "JRuby/1.2.3", # enclose in quotes if the key contains dashes
+      #     Accept: "application/json",
+      #   }
+      #   response = HTTP.send_http_get_request("http://example.com/list", headers: headers)
+      #
       # @see https://www.openhab.org/docs/configuration/actions.html#http-actions HTTP Actions
       class HTTP
         class << self
@@ -10,7 +21,8 @@ module OpenHAB
           # Sends an HTTP GET request and returns the result as a String.
           #
           # @param [String] url
-          # @param [Hash<String, String>] headers
+          # @param [Hash<String, String>, Hash<Symbol, String>] headers
+          #   A hash of headers to send with the request. Symbolic keys will be converted to strings.
           # @param [Duration, int, nil] timeout Timeout (in milliseconds, if given as an Integer)
           # @return [String] the response body
           # @return [nil] if an error occurred
@@ -19,7 +31,7 @@ module OpenHAB
             timeout ||= 5_000
             timeout = timeout.to_millis if timeout.is_a?(Duration)
 
-            sendHttpGetRequest(url, headers, timeout)
+            sendHttpGetRequest(url, headers.transform_keys(&:to_s), timeout)
           end
 
           #
@@ -28,7 +40,8 @@ module OpenHAB
           # @param [String] url
           # @param [String] content_type
           # @param [String] content
-          # @param [Hash<String, String>] headers
+          # @param [Hash<String, String>, Hash<Symbol, String>] headers
+          #   A hash of headers to send with the request. Symbolic keys will be converted to strings.
           # @param [Duration, int, nil] timeout Timeout (in milliseconds, if given as an Integer)
           # @return [String] the response body
           # @return [nil] if an error occurred
@@ -37,7 +50,7 @@ module OpenHAB
             timeout ||= 1_000
             timeout = timeout.to_millis if timeout.is_a?(Duration)
 
-            sendHttpPutRequest(url, content_type, content, headers, timeout)
+            sendHttpPutRequest(url, content_type, content, headers.transform_keys(&:to_s), timeout)
           end
 
           #
@@ -46,7 +59,8 @@ module OpenHAB
           # @param [String] url
           # @param [String] content_type
           # @param [String] content
-          # @param [Hash<String, String>] headers
+          # @param [Hash<String, String>, Hash<Symbol, String>] headers
+          #   A hash of headers to send with the request. Symbolic keys will be converted to strings.
           # @param [Duration, int, nil] timeout Timeout (in milliseconds, if given as an Integer)
           # @return [String] the response body
           # @return [nil] if an error occurred
@@ -55,14 +69,16 @@ module OpenHAB
             timeout ||= 1_000
             timeout = timeout.to_millis if timeout.is_a?(Duration)
 
-            sendHttpPostRequest(url, content_type, content, headers, timeout)
+            sendHttpPostRequest(url, content_type, content, headers.transform_keys(&:to_s), timeout)
           end
 
           #
           # Sends an HTTP DELETE request and returns the result as a String.
           #
           # @param [String] url
-          # @param [Hash<String, String>] headers
+          # @param [Hash<String, String>, Hash<Symbol, String>] headers
+          #   A hash of headers to send with the request. Keys are strings or symbols, values are strings.
+          #   Underscores in symbolic keys are replaced with dashes.
           # @param [Duration, int, nil] timeout Timeout (in milliseconds, if given as an Integer)
           # @return [String] the response body
           # @return [nil] if an error occurred
@@ -71,7 +87,7 @@ module OpenHAB
             timeout ||= 1_000
             timeout = timeout.to_millis if timeout.is_a?(Duration)
 
-            sendHttpDeleteRequest(url, headers, timeout)
+            sendHttpDeleteRequest(url, headers.transform_keys(&:to_s), timeout)
           end
         end
       end

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

@@ -70,12 +70,12 @@ module OpenHAB
         #           frame label: "Main Floor" do
         #             text item: MainFloor_AmbTemp
         #             switch item: MainFloorThermostat_TargetMode, label: "Mode", mappings: %w[off auto cool heat]
-        #             setpoint item: MainFloorThermostate_SetPoint, label: "Set Point", visibility: "MainFloorThermostat_TargetMode!=off"
+        #             setpoint item: MainFloorThermostat_SetPoint, label: "Set Point", visibility: "MainFloorThermostat_TargetMode!=off"
         #           end
         #           frame label: "Basement" do
         #             text item: Basement_AmbTemp
         #             switch item: BasementThermostat_TargetMode, label: "Mode", mappings: { OFF: "off", COOL: "cool", HEAT: "heat" }
-        #             setpoint item: BasementThermostate_SetPoint, label: "Set Point", visibility: "BasementThermostat_TargetMode!=off"
+        #             setpoint item: BasementThermostat_SetPoint, label: "Set Point", visibility: "BasementThermostat_TargetMode!=off"
         #           end
         #         end
         #       end

data/lib/openhab/core/timer.rb

@@ -49,7 +49,8 @@ module OpenHAB
         @id = id
         @thread_locals = thread_locals
         @block = block
-        @timer = ScriptExecution.create_timer(1.minute.from_now) { execute }
+        timer_identifier = block.source_location.join(":")
+        @timer = ScriptExecution.create_timer(timer_identifier, 1.minute.from_now) { execute }
         reschedule!(@time)
       end
 

data/lib/openhab/dsl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.7.0
+  version: 5.7.1
 platform: ruby
 authors:
 - Brian O'Connell