neo4j 9.3.0 → 9.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bad07009eb162540cc513015fd204759147c4dbc
-  data.tar.gz: e4922271304dbd7a9b03a1fe5afed9b252056e4d
+SHA256:
+  metadata.gz: ddd749f4da3296fd19bb4c39c1981e3b612d58715fcfbc7bf4e7267811284312
+  data.tar.gz: a39833454052a0fee01b2fbcc781d4334521a1f32415e410e711daa1867eeff0
 SHA512:
-  metadata.gz: cbfe650533ccccf0d12d5afc37b6762f860ba90b64ec3d552867df198db6dc31524ce987bc40e7869e4bf333aa90ec3b674322cf03bc54676594708901160da2
-  data.tar.gz: 78b8a4a89affb828af5f27c46826710d51d43dc6789778eb793dd4cfe80b4b10beff46d7b89eb03337bf2b6811f6dd551027f4927ba25406796a99bd4b35b057
+  metadata.gz: bb6c4d92ca9cf8544e33da06b29568e44f24ba8f87a5a861256a1cdb369acf536467ccbaafcd102b7ad04457c9da69149c0e0cec92c290b85869ef55063318ff
+  data.tar.gz: 3ee2eaf941aa6e406d7a764c843dbd2b51502452d2682512bb6c512077003c9a9f5021b905332fc7a8bb1480fa80fce49e82b055f60f058345474d9f9d67ce40

data/CHANGELOG.md

@@ -3,6 +3,20 @@ 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/).
 
+## [9.4.0] 2018-12-20
+
+## Added
+
+- `verbose_query_logs` configuration option to allow outputting of source location of queries
+- Adaptor classes loaded dynamically on demand
+- Optionally specify the full adaptor class name instead of session type only (supports driver adaptor)
+
+## Fixed
+
+- Wrong conflicting node aliases on same `branch` usage (see #1526)
+- Incorrect order when `order` and `with_associations` are used together
+- `ScopeEvalContext` redirects now all method missing calls to QueryProxy or Target
+
 ## [9.3.0] 2018-07-12
 
 ## Added

data/lib/neo4j.rb

@@ -1,8 +1,7 @@
 require 'neo4j/version'
 
 require 'neo4j-core'
-require 'neo4j/core/cypher_session'
-require 'neo4j/core/query'
+require 'neo4j/core/query_ext' # From this gem
 
 require 'neo4j/active_base'
 require 'neo4j/model_schema'

data/lib/neo4j/active_node/enum.rb

@@ -17,7 +17,7 @@ module Neo4j::ActiveNode
       end
 
       def define_enum_scopes(property_name, enum_keys)
-        enum_keys.keys.each do |name|
+        enum_keys.each_key do |name|
           scope name, -> { where(property_name => name) }
         end
       end

data/lib/neo4j/active_node/has_n.rb

@@ -239,7 +239,7 @@ module Neo4j::ActiveNode
       query_proxy = self.class.as(:previous).where(neo_id: result_cache.map(&:neo_id))
       query_proxy = self.class.send(:association_query_proxy, association_name, previous_query_proxy: query_proxy, node: :next, optional: true)
 
-      Hash[*query_proxy.pluck('ID(previous)', 'collect(next)').flatten(1)].each do |_, records|
+      Hash[*query_proxy.pluck('ID(previous)', 'collect(next)').flatten(1)].each_value do |records|
         records.each do |record|
           record.instance_variable_set('@source_proxy_result_cache', records)
         end
@@ -248,8 +248,7 @@ module Neo4j::ActiveNode
 
     # rubocop:disable Metrics/ModuleLength
     module ClassMethods
-      # rubocop:enable Style/PredicateName
-      # rubocop:disable Style/PredicateName
+      # rubocop:disable Naming/PredicateName
 
       # :nocov:
       def has_association?(name)
@@ -259,7 +258,7 @@ module Neo4j::ActiveNode
       end
       # :nocov:
 
-      # rubocop:enable Style/PredicateName
+      # rubocop:enable Naming/PredicateName
 
       def association?(name)
         !!associations[name.to_sym]
@@ -360,7 +359,7 @@ module Neo4j::ActiveNode
       #       **Available values:** ``:delete``, ``:delete_orphans``, ``:destroy``, ``:destroy_orphans``
       #       (note that the ``:destroy_orphans`` option is known to be "very metal".  Caution advised)
       #
-      def has_many(direction, name, options = {}) # rubocop:disable Style/PredicateName
+      def has_many(direction, name, options = {}) # rubocop:disable Naming/PredicateName
         name = name.to_sym
         build_association(:has_many, direction, name, options)
 
@@ -377,7 +376,7 @@ module Neo4j::ActiveNode
       # See :ref:`#has_many <Neo4j/ActiveNode/HasN/ClassMethods#has_many>` for anything
       # not specified here
       #
-      def has_one(direction, name, options = {}) # rubocop:disable Style/PredicateName
+      def has_one(direction, name, options = {}) # rubocop:disable Naming/PredicateName
         name = name.to_sym
         build_association(:has_one, direction, name, options)
 
@@ -578,5 +577,6 @@ module Neo4j::ActiveNode
         associations.key?(name) && parent_associations[name] != associations[name]
       end
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end

data/lib/neo4j/active_node/id_property.rb

@@ -145,13 +145,13 @@ module Neo4j::ActiveNode
         TypeMethods.define_id_methods(self, name, conf)
       end
 
-      # rubocop:disable Style/PredicateName
+      # rubocop:disable Naming/PredicateName
       def has_id_property?
         ActiveSupport::Deprecation.warn 'has_id_property? is deprecated and may be removed from future releases, use id_property? instead.', caller
 
         id_property?
       end
-      # rubocop:enable Style/PredicateName
+      # rubocop:enable Naming/PredicateName
 
       def id_property?
         id_property_info && !id_property_info.empty?
@@ -209,7 +209,7 @@ MSG
       end
 
       def id_property_name_type_value
-        name, type, value = Neo4j::Config.to_hash.values_at(*%w(id_property id_property_type id_property_type_value))
+        name, type, value = Neo4j::Config.to_hash.values_at('id_property', 'id_property_type', 'id_property_type_value')
 
         unless name == :neo_id || (name && type && value)
           name = :uuid

data/lib/neo4j/active_node/labels.rb

@@ -166,13 +166,13 @@ module Neo4j
           @mapped_label_name = name.to_sym
         end
 
-        # rubocop:disable Style/AccessorMethodName
+        # rubocop:disable Naming/AccessorMethodName
         def set_mapped_label_name(name)
           ActiveSupport::Deprecation.warn 'set_mapped_label_name is deprecated, use self.mapped_label_name= instead.', caller
 
           self.mapped_label_name = name
         end
-        # rubocop:enable Style/AccessorMethodName
+        # rubocop:enable Naming/AccessorMethodName
 
         private
 

data/lib/neo4j/active_node/query/query_proxy.rb

@@ -66,7 +66,7 @@ module Neo4j
         # in the QueryProxy chain.
         attr_reader :node_var
         def identity
-          @node_var || _result_string
+          @node_var || _result_string(_chain_level + 1)
         end
         alias node_identity identity
 
@@ -309,11 +309,8 @@ module Neo4j
           Neo4j::ActiveBase.new_query(context: @context)
         end
 
-        # TODO: Refactor this. Too much happening here.
-        def _result_string
-          s = (self.association && self.association.name) || (self.model && self.model.name) || ''
-
-          s ? "result_#{s}".downcase.tr(':', '').to_sym : :result
+        def _result_string(index = nil)
+          "result_#{(association || model).try(:name)}#{index}".downcase.tr(':', '').to_sym
         end
 
         def _session

data/lib/neo4j/active_node/query/query_proxy_eager_loading.rb

@@ -31,9 +31,9 @@ module Neo4j
             if spec.is_a?(Array)
               spec.each { |s| add_spec(s) }
             elsif spec.is_a?(Hash)
-              spec.each { |k, v| (self[k] ||= AssociationTree.new(model, k)).add_spec(v) }
+              process_hash(spec)
             else
-              self[spec] ||= AssociationTree.new(model, spec)
+              self[spec] ||= self.class.new(model, spec)
             end
           end
 
@@ -41,6 +41,10 @@ module Neo4j
             values.flat_map { |v| [[*prefix, v]] + v.paths(*prefix, v) }
           end
 
+          def process_hash(spec)
+            spec.each { |k, v| (self[k] ||= self.class.new(model, k)).add_spec(v) }
+          end
+
           private
 
           def target_class(model, key)
@@ -56,7 +60,7 @@ module Neo4j
 
         def perform_query
           @_cache = IdentityMap.new
-          query_from_association_tree
+          build_query
             .map do |record, eager_data|
             cache_and_init(record, with_associations_tree)
             eager_data.zip(with_associations_tree.paths.map(&:last)).each do |eager_records, element|
@@ -82,7 +86,11 @@ module Neo4j
         end
 
         def with_associations_tree
-          @with_associations_tree ||= AssociationTree.new(model)
+          @with_associations_tree ||= association_tree_class.new(model)
+        end
+
+        def association_tree_class
+          AssociationTree
         end
 
         def with_associations_tree=(tree)
@@ -106,19 +114,19 @@ module Neo4j
         end
 
         def init_associations(node, element)
-          element.keys.each { |key| node.association_proxy(key).init_cache }
+          element.each_key { |key| node.association_proxy(key).init_cache }
         end
 
         def cache_and_init(node, element)
           @_cache.add(node).tap { |n| init_associations(n, element) }
         end
 
-        def with_associations_return_clause(variables = path_names)
-          var_list(variables, &:itself)
+        def with_associations_return_clause
+          path_names.map { |n| var(n, :collection, &:itself) }.join(',')
         end
 
-        def var_list(variables)
-          variables.map { |n| yield(escape("#{n}_collection")) }.join(',')
+        def var(*parts)
+          yield(escape(parts.compact.join('_')))
         end
 
         # In neo4j version 2.1.8 this fails due to a bug:
@@ -128,8 +136,12 @@ module Neo4j
         # and this
         # MATCH (`n`) WITH `n` AS `n` RETURN `n`
         # does not
-        def var_list_fixing_neo4j_2_1_8_bug(variables)
-          var_list(variables) { |var| "#{var} AS #{var}" }
+        def var_fix(*var)
+          var(*var, &method(:as_alias))
+        end
+
+        def as_alias(var)
+          "#{var} AS #{var}"
         end
 
         def escape(s)
@@ -144,25 +156,31 @@ module Neo4j
           with_associations_tree.paths.map { |path| path_name(path) }
         end
 
+        def build_query
+          before_pluck(query_from_association_tree).pluck(identity, "[#{with_associations_return_clause}]")
+        end
+
+        def before_pluck(query)
+          query_from_chain(@order_chain, query, identity)
+        end
+
         def query_from_association_tree
-          previous_with_variables = []
-          no_order_query = with_associations_tree.paths.inject(query_as(identity).with(ensure_distinct(identity))) do |query, path|
-            with_association_query_part(query, path, previous_with_variables).tap do
-              previous_with_variables << path_name(path)
+          previous_with_vars = []
+          with_associations_tree.paths.inject(query_as(identity).with(ensure_distinct(identity))) do |query, path|
+            with_association_query_part(query, path, previous_with_vars).tap do
+              previous_with_vars << var_fix(path_name(path), :collection)
             end
           end
-          query_from_chain(@order_chain, no_order_query, identity)
-            .pluck(identity, "[#{with_associations_return_clause}]")
         end
 
-        def with_association_query_part(base_query, path, previous_with_variables)
-          optional_match_with_where(base_query, path)
+        def with_association_query_part(base_query, path, previous_with_vars)
+          optional_match_with_where(base_query, path, previous_with_vars)
             .with(identity,
                   "[collect(#{escape("#{path_name(path)}_rel")}), collect(#{escape path_name(path)})] AS #{escape("#{path_name(path)}_collection")}",
-                  *var_list_fixing_neo4j_2_1_8_bug(previous_with_variables))
+                  *previous_with_vars)
         end
 
-        def optional_match_with_where(base_query, path)
+        def optional_match_with_where(base_query, path, _)
           path
             .each_with_index.map { |_, index| path[0..index] }
             .inject(optional_match(base_query, path)) do |query, path_prefix|
@@ -183,9 +201,8 @@ module Neo4j
         end
 
         def chain
-          @order_chain, other_chain =
-            with_associations_tree.empty? ? [[], @chain] : @chain.partition { |link| link.clause == :order }
-          other_chain
+          @order_chain = @chain.select { |link| link.clause == :order } unless with_associations_tree.empty?
+          @chain
         end
       end
     end

data/lib/neo4j/active_node/scope.rb

@@ -51,13 +51,13 @@ module Neo4j::ActiveNode
         end
       end
 
-      # rubocop:disable Style/PredicateName
+      # rubocop:disable Naming/PredicateName
       def has_scope?(name)
         ActiveSupport::Deprecation.warn 'has_scope? is deprecated and may be removed from future releases, use scope? instead.', caller
 
         scope?(name)
       end
-      # rubocop:enable Style/PredicateName
+      # rubocop:enable Naming/PredicateName
 
       # @return [Boolean] true if model has access to scope with this name
       def scope?(name)
@@ -116,13 +116,12 @@ module Neo4j::ActiveNode
         end
       end
 
+      # method_missing is not delegated to super class but to aggregated class
+      # rubocop:disable Style/MethodMissingSuper
       def method_missing(name, *params, &block)
-        if query_proxy_or_target.respond_to?(name)
-          query_proxy_or_target.public_send(name, *params, &block)
-        else
-          super
-        end
+        query_proxy_or_target.public_send(name, *params, &block)
       end
+      # rubocop:enable Style/MethodMissingSuper
 
       private
 

data/lib/neo4j/config.rb

@@ -70,6 +70,10 @@ module Neo4j
         configuration[key.to_s]
       end
 
+      def fetch(key, default)
+        configuration.fetch(key, default)
+      end
+
       # Remove the value of a config entry.
       #
       # @param [Symbol] key the key of the configuration entry to delete

data/lib/neo4j/core/query_ext.rb

@@ -0,0 +1,24 @@
+module Neo4j
+  module Core
+    class Query
+      # Creates a Neo4j::ActiveNode::Query::QueryProxy object that builds off of a Core::Query object.
+      #
+      # @param [Class] model An ActiveNode model to be used as the start of a new QueryuProxy chain
+      # @param [Symbol] var The variable to be used to refer to the object from within the new QueryProxy
+      # @param [Boolean] optional Indicate whether the new QueryProxy will use MATCH or OPTIONAL MATCH.
+      # @return [Neo4j::ActiveNode::Query::QueryProxy] A QueryProxy object.
+      def proxy_as(model, var, optional = false)
+        # TODO: Discuss whether it's necessary to call `break` on the query or if this should be left to the user.
+        Neo4j::ActiveNode::Query::QueryProxy.new(model, nil, node: var, optional: optional, starting_query: self, chain_level: @proxy_chain_level)
+      end
+
+      # Calls proxy_as with `optional` set true. This doesn't offer anything different from calling `proxy_as` directly but it may be more readable.
+      def proxy_as_optional(model, var)
+        proxy_as(model, var, true)
+      end
+
+      # For instances where you turn a QueryProxy into a Query and then back to a QueryProxy with `#proxy_as`
+      attr_accessor :proxy_chain_level
+    end
+  end
+end

data/lib/neo4j/migration.rb

@@ -27,7 +27,9 @@ module Neo4j
       FileUtils.mkdir_p('db/neo4j-migrate')
     end
 
-    delegate :query, to: Neo4j::Session
+    def query(*args)
+      Neo4j::ActiveBase.current_session.query(*args)
+    end
 
     class AddIdProperty < Neo4j::Migration
       include Neo4j::Migrations::Helpers::IdProperty

data/lib/neo4j/railtie.rb

@@ -3,9 +3,7 @@ require 'rails/railtie'
 require 'neo4j/session_manager'
 # Need the action_dispatch railtie to have action_dispatch.rescue_responses initialized correctly
 require 'action_dispatch/railtie'
-require 'neo4j/core/cypher_session/adaptors/http'
-require 'neo4j/core/cypher_session/adaptors/bolt'
-require 'neo4j/core/cypher_session/adaptors/embedded'
+require 'neo4j/core/cypher_session/adaptors'
 
 module Neo4j
   class Railtie < ::Rails::Railtie
@@ -38,6 +36,7 @@ module Neo4j
 
     console do
       Neo4j::Config[:logger] = ActiveSupport::Logger.new(STDOUT)
+      Neo4j::Config[:verbose_query_logs] = false
     end
 
     # Starting Neo after :load_config_initializers allows apps to
@@ -62,18 +61,22 @@ module Neo4j
     def setup!(neo4j_config = empty_config)
       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)
+      type ||= default_session_type
+      options ||= {}
+      register_neo4j_cypher_logging(type, options)
 
-      Neo4j::SessionManager.open_neo4j_session(type || default_session_type,
+      Neo4j::SessionManager.open_neo4j_session(type,
                                                url || path || default_session_path_or_url,
                                                wait_for_connection,
-                                               options || {})
+                                               options)
     end
 
     def final_session_config!(neo4j_config)
       support_deprecated_session_configs!(neo4j_config)
 
-      neo4j_config[:session].empty? ? yaml_config_data : neo4j_config[:session]
+      (neo4j_config[:session].empty? ? yaml_config_data : neo4j_config[:session]).dup.tap do |result|
+        result[:type] ||= URI(result[:url]).scheme if result[:url]
+      end
     end
 
     def support_deprecated_session_configs!(neo4j_config)
@@ -120,7 +123,7 @@ module Neo4j
       end.detect(&:exist?)
     end
 
-    def register_neo4j_cypher_logging(session_type)
+    def register_neo4j_cypher_logging(session_type, options)
       return if @neo4j_cypher_logging_registered
 
       Neo4j::Core::Query.pretty_cypher = Neo4j::Config[:pretty_logged_cypher_queries]
@@ -129,23 +132,18 @@ module Neo4j
         (Neo4j::Config[:logger] ||= Rails.logger).debug message
       end
       Neo4j::Core::CypherSession::Adaptors::Base.subscribe_to_query(&logger_proc)
-      subscribe_to_session_type_logging!(session_type, logger_proc)
+      subscribe_to_session_type_logging!(session_type, options, logger_proc)
 
       @neo4j_cypher_logging_registered = true
     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 subscribe_to_session_type_logging!(session_type, logger_proc)
-      if TYPE_SUBSCRIBERS.key?(session_type.to_sym)
-        TYPE_SUBSCRIBERS[session_type.to_sym].call(&logger_proc)
-      else
-        fail ArgumentError, "Invalid session type: #{session_type.inspect} (expected one of #{TYPE_SUBSCRIBERS.keys.inspect})"
-      end
+    def subscribe_to_session_type_logging!(session_type, options, logger_proc)
+      SessionManager
+        .adaptor_class(session_type, options)
+        .send(
+          [:embedded, :embedded_db].include?(session_type.to_sym) ? :subscribe_to_transaction : :subscribe_to_request,
+          &logger_proc
+        )
     end
   end
 end

data/lib/neo4j/session_manager.rb

@@ -1,8 +1,5 @@
 require 'active_support/core_ext/hash'
 require 'active_support/ordered_options'
-require 'neo4j/core/cypher_session/adaptors/http'
-require 'neo4j/core/cypher_session/adaptors/bolt'
-require 'neo4j/core/cypher_session/adaptors/embedded'
 
 module Neo4j
   class SessionManager
@@ -11,12 +8,18 @@ module Neo4j
         enable_unlimited_strength_crypto! if java_platform? && session_type_is_embedded?(type)
 
         adaptor = wait_for_value(wait_for_connection, Neo4j::Core::CypherSession::ConnectionFailedError) do
-          cypher_session_adaptor(type, url_or_path, options.merge(wrap_level: :proc))
+          verbose_query_logs = Neo4j::Config.fetch(:verbose_query_logs, false)
+          cypher_session_adaptor(type, url_or_path, options.merge(wrap_level: :proc,
+                                                                  verbose_query_logs: verbose_query_logs))
         end
 
         Neo4j::Core::CypherSession.new(adaptor)
       end
 
+      def adaptor_class(type, options)
+        options[:adaptor_class] || adaptor_class_by_type(type.to_sym)
+      end
+
       protected
 
       def session_type_is_embedded?(session_type)
@@ -31,20 +34,8 @@ module Neo4j
         restricted_field.set nil, false
       end
 
-      # TODO: Deprecate embedded_db and http in favor of embedded and http
-      #
       def cypher_session_adaptor(type, path_or_url, options = {})
-        case type.to_sym
-        when :embedded_db, :embedded
-          Neo4j::Core::CypherSession::Adaptors::Embedded.new(path_or_url, options)
-        when :http
-          Neo4j::Core::CypherSession::Adaptors::HTTP.new(path_or_url, options)
-        when :bolt
-          Neo4j::Core::CypherSession::Adaptors::Bolt.new(path_or_url, options)
-        else
-          extra = ' (`server_db` has been replaced by `http` or `bolt`)'
-          fail ArgumentError, "Invalid session type: #{type.inspect}#{extra if type.to_sym == :server_db}"
-        end
+        adaptor_class(type, options).new(path_or_url, options)
       end
 
       def java_platform?
@@ -69,6 +60,26 @@ module Neo4j
           end
         end
       end
+
+      private
+
+      def adaptor_class_by_type(type)
+        ActiveSupport::Deprecation.warn('`embedded_db` session type is deprecated, please use `embedded`') if type == :embedded_db
+        case type
+        when :embedded_db, :embedded
+          require 'neo4j/core/cypher_session/adaptors/embedded'
+          Neo4j::Core::CypherSession::Adaptors::Embedded
+        when :http
+          require 'neo4j/core/cypher_session/adaptors/http'
+          Neo4j::Core::CypherSession::Adaptors::HTTP
+        when :bolt
+          require 'neo4j/core/cypher_session/adaptors/bolt'
+          Neo4j::Core::CypherSession::Adaptors::Bolt
+        else
+          extra = ' (`server_db` has been replaced by `http` or `bolt`)'
+          fail ArgumentError, "Invalid session type: #{type.inspect} (expected one of [:http, :bolt, :embedded])#{extra if type == :server_db}"
+        end
+      end
     end
   end
 end

data/lib/neo4j/shared/enum.rb

@@ -67,7 +67,7 @@ module Neo4j::Shared
         end
 
         unless case_sensitive
-          enum_keys.keys.each do |key|
+          enum_keys.each_key do |key|
             fail ArgumentError, 'Enum keys must be lowercase unless _case_sensitive = true' unless key.downcase == key
           end
         end
@@ -130,7 +130,7 @@ module Neo4j::Shared
       end
 
       def define_enum_methods_?(property_name, enum_keys, options)
-        enum_keys.keys.each do |enum_value|
+        enum_keys.each_key do |enum_value|
           method_name = build_method_name(enum_value, property_name, options)
           check_enum_method_conflicts! property_name, :"#{method_name}?"
           define_method("#{method_name}?") do
@@ -140,7 +140,7 @@ module Neo4j::Shared
       end
 
       def define_enum_methods_!(property_name, enum_keys, options)
-        enum_keys.keys.each do |enum_value|
+        enum_keys.each_key do |enum_value|
           method_name = build_method_name(enum_value, property_name, options)
           check_enum_method_conflicts! property_name, :"#{method_name}!"
           define_method("#{method_name}!") do

data/lib/neo4j/shared/initialize.rb

@@ -44,7 +44,7 @@ module Neo4j::Shared
       # Not a good long term solution
       if changed_attributes.frozen?
         attributes_changed_by_setter = ActiveSupport::HashWithIndifferentAccess.new(changed_attributes)
-        hash_to_clear.keys.each { |k| attributes_changed_by_setter.delete(k) }
+        hash_to_clear.each_key { |k| attributes_changed_by_setter.delete(k) }
         @attributes_changed_by_setter = attributes_changed_by_setter
       else
         hash_to_clear.each_key { |k| changed_attributes.delete(k) }

data/lib/neo4j/shared/type_converters.rb

@@ -76,7 +76,7 @@ module Neo4j::Shared
           when respond_to?(:to_d)
             value.to_d
           else
-            BigDecimal.new(value.to_s)
+            BigDecimal(value.to_s)
           end.to_s
         end
 

data/lib/neo4j/tasks/migration.rake

@@ -1,3 +1,4 @@
+require 'rake'
 require 'active_support/concern'
 require 'neo4j/migration'
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '9.3.0'
+  VERSION = '9.4.0'
 end

data/lib/rails/generators/neo4j/model/model_generator.rb

@@ -29,7 +29,7 @@ class Neo4j::Generators::ModelGenerator < Rails::Generators::NamedBase #:nodoc:
     options[:timestamps]
   end
 
-  # rubocop:disable Style/PredicateName
+  # rubocop:disable Naming/PredicateName
   def has_many?
     options[:has_many]
   end
@@ -56,7 +56,7 @@ class Neo4j::Generators::ModelGenerator < Rails::Generators::NamedBase #:nodoc:
     end
     txt
   end
-  # rubocop:enable Style/PredicateName
+  # rubocop:enable Naming/PredicateName
 
   def indices?
     options[:indices]

data/neo4j.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib/', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'neo4j/version'
@@ -35,8 +35,9 @@ DESCRIPTION
 
   s.add_dependency('activemodel', '>= 4.0')
   s.add_dependency('activesupport', '>= 4.0')
+  s.add_dependency('i18n', '!= 1.3.0') # version 1.3.0 introduced a bug with `symbolize_key`
   s.add_dependency('neo4j-community', '~> 2.0') if RUBY_PLATFORM =~ /java/
-  s.add_dependency('neo4j-core', '>= 7.2.2', '< 9.0.0')
+  s.add_dependency('neo4j-core', '>= 9.0.0')
   s.add_dependency('orm_adapter', '~> 0.5.0')
   s.add_development_dependency('guard')
   s.add_development_dependency('guard-rspec')
@@ -46,6 +47,6 @@ DESCRIPTION
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 4.0')
   s.add_development_dependency('rake')
-  s.add_development_dependency('rubocop', '~> 0.49.1')
+  s.add_development_dependency('rubocop', '~> 0.56.0')
   s.add_development_dependency('yard')
 end

metadata

@@ -1,212 +1,234 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 9.3.0
+  version: 9.4.0
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :runtime
+  name: activemodel
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :runtime
+  name: activesupport
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: neo4j-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: 7.2.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: 1.3.0
+  name: i18n
+  prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  name: neo4j-community
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.2
-    - - "<"
+        version: 9.0.0
+  name: neo4j-core
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: 9.0.0
 - !ruby/object:Gem::Dependency
-  name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
-  type: :runtime
+  name: orm_adapter
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: guard
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: guard-rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: guard-rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: neo4j-rake_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
-  type: :development
+  name: neo4j-rake_tasks
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: os
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: pry
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :development
+  name: railties
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
-  type: :development
+        version: 0.56.0
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.56.0
 - !ruby/object:Gem::Dependency
-  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: yard
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -214,7 +236,7 @@ dependencies:
         version: '0'
 description: 'A Neo4j OGM (Object-Graph-Mapper) for Ruby heavily inspired by ActiveRecord.
 
-'
+  '
 email: andreas.ronge@gmail.com, public@brian-underwood.codes, chris@subvertallmedia.com
 executables:
 - neo4j-jars
@@ -283,7 +305,7 @@ files:
 - lib/neo4j/active_rel/validations.rb
 - lib/neo4j/class_arguments.rb
 - lib/neo4j/config.rb
-- lib/neo4j/core/query.rb
+- lib/neo4j/core/query_ext.rb
 - lib/neo4j/errors.rb
 - lib/neo4j/migration.rb
 - lib/neo4j/migrations.rb
@@ -350,7 +372,7 @@ metadata:
   changelog_uri: https://github.com/neo4jrb/neo4j/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/neo4jrb/neo4j/
   bug_tracker_uri: https://github.com/neo4jrb/neo4j/issues
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--quiet"
 - "--title"
@@ -365,7 +387,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.9
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -373,8 +395,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []

data/lib/neo4j/core/query.rb

@@ -1,22 +0,0 @@
-module Neo4j::Core
-  class Query
-    # Creates a Neo4j::ActiveNode::Query::QueryProxy object that builds off of a Core::Query object.
-    #
-    # @param [Class] model An ActiveNode model to be used as the start of a new QueryuProxy chain
-    # @param [Symbol] var The variable to be used to refer to the object from within the new QueryProxy
-    # @param [Boolean] optional Indicate whether the new QueryProxy will use MATCH or OPTIONAL MATCH.
-    # @return [Neo4j::ActiveNode::Query::QueryProxy] A QueryProxy object.
-    def proxy_as(model, var, optional = false)
-      # TODO: Discuss whether it's necessary to call `break` on the query or if this should be left to the user.
-      Neo4j::ActiveNode::Query::QueryProxy.new(model, nil, node: var, optional: optional, starting_query: self, chain_level: @proxy_chain_level)
-    end
-
-    # Calls proxy_as with `optional` set true. This doesn't offer anything different from calling `proxy_as` directly but it may be more readable.
-    def proxy_as_optional(model, var)
-      proxy_as(model, var, true)
-    end
-
-    # For instances where you turn a QueryProxy into a Query and then back to a QueryProxy with `#proxy_as`
-    attr_accessor :proxy_chain_level
-  end
-end