mqtt-homeassistant 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4abb16dba6ea2ddab3b0619ded2e0712e2b997d710cc69d367a5234ee00371c
-  data.tar.gz: b22f5a9ddc2fc216c8a57564f6691661fb0cbaeedfa00d3de76548cf23de299f
+  metadata.gz: 3d0d4267529911dcd46d67137facee40859218e31c1de6f7c057aaa536f302c2
+  data.tar.gz: 8f7ed7810a6ae5a4c2b03b3ca3e50954c654b29307c9c19bf31bd36671319293
 SHA512:
-  metadata.gz: 9704e5112d570e0a7cdf255a365af0440a7a24c09376513703eb25726d46f180334e6c78f7ea6ad71ec2faa38adbdc511e4f453430f08840555d44276a1598d0
-  data.tar.gz: ad8ce6569cbd7fccc1fa968061f4f9a966f97710d1d51d723128f67780191d32edeb5f6738f3eb5339d3a8305d9b2e3745b5e52cc92d2b816305e5010faff0a4
+  metadata.gz: 7ea2c835d1171876cf826a71e05e4b5cad925e1107c259d184f93b8fd1848870168c0cf9e84589e575c9db20ef185869e1c11b6a48e69459ba29d4c3576fa7a7
+  data.tar.gz: 383b55527730a79b6fc966061246df42d5e0d36daf8c604937dbd90f4e05e55c87101dfdad58003e20c21ea9212de0a670365fbd38b9cd49cb2f0c55483434e0

data/lib/mqtt/home_assistant/homie/device.rb

@@ -1,3 +1,9 @@
 # frozen_string_literal: true
 
-MQTT::Homie::Device.attr_accessor :home_assistant_device, :home_assistant_discovery_prefix
+module MQTT
+  module Homie
+    class Device
+      attr_accessor :home_assistant_device, :home_assistant_discovery_prefix
+    end
+  end
+end

data/lib/mqtt/home_assistant/version.rb

@@ -2,6 +2,6 @@
 
 module MQTT
   module HomeAssistant
-    VERSION = "0.1.2"
+    VERSION = "0.1.4"
   end
 end

data/lib/mqtt/home_assistant.rb

@@ -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
@@ -163,7 +163,8 @@ module MQTT
                              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))
@@ -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)
@@ -306,7 +307,7 @@ module MQTT
                              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
@@ -354,7 +355,7 @@ module MQTT
                              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
@@ -383,7 +384,7 @@ module MQTT
                              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
 
@@ -406,7 +407,7 @@ module MQTT
                              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
 
@@ -440,7 +441,7 @@ module MQTT
                              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
@@ -468,7 +469,7 @@ module MQTT
                              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.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-09-16 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