activecypher 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3901e0713d002b9c8061ffe4f3e7e8b85cceb4faf3216df23c91cab136654356
-  data.tar.gz: ba8088d2981a28e99eca7e171553f94696c0ed940a51c4ba53fa03210dce3be8
+  metadata.gz: 8d9c41285d4f1a84779d72a479b329e6c397d4630473d369691456e35f4337fc
+  data.tar.gz: 1673192a6552da378dfd625114f8bc8eee8e973eb17583d802de8fcbcd609c70
 SHA512:
-  metadata.gz: 1e0923e31a2d8a3bfea68047870de373ab012ecc90d6164bacd43f8c7a3af1f88ce4c9051b4e4d53ca541d738cefeb988da3e508995557d2c51277870a39da60
-  data.tar.gz: 63126e6704aa13ce3094d6aafc5590eb3d9786a58d065590fb68d98b5234ed5f7d125147663928cc7baadab3da623b5aafc9432b8324a4957e11b131632e8bf8
+  metadata.gz: 6feecb3dbad832f8f8253f64b3ccb030d2fe99194824d57bf5087db7caee2e335a4e7a6b21646e7ba098250812f3b05d4a5c812b7d8b0cc5b8e93e23f1c56ebb
+  data.tar.gz: f389ab164a37e002523c55e050abc1bee7c20df6e5c6e11e311f2a5f6200a33d27ac4512f676f36eebd155ce2f71f21c87a08f9431f0fe641d1051f09aee21be

data/lib/active_cypher/connection_adapters/abstract_bolt_adapter.rb

@@ -34,9 +34,22 @@ module ActiveCypher
                    { scheme: 'none' }
                  end
 
+          # Get SSL connection params
+          ssl_params = if config[:url]
+                         resolver = ActiveCypher::ConnectionUrlResolver.new(config[:url])
+                         resolver.ssl_connection_params
+                       else
+                         {
+                           secure: config[:ssl] ? true : false,
+                           verify_cert: config[:ssc] ? false : true
+                         }
+                       end
+
           @connection = Bolt::Connection.new(
             host, port, self,
-            auth_token: auth, timeout_seconds: config.fetch(:timeout, 15)
+            auth_token: auth,
+            timeout_seconds: config.fetch(:timeout, 15),
+            **ssl_params
           )
           @connection.connect
           validate_connection

data/lib/active_cypher/connection_adapters/registry.rb

@@ -81,13 +81,15 @@ module ActiveCypher
             principal: config[:username],
             credentials: config[:password]
           }
+          # Get SSL connection params from resolver
+          ssl_params = resolver.ssl_connection_params
+
           ActiveCypher::Bolt::Driver.new(
             uri: uri,
             adapter: adapter,
             auth_token: auth_token,
             pool_size: pool_size,
-            secure: config[:ssl] ? true : false,
-            verify_cert: config[:ssc] ? false : true
+            **ssl_params
           )
         end
       end

data/lib/active_cypher/connection_url_resolver.rb

@@ -62,6 +62,17 @@ module ActiveCypher
       }
     end
 
+    # Returns SSL/TLS connection parameters based on ssl/ssc flags
+    # @return [Hash] Connection parameters for SSL/TLS
+    def ssl_connection_params
+      return {} unless @parsed
+
+      {
+        secure: @parsed[:ssl] ? true : false,
+        verify_cert: @parsed[:ssc] ? false : true
+      }
+    end
+
     private
 
     def parse_url(url_string)

data/lib/active_cypher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveCypher
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activecypher
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Abdelkader Boudih