openhab-scripting 4.42.1 → 4.43.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e41958655d441761618cb21164c7954bcb05c037023a080d2a70a741637d951
-  data.tar.gz: ee4252bafef8e2a430f98c80bc3277e5c45ef9cd0c06b645f48da848031f0abf
+  metadata.gz: deaecd8879b238c5372c733482c69ef38703231f42a8869954d692ebd3c4fc7b
+  data.tar.gz: d11b35e9b654531f1c248992cb1cd2eca1e675dd37898ca28ce16760a1531c07
 SHA512:
-  metadata.gz: c1dcd8ab59e1732eb76acd9c707d4dbd18dcae94d3fd6236d6c53362958b7fd0c977ef001c109f147df596321a99ee7640aceb25f92530f7cb8f59bd7733de9f
-  data.tar.gz: 70d92d8df318f317c42843cf8eaae67b33c9cdb24f119074f7e59e117ec29f53f1594df05e8fd35059a666a600845375048f991c9cc15b35772fb34b35d83a4f
+  metadata.gz: 3052e39904c2548942c1018b592ca3370b3c15bdd1dc92685ee647f9854bcc406b886f1168b75954adab98884a45c9a92a7eb039a13056be5f4a99772111e425
+  data.tar.gz: 752cd312e184091663ea4c47506787fdd6ea9e56b1a794593c093b413784340bbb97c95956e716762757b355a6089e45cb96dbe2d61b6787f98641bbde557e75

data/lib/openhab/core/thread_local.rb

@@ -33,7 +33,7 @@ module OpenHAB
       # @param [Hash] values Keys and values to set for running thread, if hash is nil no values are set
       #
       def thread_local(**values, &block)
-        ThreadLocal.thread_local(values, &block)
+        ThreadLocal.thread_local(**values, &block)
       end
     end
   end

data/lib/openhab/dsl/actions.rb

@@ -101,6 +101,18 @@ module OpenHAB
         volume = Types::PercentType.new(volume) unless volume.is_a?(Types::PercentType) || volume.nil?
         Audio.playSound sink&.to_s, filename.to_s, volume
       end
+
+      #
+      # Play an audio stream from an URL to the given sink(s). Set url to nil if streaming should be stopped
+      #
+      # @param [String] url The URL of the audio stream
+      # @param [String] sink The audio sink, or nil to use the default audio sink
+      #
+      # @return [void]
+      #
+      def play_stream(url, sink: nil)
+        Audio.playStream sink&.to_s, url
+      end
     end
   end
 end

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

@@ -37,7 +37,7 @@ module OpenHAB
           end
 
           # if we're NULL or UNDEF, implement special logic
-          return nil_comparison unless state?
+          return nil_comparison(other) unless state?
 
           # delegate to how the state compares to the other object
           state <=> other
@@ -45,9 +45,10 @@ module OpenHAB
 
         # Special logic for NULL/UNDEF state comparison
         # @!visibility private
-        def nil_comparison
+        def nil_comparison(other)
           # if comparing to nil, consider ourselves equal
           return 0 if other.nil?
+
           # if the other object is an Item, only consider equal if we're
           # in the same _kind_ of UnDefType state
           return raw_state == other.raw_state if other.is_a?(GenericItem) && !other.state?

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

@@ -51,6 +51,14 @@ module OpenHAB
         # @!method decrease
         #   Send the +DECREASE+ command to the item
         #   @return [DimmerItem] +self+
+
+        # raw numbers translate directly to PercentType, not a DecimalType
+        # @!visibility private
+        def format_type(command)
+          return Types::PercentType.new(command) if command.is_a?(Numeric)
+
+          super
+        end
       end
     end
   end

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

@@ -88,6 +88,7 @@ module OpenHAB
             @item.__send__(method, *args, &block)
           end
         end
+        ruby2_keywords :method_missing if respond_to? :ruby2_keywords
 
         # .
         def respond_to_missing?(method, include_private = false)

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

@@ -64,15 +64,10 @@ module OpenHAB
           return [other, state] if other.is_a?(Types::NumericType) || other.respond_to?(:to_d)
         end
 
-        # strip trailing zeros from commands
+        # raw numbers translate directly to DecimalType, not a string
         # @!visibility private
         def format_type(command)
-          # DecimalType and PercentType we want to make sure we don't have extra zeros
-          if command.instance_of?(Types::DecimalType) || command.instance_of?(Types::PercentType)
-            return command.to_big_decimal.strip_trailing_zeros.to_plain_string
-          end
-          # BigDecimal types have trailing zeros stripped
-          return command.to_java.strip_trailing_zeros.to_plain_string if command.is_a?(BigDecimal)
+          return Types::DecimalType.new(command) if command.is_a?(Numeric)
 
           super
         end

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

@@ -37,6 +37,14 @@ module OpenHAB
         # @!method move
         #   Send the +MOVE+ command to the item
         #   @return [RollershutterItem] +self+
+
+        # raw numbers translate directly to PercentType, not a DecimalType
+        # @!visibility private
+        def format_type(command)
+          return Types::PercentType.new(command) if command.is_a?(Numeric)
+
+          super
+        end
       end
     end
   end

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

@@ -173,7 +173,7 @@ module OpenHAB
             def execute(_mod = nil, inputs = nil)
               OpenHAB::DSL.import_presets
               @semaphore.synchronize do
-                thread_local(@thread_locals) do
+                thread_local(**@thread_locals) do
                   logger.trace "Canceling implicit timer #{@timed_command_details.timer} for "\
                                "#{@timed_command_details.item.id}  because received event #{inputs}"
                   @timed_command_details.timer.cancel

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

@@ -24,18 +24,21 @@ module OpenHAB
         include OpenHAB::Core::ThreadLocal
         include OpenHAB::DSL::Between
 
+        field_writer :uid
+
         #
         # Create a new Rule
         #
         # @param [Config] config Rule configuration
         #
         # Constructor sets a number of variables, no further decomposition necessary
-        def initialize(config:) # rubocop:disable Metrics/MethodLength
+        def initialize(config:) # rubocop:disable Metrics
           # Metrics disabled because only setters are called or defaults set.
           super()
           set_name(config.name)
           set_description(config.description)
           set_triggers(config.triggers)
+          self.uid = config.uid
           @run_context = config.caller
           @run_queue = config.run
           @guard = config.guard

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'method_source'
+
 require 'openhab/core/thread_local'
 require 'openhab/core/services'
 require 'openhab/log/logger'
@@ -32,6 +34,12 @@ module OpenHAB
 
         module_function
 
+        # get the block's source location, and simplify to a simple filename
+        def self.infer_rule_id_from_block(block)
+          file = File.basename(block.source_location.first)
+          "#{file}:#{block.source_location.last}"
+        end
+
         #
         # Create a new rule
         #
@@ -39,21 +47,25 @@ module OpenHAB
         # @yield [] Block executed in context of a RuleConfig
         #
         #
-        # rubocop:disable Metrics/MethodLength
-        def rule(rule_name, &block)
+        def rule(rule_name = nil, id: nil, script: nil, &block) # rubocop:disable Metrics
+          id ||= Rule.infer_rule_id_from_block(block)
+          rule_name ||= id
+          script ||= block.source rescue nil # rubocop:disable Style/RescueModifier
+
           OpenHAB::Core::ThreadLocal.thread_local(RULE_NAME: rule_name) do
             @rule_name = rule_name
+
             config = RuleConfig.new(rule_name, block.binding)
+            config.uid(id)
             config.instance_exec(config, &block)
             config.guard = Guard::Guard.new(run_context: config.caller, only_if: config.only_if,
                                             not_if: config.not_if)
             logger.trace { config.inspect }
-            process_rule_config(config)
+            process_rule_config(config, script)
           end
         rescue StandardError => e
           logger.log_exception(e, @rule_name)
         end
-        # rubocop:enable Metrics/MethodLength
 
         #
         # Cleanup rules in this script file
@@ -71,12 +83,15 @@ module OpenHAB
         # @param [RuleConfig] config for rule
         #
         #
-        def process_rule_config(config)
+        def process_rule_config(config, script) # rubocop:disable Metrics
           return unless create_rule?(config)
 
           rule = AutomationRule.new(config: config)
           Rule.script_rules << rule
           added_rule = add_rule(rule)
+          added_rule.actions.first.id = 'script'
+          added_rule.actions.first.configuration.put('type', 'application/x-ruby')
+          added_rule.actions.first.configuration.put('script', script)
 
           rule.execute(nil, { 'event' => Struct.new(:attachment).new(config.start_attachment) }) if config.on_start?
           added_rule
@@ -131,6 +146,12 @@ module OpenHAB
         #
         #
         def add_rule(rule)
+          base_uid = rule.uid
+          duplicate_index = 1
+          while $rules.get(rule.uid) # rubocop:disable Style/GlobalVars
+            duplicate_index += 1
+            rule.uid = "#{base_uid} (#{duplicate_index})"
+          end
           logger.trace("Adding rule: #{rule.inspect}")
           Rule.automation_manager.addRule(rule)
         end

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

@@ -8,7 +8,6 @@ require_relative 'guard'
 require_relative 'rule_triggers'
 require 'openhab/core/entity_lookup'
 require 'openhab/dsl/between'
-require 'openhab/dsl/dsl'
 require 'openhab/dsl/timers'
 
 module OpenHAB
@@ -62,6 +61,7 @@ module OpenHAB
         prop_array :delay, :array_name => :run_queue, :wrapper => Delay
         prop_array :otherwise, :array_name => :run_queue, :wrapper => Otherwise
 
+        prop :uid
         prop :name
         prop :description
         prop :enabled

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

@@ -7,17 +7,44 @@ module OpenHAB
       module TerseRule
         %i[changed channel cron every updated received_command].each do |trigger|
           class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-            def #{trigger}(*args, name: nil, **kwargs, &block)                   # def changed(*args, name: nil, **kwargs, &block)
-              # if no name is given, just default to the name of the rules file  #   # if no name is given, just default to the name of the rules file
-              name ||= File.basename(caller_locations.last.path)                 #   name ||= File.basename(caller_locations.last.path)
-              rule name do                                                       #   rule name do
-                #{trigger}(*args, **kwargs)                                      #     changed(*args, **kwargs)
-                run(&block)                                                      #     run(&block)
-              end                                                                #   end
-            end                                                                  # end
-            module_function #{trigger.inspect}                                   # module_function :changed
+            def #{trigger}(*args, name: nil, **kwargs, &block)            # def changed(*args, name: nil, **kwargs, &block)
+              name ||= infer_rule_name(#{trigger.inspect}, args, kwargs)  #   name ||= infer_rule_name(:changed, args, kwargs)
+              id = Rule.infer_rule_id_from_block(block)                   #   id = Rule.infer_rule_id_from_block(block)
+              name ||= id                                                 #   name ||= id
+              script = block.source rescue nil                            #   script = block.source rescue nil
+              rule name, id: id, script: script do                        #   rule name, id: id, script: script do
+                #{trigger}(*args, **kwargs)                               #     changed(*args, **kwargs)
+                run(&block)                                               #     run(&block)
+              end                                                         #   end
+            end                                                           # end
+            module_function #{trigger.inspect}                            # module_function :changed
           RUBY
         end
+
+        private
+
+        # formulate a readable rule name such as "TestSwitch received command ON" if possible
+        def infer_rule_name(trigger, args, kwargs) # rubocop:disable Metrics
+          return unless %i[changed updated received_command].include?(trigger) &&
+                        args.length == 1 &&
+                        (kwargs.keys - %i[from to command]).empty?
+          return if kwargs[:from].is_a?(Enumerable)
+          return if kwargs[:to].is_a?(Enumerable)
+          return if kwargs[:command].is_a?(Enumerable)
+
+          trigger_name = trigger.to_s.tr('_', ' ')
+          name = if args.first.is_a?(GroupItem::GroupMembers) # rubocop:disable Style/CaseLikeIf === doesn't work with GenericItem
+                   "#{args.first.group.name}.members #{trigger_name}"
+                 elsif args.first.is_a?(GenericItem)
+                   "#{args.first.name} #{trigger_name}"
+                 end
+          return unless name
+
+          name += " from #{kwargs[:from].inspect}" if kwargs[:from]
+          name += " to #{kwargs[:to].inspect}" if kwargs[:to]
+          name += " #{kwargs[:command].inspect}" if kwargs[:command]
+          name
+        end
       end
     end
   end

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

@@ -35,6 +35,7 @@ module OpenHAB
               from = Conditions::Proc.from_value(from)
               @conditions = Conditions::Proc.new(to: to, from: from)
               @duration = duration
+              @timer = nil
               logger.trace "Created Duration Condition To(#{to}) From(#{from}) "\
                            "Conditions(#{@conditions}) Duration(#{@duration})"
             end

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

@@ -20,9 +20,6 @@ module OpenHAB
           class Proc
             include OpenHAB::Log
 
-            # Proc that doesn't check any fields
-            ANY = Proc.new.freeze
-
             #
             # Converts supplied ranges to procs that check range
             # @param [Array] ranges objects to convert to range proc if they are ranges
@@ -83,6 +80,9 @@ module OpenHAB
               @command = command
             end
 
+            # Proc that doesn't check any fields
+            ANY = Proc.new.freeze # this needs to be defined _after_ initialize so its instance variables are set
+
             #
             # Process rule
             # @param [Hash] inputs inputs from trigger

data/lib/openhab/dsl/timers/timer.rb

@@ -82,7 +82,7 @@ module OpenHAB
           OpenHAB::DSL.import_presets
           semaphore.synchronize do
             Timers.timer_manager.delete(self)
-            thread_local(@thread_locals) do
+            thread_local(**@thread_locals) do
               yield(self)
             end
           end

data/lib/openhab/dsl/types/decimal_type.rb

@@ -36,14 +36,14 @@ module OpenHAB
           if value.is_a?(java.math.BigDecimal)
             super
           elsif value.is_a?(BigDecimal)
-            super(value.to_java)
+            super(value.to_java.strip_trailing_zeros)
           elsif value.is_a?(DecimalType)
             super(value.to_big_decimal)
           elsif value.is_a?(Items::NumericItem) ||
                 (value.is_a?(Items::GroupItem) && value.base_item.is_a?(Items::NumericItem))
             super(value.state)
           elsif value.respond_to?(:to_d)
-            super(value.to_d.to_java)
+            super(value.to_d.to_java.strip_trailing_zeros)
           else # rubocop:disable Lint/DuplicateBranch
             # duplicates the Java BigDecimal branch, but that needs to go first
             # in order to avoid unnecessary conversions

data/lib/openhab/log/logger.rb

@@ -212,7 +212,7 @@ module OpenHAB
               .then { |klass| java_klass(klass) }
               .then(&:name)
               .then { |name| filter_base_classes(name) }
-              .then { |name| name&.prepend('.') }
+              .then { |name| ".#{name}" unless name.nil? } # name is frozen in jruby 9.4
       end
 
       # Get the appropriate java class for the supplied klass if the supplied

data/lib/openhab/version.rb

@@ -5,5 +5,5 @@
 #
 module OpenHAB
   # @return [String] Version of OpenHAB helper libraries
-  VERSION = '4.42.1'
+  VERSION = '4.43.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.42.1
+  version: 4.43.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: JRuby Helper Libraries for OpenHAB Scripting
 email:
 - broconne@gmail.com