openhab-scripting 2.19.1 → 2.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb5d419e011ded3c2944f92dcfafa5f21f7add4d003439226d41b7c653b03077
-  data.tar.gz: f8f970fa2a14576e73c832b289b9b3b115c47686377de4ad574575fa1d017e00
+  metadata.gz: e99181d5d68e3b8deab1440bfc457890ea512a1f25a4da4dc048555f3e296f2a
+  data.tar.gz: 2b07f929d309bda53b78270b9d7274b2373132de08a075af634ca9237a79cea7
 SHA512:
-  metadata.gz: cb45e5bd5bfc28a4a0a706328c3f7eb1b4fb9e6895ab07782d9395fb44f2c1a833758f4387c1600d1650f256b7a29a0bb13bd6af2590e78e6cec1141a668dea0
-  data.tar.gz: bc250561d69f374b144b7f76e96cbf26d32b86216984ab7e3668f19a56078be087a6404a9c2da70828ae7077e3037fba554ef479de5d295344b68a3e8f13383f
+  metadata.gz: 375b6c769ee121a9dfb88d6a93338de1bd1040b1cb885f8668cdf07c0f0c0dce6d2a34cd744ebe3837a06739477f296bea0e907599b3c5446ebd400745a7a92b
+  data.tar.gz: 64396208c64ddb457a873b7829ee024d01f598c32348c9717229af106e754a545aad10dde6a85dd27045a0ac73844251b4f0bc0f56f8c72ae2b88a6a0c589878

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'java'
+
+module OpenHAB
+  module DSL
+    module Items
+      #
+      # Holds methods to automatically generate commands and
+      # accessors for items
+      module ItemCommand
+        #
+        # For every value in the supplied enumeration create a corresponding method mapped to the lowercase
+        # string representation of the enum value For example, an enum with values of STOP and START
+        # would create methods stop() and start() that send the corresponding STOP and START commands to the item
+        #
+        # @param [Java::JavaLang::Enum] command_enum Enumeration to create commands for
+        #
+        #
+        def item_command(command_enum)
+          # rubocop:disable Style/HashEachMethods
+          # Disable rule because Java enum does not support each_value
+          command_enum.values.each do |command|
+            command_method = command.to_s.downcase
+            define_method(command_method) do
+              self.command(command)
+            end
+          end
+          # rubocop:enable Style/HashEachMethods
+        end
+
+        #
+        # For every value in the supplied enumeration create a corresponding method mapped to the lowercase
+        # string representation appended with a question mark '?' of the enum value For example,
+        # an enum with values of UP and DOWN would create methods up? and down? that check
+        # if the current state matches the value of the enum
+        #
+        # @param [Java::JavaLang::Enum] command_enum Enumeration to create methods for each value
+        #   to check if current state matches that enum
+        # @yield [state] Optional block that can be used to transform state prior to comparison
+        #
+        #
+        def item_state(command_enum)
+          # rubocop:disable Style/HashEachMethods
+          # Disable rule because Java enum does not support each_value
+          command_enum.values.each do |command|
+            status_method = "#{command.to_s.downcase}?"
+            define_method(status_method) do
+              state? && state.as(command_enum) == command
+            end
+          end
+          # rubocop:enable Style/HashEachMethods
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@
 
 require 'forwardable'
 require 'java'
+require 'openhab/dsl/items/item_command'
 
 module OpenHAB
   module DSL
@@ -11,6 +12,7 @@ module OpenHAB
       #
       class RollershutterItem < Numeric
         extend Forwardable
+        extend OpenHAB::DSL::Items::ItemCommand
         include Comparable
 
         def_delegator :@rollershutter_item, :to_s
@@ -19,6 +21,10 @@ module OpenHAB
         java_import Java::OrgOpenhabCoreLibraryTypes::UpDownType
         java_import Java::OrgOpenhabCoreLibraryTypes::StopMoveType
 
+        item_command Java::OrgOpenhabCoreLibraryTypes::StopMoveType
+        item_command Java::OrgOpenhabCoreLibraryTypes::UpDownType
+        item_state   Java::OrgOpenhabCoreLibraryTypes::UpDownType
+
         #
         # Creates a new RollershutterItem
         #
@@ -32,24 +38,6 @@ module OpenHAB
           super()
         end
 
-        #
-        # Check if the rollershutter is up
-        #
-        # @return [Boolean] true if the rollershutter is up, false otherwise
-        #
-        def up?
-          state.as(UpDownType) == UpDownType::UP
-        end
-
-        #
-        # Check if the rollershutter is down
-        #
-        # @return [Boolean] true if the rollershutter is down, false otherwise
-        #
-        def down?
-          state.as(UpDownType) == UpDownType::DOWN
-        end
-
         #
         # Returns the rollershutter's position
         #
@@ -104,34 +92,6 @@ module OpenHAB
           state.as(UpDownType).equals(other)
         end
 
-        #
-        # Sends an UP command to the Item
-        #
-        def up
-          command UpDownType::UP
-        end
-
-        #
-        # Sends a DOWN command to the Item
-        #
-        def down
-          command UpDownType::DOWN
-        end
-
-        #
-        # Sends a STOP command to the Item
-        #
-        def stop
-          command StopMoveType::STOP
-        end
-
-        #
-        # Sends a MOVE command to the Item
-        #
-        def move
-          command StopMoveType::MOVE
-        end
-
         #
         # Define math operations
         #

data/lib/openhab/dsl/monkey_patch/items/contact_item.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'java'
+require 'openhab/dsl/items/item_command'
 
 module OpenHAB
   module DSL
@@ -20,24 +21,11 @@ module OpenHAB
         # Monkey patch Contact Item with Ruby methods
         #
         class ContactItem
-          java_import org.openhab.core.library.types.OpenClosedType
-          #
-          # Check if the contact is open
-          #
-          # @return [Boolean] True if contact has state and is open, false otherwise
-          #
-          def open?
-            state? && state == OpenClosedType::OPEN
-          end
+          extend OpenHAB::DSL::Items::ItemCommand
 
-          #
-          # Check if the contact is closed
-          #
-          # @return [Boolean] True if contact has state and is closed, false otherwise
-          #
-          def closed?
-            state? && state == OpenClosedType::CLOSED
-          end
+          java_import Java::OrgOpenhabCoreLibraryTypes::OpenClosedType
+
+          item_state Java::OrgOpenhabCoreLibraryTypes::OpenClosedType
 
           #
           # Compares contacts to OpenClosedTypes

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

@@ -101,10 +101,10 @@ module OpenHAB
           #
           # Get the string representation of the state of the item
           #
-          # @return [String] State of the item as a string if not UNDEF or NULL, nil otherwise
+          # @return [String] State of the item as a string
           #
           def to_s
-            state&.to_s
+            method(:state).super_method.call.to_s # call the super state to include UNDEF/NULL
           end
 
           #

data/lib/openhab/dsl/monkey_patch/items/metadata.rb

@@ -134,6 +134,18 @@ module OpenHAB
               end
             end
 
+            #
+            # Implements Hash#dig-like functionaity to metadata
+            #
+            # @param [String] key The first key
+            # @param [Array<String, Symbol>] keys More keys to dig deeper
+            #
+            # @return [OpenHAB::DSL::MonkeyPatch::Items::MetadataItem], or nil if the namespace doesn't exist
+            #
+            def dig(key, *keys)
+              keys.empty? ? self[key]&.value : self[key]&.dig(*keys)
+            end
+
             #
             # Enumerates through all the namespaces
             #

data/lib/openhab/dsl/monkey_patch/items/switch_item.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'java'
+require 'openhab/dsl/items/item_command'
+
 module OpenHAB
   module DSL
     module MonkeyPatch
@@ -16,43 +19,15 @@ module OpenHAB
         # Monkeypatching SwitchItem to add Ruby Support methods
         #
         class SwitchItem
-          java_import Java::OrgOpenhabCoreLibraryTypes::OnOffType
-          #
-          # Send the OFF command to the switch
-          #
-          #
-          def off
-            command(OnOffType::OFF)
-          end
+          extend OpenHAB::DSL::Items::ItemCommand
 
-          #
-          # Send the OFF command to the switch
-          #
-          #
-          def on
-            command(OnOffType::ON)
-          end
+          java_import Java::OrgOpenhabCoreLibraryTypes::OnOffType
 
-          #
-          # Check if a switch is on
-          #
-          # @return [Boolean] True if the switch is on, false otherwise
-          #
-          def on?
-            state? && state == OnOffType::ON
-          end
+          item_command Java::OrgOpenhabCoreLibraryTypes::OnOffType
+          item_state Java::OrgOpenhabCoreLibraryTypes::OnOffType
 
           alias truthy? on?
 
-          #
-          # Check if a switch is off
-          #
-          # @return [Boolean] True if the switch is off, false otherwise
-          #
-          def off?
-            state? && state == OnOffType::OFF
-          end
-
           #
           # Send a command to invert the state of the switch
           #

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

@@ -70,7 +70,7 @@ module OpenHAB
         def create_queue(inputs)
           case check_guards(event: inputs&.dig('event'))
           when true
-            @run_queue.dup
+            @run_queue.dup.grep_v(RuleConfig::Otherwise)
           when false
             @run_queue.dup.grep(RuleConfig::Otherwise)
           end
@@ -171,7 +171,8 @@ module OpenHAB
           trigger_delay.timer = after(trigger_delay.duration) do
             logger.trace("Delay Complete for #{trigger_delay}, executing rule")
             trigger_delay.timer = nil
-            process_queue(@run_queue.dup, mod, inputs)
+            queue = create_queue(inputs)
+            process_queue(queue, mod, inputs)
           end
           trigger_delay.tracking_to = inputs['newState']
         end

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.20.2
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,6 +40,7 @@ files:
 - lib/openhab/dsl/gems.rb
 - lib/openhab/dsl/group.rb
 - lib/openhab/dsl/items/datetime_item.rb
+- lib/openhab/dsl/items/item_command.rb
 - lib/openhab/dsl/items/items.rb
 - lib/openhab/dsl/items/number_item.rb
 - lib/openhab/dsl/items/rollershutter_item.rb