openhab-scripting 4.22.2 → 4.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 445030f6b4a4337bf93526051c00262a84695be09b3c9dea14f40ccd1c2e20d2
-  data.tar.gz: ff6198e6482c7650c3d9878f577ce89c17a5caf6d000f114dbc6a6e9f5483cf8
+  metadata.gz: 6a1dda09cc4876b335d5da064fa1e19a1196f56d030225e96f6c6efe0c22d3f6
+  data.tar.gz: 23cac17429e99d6757db5f7232e53f8d77a656fb9bfb15d2ee4984fde63d691c
 SHA512:
-  metadata.gz: d208d4623c547442f4d97c9f0ae663e18041e4f4b774b5124c96a92feb54ebd307160180f62de5c322a691f89dbd1f9315597cbf4eff98cbd01c02cf32df3b28
-  data.tar.gz: 8ad90301acb4144bfe816f1a4c83824d4e31ef9bed567a2032cb14a3b7e7287039906aae7ebf57770810d91e2fbf856f63452accb7c95090d7b51563adff8d0d
+  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/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/version.rb

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

metadata

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