Fix wait_for_connection

jboler · Jan 4, 2017 · b3356d8 · b3356d8
1 parent 8467458
commit b3356d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [8.0.4] 2016-01-03
+
+### Fixed
+
+- Fixed/refactored `wait_for_connection`
+
 ## [8.0.3] 2016-01-03
 
 ### Fixed

diff --git a/lib/neo4j/railtie.rb b/lib/neo4j/railtie.rb
@@ -62,7 +62,8 @@ def empty_config
     end
 
     def setup!(neo4j_config = empty_config)
-      type, url, path, options, wait_for_connection = final_config!(neo4j_config).values_at(:type, :url, :path, :options, :wait_for_connection)
+      wait_for_connection = neo4j_config.wait_for_connection
+      type, url, path, options = final_session_config!(neo4j_config).values_at(:type, :url, :path, :options)
       register_neo4j_cypher_logging(type || default_session_type)
 
       Neo4j::SessionManager.open_neo4j_session(type || default_session_type,
@@ -71,7 +72,7 @@ def setup!(neo4j_config = empty_config)
                                                options || {})
     end
 
-    def final_config!(neo4j_config)
+    def final_session_config!(neo4j_config)
       support_deprecated_session_configs!(neo4j_config)
 
       neo4j_config.session.empty? ? yaml_config_data : neo4j_config.session

diff --git a/lib/neo4j/version.rb b/lib/neo4j/version.rb
@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.0.3'
+  VERSION = '8.0.4'
 end