lora-rb 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b74cb1cacf8fcf8faaa5a3157968cfe1a0a35f3c
-  data.tar.gz: 0eb50e5238019cea923f4815eb21d6d9e2219a10
+  metadata.gz: a328956e282ef7fc3fc65942183c4373d304850c
+  data.tar.gz: '049b381a5922987c282f21f39562416c76265ccb'
 SHA512:
-  metadata.gz: a205809d83d84912b972778bf6328f9a1252b5145ca79bb5c6f4cde174644516abc79af6a0b8cb0adb4ec46d069e0d17ce2440d9ab8bd7f974260254907a1bad
-  data.tar.gz: 3f2a2b319b69ae7bf047267814b69593b6b26147dc72e5ab527ba4ccac77809c2752751001d6805b4620930113b03fabb3f24f6f73bb4832e1852369b432e360
+  metadata.gz: 20ee3a2d4016d80b24b44b05f128c2c37791c712e9c925900615ef460aa2d753f474f7c952d68aa1a3e63bab4ce7dec1b0191abf8442a761943bf98687b78f02
+  data.tar.gz: dff6d02731671b3074e915f5ff224686c28ccd9b857286b56f2cbb4e6ffc12dd42df33765ed9ec49326488e511bff6a06e8e701ca3fe3cdd45817c7992e2982d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.6.0 [☰](https://bitbucket.org/fractalgarden/loriot-rb/branches/compare/v0.5.0..v0.6.0) June 28th, 2017
+------------------------------
+* Now support mqtt to get and receive data throught RabbitMQ
+* Code cleaning
+
 v0.5.0 [☰](https://bitbucket.org/fractalgarden/loriot-rb/branches/compare/v0.4.0..v0.5.0) June 27th, 2017
 ------------------------------
 * Now support http push to send data with an internal http client (only send data, to receive you must have an http server)

data/lib/config/config.rb

@@ -3,7 +3,9 @@ LoraRb.configure do |config|
   # config.protocol = :tls
   # config.host = 'eu1.loriot.io'
   # config.port = 737
-  config.protocol = :http
-  config.host = 'eu72.resiot.io'
+  # config.protocol = :http
+  config.protocol = :mqtt
+  # config.host = 'eu72.resiot.io'
+  config.host = 'localhost'
   config.port = 80
 end

data/lib/core/base.rb

@@ -0,0 +1,10 @@
+require 'json'
+require 'socket'
+require 'openssl'
+require 'http'
+require 'bunny'
+
+require_relative 'configuration'
+require_relative 'configuration_dynamic'
+require_relative 'protocol'
+require_relative '../version'

data/lib/core/protocol.rb

@@ -0,0 +1,11 @@
+# LoraRb methods
+module LoraRb
+  # It contains protocols methods
+  class Protocol
+
+    # Show tips on usage
+    def self.supported_protocols
+      %w(tls http mqtt)
+    end
+  end
+end

data/lib/lora-rb.rb

@@ -13,13 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'json'
-require 'socket'
-require 'openssl'
-require 'http'
-
-require_relative 'core/configuration'
-require_relative 'core/configuration_dynamic'
+require_relative 'core/base'
 
 module LoraRb
   def self.root
@@ -27,7 +21,6 @@ module LoraRb
   end
 end
 
-require_relative 'version'
 require_relative 'lora-rb/base'
 
 unless defined?(Rails)
@@ -35,7 +28,7 @@ unless defined?(Rails)
 
   connection_protocol = LoraRb.configuration.protocol
   raise "Define your protocol in the configuration file!" unless connection_protocol
-  raise "Connection protocol #{connection_protocol} not recognized!" unless %w(tls http).include?(connection_protocol.to_s)
+  raise "Connection protocol #{connection_protocol} not recognized!" unless LoraRb::Protocol.supported_protocols.include?(connection_protocol.to_s)
   require_relative "lora-rb/#{connection_protocol}/call"
   LoraClient.include LoraRb::Call
 

data/lib/lora-rb/base.rb

@@ -54,14 +54,8 @@ class LoraClient
   def listen(options = {}, &block)
     options = { debug: @debug }.merge(options)
 
-    puts "#{Time.now} Starting Listen #{@appid}" if options[:debug]
-    response = nil
-    begin
-      response = read_data(options)
-      block.call(response) if block
-    end while response && !options[:test]
-    # Return last response
-    response
+    puts "#{Time.now} Starting Listen #{@appid}. To exit press CTRL+C" if options[:debug]
+    sub_listen(options)
   end
 
   # Close the secure connection with the cloud

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

@@ -37,6 +37,12 @@ module LoraRb
       raise('In http protocol, it expects data with an http server. Lora Network server must exec an http push ')
     end
 
+    # Waiting for messages
+    def sub_listen(options={})
+      raise('In http protocol, it expects data with an http server. Lora Network server must exec an http push ')
+    end
+
+    # Blank method. No need to close a connection with the http protocol
     def sub_quit
     end
 

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

@@ -0,0 +1,61 @@
+# LoraRb calling methods
+module LoraRb
+  # It contains all the methods for selecting the items
+  module Call
+
+    attr_reader :client
+
+    private
+
+    def sub_initialize(options={})
+      @connection = Bunny.new(hostname: options[:host])
+      @connection.start
+      @channel = @connection.create_channel
+      @queue = @channel.queue(options[:queue])
+      {'hello' => 'Lora-Rb: Ready to start!'}
+    end
+
+    # Send the request to device
+    def sub_send_cmd(options={})
+      str_request = "{\"cmd\":\"#{options[:cmd]}\",\"EUI\":\"#{options[:eui]}\",\"port\":#{options[:port]},\"confirmed\":#{options[:confirmed]},\"data\":\"#{options[:data]}\"} 	"
+      puts "#{Time.now} Cmq request: #{str_request}" if options[:debug]
+      response = @channel.default_exchange.publish(str_request, routing_key: @queue.name)
+      puts " [x] Sent '#{str_request}'" if options[:debug]
+      response
+    end
+
+    # Receive the payload from the network
+    def sub_read_data(options={})
+      delivery_info, metadata, payload = @queue.pop
+      puts " [x] Received #{delivery_info} #{metadata} #{payload}" if options[:debug]
+    end
+
+    # Waiting for message in the queue
+    def sub_listen(options={}, &block)
+      puts " [*] Waiting for messages in #{@queue.name}. To exit press CTRL+C" if options[:debug]
+      @queue.subscribe(block: true) do |delivery_info, properties, body|
+        puts " [x] Received #{body}" if options[:debug]
+        block.call(delivery_info, properties, body) if block
+        # cancel the consumer to exit
+        delivery_info.consumer.cancel
+      end
+    end
+
+    # Close the connection
+    def sub_quit
+      @connection.close
+    end
+
+  end
+end
+
+# Monkey patch since Bunny use the rails method .empty?
+class NilClass
+  def empty?; true end
+end
+# Example
+=begin
+require 'lora-rb'
+lora=LoraClient.new
+lora.send_cmd(eui: 'BE7A00000000123C')
+=end

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

@@ -65,6 +65,17 @@ module LoraRb
       JSON.parse(response)
     end
 
+    # Waiting for message
+    def sub_listen(options={}, &block)
+      response = nil
+      begin
+        response = sub_read_data(options)
+        puts " [x] Received #{response}" if options[:debug]
+        block.call(response) if block
+      end while response && !options[:test]
+    end
+
+    # Close the connection
     def sub_quit
       @ssl_socket.close
     end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module LoraRb
   def self.version
-    "0.5.0"
+    "0.6.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lora-rb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Marco Mastrodonato
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -46,14 +46,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -84,13 +98,16 @@ files:
 - lib/config/config.rb
 - lib/config/private.yml
 - lib/config/private_EXAMPLE.yml
+- lib/core/base.rb
 - lib/core/configuration.rb
 - lib/core/configuration_dynamic.rb
+- lib/core/protocol.rb
 - lib/generators/install_generator.rb
 - lib/lora-rb.rb
 - lib/lora-rb/base.rb
 - lib/lora-rb/help.rb
 - lib/lora-rb/http/call.rb
+- lib/lora-rb/mqtt/call.rb
 - lib/lora-rb/tls/call.rb
 - lib/vendor/deep_symbolize.rb
 - lib/version.rb