mqtt-homeassistant 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71dd3444a38fb640c9ca56fa26938cf6530dbfb566f39313558101fc98098c37
-  data.tar.gz: 7d6d78f91d49f2dbbc585e89c73efcfc809c34db03bb639de67ea29f1b36b4b2
+  metadata.gz: 96765202ae955e74f283eb348c22fed1c8bd4cd792aa9792ef071cc5f4bf68c3
+  data.tar.gz: bfd420db58ba339dd034c177b5352b9dee84063cd2800f7db21fbe5a125ee8ea
 SHA512:
-  metadata.gz: ebb5c6e8bbf19c7b22b9fd99d333f767bfd83b83297096dbebb5dd4c2a538a2ae8217319820f4688b16b15b3e9e0eb378ed7118b889eb0f73abdb158c7c20637
-  data.tar.gz: 6249d5ae0fcadc1fec9be359502f92c3a5c9468f44935d983ae3b505008b4c199816cf1d2e36fdceb36db6004417cc19b2199e0d2f1d4bf6b51ca6f7292131bc
+  metadata.gz: bb2f2bd2d70e208ad42a9420723088d16c33cb4607104f7b3edcaaf26a0c7a04211bd2ba04d9c31e26df84cdbd71b726ad1b995b2d34afb580648b6ee540d0fd
+  data.tar.gz: c1ee571c04ddeea59975ea544dddd1690607ae58fd4bd7c7e825879b8357bcaf405389cdb9c7154e6ce91a4f2a1562742676d5aba5d36acd21bcbbd74f7f5f17

data/lib/mqtt/home_assistant/version.rb

@@ -2,6 +2,6 @@
 
 module MQTT
   module HomeAssistant
-    VERSION = "0.1.3"
+    VERSION = "0.1.5"
   end
 end

data/lib/mqtt/home_assistant.rb

@@ -97,7 +97,7 @@ module MQTT
         end
 
         config = base_config(property.device,
-                             property.full_name,
+                             "#{property.node.name} #{property.name}",
                              device_class: device_class,
                              device: device,
                              entity_category: entity_category,
@@ -105,7 +105,7 @@ module MQTT
                  .merge({
                           payload_off: "false",
                           payload_on: "true",
-                          unique_id: "#{property.device.id}_#{property.node.id}_#{property.id}",
+                          object_id: "#{property.node.id}_#{property.id}",
                           state_topic: property.topic
                         })
         config[:expire_after] = expire_after if expire_after
@@ -159,11 +159,12 @@ module MQTT
         node = properties.first.last.node
 
         config = base_config(node.device,
-                             name || node.full_name,
+                             name || node.name,
                              device: device,
                              entity_category: entity_category,
                              icon: icon)
-        config[:unique_id] = "#{node.device.id}_#{id || node.id}"
+
+        config[:object_id] = id || node.id
         read_only_props = %i[action current_temperature]
         properties.each do |prefix, property|
           add_property(config, property, prefix, templates: templates, read_only: read_only_props.include?(prefix))
@@ -210,7 +211,7 @@ module MQTT
         icon: nil
       )
         config = base_config(property.device,
-                             name || property.node.full_name,
+                             name || property.node.name,
                              device: device,
                              device_class: device_class,
                              entity_category: entity_category,
@@ -248,7 +249,7 @@ module MQTT
         end
 
         config = base_config(property.device,
-                             name || property.node.full_name,
+                             name || property.node.name,
                              device: device,
                              device_class: device_class,
                              entity_category: entity_category,
@@ -258,7 +259,7 @@ module MQTT
                           target_humidity_command_topic: "#{target_property.topic}/set",
                           payload_off: "false",
                           payload_on: "true",
-                          unique_id: "#{property.device.id}_#{id || property.node.id}"
+                          object_id: id || property.node.id
                         })
         add_property(config, property)
         add_property(config, target_property, :target_humidity)
@@ -302,11 +303,11 @@ module MQTT
         end
 
         config = base_config(property.device,
-                             property.full_name,
+                             "#{property.node.name} #{property.name}",
                              device: device,
                              entity_category: entity_category,
                              icon: icon)
-        config[:unique_id] = "#{property.device.id}_#{property.node.id}_#{property.id}"
+        config[:object_id] = "#{property.node.id}_#{property.id}"
         add_property(config, property)
         case property.datatype
         when :boolean
@@ -350,11 +351,11 @@ module MQTT
                                                                                       float].include?(property.datatype)
 
         config = base_config(property.device,
-                             property.full_name,
+                             "#{property.node.name} #{property.name}",
                              device: device,
                              entity_category: entity_category,
                              icon: icon)
-        config[:unique_id] = "#{property.device.id}_#{property.node.id}_#{property.id}"
+        config[:object_id] = "#{property.node.id}_#{property.id}"
         add_property(config, property)
         config[:unit_of_measurement] = property.unit if property.unit
         if property.range
@@ -379,11 +380,11 @@ module MQTT
         end
 
         config = base_config(property.device,
-                             property.full_name,
+                             "#{property.node.name} #{property.name}",
                              device: device,
                              entity_category: entity_category,
                              icon: icon)
-        config[:unique_id] = "#{property.device.id}_#{property.node.id}_#{property.id}"
+        config[:object_id] = "#{property.node.id}_#{property.id}"
         add_property(config, property)
         config[:payload_on] = property.range.first
 
@@ -402,11 +403,11 @@ module MQTT
         raise ArgumentError, "Homie property must be settable" unless property.settable?
 
         config = base_config(property.device,
-                             property.full_name,
+                             "#{property.node.name} #{property.name}",
                              device: device,
                              entity_category: entity_category,
                              icon: icon)
-        config[:unique_id] = "#{property.device.id}_#{property.node.id}_#{property.id}"
+        config[:object_id] = "#{property.node.id}_#{property.id}"
         add_property(config, property)
         config[:options] = property.range
 
@@ -434,13 +435,13 @@ module MQTT
         end
 
         config = base_config(property.device,
-                             property.full_name,
+                             "#{property.node.name} #{property.name}",
                              device: device,
                              device_class: device_class,
                              entity_category: entity_category,
                              icon: icon)
                  .merge({
-                          unique_id: "#{property.device.id}_#{property.node.id}_#{property.id}",
+                          object_id: "#{property.node.id}_#{property.id}",
                           state_topic: property.topic
                         })
         config[:state_class] = state_class if state_class
@@ -462,13 +463,13 @@ module MQTT
         raise ArgumentError, "Homie property must be a boolean" unless property.datatype == :boolean
 
         config = base_config(property.device,
-                             property.full_name,
+                             "#{property.node.name} #{property.name}",
                              device: device,
                              device_class: device_class,
                              entity_category: entity_category,
                              icon: icon)
                  .merge({
-                          unique_id: "#{property.device.id}_#{property.node.id}_#{property.id}",
+                          object_id: "#{property.node.id}_#{property.id}",
                           payload_off: "false",
                           payload_on: "true"
                         })
@@ -514,6 +515,7 @@ module MQTT
 
         config = {
           name: name,
+          node_id: homie_device.id,
           availability_topic: "#{homie_device.topic}/$state",
           payload_available: "ready",
           payload_not_available: "lost",
@@ -533,7 +535,12 @@ module MQTT
       end
 
       def publish(mqtt, component, config, discovery_prefix:)
-        mqtt.publish("#{discovery_prefix || "homeassistant"}/#{component}/#{config[:unique_id]}/config",
+        node_id, object_id = config.values_at(:node_id, :object_id)
+        config = config.dup
+        config[:unique_id] = "#{node_id}_#{object_id}"
+        config.delete(:node_id)
+        config.delete(:object_id)
+        mqtt.publish("#{discovery_prefix || "homeassistant"}/#{component}/#{node_id}/#{object_id}/config",
                      config.to_json,
                      retain: true,
                      qos: 1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-homeassistant
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2023-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: homie-mqtt
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Library for publishing device auto-discovery configuration for Home Assistant