spacebunny 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfa2408a04f66e41361f1f5a03014f7db0fae232
-  data.tar.gz: 7a2fc8544b0125b1f0ae33ea70a7520a961572da
+  metadata.gz: 7374dde1dc5ef97f68a8896120f12ee9d84d88be
+  data.tar.gz: 77dee2b92ec3fea47d0214925be32076f9c7637e
 SHA512:
-  metadata.gz: b71f3cd4bffa6b2eb9b037e6388f838beb7090580036cabd18fa715914cbce9381cb4b744926ab09632a92ff21bac826c8b2289c9a6195ccb43e6a9a75d14f19
-  data.tar.gz: 7f210d44964769111087fccc18627929b650972bc944208b18e9603e94431db142a982facdec0d771fbf5c4bc0fae07e7b2e6eab55e87fac5df643e8fb135481
+  metadata.gz: b7e20c7aaf099bb1f07aed48096f965487b9348f977a207670ffe3e36afdcf614640316cd1a1d343548aab2d36e63943b16b8fb063e8231314bae50235394758
+  data.tar.gz: e90a3c501960c2978c74a19b70f177572cf4eb3f681ab621f8ede136ed654a753244056ad791a480e8630e44a90f1efc3836c78702fa8931b827a39cea889aaa

data/lib/spacebunny/device/amqp.rb

@@ -69,18 +69,24 @@ module Spacebunny
       alias_method :inbox, :on_receive
 
       def publish(channel_name, message, options = {})
-        check_client
-        channel_key = if options[:with_confirm]
-                        "#{channel_name}_confirm"
-                      else
-                        channel_name
-                      end.to_sym
-
-        unless @built_exchanges[channel_key]
-          @built_exchanges[channel_key] = create_channel(channel_name, options)
+        if check_client
+          channel_key = if options[:with_confirm]
+                          "#{channel_name}_confirm"
+                        else
+                          channel_name
+                        end.to_sym
+
+          unless @built_exchanges[channel_key]
+            @built_exchanges[channel_key] = create_channel(channel_name, options)
+          end
+          # Call Bunny "publish"
+          res = @built_exchanges[channel_key].publish message, channel_options(channel_name, options)
+          @logger.debug 'Message published'
+          res
+        else
+          @logger.debug 'Message NOT published due to client not connected'
+          false
         end
-        # Call Bunny publish method
-        @built_exchanges[channel_key].publish message, channel_options(channel_name, options)
       end
 
       def wait_for_publish_confirms
@@ -114,8 +120,10 @@ module Spacebunny
             raise ClientNotConnected
           else
             @logger.error 'Client not connected! Check internet connection'
+            return false
           end
         end
+        true
       end
 
       def create_channel(name, options = {})

data/lib/spacebunny/live_stream/amqp.rb

@@ -50,7 +50,18 @@ module Spacebunny
       private
 
       def check_client
-        raise ClientNotConnected, 'Client not connected. Did you call client.connect?' unless client_connected?
+        unless client
+          raise ClientNotSetup
+        end
+        unless client.connected?
+          if raise_on_error
+            raise ClientNotConnected
+          else
+            @logger.error 'Client not connected! Check internet connection'
+            return false
+          end
+        end
+        true
       end
 
       def client_connected?
@@ -90,26 +101,31 @@ module Spacebunny
         to_ack, auto_ack = parse_ack options.fetch(:ack, :manual)
         from_cache = options.fetch :from_cache, false
 
-        check_client
-        ls_channel = client.create_channel
-        live_stream_name = "#{live_stream_data_from_name(name)[:id]}.live_stream"
-        if from_cache
-          live_stream = ls_channel.queue live_stream_name, DEFAULT_QUEUE_OPTIONS
-        else
-          ls_exchange = ls_channel.fanout live_stream_name, DEFAULT_EXCHANGE_OPTIONS
-          live_stream = ls_channel.queue("#{client}_#{Time.now.to_f}.live_stream.temp", auto_delete: true)
-                            .bind ls_exchange, routing_key: '#'
-        end
+        if check_client
+          ls_channel = client.create_channel
+          live_stream_name = "#{live_stream_data_from_name(name)[:id]}.live_stream"
+          if from_cache
+            live_stream = ls_channel.queue live_stream_name, DEFAULT_QUEUE_OPTIONS
+          else
+            ls_exchange = ls_channel.fanout live_stream_name, DEFAULT_EXCHANGE_OPTIONS
+            live_stream = ls_channel.queue("#{client}_#{Time.now.to_f}.live_stream.temp", auto_delete: true)
+                              .bind ls_exchange, routing_key: '#'
+          end
 
-        live_stream.subscribe(block: blocking, manual_ack: to_ack) do |delivery_info, metadata, payload|
-          message = LiveStream::Message.new ls_channel, options, delivery_info, metadata, payload
+          live_stream.subscribe(block: blocking, manual_ack: to_ack) do |delivery_info, metadata, payload|
+            message = LiveStream::Message.new ls_channel, options, delivery_info, metadata, payload
 
-          yield message
+            yield message
 
-          # If ack is :auto then ack current message
-          if to_ack && auto_ack
-            message.ack
+            # If ack is :auto then ack current message
+            if to_ack && auto_ack
+              message.ack
+            end
           end
+          return true
+        else
+          @logger.debug 'Not subscribed due to client not connected'
+          false
         end
       end
     end

data/lib/spacebunny/version.rb

@@ -1,3 +1,3 @@
 module Spacebunny
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spacebunny
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-08 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http