paho-mqtt 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed14883e1ebd2e1498ad540c517a808d8d6c8b51
-  data.tar.gz: 38d3f1223a5f677ea75acdba57969091a68918c5
+  metadata.gz: 6e96a49570aa770ba8c03e15a22b3f07dab8c537
+  data.tar.gz: 33be02b618285d8493528df49641583e432398df
 SHA512:
-  metadata.gz: efd6ae4e713a3ab0fde5acbf7040028efafdd9bbccdfa2cfc66401ac2d1e636969760cbf9a5f4b0b469c389813617ddc11a1fa08a5684152130effaf227b2685
-  data.tar.gz: '08900c8d295b3419238b8950959e34e22be9ad344e44cc8f1b95630d490812ff116a00f3160f670b9148d7715f2309e86778307e358ee658d7f75503e8e0f2a0'
+  metadata.gz: 19536ea5cd1d728654965db904f9fee6a204afb783979b178b835d735f947199778523c332941fec72dec1d21e6a853c5d2eb91ea45f51cf67119209a2115862
+  data.tar.gz: 285e5abeabd2aabdd9ccc6072da616868b311870e875cfe5cd57f22d80acf766cd9acc4ab961869f73d7fd69b75ab26b487b4def1a6b2af3280b41833aa5d82e

data/.gitignore

@@ -7,3 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+*.gem
+*.log

data/lib/paho-mqtt.rb

@@ -106,7 +106,7 @@ module PahoMqtt
     file = File.open(logger_path, "a+")
     log_file = Logger.new(file)
     log_file.level = Logger::DEBUG
-    @action_manager.logger = log_file
+    @logger = log_file
   end
 
   def logger

data/lib/paho_mqtt/client.rb

@@ -71,7 +71,6 @@ module PahoMqtt
       end
 
       if @port.nil?
-        @port
         if @ssl
           @port = DEFAULT_SSL_PORT
         else

data/lib/paho_mqtt/subscriber.rb

@@ -61,12 +61,12 @@ module PahoMqtt
             adjust_qos.delete(t)
           else
 
-            @logger.error("The qos value is invalid in subscribe.") if logger?
+            @logger.error("The qos value is invalid in subscribe.") if PahoMqtt.logger?
             raise PacketException
           end
         end
       else
-        @logger.error("The packet id is invalid, already used.") if logger?
+        @logger.error("The packet id is invalid, already used.") if PahoMqtt.logger?
         raise PacketException
       end
       @subscribed_mutex.synchronize {
@@ -83,13 +83,13 @@ module PahoMqtt
       if to_unsub.length == 1
         to_unsub = to_unsub.first[:packet].topics
       else
-        @logger.error("The packet id is invalid, already used.") if logger?
+        @logger.error("The packet id is invalid, already used.") if PahoMqtt.logger?
         raise PacketException
       end
 
       @subscribed_mutex.synchronize {
         to_unsub.each do |filter|
-          @subscribed_topics.delete_if { |topic| match_filter(topic.first, filter.first) }
+          @subscribed_topics.delete_if { |topic| match_filter(topic.first, filter) }
         end
       }
       MQTT_ERR_SUCCESS
@@ -136,7 +136,12 @@ module PahoMqtt
     def valid_topics?(topics)
       unless topics.length == 0
         topics.map do |topic|
-          return MQTT_ERR_FAIL if topic.first == ""
+          case topic
+          when Array
+            return MQTT_ERR_FAIL if topic.first == ""
+          when String
+            return MQTT_ERR_FAIL if topic == ""
+          end
         end
       else
         MQTT_ERR_FAIL
@@ -187,7 +192,7 @@ module PahoMqtt
     def check_topics(topics, filters)
       if topics.is_a?(String) && filters.is_a?(String)
       else
-        @logger.error("Topics or Wildcards are not found as String.") if logger?
+        @logger.error("Topics or Wildcards are not found as String.") if PahoMqtt.logger?
         raise ArgumentError
       end
     end

data/lib/paho_mqtt/version.rb

@@ -1,3 +1,3 @@
 module PahoMqtt
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/samples/client_blocking(writing).rb

@@ -1,16 +1,18 @@
 require 'paho-mqtt'
-require 'logger'
 
-file = File.open('paho_writting.log', "a+")
-log = Logger.new(file)
-log.level = Logger::DEBUG
+PahoMqtt.logger = ('paho_mqtt.log')
+
+client = PahoMqtt::Client.new()
+
+client.on_message = lambda { |p|  puts ">>>>> This is the callback for a message event <<<<<\nTopic: #{p.topic}\nPayload: #{p.payload}\nQoS: #{p.qos}" }
 
-client = PahoMqtt::Client.new({logger: log})
 
 client.connect('localhost', 1883, client.keep_alive, true, true)
+client.subscribe(["topic_test", 2])
 
 loop do
   client.publish("topic_test", "Hello, Are you there?", false, 1)
   client.loop_write
+  client.loop_read
   sleep 1
 end

data/samples/test_client.rb

@@ -1,11 +1,8 @@
 require "paho-mqtt"
 require "logger"
 
-file = File.open('paho.log', "a+")
-log = Logger.new(file)
-log.level = Logger::DEBUG
-
-cli = PahoMqtt::Client.new({logger: log, persistent: true, keep_alive: 7})
+cli = PahoMqtt::Client.new({persistent: true, keep_alive: 7})
+PahoMqtt.logger = ('paho_log')
 
 cli.connect('localhost', 1883)
 
@@ -16,56 +13,56 @@ cli.on_suback { waiting = false}
 
 cli.on_message = lambda { |p|  puts ">>>>> This is a LAMBDA callback for message event <<<<<\nTopic: #{p.topic}\nPayload: #{p.payload}\nQoS: #{p.qos}" }
 
-toto_toto = lambda { puts ">>>>> I am LAMBDA callback for the /toto/toto topic <<<<<" }
-toto_tata = proc { puts ">>>>> I am PROC callback for the /toto/tata topic <<<<<" }
+foo_foo = lambda { |p| puts ">>>>> I am LAMBDA callback for the /foo/foo topic <<<<<" }
+foo_bar = proc { puts ">>>>> I am PROC callback for the /foo/bar topic <<<<<" }
 
 
-cli.add_topic_callback('/toto/tutu') do
-  puts ">>>>> I am BLOCK callback for the /toto/tutu topic <<<<<" 
+cli.add_topic_callback('/foo/tutu') do
+  puts ">>>>> I am BLOCK callback for the /foo/tutu topic <<<<<"
 end
-cli.add_topic_callback('/toto/tata', toto_tata)
-cli.add_topic_callback('/toto/toto', toto_toto)
+cli.add_topic_callback('/foo/bar', foo_bar)
+cli.add_topic_callback('/foo/foo', foo_foo)
 
 #########################################################
 
-cli.subscribe(['/toto/toto', 0], ['/toto/tata', 1], ['/toto/tutu', 2], ["/toto", 0])
+cli.subscribe(['/foo/foo', 0], ['/foo/bar', 1], ['/foo/tutu', 2], ["/foo", 0])
 
 while waiting do
   sleep 0.0001
 end
 
-cli.publish("/toto/tutu", "It's me!", false, 2)
-cli.publish("/toto/tutu", "It's you!", false, 1)
-cli.publish("/toto/tutu", "It's them!", false, 0)
+cli.publish("/foo/tutu", "It's me!", false, 2)
+cli.publish("/foo/tutu", "It's you!", false, 1)
+cli.publish("/foo/tutu", "It's them!", false, 0)
 
-cli.publish("/toto/tata", "It's me!", false, 2)
-cli.publish("/toto/tata", "It's you!", false, 1)
-cli.publish("/toto/tata", "It's them!", false, 0)
+cli.publish("/foo/bar", "It's me!", false, 2)
+cli.publish("/foo/bar", "It's you!", false, 1)
+cli.publish("/foo/bar", "It's them!", false, 0)
 
-cli.publish("/toto/toto", "It's me!", false, 2)
-cli.publish("/toto/toto", "It's you!", false, 1)
-cli.publish("/toto/toto", "It's them!", false, 0)
+cli.publish("/foo/foo", "It's me!", false, 2)
+cli.publish("/foo/foo", "It's you!", false, 1)
+cli.publish("/foo/foo", "It's them!", false, 0)
 
 sleep cli.ack_timeout
 
 cli.on_message = nil
-toto_tutu = lambda { puts ">>>>> Changing callback type to LAMBDA for the /toto/tutu topic <<<<<" }
-cli.add_topic_callback('/toto/tutu', toto_tutu)
-cli.add_topic_callback('/toto/tata') do
-  puts ">>>>> Changing callback type to BLOCK for the /toto/tata topic <<<<<"
+foo_tutu = lambda { |p| puts ">>>>> Changing callback type to LAMBDA for the /foo/tutu topic <<<<<" }
+cli.add_topic_callback('/foo/tutu', foo_tutu)
+cli.add_topic_callback('/foo/bar') do
+  puts ">>>>> Changing callback type to BLOCK for the /foo/bar topic <<<<<"
 end
 
-cli.publish("/toto/tutu", "It's me!", false, 2)
-cli.publish("/toto/tutu", "It's you!", false, 1)
-cli.publish("/toto/tutu", "It's them!", false, 0)
+cli.publish("/foo/tutu", "It's me!", false, 2)
+cli.publish("/foo/tutu", "It's you!", false, 1)
+cli.publish("/foo/tutu", "It's them!", false, 0)
 
-cli.publish("/toto/tata", "It's me!", false, 2)
-cli.publish("/toto/tata", "It's you!", false, 1)
-cli.publish("/toto/tata", "It's them!", false, 0)
+cli.publish("/foo/bar", "It's me!", false, 2)
+cli.publish("/foo/bar", "It's you!", false, 1)
+cli.publish("/foo/bar", "It's them!", false, 0)
 
 sleep cli.ack_timeout
 
-cli.unsubscribe('+/tutu', "+/+")
+cli.unsubscribe("+/tutu", "+/+")
 
 puts "Waiting 10 sec for keeping alive..."
 sleep 10

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paho-mqtt
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Pierre Goudet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,8 +118,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: A simple mqtt client gem
 test_files: []
+has_rdoc: