spacebunny 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 959545411cb9300660ebea4e3a98d763a53c60bb
-  data.tar.gz: d7c76db70d9bf229c930a8eab87223a2f94170d0
+  metadata.gz: 892d8bf97ea06186b2d57513dbbd19af079af1a5
+  data.tar.gz: 5588c10bc31b8506431961d45d9667754bb71edf
 SHA512:
-  metadata.gz: f15e9f4c2e7fc3312631e42b8d6a1f498447bb785c8cfdcb6c7d5f3dbc8308851c348a8375f9f6779ef3927365575757d0037760170206ef89ba8422401d0e5a
-  data.tar.gz: 5259d658d1b70bf4e0dea4fe4103ddb5bf3cbda9e76bdd1b4eb60de3af48fca4c70cf49f885ee1e9cb9d6ef3dd8c12a97f787f06345a62bf12eff1a8ac9db43b
+  metadata.gz: 36bd68143b81a475e91044c1e86fa29c986bbb8ad0059c971fe9f45584127f6cd160fb9a85b91cc27c537b9a6202316c28bc7f4c3f1e48116d846eff3dedbadb
+  data.tar.gz: f71344d65f2e367a80b5992ebc60e3c10847137e746c1abf3cededdbd521f1cb28c39cbd0653dad77f1fa7a2ef206bdb8d21089732f9eb0ceb7f3b0560eec50b

data/lib/spacebunny/device/amqp.rb

@@ -26,18 +26,15 @@ module Spacebunny
         # Re-create client every time connect is called
         @client = Bunny.new(connection_params)
         @client.start
-      end
-
-      def channel_from_name(name)
-        # In @built_channels in fact we have exchanges
-        with_channel_check name do
-          @built_exchanges[name]
-        end
+        logger.info 'Connected to SpaceBunny'
       end
 
       def disconnect
         super
+        @built_exchanges = {}
+        @built_channels = {}
         client.stop if client
+        logger.info 'Disconnected from SpaceBunny'
       end
 
       def input_channel

data/lib/spacebunny/device/base.rb

@@ -24,13 +24,13 @@ module Spacebunny
         @key = key || options[:key]
         @api_endpoint = options[:api_endpoint] || {}
 
-        extract_custom_connection_configs_from options
-        set_channels options[:channels]
-
         @raise_on_error = options[:raise_on_error]
         @log_to = options[:log_to] || STDOUT
-        @log_level = options[:log_level] || ::Logger::WARN
+        @log_level = options[:log_level] || ::Logger::ERROR
         @logger = options[:logger] || build_logger
+
+        extract_custom_connection_configs_from options
+        set_channels options[:channels]
       end
 
       def api_endpoint=(options)
@@ -199,6 +199,7 @@ module Spacebunny
         @custom_connection_configs[:device_id] = @custom_connection_configs.delete :device_id
         @custom_connection_configs[:device_name] = @custom_connection_configs.delete :device_name
         @custom_connection_configs[:secret] = @custom_connection_configs.delete :secret
+        @custom_connection_configs[:logger] = @custom_connection_configs.delete(:logger) || @logger
       end
 
       # @private
@@ -238,7 +239,7 @@ module Spacebunny
           when :error, ::Logger::ERROR, 'error' then ::Logger::ERROR
           when :fatal, ::Logger::FATAL, 'fatal' then ::Logger::FATAL
           else
-            Logger::WARN
+            Logger::ERROR
         end
       end
     end

data/lib/spacebunny/live_stream/amqp.rb

@@ -7,11 +7,10 @@ module Spacebunny
       DEFAULT_EXCHANGE_OPTIONS = { passive: true }
       ACK_TYPES = [:manual, :auto]
 
-      attr_reader :built_live_streams, :client
+      attr_reader :client
 
       def initialize(*args)
         super(:amqp, *args)
-        @built_live_streams = {}
       end
 
       def connect
@@ -26,18 +25,13 @@ module Spacebunny
         # Re-create client every time connect is called
         @client = Bunny.new(connection_params)
         @client.start
-      end
-
-      def channel_from_name(name)
-        # In @built_channels in fact we have exchanges
-        with_channel_check name do
-          @built_exchanges[name]
-        end
+        logger.info 'Connected to SpaceBunny'
       end
 
       def disconnect
         super
-        client.stop
+        client.stop if client
+        logger.info 'Disconnected from SpaceBunny'
       end
 
       # Subscribe for messages coming from Live Stream with name 'name'

data/lib/spacebunny/live_stream/base.rb

@@ -24,13 +24,13 @@ module Spacebunny
         @secret = options[:secret] || raise(SecretRequired)
         @api_endpoint = options[:api_endpoint] || {}
 
-        extract_custom_connection_configs_from options
-        set_live_streams options[:live_streams]
-
         @raise_on_error = options[:raise_on_error]
         @log_to = options[:log_to] || STDOUT
-        @log_level = options[:log_level] || ::Logger::WARN
+        @log_level = options[:log_level] || ::Logger::ERROR
         @logger = options[:logger] || build_logger
+
+        extract_custom_connection_configs_from options
+        set_live_streams options[:live_streams]
       end
 
       def api_endpoint=(options)
@@ -157,6 +157,7 @@ module Spacebunny
         @custom_connection_configs[:vhost] = @custom_connection_configs.delete :vhost
         @custom_connection_configs[:client] = @custom_connection_configs.delete :client
         @custom_connection_configs[:secret] = @custom_connection_configs.delete :secret
+        @custom_connection_configs[:logger] = @custom_connection_configs.delete(:logger) || @logger
       end
 
       # @private
@@ -202,7 +203,7 @@ module Spacebunny
           when :error, ::Logger::ERROR, 'error' then ::Logger::ERROR
           when :fatal, ::Logger::FATAL, 'fatal' then ::Logger::FATAL
           else
-            Logger::WARN
+            Logger::ERROR
         end
       end
     end

data/lib/spacebunny/version.rb

@@ -1,3 +1,3 @@
 module Spacebunny
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/spacebunny.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 1.9.3'
   spec.add_runtime_dependency 'http', '~> 2.0.3', '>= 1.0.4'
-  spec.add_runtime_dependency 'bunny', '~> 2.6.0', '>= 2.3.0'
+  spec.add_runtime_dependency 'bunny', '~> 2.6.4', '>= 2.3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spacebunny
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.4
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.4
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0