openhab-scripting 5.39.2 → 5.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2081031ffcc82e70d291fcc40fdd07392594de2a23b4651779344eee695ac07a
-  data.tar.gz: 70a936e23a9ec88481ebff305cb00cde0a135f3055ccc53e2f45ca8af59ab22b
+  metadata.gz: 0b6537168353f3323482af5e045d5b219eb4b6bad9fc08e8e2bcc354c05b06da
+  data.tar.gz: 3ef5da367c87c63824267faea340a9c84344062532fabde415455faf96854e93
 SHA512:
-  metadata.gz: 5d6d93194d2c3f73a507199fef247c997f417d9680690afe750d8c4057d9eba71df8bcd149e08a777bc684a3a4f46dd7881d657d07a28afa3b2736d60ef09a58
-  data.tar.gz: 473cfd4c44219a29872c94e9d443e204c6622ca792d6e82bc9fe14f15a7614e7f0bf6ae9e81f642ca55567492a34e1ec23a3e344fe157d4918f84d1673836798
+  metadata.gz: c09161c22502c0ba7857709166e52f98e160cb78b8b3694c904a2dab4b70da3216ff1c1b73f390be8485f1a2619241ae208bba867882a65a2ae9d3a0d2cbb95f
+  data.tar.gz: b4cffd48bc9f39d9ca0a01a254372157fee86823a0c7bf561273b4084b68ef22ef49c3d95a86c46ac8356d6977170c73d2f0d1997c2f0badfe91e37f9b26ccde

data/lib/openhab/core_ext/ruby/object.rb

@@ -5,10 +5,6 @@ module OpenHAB
     module Ruby
       # @!visibility private
       module Object
-        class << self
-          attr_reader :top_self
-        end
-
         # @!visibility private
         module ClassMethods
           # capture methods defined at top level (which get added to Object)
@@ -18,7 +14,7 @@ module OpenHAB
             if DSL.private_instance_methods.include?(method)
               # Duplicate methods that conflict with DSL onto `main`'s singleton class,
               # so that they'll take precedence over DSL's method.
-              Object.top_self.singleton_class.define_method(method, instance_method(method))
+              TOPLEVEL_BINDING.receiver.singleton_class.define_method(method, instance_method(method))
             end
 
             super

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

@@ -313,6 +313,8 @@ module OpenHAB
         #   Google Assistant metadata (see {ItemBuilder#ga})
         # @param homekit [String, Symbol, Array<(String, Hash<String, Object>)>, nil]
         #   Homekit metadata (see {ItemBuilder#homekit})
+        # @param matter [String, Symbol, Array<(String, Hash<String, Object>)>, nil]
+        #   Matter metadata (see {ItemBuilder#matter})
         # @param metadata [Hash<String, Hash>] Generic metadata (see {ItemBuilder#metadata})
         # @param state [State] Initial state
         def initialize(type,
@@ -340,6 +342,7 @@ module OpenHAB
                        alexa: nil,
                        ga: nil, # rubocop:disable Naming/MethodParameterName
                        homekit: nil,
+                       matter: nil,
                        metadata: nil,
                        state: nil)
           raise ArgumentError, "`name` cannot be nil" if name.nil?
@@ -389,6 +392,7 @@ module OpenHAB
           self.alexa(alexa) if alexa
           self.ga(ga) if ga
           self.homekit(homekit) if homekit
+          self.matter(matter) if matter
           self.state = state
 
           self.group(*group)
@@ -495,7 +499,18 @@ module OpenHAB
         #   @return [void]
         #
 
-        %i[alexa ga homekit].each do |shortcut|
+        #
+        # @!method matter(value, config = nil)
+        #   Shortcut for adding Matter metadata
+        #
+        #   @see https://www.openhab.org/addons/bindings/matter/#matter-bridge
+        #
+        #   @param value [String, Symbol] Matter device type or attribute(s)
+        #   @param config [Hash, nil] Additional Matter configuration
+        #   @return [void]
+        #
+
+        %i[alexa ga homekit matter].each do |shortcut|
           define_method(shortcut) do |value = nil, config = nil|
             value, config = value if value.is_a?(Array)
             metadata[shortcut] = [value, config]

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

@@ -2,13 +2,7 @@
 
 require "forwardable"
 
-require_relative "property"
-require_relative "guard"
-require_relative "triggers"
-require_relative "rule_triggers"
-require_relative "terse"
-
-Dir[File.expand_path("triggers/*.rb", __dir__)].each do |f|
+Dir[File.expand_path("**/*.rb", __dir__)].each do |f|
   require f
 end
 

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

@@ -10,7 +10,3 @@ module OpenHAB
     end
   end
 end
-
-Dir[File.expand_path("triggers/**/*.rb", __dir__)].each do |f|
-  require f
-end

data/lib/openhab/dsl/version.rb

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

data/lib/openhab/dsl.rb

@@ -45,13 +45,14 @@ module OpenHAB
 
     module Rules
       # sorted alphabetically
-      autoload :AutomationRule, "openhab/dsl/rules/automation_rule"
+      autoload :AutomationRule, "openhab/dsl/rules/builder"
       autoload :Builder, "openhab/dsl/rules/builder"
-      autoload :Guard, "openhab/dsl/rules/guard"
-      autoload :NameInference, "openhab/dsl/rules/name_inference"
-      autoload :Property, "openhab/dsl/rules/property"
-      autoload :RuleTriggers, "openhab/dsl/rules/rule_triggers"
-      autoload :Terse, "openhab/dsl/rules/terse"
+      autoload :Guard, "openhab/dsl/rules/builder"
+      autoload :NameInference, "openhab/dsl/rules/builder"
+      autoload :Property, "openhab/dsl/rules/builder"
+      autoload :RuleTriggers, "openhab/dsl/rules/builder"
+      autoload :Terse, "openhab/dsl/rules/builder"
+      autoload :Triggers, "openhab/dsl/rules/builder"
     end
 
     # include this before Core::Actions so that Core::Action's method_missing
@@ -1138,6 +1139,5 @@ OpenHAB::Core::Items.import_into_global_namespace
 singleton_class.include(OpenHAB::DSL)
 # Patch Object to work around https://github.com/openhab/openhab-jruby/issues/4
 Object.extend(OpenHAB::CoreExt::Ruby::Object::ClassMethods)
-OpenHAB::CoreExt::Ruby::Object.instance_variable_set(:@top_self, self)
 
 logger.debug { "openHAB JRuby Scripting Library Version #{OpenHAB::DSL::VERSION} Loaded" }

metadata

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