mosq 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b296db03c458067273327316bdb11e9e363d671e
-  data.tar.gz: 78c2ba4c4782f25a010398be2823161163b49411
+  metadata.gz: 6cbee712fb0536d070cb58d1d892d066992120a1
+  data.tar.gz: 5adaa9828b31824d8a08be875a2120ffb3892c17
 SHA512:
-  metadata.gz: 07a7d0ab55446f767c6a81eba9eae3a1ea08524c55d2fc6f29a32a26e33e192a3bb01cd9e49ca4a9a0bef36b72d96f76c8f78466f1808d9acf7fb68504180a27
-  data.tar.gz: 41e4acb30e8ae4c775864a1f6df4545f4ebde02850a5c02b3bdd0d100fed4dff417f3232ddd29a1140d2001f75484b26f1ab44f595cc342743860388bd5fbe02
+  metadata.gz: f1d2359634518bc1794b513bfbac245a951998b915c3360e724932d1ccf3902fdfa9c53727a02697f1cd1a06776a948a5030b66e8345861fc57a8775c208ca65
+  data.tar.gz: aea1439f96aead78b618debbdffd734f88cc646117957f5dd530d99e29ef02481b7be8185d50ab7cabdb05194469c8533e6072abb4b8a46bd2906e2f049a1ae7

data/lib/mosq/client.rb

@@ -14,7 +14,8 @@ module Mosq
     def initialize(*args)
       @options = Util.connection_info(*args)
       
-      @options[:heartbeat] ||= 30 # seconds
+      @options[:max_in_flight] ||= 20 # messages
+      @options[:heartbeat]     ||= 30 # seconds
       @protocol_timeout = DEFAULT_PROTOCOL_TIMEOUT
       
       Util.null_check "creating the client",
@@ -36,12 +37,13 @@ module Mosq
       end
     end
     
-    def username;  @options.fetch(:username);  end
-    def password;  @options.fetch(:password);  end
-    def host;      @options.fetch(:host);      end
-    def port;      @options.fetch(:port);      end
-    def ssl?;      @options.fetch(:ssl);       end
-    def heartbeat; @options.fetch(:heartbeat); end
+    def username;      @options.fetch(:username);      end
+    def password;      @options.fetch(:password);      end
+    def host;          @options.fetch(:host);          end
+    def port;          @options.fetch(:port);          end
+    def ssl?;          @options.fetch(:ssl);           end
+    def heartbeat;     @options.fetch(:heartbeat);     end
+    def max_in_flight; @options.fetch(:max_in_flight); end
     
     # The maximum time interval the user application should wait between
     # yielding control back to the client object by calling methods like
@@ -59,6 +61,9 @@ module Mosq
     # Initiate the connection with the server.
     # It is necessary to call this before any other communication.
     def start
+      Util.error_check "configuring the maximum number of inflight messages",
+        FFI.mosquitto_max_inflight_messages_set(ptr, @options[:max_in_flight])
+      
       Util.error_check "configuring the username and password",
         FFI.mosquitto_username_pw_set(ptr, @options[:usernam], @options[:password])
       

data/lib/mosq/client/bucket.rb

@@ -5,15 +5,23 @@ module Mosq
     # @api private
     class Bucket
       def initialize(ptr)
-        FFI.mosquitto_connect_callback_set     ptr, method(:on_connect)
-        # FFI.mosquitto_disconnect_callback_set  ptr, method(:on_disconnect)
-        FFI.mosquitto_publish_callback_set     ptr, method(:on_publish)
-        FFI.mosquitto_message_callback_set     ptr, method(:on_message)
-        FFI.mosquitto_subscribe_callback_set   ptr, method(:on_subscribe)
-        FFI.mosquitto_unsubscribe_callback_set ptr, method(:on_unsubscribe)
-        # FFI.mosquitto_log_callback_set         ptr, method(:on_log)
+        @events    = []
+        @callbacks = {}
         
-        @events = []
+        FFI.mosquitto_connect_callback_set     ptr, new_callback(:on_connect)
+        # FFI.mosquitto_disconnect_callback_set  ptr, new_callback(:on_disconnect)
+        FFI.mosquitto_publish_callback_set     ptr, new_callback(:on_publish)
+        FFI.mosquitto_message_callback_set     ptr, new_callback(:on_message)
+        FFI.mosquitto_subscribe_callback_set   ptr, new_callback(:on_subscribe)
+        FFI.mosquitto_unsubscribe_callback_set ptr, new_callback(:on_unsubscribe)
+        # FFI.mosquitto_log_callback_set         ptr, new_callback(:on_log)
+      end
+      
+      def new_callback(symbol)
+        # This ensures that callback Procs are retained in the Bucket,
+        # and are not garbage-collected for the entire life of the Client.
+        # If the callback Procs are garbage-collected then invoked, SIGSEGV!
+        @callbacks[symbol] = method(symbol).to_proc
       end
       
       attr_reader :events

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mosq
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi