openhab-scripting 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0522f086fca640c17a05634e13924dd9e39fc0630fba03954d4c0ffcfc1739c7
-  data.tar.gz: 9c01b1545d9e999ecc9ff0836691ef858794085ffb09433a3636c7594251e13b
+  metadata.gz: 63a0ce6f1514492eb9e576ddcdcad35b2d10311f0eb4f25bd27dccef521495be
+  data.tar.gz: df77ba04c98b1cbc0a3595ccb6a6813159ac89b34fe33b914ae20398a9936934
 SHA512:
-  metadata.gz: c1c7e125bb92764cc330924cacc30b03bf8759633bf34e51000897614af32efa2bcddfd2c48e5514be160d6c2d625eb38449c4d6203c5ca418bf67868d302aa2
-  data.tar.gz: 61742a93f67041588c6f6af954f95dd7515d8ee2d913812f5ac32212a8ddc49f979da4712125d1b15ca327b130ec81102308edbe5689f43e386d24b46f185357
+  metadata.gz: 124a9d294d2e55204af25ec01861d3891d74fbbb03b9b96b181e8d5b8f0967926d245e7f6c42772894c99763f9a3caa586b81a5137960583c38304eb56609fd1
+  data.tar.gz: f6255e787a44419ea44ef763fff95a3a6609fe8d2beb179fb81d78ee4ff44485196d5bb1ada9ae4dd1dc7962ddac2817076420d306ed2662c2cf2d24ad700fa4

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

@@ -38,6 +38,24 @@ module OpenHAB
           def ===(other)
             other.is_a?(self)
           end
+
+          # @!visibility private
+          def item_states_event_builder
+            @item_states_event_builder ||=
+              OpenHAB::OSGi.service("org.openhab.core.io.rest.sse.internal.SseItemStatesEventBuilder")&.tap do |builder|
+                m = builder.class.java_class.get_declared_method("getDisplayState", Item, java.util.Locale)
+                m.accessible = true
+                builder.instance_variable_set(:@getDisplayState, m)
+                # Disable "singleton on non-persistent Java type"
+                original_verbose = $VERBOSE
+                $VERBOSE = nil
+                def builder.get_display_state(item)
+                  @getDisplayState.invoke(self, item, nil)
+                end
+              ensure
+                $VERBOSE = original_verbose
+              end
+          end
         end
         # rubocop:enable Naming/MethodName
 
@@ -83,22 +101,7 @@ module OpenHAB
         #   logger.info(Exterior_WindDirection.formatted_state) # => "NE (36°)"
         #
         def formatted_state
-          # use to_string, not to_s, to get the original openHAB toString(), instead of any overrides
-          # the JRuby library has defined
-          raw_state_string = raw_state.to_string
-
-          return raw_state_string unless (pattern = state_description&.pattern)
-
-          transformed_state_string = org.openhab.core.transform.TransformationHelper.transform(OSGi.bundle_context,
-                                                                                               pattern,
-                                                                                               raw_state_string)
-          if transformed_state_string.nil? || transformed_state_string == raw_state_string
-            return state&.format(pattern) || raw_state_string
-          end
-
-          transformed_state_string
-        rescue org.openhab.core.transform.TransformationException
-          raw_state_string
+          GenericItem.item_states_event_builder.get_display_state(self)
         end
 
         #

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

@@ -112,9 +112,9 @@ module OpenHAB
         #   # @example
         #   #   NumberC.state | ImperialUnits::FAHRENHEIT
         #   #
-        #   def to_unit(unit); end
+        #   def to_invertible_unit(unit); end
 
-        alias_method :|, :to_unit
+        alias_method :|, :to_invertible_unit
 
         #
         # Comparison

data/lib/openhab/dsl/version.rb

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

data/lib/openhab/rspec/karaf.rb

@@ -323,6 +323,8 @@ module OpenHAB
 
       ALLOWED_BUNDLES = %w[
         org.openhab.core.io.monitor
+        org.openhab.core.io.rest
+        org.openhab.core.io.rest.sse
       ].freeze
       private_constant :ALLOWED_BUNDLES
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Brian O'Connell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler