paho-mqtt 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e96a49570aa770ba8c03e15a22b3f07dab8c537
-  data.tar.gz: 33be02b618285d8493528df49641583e432398df
+  metadata.gz: 59165a42d0455ead88b2d98f90ffded161270bd5
+  data.tar.gz: 4b1518662800f85b79bc02ed79d694ec4c8d1d60
 SHA512:
-  metadata.gz: 19536ea5cd1d728654965db904f9fee6a204afb783979b178b835d735f947199778523c332941fec72dec1d21e6a853c5d2eb91ea45f51cf67119209a2115862
-  data.tar.gz: 285e5abeabd2aabdd9ccc6072da616868b311870e875cfe5cd57f22d80acf766cd9acc4ab961869f73d7fd69b75ab26b487b4def1a6b2af3280b41833aa5d82e
+  metadata.gz: da53418b2eca67e6815ca89f1923c14eb205eaad902026becb715a3910b56718a1d75c0d89db4f4f92ec126d726844a02eb45f70385ada6b9c3981c9bb97c95b
+  data.tar.gz: e96111e7f79286a660a90932f56bdf273d548816e93eb4df423103530990552b0eb3c1e6f6a6fd10f5cb247c4135d0238a2bc2f459ae8800cb9a959491e2a1f9

data/lib/paho-mqtt.rb

@@ -117,6 +117,51 @@ module PahoMqtt
     @logger.is_a?(Logger)
   end
 
+  def match_filter(topics, filters)
+    check_topics(topics, filters)
+    index = 0
+    rc = false
+    topic = topics.split('/')
+    filter = filters.split('/')
+    while index < [topic.length, filter.length].max do
+      if is_end?(topic[index], filter[index])
+        break
+      elsif is_wildcard?(filter[index])
+        rc = index == (filter.length - 1)
+        break
+      elsif keep_running?(filter[index], topic[index])
+        index = index + 1
+      else
+        break
+      end
+    end
+    is_matching?(rc, topic.length, filter.length, index)
+  end
+
+  def keep_running?(filter_part, topic_part)
+    filter_part == topic_part || filter_part == '+'
+  end
+
+  def is_wildcard?(filter_part)
+    filter_part == '#'
+  end
+
+  def is_end?(topic_part, filter_part)
+    topic_part.nil? || filter_part.nil?
+  end
+
+  def is_matching?(rc, topic_length, filter_length, index)
+    rc || index == [topic_length, filter_length].max
+  end
+
+  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?
+      raise ArgumentError
+    end
+  end
+
   class Exception < ::Exception
   end
 

data/lib/paho_mqtt/client.rb

@@ -70,6 +70,10 @@ module PahoMqtt
         self.send("#{k}=", v)
       end
 
+      if @ssl
+        @ssl_context = OpenSSL::SSL::SSLContext.new
+      end
+
       if @port.nil?
         if @ssl
           @port = DEFAULT_SSL_PORT
@@ -92,7 +96,7 @@ module PahoMqtt
       @ssl ||= true
       @ssl_context = SSLHelper.config_ssl_context(cert_path, key_path, ca_path)
     end
-    
+
     def connect(host=@host, port=@port, keep_alive=@keep_alive, persistent=@persistent, blocking=@blocking)
       @persistent = persistent
       @blocking = blocking
@@ -102,7 +106,7 @@ module PahoMqtt
       @connection_state_mutex.synchronize {
         @connection_state = MQTT_CS_NEW
       }
-      @mqtt_thread.kill unless @mqtt_thread.nil? 
+      @mqtt_thread.kill unless @mqtt_thread.nil?
       init_connection
       @connection_helper.send_connect(session_params)
       begin
@@ -249,7 +253,7 @@ module PahoMqtt
     def remove_topic_callback(topic)
       @handler.clear_topic_callback(topic)
     end
-    
+
     def on_connack(&block)
       @handler.on_connack = block if block_given?
       @handler.on_connack

data/lib/paho_mqtt/handler.rb

@@ -141,7 +141,7 @@ module PahoMqtt
       qos = packet.qos
       if @publisher.do_publish(qos, id) == MQTT_ERR_SUCCESS
         @on_message.call(packet) unless @on_message.nil?
-        @registered_callback.assoc(packet.topic).last.call(packet) if @registered_callback.any? { |pair| pair.first == packet.topic}
+        check_callback(packet)
       end
     end
 
@@ -267,5 +267,17 @@ module PahoMqtt
          raise PacketException
       end
     end
+
+    def check_callback(packet)
+      callbacks = []
+      @registered_callback.each do |reccord|
+        callbacks.push(reccord.last) if PahoMqtt.match_filter(packet.topic, reccord.first)
+      end
+      unless callbacks.empty?
+        callbacks.each do |callback|
+            callback.call(packet)
+        end
+      end
+    end
   end
 end

data/lib/paho_mqtt/subscriber.rb

@@ -89,7 +89,7 @@ module PahoMqtt
 
       @subscribed_mutex.synchronize {
         to_unsub.each do |filter|
-          @subscribed_topics.delete_if { |topic| match_filter(topic.first, filter) }
+          @subscribed_topics.delete_if { |topic| PahoMqtt.match_filter(topic.first, filter) }
         end
       }
       MQTT_ERR_SUCCESS
@@ -148,53 +148,5 @@ module PahoMqtt
       end
       MQTT_ERR_SUCCESS
     end
-
-
-    private
-
-    def match_filter(topics, filters)
-      check_topics(topics, filters)
-      index = 0
-      rc = false
-      topic = topics.split('/')
-      filter = filters.split('/')
-      while index < [topic.length, filter.length].max do
-        if is_end?(topic[index], filter[index])
-          break
-        elsif is_wildcard?(filter[index])
-          rc = index == (filter.length - 1)
-          break
-        elsif keep_running?(filter[index], topic[index])
-          index = index + 1
-        else
-          break
-        end
-      end
-      is_matching?(rc, topic.length, filter.length, index)
-    end
-
-    def keep_running?(filter_part, topic_part)
-      filter_part == topic_part || filter_part == '+'
-    end
-
-    def is_wildcard?(filter_part)
-      filter_part == '#'
-    end
-
-    def is_end?(topic_part, filter_part)
-      topic_part.nil? || filter_part.nil?
-    end
-
-    def is_matching?(rc, topic_length, filter_length, index)
-      rc || index == [topic_length, filter_length].max
-    end
-
-    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 PahoMqtt.logger?
-        raise ArgumentError
-      end
-    end
   end
 end

data/lib/paho_mqtt/version.rb

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

metadata

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