activegraph 10.0.0.pre.beta.2 → 10.0.0.pre.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c6ef6e85cad5ae83d519bf7c5d781f70f39d9528bf79722e3913a5edfdc0ca2
-  data.tar.gz: 8a75e8976bcb65c734db47024d84f55dad7897ee7e0eb6e08a2e3a60571f441c
+  metadata.gz: 5bf12b2e24dd9557ad7d5a232f653e150241910a48293d4aeba5f5e16f160a42
+  data.tar.gz: 36adc4653772d9132ea19f086b361f4d14fe61704ad1c75214ff441bac0652c9
 SHA512:
-  metadata.gz: ead910dc52bdd93b39b274fc766f376972a16b284a79ba7b8b25b52dab54508927ea7e0ed857f6c416500f283210d659dec1c8fe955cf2ec417dc13d0b5ecc08
-  data.tar.gz: 53d4531aaa3afa01b813f9b4e40adda8ffc3a69b6d0c9f23606d9ef98d184126952909166d17d57e7e3fa372772bf17ce0bf36651cff11c17124a5556d6057ca
+  metadata.gz: e0b15269740380e2bf9bf274f0d3cf89c0bc1394d3469c92919ce0fa172a0b7b22abeec2f7484440c2ff1dd38be275fbb6307aebcf1f8b5174cca8a8568aab70
+  data.tar.gz: fa92fc22ff87ae268a8ef951adb7dc2b838d3673db36ec34cbbf204be1584814a1c48d9c97fa2b87ae8ea09261ffb0a7a72e4c8be2f7dd4ac081c730b3be3b53

data/activegraph.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name     = 'activegraph'
   s.version  = ActiveGraph::VERSION
 
-  s.required_ruby_version = ((RUBY_PLATFORM == 'java') ? '>= 1.9.3' : '>= 2.1.9')
+  s.required_ruby_version = '>= 2.5'
 
   s.authors  = 'Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek'
   s.email    = 'andreas.ronge@gmail.com, public@brian-underwood.codes, chris@subvertallmedia.com, heinrich@mail.com'
@@ -38,7 +38,7 @@ DESCRIPTION
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('guard-rubocop')
   s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
-  s.add_development_dependency("neo4j-#{RUBY_PLATFORM =~ /java/ ? 'java' : 'ruby'}-driver", '>= 0.3.0')
+  s.add_development_dependency("neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", '>= 0.3.0')
   s.add_development_dependency('os')
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 4.0')

data/lib/active_graph/railtie.rb

@@ -7,7 +7,9 @@ require 'active_graph/core/driver'
 module ActiveGraph
   class Railtie < ::Rails::Railtie
     def empty_config
-      ActiveSupport::OrderedOptions.new.tap { |cfg| cfg.driver = ActiveSupport::OrderedOptions.new }
+      ActiveSupport::OrderedOptions.new.tap do |cfg|
+        cfg.driver = ActiveSupport::OrderedOptions.new.tap { |cfg| cfg.config = ActiveSupport::OrderedOptions.new }
+      end
     end
 
     config.neo4j = empty_config
@@ -58,13 +60,12 @@ module ActiveGraph
     end
 
     def setup!(neo4j_config = empty_config)
-      url, path, auth_token, username, password, config, options =
-        final_driver_config!(neo4j_config).values_at(:url, :path, :auth_token, :username, :password, :config, :options)
+      url, path, auth_token, username, password, config =
+        final_driver_config!(neo4j_config).values_at(:url, :path, :auth_token, :username, :password, :config)
       auth_token ||= username ? Neo4j::Driver::AuthTokens.basic(username, password) : Neo4j::Driver::AuthTokens.none
-      options ||= config || {}
       register_neo4j_cypher_logging
 
-      ActiveGraph::Base.new_driver(url || path || default_driver_path_or_url, auth_token, options)
+      ActiveGraph::Base.new_driver(url || path || default_driver_path_or_url, auth_token, config)
     end
 
     def final_driver_config!(neo4j_config)

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '10.0.0-beta.2'
+  VERSION = '10.0.0-beta.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.0.0.pre.beta.2
+  version: 10.0.0.pre.beta.3
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -410,7 +410,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.9
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"