neo4j 6.1.5 → 6.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e354c8febb1d9184fa43cce76cd330c41c6dbd8
-  data.tar.gz: afd33c3f4996017fac26e3315e023627a2664591
+  metadata.gz: 638962213a8d5eab5d30064bc56b0c1144bf0a29
+  data.tar.gz: b4e1666949e6f065a38d653e413cc0ead3eadecd
 SHA512:
-  metadata.gz: 6f69ced8cf20c80e1ec7220eecf27f63eaa6b95f6f74e9bd1940ae7fc93c5de4ca53ce8af463d19185866efab1570e1ee12a90dff447b986449243d723b56e50
-  data.tar.gz: c430069c05842ada0082e3f9d1be20981660901bd50844b276ee6363cdb2f2f89ab35bb732ee808c24a3a48cd5c51fd119dd79b7a02626fa81d956dcc92ac983
+  metadata.gz: 29faddc490ad08ae876f80856158496c7daa5b53f648ffca5cacff13f4c687e64f9049d4c6aa44503b4e71956daaaab97b92c75696497a7213c1f8f3cad8d3b6
+  data.tar.gz: 652d119b06f5df0e563e890d6c71fa1b5b6467e6d710fb7df9b37ee6372fe8811a1e75f2b923008f9c57541d2eb1c891e02ce14dbccf67e8c85b9e754b984082

data/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/).
 
+## [6.1.6] - 2016-02-03
+
+### Added
+
+- `wait_for_connection` configuration variable allows you to tell the gem to wait for up to 60 seconds for Neo4j to be available.  This is useful in environments such as Docker Compose
+
 ## [6.1.5] - 2016-01-28
 
 ### Fixed

data/lib/neo4j/railtie.rb

@@ -77,23 +77,44 @@ module Neo4j
         session.start
       end
 
-      def open_neo4j_session(options)
+      def open_neo4j_session(options, wait_for_connection = false)
         type, name, default, path = options.values_at(:type, :name, :default, :path)
 
         if !java_platform? && type == :embedded_db
           fail "Tried to start embedded Neo4j db without using JRuby (got #{RUBY_PLATFORM}), please run `rvm jruby`"
         end
 
-        session = if options.key?(:name)
-                    Neo4j::Session.open_named(type, name, default, path)
-                  else
-                    Neo4j::Session.open(type, path, options[:options])
-                  end
+        session = wait_for_value(wait_for_connection) do
+          if options.key?(:name)
+            Neo4j::Session.open_named(type, name, default, path)
+          else
+            Neo4j::Session.open(type, path, options[:options])
+          end
+        end
 
         start_embedded_session(session) if type == :embedded_db
       end
     end
 
+    def wait_for_value(wait)
+      session = nil
+      Timeout.timeout(60) do
+        until session
+          begin
+            if session = yield
+              puts
+              return session
+            end
+          rescue Faraday::ConnectionFailed => e
+            raise e if !wait
+
+            putc '.'
+            sleep(1)
+          end
+        end
+      end
+    end
+
     def register_neo4j_cypher_logging
       return if @neo4j_cypher_logging_registered
 
@@ -120,7 +141,7 @@ module Neo4j
       Neo4j::Railtie.setup_default_session(cfg)
 
       cfg.sessions.each do |session_opts|
-        Neo4j::Railtie.open_neo4j_session(session_opts)
+        Neo4j::Railtie.open_neo4j_session(session_opts, cfg.wait_for_connection)
       end
       Neo4j::Config.configuration.merge!(cfg.to_hash)
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '6.1.5'
+  VERSION = '6.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 6.1.5
+  version: 6.1.6
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter