openhab-scripting 4.23.0 → 4.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a1dda09cc4876b335d5da064fa1e19a1196f56d030225e96f6c6efe0c22d3f6
-  data.tar.gz: 23cac17429e99d6757db5f7232e53f8d77a656fb9bfb15d2ee4984fde63d691c
+  metadata.gz: 2b0032a1e364c6042f9f01f21c8315f0cbaf2e3b311c7e227073eb26394f8f8a
+  data.tar.gz: c3c2279228081ec8f9a565dd9e3fd8a2d42b1c09d01c6de85951493a79f8f098
 SHA512:
-  metadata.gz: 5e473c9f0e2764d041613fd728377895430e790846986d3aca9b508f1ef3c0999c72473402cc0094d42c866871fa3161daeb0d4eedc3173b5485e9e33ab9f979
-  data.tar.gz: fdddf783a82f71c0e1364f47f8397daa394ded4935bd16f7746000f9c6f466db074000a2bf065ee1f1daf05f43f1fa1a3d94db3169144cadc7cb2114b5a96a36
+  metadata.gz: 9ac07684db4dc05fa66423d2d775d8bbddeb197b672d6e7bd87a3ff811e0c1d9ea1a93da26a9775bfa4d2fba3b07d915783caf3eadaace99d6e09b2fe65ceb2e
+  data.tar.gz: 9f5be2827c0dddc7224b91d2fb9afbeffeb276b9395ff2439910415aade2019c8f2f374e07e47b38719f8c70ace700d3c4f3b7d8509086404037d21f338e3c7f

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

@@ -25,7 +25,14 @@ module OpenHAB
           super
         end
 
-        #
+        # Support conversion to location items from a hash
+        # @!visibility private
+        def format_type(command)
+          return PointType.new(command.to_hash) if command.respond_to?(:to_hash)
+
+          super
+        end
+
         # Type Coercion
         #
         # Coerce object to a PointType

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

@@ -17,6 +17,7 @@ module OpenHAB
         # @param longitude [DecimalType, QuantityType, StringType, Numeric]
         # @param altitude [DecimalType, QuantityType, StringType, Numeric]
         def initialize(*args) # rubocop:disable Metrics
+          args = from_hash(args.first.to_hash) if args.first.respond_to? :to_hash
           if (2..3).cover?(args.length)
             args = args.each_with_index.map do |value, index|
               if value.is_a?(DecimalType) || value.is_a?(StringType)
@@ -118,6 +119,13 @@ module OpenHAB
           QuantityType.new(raw_altitude.to_big_decimal, Units::METRE)
         end
 
+        #
+        # Convert the PointType to a hash
+        # @return [Hash] with keys latitude/longitude/altitude
+        def to_h
+          { latitude: latitude, longitude: longitude, altitude: altitude }
+        end
+
         #
         # Calculate the distance in meters from other, ignoring altitude.
         #
@@ -138,7 +146,7 @@ module OpenHAB
 
         # coerce an object to a PointType
         # @return [PointType]
-        def coerce_single(other)
+        def coerce_single(other) # rubocop:disable Metrics
           logger.trace("Coercing #{self} as a request from #{other.class}")
           if other.is_a?(PointType)
             other
@@ -148,7 +156,22 @@ module OpenHAB
             other.state
           elsif other.respond_to?(:to_str)
             PointType.new(other.to_str)
+          elsif other.respond_to?(:to_hash)
+            PointType.new(other.to_hash)
+          end
+        end
+
+        #
+        # Convert hash into ordered arguments for constructor
+        #
+        def from_hash(hash)
+          keys = [%i[lat long alt], %i[latitude longitude altitude]]
+          keys.each do |key_set|
+            values = hash.transform_keys(&:to_sym).values_at(*key_set)
+
+            return *values.compact if values[0..1].all?
           end
+          raise ArgumentError, "Supplied arguments (#{hash}) must contain one of the following sets #{keys}"
         end
       end
     end

data/lib/openhab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 4.23.0
+  version: 4.24.0
 platform: ruby
 authors:
 - Brian O'Connell