neo4j 8.0.0.alpha.5 → 8.0.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35366c5049bd09b2d9172d7f174576aacb39b3ab
-  data.tar.gz: 3e19875b85dcc4de4a7f5f1a21d9351db2a66c03
+  metadata.gz: ac1f95d91c95d7a8d809de657a186fe9a98f0872
+  data.tar.gz: b1fb1a75eaacc95293219bdc997513a523222ee1
 SHA512:
-  metadata.gz: 48be8c4082aa6603f6a5a09ecfd6173707f90fe228e1f7e2dd1fedd95de7e00b557a8287b4d5c375e3d1f25b745b7997c7132c919056e913fdff27ac81126596
-  data.tar.gz: d92edef01fa0175833fc0849ae67416681abd01483131100437973860453037fe0991b361d98bc22e1e9d72426cdf658f8f8d839887583df0118782b108dda00
+  metadata.gz: 8a01f591a8e12eb3d305f9c7fcba1779bba18034d1ad413e8b856ee362a61e66cc5a06dbe5e810f9f9fe9542a25f336b052f8a1a34669c16582ac509de6ab8c7
+  data.tar.gz: aad90232c15f4c746195237be20f98e2a4bf091c4f32a65f7a205660a90ca6f3af73fdf5e8176493fa2d201714ae07bb2357bb58716dedf3a4f88b16e6503a0d

data/CHANGELOG.md

@@ -14,10 +14,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - `ActiveNode#destroy` and `ActiveRel#destroy` now return the object in question rather than `true` to be compatible with `ActiveRecord` (see #1254)
+- Multiple sessions in Rails config no longer supported
+- Instead of using `session_type`, `session_url`, `session_path`, and `session_options` in config `session.type`, `session.url`, `session.path`, and `session.options` should now be used.
 
 ### Fixed
 
 - Bugs with using `neo_id` as `ActiveNode` `id_property` (thanks klobuczek / see #1274)
+- Issue where `session_url` (now `session.url`) was not working
+- Various issues with not be able to run migrations when migration were pending
+- Broken sessions when threading
 
 ## [8.0.0.alpha.2] 2016-08-05
 

data/lib/neo4j/active_base.rb

@@ -5,11 +5,19 @@ module Neo4j
     class << self
       # private?
       def current_session
-        SessionRegistry.current_session.tap do |session|
+        (SessionRegistry.current_session ||= establish_session).tap do |session|
           fail 'No session defined!' if session.nil?
         end
       end
 
+      def on_establish_session(&block)
+        @establish_session_block = block
+      end
+
+      def establish_session
+        @establish_session_block.call if @establish_session_block
+      end
+
       def current_transaction_or_session
         current_transaction || current_session
       end

data/lib/neo4j/railtie.rb

@@ -45,27 +45,69 @@ module Neo4j
     # Starting Neo after :load_config_initializers allows apps to
     # register migrations in config/initializers
     initializer 'neo4j.start', after: :load_config_initializers do |app|
-      cfg = app.config.neo4j
-      # Set Rails specific defaults
-      Neo4j::SessionManager.setup! cfg
+      Neo4j::ActiveBase.on_establish_session { setup! app.config.neo4j }
 
       Neo4j::Config[:logger] ||= Rails.logger
 
-      session_types = cfg.sessions.map { |session_opts| session_opts[:type] }
-
-      register_neo4j_cypher_logging(session_types)
       if Rails.env.development? && !Neo4j::Migrations.currently_running_migrations && Neo4j::Config.fail_on_pending_migrations
         Neo4j::Migrations.check_for_pending_migrations!
       end
     end
 
+    def setup!(cfg = nil)
+      neo4j_config ||= ActiveSupport::OrderedOptions.new
+      cfg.each {|k, v| neo4j_config[k] = v } if cfg
+
+      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)
+
+      Neo4j::SessionManager.open_neo4j_session(type || default_session_type,
+                                               url || path || default_session_path_or_url,
+                                               wait_for_connection,
+                                               options || {})
+    end
+
+    def support_deprecated_session_configs!(neo4j_config)
+      ActiveSupport::Deprecation.warn('neo4j.config.sessions is deprecated, please use neo4j.config.session (not an array)') if neo4j_config.sessions.present?
+      neo4j_config.session ||= (neo4j_config.sessions && neo4j_config.sessions[0]) || {}
+
+      %w(type path url options).each do |key|
+        value = neo4j_config.send("session_#{key}")
+        if value.present?
+          ActiveSupport::Deprecation.warn("neo4j.config.session_#{key} is deprecated, please use neo4j.config.session.#{key}")
+          neo4j_config.session[key] = value
+        end
+      end
+    end
+
+    def default_session_type
+      if ENV['NEO4J_URL']
+        URI(ENV['NEO4J_URL']).scheme.tap do |scheme|
+          fail "Invalid scheme for NEO4J_URL: #{scheme}" if !%w(http bolt).include?(scheme)
+        end
+      else
+        ENV['NEO4J_TYPE'] || config_data[: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'
+    end
+
+
     TYPE_SUBSCRIBERS = {
       http: Neo4j::Core::CypherSession::Adaptors::HTTP.method(:subscribe_to_request),
       bolt: Neo4j::Core::CypherSession::Adaptors::Bolt.method(:subscribe_to_request),
       embedded: Neo4j::Core::CypherSession::Adaptors::Embedded.method(:subscribe_to_transaction)
     }
 
-    def register_neo4j_cypher_logging(session_types)
+    def register_neo4j_cypher_logging(session_type)
       return if @neo4j_cypher_logging_registered
 
       Neo4j::Core::Query.pretty_cypher = Neo4j::Config[:pretty_logged_cypher_queries]
@@ -74,9 +116,7 @@ module Neo4j
         (Neo4j::Config[:logger] ||= Rails.logger).debug message
       end
       Neo4j::Core::CypherSession::Adaptors::Base.subscribe_to_query(&logger_proc)
-      session_types.map(&:to_sym).uniq.each do |type|
-        TYPE_SUBSCRIBERS[type].call(&logger_proc)
-      end
+      TYPE_SUBSCRIBERS[session_type.to_sym].call(&logger_proc)
 
       @neo4j_cypher_logging_registered = true
     end

data/lib/neo4j/session_manager.rb

@@ -7,46 +7,14 @@ require 'neo4j/core/cypher_session/adaptors/embedded'
 module Neo4j
   class SessionManager
     class << self
-      def setup!(cfg = nil)
-        cfg ||= ActiveSupport::OrderedOptions.new
-
-        setup_default_session(cfg)
-
-        cfg.sessions.each do |session_opts|
-          open_neo4j_session(session_opts, cfg.wait_for_connection)
-        end
-
-        Neo4j::Config.configuration.merge!(cfg.to_h)
-      end
-
-      # TODO: Remove ability for multiple sessions?
-      # Ability to overwrite default session per-model like ActiveRecord?
-      def setup_default_session(cfg)
-        setup_config_defaults!(cfg)
-
-        return if !cfg.sessions.empty?
-
-        cfg.sessions << {type: cfg.session_type, path: cfg.session_path, options: cfg.session_options.merge(default: true)}
-      end
-
-      # TODO: Support `session_url` config for server mode
-      def setup_config_defaults!(cfg)
-        cfg.session_type ||= default_session_type
-        cfg.session_path ||= default_session_path
-        cfg.session_options ||= {}
-        cfg.sessions ||= []
-      end
-
-      def open_neo4j_session(options, wait_for_connection = false)
-        session_type, path, url = options.values_at(:type, :path, :url)
-
+      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)
 
         adaptor = wait_for_value(wait_for_connection) do
-          cypher_session_adaptor(session_type, url || path, (options[:options] || {}).merge(wrap_level: :proc))
+          cypher_session_adaptor(type, url_or_path, options.merge(wrap_level: :proc))
         end
 
-        Neo4j::ActiveBase.current_adaptor = adaptor
+        Neo4j::Core::CypherSession.new(adaptor)
       end
 
       protected
@@ -94,22 +62,6 @@ module Neo4j
         end
       end
 
-      def default_session_type
-        if ENV['NEO4J_URL']
-          URI(ENV['NEO4J_URL']).scheme.tap do |scheme|
-            fail "Invalid scheme for NEO4J_URL: #{scheme}" if !%w(http bolt).include?(scheme)
-          end
-        else
-          ENV['NEO4J_TYPE'] || config_data[:type] || :http
-        end.to_sym
-      end
-
-      def default_session_path
-        ENV['NEO4J_URL'] || ENV['NEO4J_PATH'] ||
-          config_data[:url] || config_data[:path] ||
-          'http://localhost:7474'
-      end
-
       def java_platform?
         RUBY_PLATFORM =~ /java/
       end

data/lib/neo4j/version.rb

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

metadata

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