spacebunny 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7374dde1dc5ef97f68a8896120f12ee9d84d88be
-  data.tar.gz: 77dee2b92ec3fea47d0214925be32076f9c7637e
+SHA256:
+  metadata.gz: fe4680375b3b128efbc35c538afe1a3773b1efcb143948fd347a5748080f4042
+  data.tar.gz: 6dc83ba64745a3f7cdbb6e585180221fb884d5d425684bbdf94788ef06923735
 SHA512:
-  metadata.gz: b7e20c7aaf099bb1f07aed48096f965487b9348f977a207670ffe3e36afdcf614640316cd1a1d343548aab2d36e63943b16b8fb063e8231314bae50235394758
-  data.tar.gz: e90a3c501960c2978c74a19b70f177572cf4eb3f681ab621f8ede136ed654a753244056ad791a480e8630e44a90f1efc3836c78702fa8931b827a39cea889aaa
+  metadata.gz: 2143d429591141aa6564b0234867193f279ab68faecfd11f7e5e063956a709f10024d7f8b535cb52721e66b446baa48c6bcb05619d3f9d29bdb548121023ff20
+  data.tar.gz: 85805efff5c1362d8b5c204927a901868704c7c1c1f215e5dacf24d89cc89923696d832a82a8dbae483ba74f2be3b459c4f7ba313fded78101a3623616bd6b13

data/lib/spacebunny/device/base.rb

@@ -29,7 +29,7 @@ module Spacebunny
         @log_level = options[:log_level] || ::Logger::ERROR
         @logger = options[:logger] || build_logger
 
-        extract_custom_connection_configs_from options
+        extract_and_normalize_custom_connection_configs_from options
         set_channels options[:channels]
       end
 
@@ -71,7 +71,7 @@ module Spacebunny
         unless options.is_a? Hash
           raise ArgumentError, 'connection_options must be an Hash. See doc for further info'
         end
-        extract_custom_connection_configs_from options.with_indifferent_access
+        extract_and_normalize_custom_connection_configs_from options.with_indifferent_access
       end
 
       def disconnect
@@ -169,6 +169,7 @@ module Spacebunny
       # @private
       # Check for required params presence
       def check_connection_configs
+        puts @connection_configs.inspect
         raise DeviceIdMissing unless @connection_configs[:device_id]
       end
 
@@ -194,19 +195,22 @@ module Spacebunny
 
       # @private
       # Copy options to custom_connection_configs and normalize some of the attributes overwriting it
-      def extract_custom_connection_configs_from(options)
+      def extract_and_normalize_custom_connection_configs_from(options)
         @custom_connection_configs = options
-        # Auto_recover from connection.close by default
-        @custom_connection_configs[:host] = @custom_connection_configs.delete :host
-        if @custom_connection_configs[:protocols] && custom_connection_configs[:protocols][@protocol]
-          @custom_connection_configs[:port] = @custom_connection_configs[:protocols][@protocol].delete :port
-          @custom_connection_configs[:tls_port] = @custom_connection_configs[:protocols][@protocol].delete :tls_port
-        end
-        @custom_connection_configs[:vhost] = @custom_connection_configs.delete :vhost
-        @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
+
+        if conn_options = @custom_connection_configs[:connection]
+          @custom_connection_configs[:host] = conn_options.delete :host
+          if conn_options[:protocols] && conn_options[:protocols][@protocol]
+            @custom_connection_configs[:port] = conn_options[:protocols][@protocol].delete :port
+            @custom_connection_configs[:tls_port] = conn_options[:protocols][@protocol].delete :tls_port
+          end
+          @custom_connection_configs[:vhost] = conn_options.delete :vhost
+          @custom_connection_configs[:device_id] = conn_options.delete :device_id
+          @custom_connection_configs[:device_name] = conn_options.delete :device_name
+          @custom_connection_configs[:secret] = conn_options.delete :secret
+        end
       end
 
       # @private

data/lib/spacebunny/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spacebunny
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Space Bunny platform SDK