openhab-scripting 5.51.1 → 5.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bebd7a1e58d82b03df1ebd7f4fc9597d2d9e6cd7c91ea005d7acb0503779bd7
-  data.tar.gz: fb8f9f969406d461afab954d2167020cc1675b2e21c326c3a44608672d986542
+  metadata.gz: 44b392f4d106e9bc092ddf981e4597e6fd68c4d4eaca45120f6409712ec877ad
+  data.tar.gz: cd319b4063c404b98d922878c5aaa75c8e5278be43ed05dc52d7e03d80d64e24
 SHA512:
-  metadata.gz: 9fd91778d33e15df82db68a48ce088ae2f785190c21a3400aaad5321f26c5d08cad70d1c1920de12b73bf5dc14c16c79333013615438af51afcb0d125941304f
-  data.tar.gz: 1fe651817f682da6efb0b3ea58520265cdb709ada168ef4c2d9a43e91115c27e43e44716a8d4e97c60cc277519a456b1a7bdcccd06ebba41fa25052893b747bf
+  metadata.gz: 3c0d8fabc27ea76a5aa3d9f9062f7371a61f20017535192ac410e57ac13c1c5a03b50970fdb61a6bdb7d6729572282765d55cec7475920037a23b761511dbf51
+  data.tar.gz: a49a9d2f4827353397c126c30a89e9ffb00a50693ec3ca9d0b20bf9e7c05de972190e5bb60e0672f492553a63fa13622694c678006041c61a9038ce2ea6cf4f6

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

@@ -28,10 +28,7 @@ module OpenHAB
           # @return [nil] if an error occurred
           #
           def send_http_get_request(url, headers: {}, timeout: nil)
-            timeout ||= 5_000
-            timeout = timeout.to_millis if timeout.is_a?(Duration)
-
-            sendHttpGetRequest(url, headers.transform_keys(&:to_s), timeout)
+            request(:sendHttpGetRequest, url, headers:, timeout:, default_timeout: 5_000)
           end
           alias_method :get, :send_http_get_request
 
@@ -48,10 +45,7 @@ module OpenHAB
           # @return [nil] if an error occurred
           #
           def send_http_put_request(url, content_type = nil, content = nil, headers: {}, timeout: nil)
-            timeout ||= 1_000
-            timeout = timeout.to_millis if timeout.is_a?(Duration)
-
-            sendHttpPutRequest(url, content_type, content, headers.transform_keys(&:to_s), timeout)
+            request(:sendHttpPutRequest, url, content_type, content, headers:, timeout:)
           end
           alias_method :put, :send_http_put_request
 
@@ -68,13 +62,29 @@ module OpenHAB
           # @return [nil] if an error occurred
           #
           def send_http_post_request(url, content_type = nil, content = nil, headers: {}, timeout: nil)
-            timeout ||= 1_000
-            timeout = timeout.to_millis if timeout.is_a?(Duration)
-
-            sendHttpPostRequest(url, content_type, content, headers.transform_keys(&:to_s), timeout)
+            request(:sendHttpPostRequest, url, content_type, content, headers:, timeout:)
           end
           alias_method :post, :send_http_post_request
 
+          #
+          # Sends an HTTP PATCH request and returns the result as a String.
+          #
+          # @param [String] url
+          # @param [String] content_type
+          # @param [String] content
+          # @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
+          #
+          # @since openHAB 5.3
+          #
+          def send_http_patch_request(url, content_type = nil, content = nil, headers: {}, timeout: nil)
+            request(:sendHttpPatchRequest, url, content_type, content, headers:, timeout:)
+          end
+          alias_method :patch, :send_http_patch_request
+
           #
           # Sends an HTTP DELETE request and returns the result as a String.
           #
@@ -87,12 +97,18 @@ module OpenHAB
           # @return [nil] if an error occurred
           #
           def send_http_delete_request(url, headers: {}, timeout: nil)
-            timeout ||= 1_000
+            request(:sendHttpDeleteRequest, url, headers:, timeout:)
+          end
+          alias_method :delete, :send_http_delete_request
+
+          private
+
+          def request(java_method, url, *payload, headers:, timeout:, default_timeout: 1_000)
+            timeout ||= default_timeout
             timeout = timeout.to_millis if timeout.is_a?(Duration)
 
-            sendHttpDeleteRequest(url, headers.transform_keys(&:to_s), timeout)
+            public_send(java_method, url, *payload, headers.transform_keys(&:to_s), timeout)
           end
-          alias_method :delete, :send_http_delete_request
         end
       end
     end

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

@@ -6,9 +6,6 @@ module OpenHAB
       # @see https://www.openhab.org/docs/configuration/multimedia.html#actions-3 Voice Actions
       class Voice
         class << self
-          # @!visibility private
-          alias_method :raw_say, :say if method_defined?(:say)
-
           #
           # Say text via openHAB Text-To-Speech service, Voice.say()
           #
@@ -27,7 +24,15 @@ module OpenHAB
           #
           def say(text, voice: nil, sink: nil, volume: nil)
             volume = PercentType.new(volume) unless volume.is_a?(PercentType) || volume.nil?
-            raw_say(text.to_s, voice&.to_s, sink&.to_s, volume)
+            java_send :say,
+                      [java.lang.Object,
+                       java.lang.String,
+                       java.lang.String,
+                       org.openhab.core.library.types.PercentType],
+                      text.to_s,
+                      voice&.to_s,
+                      sink&.to_s,
+                      volume
           end
         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.51.1"
+    VERSION = "5.52.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.51.1
+  version: 5.52.0
 platform: ruby
 authors:
 - Brian O'Connell
@@ -389,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.18
+rubygems_version: 4.0.19
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []