meshtastic 0.0.114 → 0.0.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34eef8b231322cca365191e89c50ef9b10a77d8456ae2e390b86e41b72611d3f
-  data.tar.gz: e1e2dc348d689525ba523dd68f0e333a4f3aae60c83d8413b9f04ab70b8cba62
+  metadata.gz: caa92569cfc04914d4775054daefc5382265ccdcde9791caa0c7efcb27322ce3
+  data.tar.gz: f06f9ec597ee5636fa7faed5bfaa6023f731d561b4d46341d9486e311eb29ea1
 SHA512:
-  metadata.gz: 138fb6597e450a6f7d8818040d329093c259bb598d06679588d26c520b3cc1c64ebc6fab0e1c6ebe85c89d78e2ce8651cbb5be349708e014fce693ce9cf2b1fa
-  data.tar.gz: f7b9b40377b8829b0be90f7278bdf00086ca715a80d6e19b20ff8275a37cedcbe2e1a5436cea15d5fcdb0592c2a1681ce046bedbf79f39ad724b09046377f9db
+  metadata.gz: 7ba94636af81ca286cdf239ed65249093457a666df9dd003975417e729c4179c8b010e28480424a2e263670174283326e40672ea591dbc11d50bad5a1b4043ec
+  data.tar.gz: 575743047507a3d99fbe9556c348f09b4606c3247565d50aaf668662dd0eec3f970640a4db19bddfcbf0e71d2981355ccc1125ea77ada3cae62d78267f1c7f61

data/README.md

@@ -24,7 +24,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Usage
 
-At the moment the only module available is `Meshtastic::MQTT`.  To view MQTT messages, and filter for all messages containing `_APP` _and_ `LongFast` strings, use the following code:
+At the moment the only module available is `Meshtastic::MQTT`.  To view MQTT messages, and include only messages containing `_APP` _and_ `LongFast` strings, use the following code:
 
 ```ruby
 require 'meshtastic'
@@ -32,7 +32,7 @@ Meshtastic::MQTT.help
 mqtt_obj = Meshastic::MQTT.connect
 Meshtastic::MQTT.subscribe(
   mqtt_obj: mqtt_obj,
-  filter: '_APP, LongFast'
+  include: '_APP, LongFast'
 )
 ```
 
@@ -78,7 +78,7 @@ Meshtastic::MQTT.subscribe(
   region: 'US',
   channel_topic: '2/e/LongFast/#',
   psks: { LongFast: 'AQ==' },
-  filter: '!YOUR_CLIENT_ID'
+  include: '!YOUR_CLIENT_ID'
 ) do |message|
   puts message.inspect
 end

data/lib/meshtastic/mqtt.rb

@@ -66,7 +66,7 @@ module Meshtastic
     #   psks: 'optional - hash of :channel_id => psk key value pairs (default: { LongFast: "AQ==" })',
     #   qos: 'optional - quality of service (default: 0)',
     #   exclude: 'optional - comma-delimited string(s) to exclude in message (default: nil)',
-    #   filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)',
+    #   include: 'optional - comma-delimited string(s) to include on in message (default: nil)',
     #   gps_metadata: 'optional - include GPS metadata in output (default: false)',
     #   include_raw: 'optional - include raw packet data in output (default: false)'
     # )
@@ -88,7 +88,7 @@ module Meshtastic
       qos = opts[:qos] ||= 0
       json = opts[:json] ||= false
       exclude = opts[:exclude]
-      filter = opts[:filter]
+      include = opts[:include]
       gps_metadata = opts[:gps_metadata] ||= false
       include_raw = opts[:include_raw] ||= false
 
@@ -100,7 +100,7 @@ module Meshtastic
 
       # MQTT::ProtocolException: No Ping Response received for 23 seconds (MQTT::ProtocolException)
 
-      filter_arr = filter.to_s.split(',').map(&:strip)
+      include_arr = include.to_s.split(',').map(&:strip)
       exclude_arr = exclude.to_s.split(',').map(&:strip)
       mqtt_obj.get_packet do |packet_bytes|
         raw_packet = packet_bytes.to_s if include_raw
@@ -204,16 +204,14 @@ module Meshtastic
 
           next
         ensure
-          exclude_arr = [message[:id].to_s] if exclude.nil?
-          filter_arr = [message[:id].to_s] if filter.nil?
+          include_arr = [message[:id].to_s] if include_arr.empty?
           if message.is_a?(Hash)
             flat_message = message.values.join(' ')
 
-            disp = true if filter_arr.first == message[:id] ||
-                           filter_arr.all? { |filter| flat_message.include?(filter) }
-
-            disp = false if exclude_arr.first == message[:id] ||
-                            exclude_arr.all? { |exclude| flat_message.include?(exclude) }
+            disp = true if exclude_arr.none? { |exclude| flat_message.include?(exclude) } && (
+                             include_arr.first == message[:id] ||
+                             include_arr.all? { |include| flat_message.include?(include) }
+                           )
 
             if disp
               if block_given?
@@ -312,7 +310,7 @@ module Meshtastic
           qos: 'optional - quality of service (default: 0)',
           json: 'optional - JSON output (default: false)',
           exclude: 'optional - comma-delimited string(s) to exclude in message (default: nil)',
-          filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)',
+          include: 'optional - comma-delimited string(s) to include on in message (default: nil)',
           gps_metadata: 'optional - include GPS metadata in output (default: false)'
         )
 

data/lib/meshtastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Meshtastic
-  VERSION = '0.0.114'
+  VERSION = '0.0.115'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.114
+  version: 0.0.115
 platform: ruby
 authors:
 - 0day Inc.