lora-rb 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 213844df0c3f518068ec280585bcd4c3a8d6b5df
-  data.tar.gz: 6ab538fa6d2dfdccc730908be73c580793900894
+  metadata.gz: 6721e00c200b9586f0163e4201d8d6567da32c95
+  data.tar.gz: a3570cca519d24039ffc15e3f5f460d8c375b6f1
 SHA512:
-  metadata.gz: f726dc55bed3ee0c18a15e62132216161aa55506a2eddaec0a0025c15c899016724d1fc8d000573f1090ac8f91ff5b28700f32f04d796287a0e3f561b104280c
-  data.tar.gz: b87fca2f73d4e4d5a5092bf197f4fcbaa83c2ee8f12c65537a9d472a97cb3ff8c91de8b8e000d270e840929ffa7373efde4290bec4718f1a44904b6f8bab6dad
+  metadata.gz: 8be4bf0294c38f19c0221b674867be53a4f21263e968244c8f952b87fcee9d0ebe0b7b534ac48556834d2f3ed1ed4e272d6deac89444e73847b3b0a3a2f988fb
+  data.tar.gz: 960adbb35dbdb17ecc3d42f94cfece6dfa256eb837a07ba694d06032408f632f6db17f88a3fa4ebdeb9e939f3a128224f908d316b4b05b7fd325f995b61123b9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v0.9.1 [☰](https://bitbucket.org/fractalgarden/loriot-rb/branches/compare/v0.9.0..v0.9.1) August 7th, 2017
+------------------------------
+* Added port to message uplink via mqtt, EUI is now eui
+
 v0.9.0 [☰](https://bitbucket.org/fractalgarden/loriot-rb/branches/compare/v0.8.0..v0.9.0) August 7th, 2017
 ------------------------------
 * Mqtt protocol renamed to Rabbitmq and new generic mqtt protocol added

data/lib/lora-rb/mqtt/call.rb

@@ -84,7 +84,10 @@ module LoraRb
       puts " [x] Reading topic #{topic}..." if options[:debug]
       topic, message = @client.get(topic)
       message = JSON.parse(message)
-      message['EUI'] ||= get_eui_from_topic(topic) if message.respond_to? '[]'
+      if message.respond_to? '[]'
+        message['eui'] ||= get_eui_from_topic(topic)
+        message['port'] ||= get_port_from_topic(topic)
+      end
       puts " [x] #{topic}: #{message}" if options[:debug]
       return topic, message
     end
@@ -98,7 +101,10 @@ module LoraRb
         # Block is executed for every message received
         puts " [x] #{topic}: #{message}" if options[:debug]
         message = JSON.parse(message)
-        message['EUI'] ||= get_eui_from_topic(topic) if message.respond_to? '[]'
+        if message.respond_to? '[]'
+          message['eui'] ||= get_eui_from_topic(topic)
+          message['port'] ||= get_port_from_topic(topic)
+        end
         puts " [x] after rework: #{message}" if options[:debug]
         block.call(topic, message) if block
         break if options[:test]
@@ -113,7 +119,13 @@ module LoraRb
     private
 
     def get_eui_from_topic(topic)
-      topic&.match(/(?!devices\/)\w{16}/)&.to_s
+      res = topic&.match(/devices\/(\w{16})/)
+      res[1] if res
+    end
+
+    def get_port_from_topic(topic)
+      res = topic&.match(/uplink\/(\d+)(\/|\Z)/)
+      res[1] if res
     end
 
     def generate_request_id

data/lib/version.rb

@@ -1,5 +1,5 @@
 module LoraRb
   def self.version
-    "0.9.0"
+    "0.9.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lora-rb
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Marco Mastrodonato