neo4j 8.0.0.alpha.6 → 8.0.0.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac1f95d91c95d7a8d809de657a186fe9a98f0872
-  data.tar.gz: b1fb1a75eaacc95293219bdc997513a523222ee1
+  metadata.gz: 7e27235ebda95170bf3b1be86184d65f52c6ce62
+  data.tar.gz: fd49a4500e63667ecf2073c47dc56bb28f9bafe2
 SHA512:
-  metadata.gz: 8a01f591a8e12eb3d305f9c7fcba1779bba18034d1ad413e8b856ee362a61e66cc5a06dbe5e810f9f9fe9542a25f336b052f8a1a34669c16582ac509de6ab8c7
-  data.tar.gz: aad90232c15f4c746195237be20f98e2a4bf091c4f32a65f7a205660a90ca6f3af73fdf5e8176493fa2d201714ae07bb2357bb58716dedf3a4f88b16e6503a0d
+  metadata.gz: c2c5b918e977389e50ba89ba7bd95391846a47e2357987e2691b79e57526324a4aba4cfaee5ec03e3f35359c2c29e10a9fa3233ce606009062d27a822a2fd48c
+  data.tar.gz: 67e94db613943bf239a2db082b44f6baa6a1ca98abe274ac66d5536c293e5348f9cd3361d098d8a9e2d5b9c6bf1be1383af28c1e4d1944be366568f4ff2a268a

data/lib/neo4j/railtie.rb

@@ -36,16 +36,19 @@ module Neo4j
       load 'neo4j/tasks/migration.rake'
     end
 
-    console do |app|
+    console do
       Neo4j::Config[:logger] = ActiveSupport::Logger.new(STDOUT)
-
-      register_neo4j_cypher_logging(app.config.neo4j.sessions.map { |s| s[:type] })
     end
 
     # Starting Neo after :load_config_initializers allows apps to
     # register migrations in config/initializers
     initializer 'neo4j.start', after: :load_config_initializers do |app|
-      Neo4j::ActiveBase.on_establish_session { setup! app.config.neo4j }
+      neo4j_config = ActiveSupport::OrderedOptions.new
+      app.config.neo4j.each { |k, v| neo4j_config[k] = v } if app.config.neo4j
+
+      Neo4j::Config.configuration.merge!(neo4j_config.to_h)
+
+      Neo4j::ActiveBase.on_establish_session { setup! neo4j_config }
 
       Neo4j::Config[:logger] ||= Rails.logger
 
@@ -54,14 +57,9 @@ module Neo4j
       end
     end
 
-    def setup!(cfg = nil)
-      neo4j_config ||= ActiveSupport::OrderedOptions.new
-      cfg.each {|k, v| neo4j_config[k] = v } if cfg
-
+    def setup!(neo4j_config = nil)
       support_deprecated_session_configs!(neo4j_config)
 
-      Neo4j::Config.configuration.merge!(neo4j_config.to_h)
-
       type, url, path, options, wait_for_connection = neo4j_config.session.values_at(:type, :path, :url, :options, :wait_for_connection)
       register_neo4j_cypher_logging(type || default_session_type)
 
@@ -90,14 +88,12 @@ module Neo4j
           fail "Invalid scheme for NEO4J_URL: #{scheme}" if !%w(http bolt).include?(scheme)
         end
       else
-        ENV['NEO4J_TYPE'] || config_data[:type] || :http
+        ENV['NEO4J_TYPE'] || :http
       end.to_sym
     end
 
     def default_session_path_or_url
-      ENV['NEO4J_URL'] || ENV['NEO4J_PATH'] ||
-        config_data[:url] || config_data[:path] ||
-        'http://localhost:7474'
+      ENV['NEO4J_URL'] || ENV['NEO4J_PATH'] || 'http://localhost:7474'
     end
 
 

data/lib/neo4j/session_manager.rb

@@ -7,8 +7,8 @@ require 'neo4j/core/cypher_session/adaptors/embedded'
 module Neo4j
   class SessionManager
     class << self
-      def open_neo4j_session(type, url_or_path, url, wait_for_connection = false, options = {})
-        enable_unlimited_strength_crypto! if java_platform? && session_type_is_embedded?(session_type)
+      def open_neo4j_session(type, url_or_path, wait_for_connection = false, options = {})
+        enable_unlimited_strength_crypto! if java_platform? && session_type_is_embedded?(type)
 
         adaptor = wait_for_value(wait_for_connection) do
           cypher_session_adaptor(type, url_or_path, options.merge(wrap_level: :proc))

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.0.0.alpha.6'
+  VERSION = '8.0.0.alpha.7'
 end

data/neo4j.gemspec

@@ -7,7 +7,8 @@ require 'neo4j/version'
 Gem::Specification.new do |s|
   s.name     = 'neo4j'
   s.version  = Neo4j::VERSION
-  s.required_ruby_version = '>= 2.1.9'
+
+  s.required_ruby_version = ((RUBY_PLATFORM == 'java') ? '>= 1.9.3' : '>= 2.1.9')
 
   s.authors  = 'Andreas Ronge, Brian Underwood, Chris Grigg'
   s.email    = 'andreas.ronge@gmail.com, brian@brian-underwood.codes, chris@subvertallmedia.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 8.0.0.alpha.6
+  version: 8.0.0.alpha.7
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter