openhab-scripting 5.41.0 → 5.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6920b2ea75f2c8d7e849173181ebbcd05d40006c2cd70785b119b8645e34032e
-  data.tar.gz: 91cd7e588646072b2cd82ffece697dc8d74b8ddad377575e88748adac7325b63
+  metadata.gz: 73d44fb2a401e3ffc950a2d19ca59000005bf77cbb891e9e94287b8f0909adb1
+  data.tar.gz: a7c690eb7003d86678ad9a3a5310eb3566a6f77d11fd984049f825959f5c4346
 SHA512:
-  metadata.gz: 9e330a848117416e972df7b10e9735e27c20d71a622242a12d4e4dba7401ce9eb4b9e82171830d328d282d852d4e68e9d11d7ed16e495743658f14d0a6e8ea3a
-  data.tar.gz: 367be6bb928558652035129c6ec0d8c372ab6cedcc04a914d247a9cf3421830c1a5a188197361a7334c0036f813553ed0168df71a5e74e7d4be7920e51a90485
+  metadata.gz: 1517830917a483f391f14fc45ad281e2f04165797a1f13a65b543d6cd89d1196f5312b605312e41733de73012282bf474c77bd261574ba226b6bd6df62055a5e
+  data.tar.gz: d0c83fdf5d653c0e548a7de8d0035e0b2beefa3963d963ef20d51b3ed01ffc585b9085124b0dc2dfb0eef6ae2e3848c44958cb6a7dc7d346dd45f94f568a96eb

data/lib/openhab/core/events/abstract_event.rb

@@ -39,7 +39,7 @@ module OpenHAB
         #
         # Returns the event payload as a Hash.
         #
-        # @return [Hash, nil] The payload object parsed by JSON. The keys are symbolized.
+        # @return [Hash, String, nil] The payload object parsed by JSON. The keys are symbolized.
         #   `nil` when the payload is empty.
         #
         def payload
@@ -48,6 +48,8 @@ module OpenHAB
           original_verbose = $VERBOSE
           $VERBOSE = nil
           @payload ||= JSON.parse(get_payload, symbolize_names: true) unless get_payload.empty?
+        rescue JSON::ParserError
+          get_payload
         ensure
           $VERBOSE = original_verbose
         end

data/lib/openhab/core/items/item.rb

@@ -91,20 +91,30 @@ module OpenHAB
           label || name
         end
 
-        # @!attribute [r] formatted_state
+        # @!attribute [r] display_state
         #
         # Format the item's state according to its state description
         #
-        # This may include running a transformation.
+        # This may include running a transformation, if one is defined in the
+        # state description's pattern, otherwise it will format according to the
+        # pattern. If no state description is defined, the state will simply
+        # be returned as a string.
+        #
+        # @note While this method is also aliased to `#transformed_state` to
+        #   match the field available in the openHAB REST API, unlike the API it
+        #   will always return a value even if the state description has no
+        #   transformation.
         #
         # @return [String] The formatted state
         #
         # @example
-        #   logger.info(Exterior_WindDirection.formatted_state) # => "NE (36°)"
+        #   logger.info(Exterior_WindDirection.display_state) # => "NE (36°)"
         #
-        def formatted_state
+        def display_state
           Item.item_states_event_builder.get_display_state(self)
         end
+        alias_method :transformed_state, :display_state
+        alias_method :formatted_state, :display_state
 
         #
         # Send a command to this item

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

@@ -1804,6 +1804,7 @@ module OpenHAB
         #   end
         #
         def event(topic, source: nil, types: nil, attach: nil)
+          types ||= org.openhab.core.events.EventSubscriber::ALL_EVENT_TYPES
           types = types.join(",") if types.is_a?(Enumerable)
           trigger("core.GenericEventTrigger",
                   topic:,

data/lib/openhab/dsl/version.rb

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

metadata

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