mqtt-homie-homeassistant 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f074f72b825d7bd2a1ea3738c280ffeee0ba794e7c7a5018e4e5dac68a823da4
-  data.tar.gz: 2dab1a161248b41aa76a3eb2a30a076e5aa4f6c64d7478244b94d3633625c25b
+  metadata.gz: f7a067f82919d4200a446e8200bb203182c9accabc4dd46c5571f0f479b05d8d
+  data.tar.gz: 4c6103167d5c02ae41759331edae2236ed3b5c640c5ce1b59f6fc8df33639abf
 SHA512:
-  metadata.gz: 7b9ac095761dc5891d9c3f2809633b578dec8cbb78a6f3cd6f40a409d89550d6676a7834a711efcfa5e2b2e537a0319dd906b7217c5860df49b5946792d20139
-  data.tar.gz: e1d68f4ba1d974212e0a034f49bfb28c638d6a6c900171c59c7f8133f15a0169e2aedc69ca656d43a2d592ab005d8d7a5b0cf8ece3f20ccff283e7417b6833ad
+  metadata.gz: 5a22217955039685036ec7810838128d73143b5c8656ea9e5ce7385bb74f741da1464e7d8331a33b9bd7eb3a85b0d8d753e4a4d0358e7fd906302bf543d0c8cb
+  data.tar.gz: d289686bca09dc679bc0050c7d21c3ecc2f283644c8cd6edd1c75c35085749b278d3db2a8b0d490fbf5b21ac027eb3db0b8356a5773669717f825eb878690b1a

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

@@ -4,11 +4,20 @@ module MQTT
   module Homie
     module HomeAssistant
       module Device
-        def self.included(klass)
+        def self.prepended(klass)
           super
           klass.attr_accessor :home_assistant_device, :home_assistant_discovery_prefix
         end
 
+        def initialize(*args, home_assistant_discovery: true, **kwargs)
+          super(*args, **kwargs)
+          @home_assistant_discovery = home_assistant_discovery
+        end
+
+        def home_assistant_discovery?
+          @home_assistant_discovery
+        end
+
         # @!visibility private
         def base_hass_config(config)
           config[:availability] = [{
@@ -20,11 +29,11 @@ module MQTT
           config[:device][:name] ||= name
           config[:device][:identifiers] ||= id
           config[:device][:sw_version] ||= MQTT::Homie::Device::VERSION
-          config[:node_id] = id
+          config[:node_id] ||= id
           config[:qos] = 1
         end
       end
     end
-    Device.include(HomeAssistant::Device)
+    Device.prepend(HomeAssistant::Device)
   end
 end

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

@@ -184,6 +184,8 @@ module MQTT
         end
 
         def publish_hass_component(device: nil, discovery_prefix: nil, object_id: nil, **kwargs)
+          return unless self.device.home_assistant_discovery?
+
           discovery_prefix ||= self.device.home_assistant_discovery_prefix
           device = self.device.home_assistant_device.merge(device || {}) if self.device.home_assistant_device
 
@@ -193,6 +195,7 @@ module MQTT
           kwargs[:discovery_prefix] ||= discovery_prefix
           kwargs[:unique_id] ||= "#{self.device.id}_#{object_id}"
           self.device.base_hass_config(kwargs)
+
           if published?
             self.device.mqtt.publish_hass_component(object_id, **kwargs)
           else

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

@@ -132,6 +132,7 @@ module MQTT
           if !read_only && settable?
             config[:"#{prefix}command_topic"] = "#{topic}/set"
             config[:"#{prefix}command_template"] = "{{ value | round(0) }}" if datatype == :integer
+            config[:optimistic] = true if optimistic? && !config.key?(:optimistic)
           end
           config.merge!(templates.slice(:"#{prefix}template", :"#{prefix}command_template"))
         end
@@ -150,6 +151,8 @@ module MQTT
         private
 
         def publish_hass_component(device: nil, discovery_prefix: nil, object_id: nil, **kwargs)
+          return unless self.device.home_assistant_discovery?
+
           discovery_prefix ||= self.device.home_assistant_discovery_prefix
           device = self.device.home_assistant_device.merge(device || {}) if self.device.home_assistant_device
 
@@ -159,6 +162,7 @@ module MQTT
           kwargs[:discovery_prefix] ||= discovery_prefix
           kwargs[:unique_id] ||= "#{self.device.id}_#{object_id}"
           self.device.base_hass_config(kwargs)
+
           if published?
             self.device.mqtt.publish_hass_component(object_id, **kwargs)
           else

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

@@ -3,7 +3,7 @@
 module MQTT
   module Homie
     module HomeAssistant
-      VERSION = "1.0.6"
+      VERSION = "1.1.0"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-homie-homeassistant
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Cody Cutrer
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: homie-mqtt
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: mqtt-homeassistant
   requirement: !ruby/object:Gem::Requirement