neo4jrb_spatial 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d7020cf724fdf56d3816dd13a1c1a6335f9cee3
-  data.tar.gz: 2326bbe73ef0c9787be9fcdac40b220a505e7e52
+  metadata.gz: fb742b0cbfe6febf9d05b442ee46e0b887827370
+  data.tar.gz: e8f00d7f1d1bb32eef67be847d5e15a98a1117e7
 SHA512:
-  metadata.gz: 4f6874f5330f2bf7c895db54280b263c741c6b055a7ac6846d7cac3f7eb7a99e99f74177e8f4f16e49638173574bbb22c080234ee2809e3b72926e118736f4d2
-  data.tar.gz: 8e550e27b37a492ddaf7974ca22f7f962047f0bd36ae59cc1853bee5c52124cc3b01d174ae35bf7f8c7faea7cd52e36cc4f3f272570f21218b1a322818a7c419
+  metadata.gz: 48c8cee0ef882d1e12b880bd5488b3457049ac7af25373bcf936dc0d3cbf1be29ae72388b35a1c31686485f62c3cad27d77f42f24c5c7b751af25ce83a922d1a
+  data.tar.gz: f3490009b572971ea316ad313de889b6589a2299b0b4d8a7c5557bba66784fbf672454f5a8933719e92a322f86b7b77b7717b1eb3de2be22fd3aeaaf7064363d

data/CHANGELOG.md

@@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [1.2.0] - 2016-09-26
+
+### Fixed
+
+- Compatibility with `neo4j-core ~> 6.1.4` (see #13)
+- Some module nesting issues (see #10)
+- Travis setup (see #13)
+
 ## [1.1.0] - 2015-10-15
 
 ### Fixed

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in neo4jrb_spatial.gemspec
 gemspec
+
+gem 'activesupport', '~> 4.2' if RUBY_VERSION.to_f < 2.2

data/README.md

@@ -2,6 +2,12 @@
 
 Provides support for Neo4j Spatial to Neo4j.rb 5+.
 
+## Code Status
+
+[![Build Status](https://secure.travis-ci.org/neo4jrb/neo4jrb_spatial.png?branch=master)](http://travis-ci.org/neo4jrb/neo4jrb_spatial)
+
+## Introduction
+
 It is more or less a Neo4j.rb-flavored implementation of [Max De Marzi](https://github.com/maxdemarzi)'s
 [code](https://github.com/maxdemarzi/neography/blob/46be2bb3c66aea14e707b1e6f82937e65f686ccc/lib/neography/rest/spatial.rb) from
 [Neography](https://github.com/maxdemarzi/neography).
@@ -66,28 +72,28 @@ Neo4j::Session.current.query.start('n = node:restaurants({location})').params(lo
 ## Use it with the Neo4j gem
 
  Neo4j.rb does not support legacy indexes, so adding nodes to spatial indexes needs to happen separately from node creation. This is complicated by the fact that Neo4j.rb creates all nodes in transactions, so `after_create` callbacks won't work; instead, add your node to the index once you've confirmed it has been created.
- 
+
  Start by adding `lat` and `lon` properties to your model. You can also add a `spatial_index` to save yourself some time later.
- 
+
  ```
  class Restaurant
    include Neo4j::ActiveNode
    include Neo4j::ActiveNode::Spatial
-   
+
    # This is optional but might make things easier for you later
    spatial_index 'restaurants'
-   
+
    property :name
    property :lat
    property :lon
  end
- 
+
  # Create it
  pizza_hut = Restaurant.create(name: 'Pizza Hut', lat: 60.1, lon: 15.1)
- 
+
  # When called without an argument, it will use the value set through `spatial_index` in the model
  pizza_hut.add_to_spatial_index
- 
+
  # Alternatively, to add it to a different index, just give it that name
  pizza_hut.add_to_spatial_index('fake_pizza_places')
  ```
@@ -112,12 +118,12 @@ Restaurant.all.spatial_match(:r, params_string)
 ```
 
 It then drops you back into a QueryProxy in the context of the class. If you had an `employees` association defined in your model:
- 
+
  ```
  # Find all restaurants within the specified distance, then find their employees who are age 30
  Restauarant.all.spatial_match(:r, 'withinDistance:[41.99,-87.67,10.0]').employees.where(age: 30)
  ```
- 
+
 If you did no define `spatial_index` on your model or what to query against something other than the model's default, you can feed a third argument: the index to use for the query.
 
 ## Additional Resources
@@ -129,4 +135,4 @@ mostly works for an idea of the basics, just replace Neography-specific commands
 
 ## Contributions
 
-Pull requests and maintanence help would be swell. In addition to being fully tested, please ensure rubocop passes by running `rubocop` from the CLI. 
+Pull requests and maintanence help would be swell. In addition to being fully tested, please ensure rubocop passes by running `rubocop` from the CLI.

data/lib/neo4j/active_node/spatial.rb

@@ -1,39 +1,43 @@
-module Neo4j::ActiveNode
-  module Spatial
-    def self.included(other)
-      other.extend(ClassMethods)
-    end
-
-    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)
-    end
+module Neo4j
+  module ActiveNode
+    module Spatial
+      def self.included(other)
+        other.extend(ClassMethods)
+      end
 
-    module ClassMethods
-      attr_reader :spatial_index_name
-      def spatial_index(index_name = nil)
-        return spatial_index_name unless index_name
-        # create_index_callback(index_name)
-        @spatial_index_name = index_name
+      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)
       end
 
-      # This will not work for now. Neo4j Spatial's REST API doesn't seem to work within transactions.
-      # def create_index_callback(index_name)
-      #   after_create(proc { |node| Neo4j::Session.current.add_node_to_spatial_index(index_name, node) })
-      # end
+      module ClassMethods
+        attr_reader :spatial_index_name
+        def spatial_index(index_name = nil)
+          return spatial_index_name unless index_name
+          # create_index_callback(index_name)
+          @spatial_index_name = index_name
+        end
+
+        # This will not work for now. Neo4j Spatial's REST API doesn't seem to work within transactions.
+        # def create_index_callback(index_name)
+        #   after_create(proc { |node| Neo4j::Session.current.add_node_to_spatial_index(index_name, node) })
+        # end
 
-      # private :create_index_callback
+        # private :create_index_callback
+      end
     end
 
-    class Query::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
-          .start("#{var} = node:#{index}({spatial_params})")
-          .proxy_as(model, var)
-          .params(spatial_params: params_string)
+    module Query
+      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
+            .start("#{var} = node:#{index}({spatial_params})")
+            .proxy_as(model, var)
+            .params(spatial_params: params_string)
+        end
       end
     end
   end

data/lib/neo4j/spatial.rb

@@ -1,130 +1,144 @@
-module Neo4j::Server
-  module Spatial
-    def spatial?
-      Neo4j::Session.current.connection.get('/db/data/ext/SpatialPlugin').status == 200
-    end
+module Neo4j
+  module Server
+    module Spatial
+      def spatial?
+        Neo4j::Session.current.connection.get('/db/data/ext/SpatialPlugin').status == 200
+      end
 
-    def spatial_plugin
-      Neo4j::Session.current.connection.get('/db/data/ext/SpatialPlugin').body
-    end
+      def spatial_plugin
+        parse_response! Neo4j::Session.current.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'
-      }
+      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
+        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
-      }
+      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
+        spatial_post('/ext/SpatialPlugin/graphdb/addEditableLayer', options)
+      end
 
-    def get_layer(layer)
-      options = {
-        layer: layer
-      }
-      spatial_post('/ext/SpatialPlugin/graphdb/getLayer', 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 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 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: "#{resource_url}node/#{node.neo_id}"
-      }
-      spatial_post('/ext/SpatialPlugin/graphdb/addNodeToLayer', options)
-    end
+      def add_node_to_layer(layer, node)
+        options = {
+          layer: layer,
+          node: "#{resource_url}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_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 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'
+      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
+        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
+      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
+      private
 
-    def spatial_post(path, options)
-      Neo4j::Session.current.connection.post("/db/data/#{path}", options).body
-    end
+      def spatial_post(path, options)
+        parse_response! Neo4j::Session.current.connection.post("/db/data/#{path}", options).body
+      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
+      def parse_response!(response)
+        request_error!(response[:exception], response[:message], response[:stack_trace]) if response.is_a?(Hash) && response[:exception]
+        response
+      end
+
+      def request_error!(code, message, stack_trace)
+        fail Neo4jrbSpatial::RequestError, <<-ERROR
+  #{ANSI::CYAN}#{code}#{ANSI::CLEAR}: #{message}
+  #{stack_trace}
+ERROR
+      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
 
-  class CypherSession
-    include Spatial
+    class CypherSession < Neo4j::Session
+      include Spatial
+    end
   end
 end

data/lib/neo4jrb_spatial.rb

@@ -1,3 +1,4 @@
 require 'neo4jrb_spatial/version'
+require 'neo4jrb_spatial/errors'
 require 'neo4j/spatial'
 require 'neo4j/active_node/spatial'

data/lib/neo4jrb_spatial/errors.rb

@@ -0,0 +1,7 @@
+module Neo4jrbSpatial
+  class Error < ::StandardError
+  end
+
+  class RequestError < Error
+  end
+end

data/lib/neo4jrb_spatial/version.rb

@@ -1,3 +1,3 @@
 module Neo4jrbSpatial
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/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'
-  spec.add_dependency 'neo4j-core', '>= 5.0.1'
+  spec.add_dependency 'neo4j', '>= 5.0.1', '< 8'
+  spec.add_dependency 'neo4j-core', '>= 5.0.1', '< 7'
   spec.add_dependency 'neo4j-rake_tasks', '~> 0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4jrb_spatial
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Grigg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +97,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: neo4j-core
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +107,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,6 +117,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: neo4j-rake_tasks
   requirement: !ruby/object:Gem::Requirement
@@ -132,11 +144,10 @@ files:
 - CHANGELOG.md
 - Gemfile
 - README.md
-- bin/console
-- bin/setup
 - lib/neo4j/active_node/spatial.rb
 - lib/neo4j/spatial.rb
 - lib/neo4jrb_spatial.rb
+- lib/neo4jrb_spatial/errors.rb
 - lib/neo4jrb_spatial/version.rb
 - neo4jrb_spatial.gemspec
 homepage: https://github.com/neo4jrb/neo4jrb_spatial
@@ -158,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides basic support for Neo4j Spatial with Neo4j.rb.

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'neo4jrb_spatial'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here