openhab-scripting 4.21.0 → 4.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 330baeb4ed7472cdf6c60ba060d0b4482f988fa72c8ff0dd33b00c3e2df28b4a
-  data.tar.gz: 35cab5382ecb542fcc90f02200c8ac977ccf4c1c880e2b644df2715c11fc36b1
+  metadata.gz: 6a1dda09cc4876b335d5da064fa1e19a1196f56d030225e96f6c6efe0c22d3f6
+  data.tar.gz: 23cac17429e99d6757db5f7232e53f8d77a656fb9bfb15d2ee4984fde63d691c
 SHA512:
-  metadata.gz: a8c14ed23a21431328a55326313c06d16fdd0447426e741270d2f26ada96dee1425fb8e30da96b6d515b6c1406392ec56c2d3e598f5822b0a528273bacbbf441
-  data.tar.gz: 265d8939f4c02ccd883c006903d759c8f5208c6c80035a831344055c44c94880e703f76830ecd535464a8cbddd0d4e543cf5af23e35f379b3c532c9525cc9f2f
+  metadata.gz: 5e473c9f0e2764d041613fd728377895430e790846986d3aca9b508f1ef3c0999c72473402cc0094d42c866871fa3161daeb0d4eedc3173b5485e9e33ab9f979
+  data.tar.gz: fdddf783a82f71c0e1364f47f8397daa394ded4935bd16f7746000f9c6f466db074000a2bf065ee1f1daf05f43f1fa1a3d94db3169144cadc7cb2114b5a96a36

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

@@ -48,10 +48,51 @@ module OpenHAB
         # convert it to an HSBType
         # @!visibility private
         def format_type(command)
+          return format_hash(command.to_hash) if command.respond_to?(:to_hash)
           return Types::HSBType.new(command) if command.respond_to?(:to_str)
 
           super
         end
+
+        #
+        # Convert the ColorItem to a hash
+        # @param [:hsb, :rgb] format for hash
+        # @return [Hash] in requested format
+        def to_h(format = :hsb)
+          values = to_a(format)
+          keys = (format == :hsb ? %i[hue saturation brightness] : %i[red green blue])
+          keys.zip(values).to_h
+        end
+
+        #
+        # Convert the ColorItem to an array of values
+        # @param [:hsb, :rgb] format for elements in the array
+        # @return [Array] of ColorItem components in requested format
+        def to_a(format = :hsb)
+          case format
+          when :hsb then [hue, saturation, brightness]
+          when :rgb then [red, green, blue].map(&:to_byte)
+          else
+            raise ArgumentError, "Unsupported format #{format}"
+          end
+        end
+
+        private
+
+        # Mapping of hash values sets to conversion methods
+        HASH_KEYS = { %i[r g b] => :from_rgb,
+                      %i[red green blue] => :from_rgb,
+                      %i[h s b] => :from_hsb,
+                      %i[hue saturation brightness] => :from_hsb }.freeze
+
+        def format_hash(hash)
+          hash = hash.transform_keys(&:to_sym)
+          HASH_KEYS.each do |key_set, method|
+            values = hash.values_at(*key_set).compact
+            return Types::HSBType.public_send(method, *values) if values.length == 3
+          end
+          raise ArgumentError, "Supplied hash (#{hash}) must contain one of the following keysets #{keys.keys}"
+        end
       end
     end
   end

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

@@ -2,6 +2,7 @@
 
 require 'forwardable'
 require 'time'
+require 'java'
 
 require 'openhab/dsl/items/comparable_item'
 
@@ -9,6 +10,7 @@ module OpenHAB
   module DSL
     module Items
       java_import org.openhab.core.library.items.DateTimeItem
+      java_import java.time.format.DateTimeFormatter
 
       # Adds methods to core OpenHAB DateTimeItem type to make it more natural
       # in Ruby
@@ -53,6 +55,7 @@ module OpenHAB
         # @!visibility private
         def format_type(command)
           return command.iso8601 if command.respond_to?(:iso8601)
+          return DateTimeFormatter::ISO_OFFSET_DATE_TIME.format(command) if command.is_a? java.time.ZonedDateTime
 
           super
         end

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

@@ -152,7 +152,7 @@ module OpenHAB
               @thread_locals = Thread.current[:RULE_NAME] ? { RULE_NAME: Thread.current[:RULE_NAME] } : {}
               set_name("Cancels implicit timer for #{timed_command_details.item.id}")
               set_triggers([OpenHAB::DSL::Rules::Triggers::Trigger.trigger(
-                type: OpenHAB::DSL::Rules::Triggers::Trigger::ITEM_STATE_UPDATE,
+                type: OpenHAB::DSL::Rules::Triggers::Trigger::ITEM_STATE_CHANGE,
                 config: { 'itemName' => timed_command_details.item.name }
               )])
             end

data/lib/openhab/dsl/time/month_day.rb

@@ -107,10 +107,13 @@ module OpenHAB
       # Extend MonthDay java object with some helper methods
       class MonthDay
         include OpenHAB::Log
+        java_import java.time.format.DateTimeFormatter
         # Parse MonthDay string as defined with by Monthday class without leading double dash "--"
         def self.parse(string)
-          ##          string = "--#{string}" unless string.to_s.start_with? '--'
-          java_send :parse, [java.lang.CharSequence], "--#{string}"
+          logger.trace("#{self.class}.parse #{string} (#{string.class})")
+          java_send :parse, [java.lang.CharSequence, java.time.format.DateTimeFormatter],
+                    string.to_s,
+                    DateTimeFormatter.ofPattern('[--]M-d')
         end
 
         # Can the supplied object be parsed into a MonthDay
@@ -123,6 +126,9 @@ module OpenHAB
           to_string.delete_prefix('--')
         end
 
+        # remove the inherited #== method to use our <=> below
+        remove_method :==
+
         # Extends MonthDay comparison to support Strings
         # Necessary to support mixed ranges of Strings and MonthDay types
         # @return [Number, nil] -1,0,1 if other MonthDay is less than, equal to, or greater than this MonthDay

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

@@ -47,7 +47,7 @@ module OpenHAB
           # @param saturation [PercentType, Numeric] Saturation component (0-100%)
           # @param brightness [PercentType, Numeric] Brightness component (0-100%)
           # @return [HSBType]
-          def from_hsv(hue, saturation, brightness)
+          def from_hsb(hue, saturation, brightness)
             new(hue, saturation, brightness)
           end
 

data/lib/openhab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.21.0
+  version: 4.23.0
 platform: ruby
 authors:
 - Brian O'Connell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler