homie-mqtt 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 520ad8e14f8ce8df9fb824ef2cc3b65e1bef81e70d2b530bc5442732e627a913
-  data.tar.gz: 801041e538a20ce166eb0528d33cd8c77bb5567e0a7ecea57dba59a63a85bef5
+  metadata.gz: 64cfaf8cbbff82a3059c8fcfa639efc39f006241cd79aaadb6bce200eb82a9cc
+  data.tar.gz: d9045a9c729515c2912aeb11b20c5ecad9885b7e0f4df95263e688d74d72f077
 SHA512:
-  metadata.gz: efa3b6a779f9814ba7d9bade3bde3b3c65325630ec3e81cea5e1e023c338e105367d1f91b039bf9a43230a43bf6260352dfdf21833b6a3fa08c15e6a980e144b
-  data.tar.gz: '09c32c899c26b9ec86ed5022daff775a48aafaa4aa65e95e0a30f306e381dd3d6262b0b398c923d9a5c9b0a778dd42211b1e680cb004be4196160bdbf57f927e'
+  metadata.gz: 04ea1126fe4310cc758ddf23fe859f380a0250baf0998a1fab3d695c6f18e6087028dd35de8f619414ec0512d46ac24fb6fb91cae2821729c18b2a91b209455d
+  data.tar.gz: 6200b420bed16a9267cdde8f7192c52d8cd72568dcb72e35247620bd4b71031069a12986b41290329c199bfbf0fc7abdbf25a81d8fdbe1bcce7906b09a883673

data/lib/mqtt/homie/device.rb

@@ -40,27 +40,30 @@ module MQTT
         "#{root_topic}/#{id}"
       end
 
-      def node(*args, **kwargs)
+      def node(id, *args, **kwargs)
+        raise ArgumentError, "Node '#{id}' already exists" if @nodes.key?(id)
+
         init do |prior_state|
-          node = Node.new(self, *args, **kwargs)
-          raise ArgumentError, "Node '#{node.id}' already exists" if @nodes.key?(node.id)
-          @nodes[node.id] = node
+          node = Node.new(self, id, *args, **kwargs)
+
+          @nodes[id] = node
           yield node if block_given?
           if prior_state == :ready
             node.publish
             mqtt.publish("#{topic}/$nodes", @nodes.keys.join(","), retain: true, qos: 1)
           end
+          node
         end
-        self
       end
 
       def remove_node(id)
-        return unless (node = @nodes[id])
+        return false unless (node = @nodes[id])
         init do
           node.unpublish
           @nodes.delete(id)
           mqtt.publish("#{topic}/$nodes", @nodes.keys.join(","), retain: true, qos: 1) if @published
         end
+        true
       end
 
       def [](id)
@@ -120,28 +123,33 @@ module MQTT
 
       def init
         if state == :init
-          yield(state)
-          return
+          return yield state
         end
 
         prior_state = state
         mqtt.publish("#{topic}/$state", (state = :init).to_s, retain: true, qos: 1)
-        yield(prior_state)
+        result = nil
+        mqtt.batch_publish do
+          result = yield prior_state
+        end
         mqtt.publish("#{topic}/$state", (state = :ready).to_s, retain: true, qos: 1)
-        nil
+        result
       end
 
-      private
-
       def clear_topics
+        raise ArgumentError, "cannot clear topics once published" if @published
+
         @mqtt.subscribe("#{topic}/#")
         @mqtt.unsubscribe("#{topic}/#", wait_for_ack: true)
         while !@mqtt.queue_empty?
           packet = @mqtt.get
           @mqtt.publish(packet.topic, retain: true, qos: 0)
         end
+        true
       end
 
+      private
+
       def topic_regex
         @topic_regex ||= Regexp.new("^#{Regexp.escape(topic)}/(?<node>#{REGEX})/(?<property>#{REGEX})/set$")
       end

data/lib/mqtt/homie/node.rb

@@ -23,17 +23,18 @@ module MQTT
           raise ArgumentError, "Property '#{property.id}' already exists on '#{id}'" if @properties.key?(property.id)
           @properties[property.id] = property
           property.publish if prior_state == :ready
+          property
         end
-        self
       end
 
       def remove_property(id)
-        return unless (property = @properties[id])
+        return false unless (property = @properties[id])
         init do
           property.unpublish
           @properties.delete(id)
           mqtt.publish("#{topic}/$properties", @properties.keys.join(","), retain: true, qos: 1) if @published
         end
+        true
       end
 
       def [](id)

data/lib/mqtt/homie/property.rb

@@ -18,6 +18,7 @@ module MQTT
         raise ArgumentError, "format is required for enums" if datatype == :enum && format.nil?
         raise ArgumentError, "format is required for colors" if datatype == :color && format.nil?
         raise ArgumentError, "format must be either rgb or hsv for colors" if datatype == :color && !%w{rgb hsv}.include?(format.to_s)
+        raise ArgumentError, "an initial value cannot be provided for a non-retained property" if !value.nil? && !retained
 
         super(id, name)
 
@@ -49,7 +50,7 @@ module MQTT
 
       def value=(value)
         if @value != value
-          @value = value
+          @value = value if retained?
           mqtt.publish(topic, value.to_s, retain: retained?, qos: 1) if @published
         end
       end

data/lib/mqtt/homie/version.rb

@@ -2,6 +2,6 @@
 
 module MQTT
   module Homie
-    VERSION = '1.2.2'
+    VERSION = '1.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homie-mqtt
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-ccutrer
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description:
+description: 
 email: cody@cutrer.com'
 executables: []
 extensions: []
@@ -68,7 +68,7 @@ homepage: https://github.com/ccutrer/homie-mqtt
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -83,8 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Library for publishing devices that conform to the Homie spec.
 test_files: []