openhab-scripting 4.14.0 → 4.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e18ecb6c7855be5621a529eb7a7c35bfdf7afe8ec134a375e4ef0458f77c4edd
-  data.tar.gz: 862215cf6988193ec43bbd9a79e8ff16d6a50c91d832346f2d4eb180ba751129
+  metadata.gz: 9fa69c603c1f7a32428d12860585b0a4059c70b617b6df72d3da0521a7e36163
+  data.tar.gz: 68527c0ea3b42ba5187322062dbe05d4a22bef29dabd048af9336ff80e7da5b7
 SHA512:
-  metadata.gz: 21a39ca9ec68afb322cd63fc7c76bd2e8eec26bb8076f0160b3f959465d08060f40516bc9a866251f0c6c1e29a8d2c1b5339645ed6e6726bcf054768e7f262cc
-  data.tar.gz: 20af639fd0bdf052e34a6eb73b94e0de96f1cdf31584bd2475a54d23d404354444536b7a5ebda83ea51ae0799486ca91d42e96eafb7e9ad260db487aeced166a
+  metadata.gz: 7115395f5f02afcbd5b2e3cb243192aaed694309d24383005c567859bba6cf693286c772edb101ce924d10268bc986f406d2ee8dc1a7f942be07793b91dc1ca8
+  data.tar.gz: 9d9a0478ba8ee6275014ddbdc03fe67ed23a15acef1813d5195109dbc9069ca2b3d69d5a038a7bf3a4c22ec52433144659e46bf3481c3e5055b97ff8d7920f1e

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

@@ -87,7 +87,7 @@ module OpenHAB
         # @return [Queue] <description>
         #
         def create_queue(inputs)
-          case check_guards(event: inputs&.dig('event'))
+          case check_guards(event: extract_event(inputs))
           when true
             @run_queue.dup.grep_v(RuleConfig::Otherwise)
           when false
@@ -95,13 +95,30 @@ module OpenHAB
           end
         end
 
+        #
+        # Extract the event object from inputs
+        # and merge other inputs keys/values into the event
+        #
+        # @param [Map] inputs rule inputs
+        #
+        # @return [Object] event object
+        #
+        def extract_event(inputs)
+          event = inputs&.dig('event')
+          unless event
+            event = Struct.new(:event, :attachment, :command).new
+            event.command = inputs&.dig('command')
+          end
+          add_attachment(event, inputs)
+        end
+
         #
         # Get the trigger_id for the trigger that caused the rule creation
         #
         # @return [Hash] Input hash potentially containing trigger id
         #
         def trigger_id(inputs)
-          inputs&.keys&.grep(/\.event$/)&.first&.chomp('.event')
+          inputs&.dig('module')
         end
 
         #
@@ -128,10 +145,6 @@ module OpenHAB
           attachment = @attachments[trigger_id(inputs)]
           return event unless attachment
 
-          # Some events, like those from cron triggers don't have an event
-          # so an event is created
-          event ||= Struct.new(:event).new
-
           event.attachment = attachment
           event
         end
@@ -301,11 +314,9 @@ module OpenHAB
         # @param [Map] inputs OpenHAB map object describing rule trigge
         #
         #
-        # rubocop:disable Metrics/MethodLength
         # No logical way to break this method up
         def process_queue(run_queue, mod, inputs)
-          event = inputs&.dig('event')
-          event = add_attachment(event, inputs)
+          event = extract_event(inputs)
 
           while (task = run_queue.shift)
             if task.is_a? RuleConfig::Delay
@@ -317,7 +328,6 @@ module OpenHAB
         rescue StandardError => e
           print_backtrace(e)
         end
-        # rubocop:enable Metrics/MethodLength
 
         #
         # Dispatch execution block tasks to different methods

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

@@ -38,7 +38,6 @@ module OpenHAB
         config.guard = Guard::Guard.new(only_if: config.only_if, not_if: config.not_if)
         logger.trace { config.inspect }
         process_rule_config(config)
-        config
       rescue StandardError => e
         re_raise_with_backtrace(e)
       end
@@ -89,6 +88,7 @@ module OpenHAB
         Rules.script_rules << rule
         add_rule(rule)
         rule.execute(nil, { 'event' => Struct.new(:attachment).new(config.start_attachment) }) if config.on_start?
+        rule
       end
 
       #

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

@@ -8,6 +8,7 @@ require 'openhab/dsl/rules/triggers/changed'
 require 'openhab/dsl/rules/triggers/channel'
 require 'openhab/dsl/rules/triggers/command'
 require 'openhab/dsl/rules/triggers/updated'
+require 'openhab/dsl/rules/triggers/generic'
 require 'openhab/dsl/rules/guard'
 require 'openhab/core/entity_lookup'
 require 'openhab/dsl/between'

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'openhab/log/logger'
+
+module OpenHAB
+  module DSL
+    module Rules
+      #
+      # Module holds rule triggers
+      #
+      module Triggers
+        include OpenHAB::Log
+
+        #
+        # Create a generic trigger given the trigger type uid and a configuration hash
+        #
+        # @param [Type] Trigger type UID
+        # @param [Configuration] A hash containing the trigger configuration entries
+        #
+        # @return [Trigger] Trigger object
+        #
+        def trigger(type, attach: nil, **configuration)
+          logger.trace("Creating a generic trigger for type(#{type}) with configuration(#{configuration})")
+          append_trigger(type, configuration, attach: attach)
+        end
+      end
+    end
+  end
+end

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

@@ -48,6 +48,7 @@ module OpenHAB
         #
         def append_trigger(type, config, attach: nil)
           logger.trace("Creating trigger of type #{type} for #{config}")
+          config.transform_keys!(&:to_s)
           trigger = Trigger.trigger(type: type, config: config)
           @attachments[trigger.id] = attach if attach
           @triggers << trigger

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

@@ -24,8 +24,6 @@ module OpenHAB
         include OpenHAB::Log
         extend Forwardable
 
-        def_delegator :@timer, :is_active, :active?
-        def_delegator :@timer, :is_running, :running?
         def_delegator :@timer, :has_terminated, :terminated?
 
         #

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

@@ -30,11 +30,7 @@ module OpenHAB
         #
         # @return [QuantityType] This quantity converted to another unit
         #
-        def |(other)
-          other = org.openhab.core.types.util.UnitUtils.parse_unit(other) if other.is_a?(String)
-
-          to_unit(other)
-        end
+        alias | to_unit
 
         #
         # Comparison

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

@@ -27,7 +27,7 @@ module OpenHAB
         #
         def coerce(other)
           logger.trace("Coercing #{self} (#{self.class}) as a request from #{other.class}")
-          return [other.as(self.class), self] if other.is_a?(Type)
+          return [other.as(self.class), self] if other.is_a?(Type) && other.respond_to?(:as)
         end
 
         #

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.15.1
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-14 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,6 +103,7 @@ files:
 - lib/openhab/dsl/rules/triggers/channel.rb
 - lib/openhab/dsl/rules/triggers/command.rb
 - lib/openhab/dsl/rules/triggers/cron.rb
+- lib/openhab/dsl/rules/triggers/generic.rb
 - lib/openhab/dsl/rules/triggers/trigger.rb
 - lib/openhab/dsl/rules/triggers/updated.rb
 - lib/openhab/dsl/states.rb