openhab-scripting 5.35.0 → 5.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34c9100f2748e1c7736131f0a3144c1f2cd997a7e6757bc1c18f6785973cbee0
-  data.tar.gz: f9582b65775c086ad9124e0d726b2f39a4376976c6191a5140fee61db18889fc
+  metadata.gz: b21b40668410811b84a0ffeb8e4e8f1538d9fe8ba546dbdc8c9a4e4b70a0f245
+  data.tar.gz: d521f1f642bd2d96e9dea0fab156f3120eadb4004579770d4d49d3d6ca5f700b
 SHA512:
-  metadata.gz: 03e8a9dc657a8524dc9dd15b681e538f8b4cb970f18735dd0b91ee6331d57672507975abad1c59169e7f4670c850c3dad178401c31ac1f620f057edefbf61ec9
-  data.tar.gz: 7b108943f0e1c09b00d101f99adaed0689b27213426251d273bff517554f122095bffaaba733d1589cf43e30597b53fa7622a05e198b39d74e471413d79ee98d
+  metadata.gz: 48a66dcc913693a3e00cbed821168c4c3ee5d2404775d9bc939f7e79026056714db6abbb049bbf361b1afbac9539eaaab2bc9d5ba000a7ccfc3ee9ab61b00443
+  data.tar.gz: cdb4a5702f8e8b7f39768e0c0718781cda73a5849e86171860b2906e1c46bc7792ba0ebd7245dcf24b50e317606382e54e62aa54d676fb8c2ef359f83cdef5cb

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

@@ -120,7 +120,7 @@ module OpenHAB
           # @return [String]
           def inspect
             r = "#<OpenHAB::Core::Items::GroupItems::Members #{name}"
-            r += " #{map(&:name).inspect}>" unless @group.__getobj__.nil?
+            r += " #{map(&:name).inspect}" unless @group.__getobj__.nil?
             "#{r}>"
           end
           alias_method :to_s, :inspect

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

@@ -51,7 +51,7 @@ module OpenHAB
         # @raise [FrozenError] if `update` is true but the existing item with the same name
         #   wasn't created by the current provider.
         #
-        # @see DSL::Items::Builder
+        # @see DSL::Items::Builder DSL::Items::Builder for more details and examples
         #
         def build(preferred_provider = nil, update: true, &block)
           DSL::Items::BaseBuilderDSL.new(preferred_provider, update: update)

data/lib/openhab/core/items/semantics/semantic_tag.rb

@@ -86,7 +86,7 @@ module OpenHAB
 
           # @return [String]
           def inspect
-            parent = "(#{parent_uid})" unless parent_uid.empty?
+            parent = " (#{parent_uid})" unless parent_uid.empty?
             "#<OpenHAB::Core::Items::Semantics::#{name}#{parent} " \
               "label=#{label.inspect} " \
               "description=#{description.inspect} " \

data/lib/openhab/core/registry.rb

@@ -19,21 +19,8 @@ module OpenHAB
       #
       def provider_for(key)
         elementReadLock.lock
-        if key.is_a?(org.openhab.core.common.registry.Identifiable)
-          return unless (provider = elementToProvider[key])
-
-          # The HashMap lookup above uses java's hashCode() which has been overridden
-          # by GenericItem and ThingImpl to return object's uid, e.g. item's name, thing uid
-          # so it will return a provider even for an unmanaged object having the same uid
-          # as an existing managed object.
-
-          # So take an extra step to verify that the provider really holds the given instance.
-          # by using equal? to compare the object's identity.
-          # Only ManagedProviders have a #get method to look up the object by uid.
-          provider if !provider.is_a?(ManagedProvider) || provider.get(key.uid).equal?(key)
-        elsif (element = identifierToElement[key])
-          elementToProvider[element]
-        end
+        element = key.is_a?(org.openhab.core.common.registry.Identifiable) ? key : identifierToElement[key]
+        elementToProvider[element] if element
       ensure
         elementReadLock.unlock
       end

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

@@ -116,6 +116,19 @@ module OpenHAB
 
         alias_method :|, :to_invertible_unit
 
+        #
+        # Check equality without unit inversion
+        #
+        # @return [true,false] if the same value is represented, without unit inversion
+        #
+        def eql?(other)
+          return false unless other.instance_of?(self.class)
+          # compare_to in OH5 will throw an IAE if the units are not compatible
+          return false unless unit.compatible?(other.unit)
+
+          super
+        end
+
         #
         # Comparison
         #

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

@@ -10,7 +10,7 @@ module OpenHAB
       # This can be useful either to create items as soon as the script loads,
       # or even later based on a rule executing.
       #
-      # @example
+      # @example Create/update JRuby-provided items at runtime
       #   items.build do
       #     switch_item MySwitch, "My Switch"
       #     switch_item NotAutoupdating, autoupdate: false, channel: "mqtt:topic:1#light"
@@ -30,6 +30,13 @@ module OpenHAB
       #     number_item OutdoorBrightness, state: 10_000 | "lx"
       #   end
       #
+      # @example Create/update persistent managed-items that are stored in the JSONDB and are editable in the MainUI
+      #   items.build(:persistent) do
+      #     switch_item MySwitch, "My Switch"
+      #   end
+      #
+      # @see OpenHAB::Core::Items::Registry#build items.build for the arguments to this method
+      #
       module Builder
         include Core::EntityLookup
 
@@ -173,7 +180,6 @@ module OpenHAB
             provider.all.each do |link|
               provider.remove(link.uid) if link.item_name == item.name && !channel_uids.include?(link.linked_uid)
             end
-
             item
           end
         end
@@ -691,8 +697,8 @@ module OpenHAB
         # @!visibility private
         def build
           item = create_item
-          item.label = label
-          item.category = icon.to_s if icon
+          item.set_label(label) # Don't use item#label= because it triggers a provider.update
+          item.set_category(icon.to_s) if icon # ditto here
           groups.each do |group|
             group = group.name if group.respond_to?(:name)
             item.add_group_name(group.to_s)

data/lib/openhab/dsl/version.rb

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

data/lib/openhab/rspec/mocks/persistence_service.rb

@@ -79,7 +79,7 @@ module OpenHAB
           item_history.insert(insert_index, new_item)
         end
 
-        def remove(filter)
+        def remove(filter, _alias = nil)
           query_internal(filter) do |item_history, index|
             historic_item = item_history.delete_at(index)
             @data.delete(historic_item.name) if item_history.empty?
@@ -87,7 +87,7 @@ module OpenHAB
           true
         end
 
-        def query(filter)
+        def query(filter, _alias = nil)
           result = []
 
           query_internal(filter) do |item_history, index|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.35.0
+  version: 5.35.1
 platform: ruby
 authors:
 - Brian O'Connell
@@ -9,7 +9,7 @@ authors:
 - Jimmy Tanagra
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -487,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.5
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []