Neo4j 8.x and Core 7.x support

.travis.yml

@@ -15,7 +15,7 @@ script:
 language: ruby
 jdk: oraclejdk8
 rvm:
-  - 2.0.0
+  - 2.1.9
   - 2.2.4
   - 2.3.1
   - jruby-9.0.5.0

Gemfile

@@ -4,3 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'activesupport', '~> 4.2' if RUBY_VERSION.to_f < 2.2
+
+gem 'neo4j', '~> 8.0.0.alpha.2'

lib/neo4j/active_node/spatial.rb

@@ -8,7 +8,7 @@ def self.included(other)
       def add_to_spatial_index(index_name = nil)
         index = index_name || self.class.spatial_index_name
         fail 'index name not found' unless index
-        Neo4j::Session.current.add_node_to_spatial_index(index, self)
+        ActiveBase.current_session.add_node_to_spatial_index(index, self)
       end
 
       module ClassMethods
@@ -33,7 +33,7 @@ class QueryProxy
         def spatial_match(var, params_string, spatial_index = nil)
           index = model.spatial_index_name || spatial_index
           fail 'Cannot query without index. Set index in model or as third argument.' unless index
-          Neo4j::Session.current.query
+          Neo4j::ActiveBase.new_query
             .start("#{var} = node:#{index}({spatial_params})")
             .proxy_as(model, var)
             .params(spatial_params: params_string)

lib/neo4j/cypher_session.rb

@@ -0,0 +1,28 @@
+module Neo4j
+  module Core
+    module Spatial
+      module CypherSession
+        %w(
+          spatial?
+          spatial_plugin
+          add_point_layer
+          add_editable_layer
+          get_layer
+          add_geometry_to_layer
+          edit_geometry_from_layer
+          add_node_to_layer
+          find_geometries_in_bbox
+          find_geometries_within_distance
+          create_spatial_index
+          add_node_to_spatial_index
+        ).each do |method, &_block|
+          define_method(method) do |*args, &block|
+            @adaptor.send(method, *args, &block)
+          end
+        end
+      end
+    end
+  end
+end
+
+Neo4j::Core::CypherSession.__send__(:include, Neo4j::Core::Spatial::CypherSession)

lib/neo4j/http_adaptor.rb

@@ -0,0 +1,138 @@
+require 'neo4j/core/cypher_session/adaptors/http'
+
+module Neo4j
+  module Core
+    module Spatial
+      module HTTPAdaptor
+        def spatial?
+          connection.get('/db/data/ext/SpatialPlugin').status == 200
+        end
+
+        def spatial_plugin
+          connection.get('/db/data/ext/SpatialPlugin').body
+        end
+
+        def add_point_layer(layer, lat = nil, lon = nil)
+          options = {
+            layer: layer,
+            lat: lat || 'lat',
+            lon: lon || 'lon'
+          }
+
+          spatial_post('/ext/SpatialPlugin/graphdb/addSimplePointLayer', options)
+        end
+
+        def add_editable_layer(layer, format = 'WKT', node_property_name = 'wkt')
+          options = {
+            layer: layer,
+            format: format,
+            nodePropertyName: node_property_name
+          }
+
+          spatial_post('/ext/SpatialPlugin/graphdb/addEditableLayer', options)
+        end
+
+        def get_layer(layer)
+          options = {
+            layer: layer
+          }
+          spatial_post('/ext/SpatialPlugin/graphdb/getLayer', options)
+        end
+
+        def add_geometry_to_layer(layer, geometry)
+          options = {
+            layer: layer,
+            geometry: geometry
+          }
+          spatial_post('/ext/SpatialPlugin/graphdb/addGeometryWKTToLayer', options)
+        end
+
+        def edit_geometry_from_layer(layer, geometry, node)
+          options = {
+            layer: layer,
+            geometry: geometry,
+            geometryNodeId: get_id(node)
+          }
+          spatial_post('/ext/SpatialPlugin/graphdb/updateGeometryFromWKT', options)
+        end
+
+        def add_node_to_layer(layer, node)
+          options = {
+            layer: layer,
+            node: "/db/data/node/#{node.neo_id}"
+          }
+          spatial_post('/ext/SpatialPlugin/graphdb/addNodeToLayer', options)
+        end
+
+        def find_geometries_in_bbox(layer, minx, maxx, miny, maxy)
+          options = {
+            layer: layer,
+            minx: minx,
+            maxx: maxx,
+            miny: miny,
+            maxy: maxy
+          }
+          spatial_post('/ext/SpatialPlugin/graphdb/findGeometriesInBBox', options)
+        end
+
+        def find_geometries_within_distance(layer, pointx, pointy, distance)
+          options = {
+            layer: layer,
+            pointX: pointx,
+            pointY: pointy,
+            distanceInKm: distance
+          }
+          spatial_post('/ext/SpatialPlugin/graphdb/findGeometriesWithinDistance', options)
+        end
+
+        def create_spatial_index(name, type = nil, lat = nil, lon = nil)
+          options = {
+            name: name,
+            config: {
+              provider: 'spatial',
+              geometry_type: type || 'point',
+              lat: lat || 'lat',
+              lon: lon || 'lon'
+            }
+          }
+          spatial_post('/index/node', options)
+        end
+
+        def add_node_to_spatial_index(index, node)
+          options = {
+            uri: "/#{get_id(node)}",
+            key: 'k',
+            value: 'v'
+          }
+          spatial_post("/index/node/#{index}", options)
+        end
+
+        private
+
+        def spatial_post(path, options)
+          connection.post("/db/data/#{path}", options).body
+        end
+
+        def connection
+          @requestor.instance_variable_get(:@faraday)
+        end
+
+        def get_id(id)
+          return id.neo_id if id.respond_to?(:neo_id)
+          case id
+          when Array
+            get_id(id.first)
+          when Hash
+            id[:self].split('/').last
+          when String
+            id.split('/').last
+          else
+            id
+          end
+        end
+      end
+    end
+  end
+end
+
+Neo4j::Core::CypherSession::Adaptors::HTTP.include Neo4j::Core::Spatial::HTTPAdaptor

lib/neo4jrb_spatial.rb

@@ -1,4 +1,9 @@
 require 'neo4jrb_spatial/version'
 require 'neo4jrb_spatial/errors'
+# New Cypher API
+require 'neo4j/http_adaptor'
+require 'neo4j/cypher_session'
+# Old cypher API
 require 'neo4j/spatial'
+# Neo4jrb OGM
 require 'neo4j/active_node/spatial'

neo4jrb_spatial.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
 
-  spec.add_dependency 'neo4j', '>= 5.0.1', '< 8'
-  spec.add_dependency 'neo4j-core', '>= 5.0.1', '< 7'
+  spec.add_dependency 'neo4j', '>= 5.0.1'
+  spec.add_dependency 'neo4j-core', '>= 5.0.1'
   spec.add_dependency 'neo4j-rake_tasks', '~> 0.3'
 end

spec/active_node_spec.rb

@@ -0,0 +1,31 @@
+describe 'ActiveNode integration', type: :active_model do
+  let(:node) { Restaurant.create(name: "Chris's Restaurant", lat: 60.1, lon: 15.2) }
+  let(:outside_node) { Restaurant.create(name: 'Lily Thai', lat: 59.0, lon: 14.9) }
+  before do
+    Neo4j::ActiveBase.current_session.create_spatial_index('restaurants')
+    stub_active_node_class('Restaurant') do
+      include Neo4j::ActiveNode::Spatial
+      spatial_index 'restaurants'
+      property :name
+      property :lat
+      property :lon
+    end
+
+    Restaurant.delete_all
+    [node, outside_node].each(&:add_to_spatial_index)
+  end
+
+  let(:match) { Restaurant.all.spatial_match(:r, 'withinDistance:[60.0,15.0,100.0]') }
+
+  it 'is a QueryProxy' do
+    expect(match).to respond_to(:to_cypher)
+  end
+
+  it 'matches to the node in the spatial index' do
+    expect(match.first).to eq node
+  end
+
+  it 'only returns expected nodes' do
+    expect(match.to_a).not_to include(outside_node)
+  end
+end