openhab-scripting 5.12.0 → 5.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35d0d28ba4dd272f12cd989761c2d615836d25dbafbc2af2b60692f8a535d5c1
-  data.tar.gz: 4d51dd07a43f5ff7a7ad43bc66cbb1d63b320486a82036d1a8cbfb22412a061b
+  metadata.gz: 0d3cc7138b6a4b42066a80ec926d31c2b6f1dc9538ae4498d1b6014be8d8aa1d
+  data.tar.gz: eae0f6ddcde8c3a2b8b6b747554e73dc3b86b63f599f9afe2e50676e4cc8c4f8
 SHA512:
-  metadata.gz: 76c075f22df43c0ecfe37775e297f496d2f55fe60e6da95bbece311d92fe3e37e50d867a23f6f52c3ebeb690771e7eb5512c357ca3b0745d83d03a8df892cad7
-  data.tar.gz: 93eb532732729b91437a669fbbe9b0b024397332faa435c82ebe17d50c4ea4a29576108c819010c0a497a5912d74eaa95e87fc0d98b01f9fa0987fbb52b5fa7b
+  metadata.gz: 5fb2a8142e739424fabd68595923588066edc753f62467c6cd1e4b3ab38b9d2b1717d7d24dbfcd96533000fa1adcef1e8470790167d7b5f031dc24ce34c25f82
+  data.tar.gz: 5ea1f6bd0c4926ae9126f388af80c2d69bd643f14495226cad3388150b971080705bea645e52b76308a7c96a48026c5be02ae6ba6408973eba73d22b6bee3626

data/lib/openhab/dsl/rules/triggers/watch/watch_handler.rb

@@ -46,6 +46,7 @@ module OpenHAB
                 @block = block
                 @subdirs = subdirs
                 @path = Pathname.new(path)
+                @custom_watcher = nil
                 return if path.to_s.start_with?(OpenHAB::Core.config_folder.to_s)
 
                 @custom_watcher = "jrubyscripting-#{SecureRandom.uuid}"

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

@@ -32,6 +32,36 @@ module OpenHAB
       #     end
       #   end
       #
+      # @example Create a Thing within a Bridge
+      #   things.build do
+      #     bridge "mqtt:broker:mosquitto", config: { host: "127.0.0.1", enableDiscovery: false } do
+      #       thing "mqtt:topic:window1", "My Window Sensor" do
+      #         channel "contact1", "contact", config: {
+      #           stateTopic: "zigbee2mqtt/window1/contact",
+      #           on: "false",
+      #           off: "true"
+      #         }
+      #       end
+      #     end
+      #   end
+      #
+      #   items.build do
+      #     contact_item Window1_Contact, channel: "mqtt:topic:window1:contact1"
+      #   end
+      #
+      # @example Create a Thing separately from the Bridge
+      #   things.build do
+      #     bridge = bridge "mqtt:broker:mosquitto", config: { host: "127.0.0.1", enableDiscovery: false }
+      #
+      #     thing "mqtt:topic:window1", "My Window Sensor", bridge: bridge do
+      #       channel "contact1", "contact", config: {
+      #         stateTopic: "zigbee2mqtt/window1/contact",
+      #         on: "false",
+      #         off: "true"
+      #       }
+      #     end
+      #   end
+      #
       # @see ThingBuilder#initialize ThingBuilder#initialize for #thing's parameters
       # @see ChannelBuilder#initialize ChannelBuilder#initialize for #channel's parameters
       # @see Items::Builder
@@ -61,6 +91,7 @@ module OpenHAB
 
         def build(klass, *args, **kwargs, &block)
           builder = klass.new(*args, **kwargs)
+          builder.parent_builder = self if builder.respond_to?(:parent_builder=)
           builder.instance_eval(&block) if block
           thing = builder.build
 
@@ -190,6 +221,7 @@ module OpenHAB
           @location = location.label if location.is_a?(Item)
           @config = config.transform_keys(&:to_s)
           @enabled = enabled
+          @builder = org.openhab.core.thing.binding.builder.ThingBuilder unless instance_variable_defined?(:@builder)
         end
 
         # Add an explicitly configured channel to this item
@@ -222,13 +254,12 @@ module OpenHAB
             @channels = merged_channels.values
           end
 
-          builder = org.openhab.core.thing.binding.builder.ThingBuilder
-                       .create(thing_type_uid, uid)
-                       .with_label(label)
-                       .with_location(location)
-                       .with_configuration(configuration)
-                       .with_bridge(bridge_uid)
-                       .with_channels(channels)
+          builder = @builder.create(thing_type_uid, uid)
+                            .with_label(label)
+                            .with_location(location)
+                            .with_configuration(configuration)
+                            .with_bridge(bridge_uid)
+                            .with_channels(channels)
 
           builder.with_properties(thing_type.properties) if thing_type
 
@@ -244,16 +275,26 @@ module OpenHAB
 
       # The BridgeBuilder DSL allows you to customize a thing
       class BridgeBuilder < ThingBuilder
+        # @!visibility private
+        attr_accessor :parent_builder
+
+        # Constructor for BridgeBuilder
+        # @see ThingBuilder#initialize
+        def initialize(uid, label = nil, binding: nil, type: nil, bridge: nil, location: nil, config: {}, enabled: nil)
+          @builder = org.openhab.core.thing.binding.builder.BridgeBuilder
+          super
+        end
+
         # Create a new Bridge with this Bridge as its Bridge
         # @see BridgeBuilder#initialize
         def bridge(*args, **kwargs, &block)
-          super(*args, bridge: self, **kwargs, &block)
+          parent_builder.bridge(*args, bridge: self, **kwargs, &block)
         end
 
         # Create a new Thing with this Bridge as its Bridge
         # @see ThingBuilder#initialize
         def thing(*args, **kwargs, &block)
-          super(*args, bridge: self, **kwargs, &block)
+          parent_builder.thing(*args, bridge: self, **kwargs, &block)
         end
       end
 
@@ -283,7 +324,7 @@ module OpenHAB
         # @param [String] uid The channel's ID.
         # @param [String, ChannelTypeUID, :trigger] type The concrete type of the channel.
         # @param [String] label The channel label.
-        # @param [thing] thing The thing associated with this channel.
+        # @param [Thing] thing The thing associated with this channel.
         #   This parameter is not needed for the {ThingBuilder#channel} method.
         # @param [String] description The channel description.
         # @param [String] group The group name.

data/lib/openhab/dsl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.12.1
 platform: ruby
 authors:
 - Brian O'Connell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler