homie-mqtt 1.4.0 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb5e19afec9a2e2d3525ea4879992306f2cd56632139bbc4d691ccc1e2b6bbb
-  data.tar.gz: ff164da43b91048841edef8488e654108d0c566dfe4e0b8150a1cff423b36214
+  metadata.gz: c95ecceb8af9d97949e7ee75cccf878f80270ff703c07ee957b9b276c96f6538
+  data.tar.gz: 0162763dce328e5c4a43045740ca5e907d0506de4e8fc05592c524763274e965
 SHA512:
-  metadata.gz: b4cd79531f71ce7cc077b7f06acd181dd41694494eacab571323fb3930755a10aa57254b1d81dfec3d66ab880b39adc5b21af62ce8c66e84304ca52bf2021fc6
-  data.tar.gz: a11b7bf36fdfb34677d9becdb733ddd4c53cf0ed64f51575b44d257e37b04bd7c07599b0ca6c37b0c7da70466d0b3389373b2d9795327947ba93dd2d14761528
+  metadata.gz: 53500d60691a22a98a46c81e0f5c6627bcc356503186f5275b4c643321254719ac6effbb094241f1f37800859f80f6ec4b9b5c2749e91f4169ec38e1073d9595
+  data.tar.gz: 4ee3a6ba42de0f71746c1211e4d9e543d3587d7f7d79524667e71b40a61e3a65a5a23ec90a8e09dc318399528b65345d863df423b3a5f5cd44cd3378e2cbcb9f

data/lib/mqtt/homie/device.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require 'mqtt'
+require 'ruby2_keywords'
 
 module MQTT
   module Homie
     class Device < Base
       attr_reader :root_topic, :state, :mqtt
+      attr_accessor :logger
+      attr_accessor :out_of_band_topic_proc
 
       def initialize(id, name, root_topic: nil, mqtt: nil, clear_topics: true, &block)
         super(id, name)
@@ -13,7 +16,7 @@ module MQTT
         @state = :init
         @nodes = {}
         @published = false
-        @block = block
+        @out_of_band_topic_proc = block
         mqtt = MQTT::Client.new(mqtt) if mqtt.is_a?(String)
         @mqtt = mqtt || MQTT::Client.new
         @mqtt.set_will("#{topic}/$state", "lost", retain: true, qos: 1)
@@ -40,11 +43,11 @@ module MQTT
         "#{root_topic}/#{id}"
       end
 
-      def node(id, *args, **kwargs)
+      ruby2_keywords def node(id, *args)
         raise ArgumentError, "Node '#{id}' already exists" if @nodes.key?(id)
 
         init do |prior_state|
-          node = Node.new(self, id, *args, **kwargs)
+          node = Node.new(self, id, *args)
 
           @nodes[id] = node
           yield node if block_given?
@@ -87,12 +90,13 @@ module MQTT
             Thread.current.report_on_exception = false
 
             mqtt.get do |packet|
+              logger&.debug("received packet at #{packet.topic} with payload #{packet.payload.inspect}")
               match = packet.topic.match(topic_regex)
               node = @nodes[match[:node]] if match
               property = node[match[:property]] if node
 
               unless property&.settable?
-                @block&.call(topic, packet.payload)
+                @out_of_band_topic_proc&.call(packet.topic, packet.payload)
                 next
               end
 

data/lib/mqtt/homie/node.rb

@@ -17,9 +17,9 @@ module MQTT
         "#{device.topic}/#{id}"
       end
 
-      def property(*args, **kwargs, &block)
+      ruby2_keywords def property(*args, &block)
         device.init do |prior_state|
-          property = Property.new(self, *args, **kwargs, &block)
+          property = Property.new(self, *args, &block)
           raise ArgumentError, "Property '#{property.id}' already exists on '#{id}'" if @properties.key?(property.id)
           @properties[property.id] = property
           property.publish if prior_state == :ready

data/lib/mqtt/homie/property.rb

@@ -6,7 +6,7 @@ module MQTT
       attr_reader :node, :datatype, :format, :unit, :value
 
       def initialize(node, id, name, datatype, value = nil, format: nil, retained: true, unit: nil, &block)
-        raise ArgumentError, "Invalid Homie datatype" unless %s{string integer float boolean enum color datetime duration}
+        raise ArgumentError, "Invalid Homie datatype" unless %i[string integer float boolean enum color datetime duration].include?(datatype)
         raise ArgumentError, "retained must be boolean" unless [true, false].include?(retained)
         format = format.join(",") if format.is_a?(Array) && datatype == :enum
         if %i{integer float}.include?(datatype) && format.is_a?(Range)
@@ -170,8 +170,10 @@ module MQTT
       def publish_value
         serialized = value
         serialized = serialized&.iso8601 if %i[datetime duration].include?(datatype)
+        serialized = serialized.to_s
 
-        mqtt.publish(topic, serialized.to_s, retain: retained?, qos: 1)
+        node.device.logger&.debug("publishing #{serialized.inspect} to #{topic}")
+        mqtt.publish(topic, serialized, retain: retained?, qos: 1)
       end
     end
   end

data/lib/mqtt/homie/version.rb

@@ -2,6 +2,6 @@
 
 module MQTT
   module Homie
-    VERSION = '1.4.0'
+    VERSION = '1.4.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homie-mqtt
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.5
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-30 00:00:00.000000000 Z
+date: 2021-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-ccutrer
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement