neo4j-core 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d3cbf5325e61b512d3ee45eb02a58125794fc80
-  data.tar.gz: db9a665ef9d8a6dade91ad8f715969737d21390a
+  metadata.gz: 413db701027dd75c0757902fba22db6a5b289781
+  data.tar.gz: 59d07ba453f252c053fbd6b353b3604415cd3a0f
 SHA512:
-  metadata.gz: 17b7d282f266d5167f92eeec3c06daf0d5321eed771d895544dadcb0f2dc8346f97e612d67156a43d033093caa805f1b18c03f010c65775966068c8768f30145
-  data.tar.gz: 7d3023581c880837bfc13d714b873303012d01cd3fcd6ae3409e419220e488a960c3517ad590c48e14bcdb5a49f8360c991dd6fa39da19537444174c9ec8b850
+  metadata.gz: cf46b06d8cf1c4b4152fe7ce4f870ca019cdb475d06a2e2d902db223c7d6d2c8abf20b44cba5a352e3e3b4122d4e79e698bdc105a169e41fdc51bca506958474
+  data.tar.gz: 9dcdf5e2fdb993c3de4203a0e21029bc497fd6562096bdd6b76b761565c0e56206f16cccd2bc449d5625c8235931f4312810697ed2b547a41d3fb42286d98bb1

data/Gemfile

@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'zip'
-
 # gem 'neo4j-advanced',   '>= 1.8.1', '< 2.0', :require => false
 # gem 'neo4j-enterprise', '>= 1.8.1', '< 2.0', :require => false
 
@@ -14,7 +12,6 @@ end
 group 'test' do
   gem 'coveralls', require: false
   gem 'simplecov-html', require: false
-  gem 'rake', '>= 0.8.7'
   gem 'rspec', '~> 3.0'
   gem 'rspec-its'
 end

data/README.md

@@ -1,25 +1,51 @@
-# Neo4j-core v3.0 [![Code Climate](https://codeclimate.com/github/neo4jrb/neo4j-core.png)](https://codeclimate.com/github/neo4jrb/neo4j-core) [![Build Status](https://travis-ci.org/neo4jrb/neo4j-core.png)](https://travis-ci.org/neo4jrb/neo4j-core) [![Coverage Status](https://coveralls.io/repos/neo4jrb/neo4j-core/badge.png?branch=master)](https://coveralls.io/r/neo4jrb/neo4j-core?branch=master) [![PullReview stats](https://www.pullreview.com/github/neo4jrb/neo4j-core/badges/master.svg?)](https://www.pullreview.com/github/neo4jrb/neo4j-core/reviews/master)
+# Neo4j-core [![Code Climate](https://codeclimate.com/github/neo4jrb/neo4j-core.png)](https://codeclimate.com/github/neo4jrb/neo4j-core) [![Build Status](https://travis-ci.org/neo4jrb/neo4j-core.png)](https://travis-ci.org/neo4jrb/neo4j-core) [![Coverage Status](https://coveralls.io/repos/neo4jrb/neo4j-core/badge.png?branch=master)](https://coveralls.io/r/neo4jrb/neo4j-core?branch=master) [![PullReview stats](https://www.pullreview.com/github/neo4jrb/neo4j-core/badges/master.svg?)](https://www.pullreview.com/github/neo4jrb/neo4j-core/reviews/master)
 
 A simple Ruby wrapper around the Neo4j graph database that works with the server and embedded Neo4j API. This gem can be used both from JRuby and normal MRI.
 It can be used standalone without the neo4j gem.
 
 ## Documentation
 
-* [3.0 Documentation](https://github.com/neo4jrb/neo4j-core/wiki)
-* [2.x Documentation](https://github.com/neo4jrb/neo4j-core/tree/v2.x)
+### 3.0+ Documentation:
 
+ * http://neo4jrb.readthedocs.org/en/stable/
+ * https://github.com/neo4jrb/neo4j-core/wiki
+
+### 2.x Documentation
+
+https://github.com/neo4jrb/neo4j-core/tree/v2.x
 
 ## Support
 
-* [Neo4j.rb mailing list](https://groups.google.com/forum/#!forum/neo4jrb)
-* Consulting support ? ask any of the developers
+### Issues
+
+[![Next Release](https://badge.waffle.io/neo4jrb/neo4j-core.png?label=Next%20Release&title=Next%20Release) ![In Progress](https://badge.waffle.io/neo4jrb/neo4j-core.png?label=In%20Progress&title=In%20Progress) ![In Master](https://badge.waffle.io/neo4jrb/neo4j-core.png?label=In%20Master&title=In%20Master)](https://waffle.io/neo4jrb/neo4j-core)
+
+[![Post an issue](https://img.shields.io/badge/Bug%3F-Post%20an%20issue!-blue.svg)](https://waffle.io/neo4jrb/neo4j-core)
+
+
+### Get Support
+
+#### Documentation
+
+All new documentation will be done via our [readthedocs](http://neo4jrb.readthedocs.org) site, though some old documentation has yet to be moved from our [wiki](https://github.com/neo4jrb/neo4j/wiki) (also there is the [neo4j-core wiki](https://github.com/neo4jrb/neo4j-core/wiki))
+
+#### Contact Us
+
+[![StackOverflow](https://img.shields.io/badge/StackOverflow-Ask%20a%20question!-blue.svg)](http://stackoverflow.com/questions/ask?tags=neo4j.rb+neo4j+ruby)  [![Gitter](https://img.shields.io/badge/Gitter-Join%20our%20chat!-blue.svg)](https://gitter.im/neo4jrb/neo4j?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)  [![Twitter](https://img.shields.io/badge/Twitter-Tweet%20with%20us!-blue.svg)](https://twitter.com/neo4jrb)  [![Mailing list](https://img.shields.io/badge/Mailing%20list-Mail%20us!-blue.svg)](https://groups.google.com/forum/#!forum/neo4jrb)
+
 
 ## Developers
 
-* [Andreas Ronge](https://github.com/neo4jrb)
+### Original Author
+
+* [Andreas Ronge](https://github.com/andreasronge)
+
+### Current Maintainers
+
 * [Brian Underwood](https://github.com/cheerfulstoic)
 * [Chris Grigg](https://github.com/subvertallchris)
 
+Consulting support? Contact [Chris](http://subvertallmedia.com/) and/or [Brian](http://www.brian-underwood.codes/)
 
 ## Contributing
 

data/lib/neo4j/ansi.rb

@@ -0,0 +1,14 @@
+module Neo4j
+  module ANSI
+    CLEAR = "\e[0m"
+    BOLD = "\e[1m"
+
+    RED = "\e[31m"
+    GREEN = "\e[32m"
+    YELLOW = "\e[33m"
+    BLUE = "\e[34m"
+    MAGENTA = "\e[35m"
+    CYAN = "\e[36m"
+    WHITE = "\e[37m"
+  end
+end

data/lib/neo4j/label.rb

@@ -60,7 +60,6 @@ module Neo4j
     end
 
     class << self
-      include Neo4j::Core::CypherTranslator
       INDEX_PATH = '/db/data/schema/index/'
       CONSTRAINT_PATH = '/db/data/schema/constraint/'
 

data/lib/neo4j/node.rb

@@ -168,7 +168,12 @@ module Neo4j
     class << self
       # Creates a node
       def create(props = nil, *labels_or_db)
-        session = Neo4j::Core::ArgumentHelper.session(labels_or_db)
+        session = if labels_or_db.last.is_a?(Neo4j::Session)
+                    labels_or_db.pop
+                  else
+                    Neo4j::Session.current!
+                  end
+
         session.create_node(props, labels_or_db)
       end
 

data/lib/neo4j-core/helpers.rb

@@ -1,18 +1,13 @@
 module Neo4j
   module Core
-    module ArgumentHelper
-      def self.session(args)
-        args.last.is_a?(Neo4j::Session) ? args.pop : Neo4j::Session.current!
-      end
-    end
-
     module TxMethods
       def tx_methods(*methods)
         methods.each do |method|
           tx_method = "#{method}_in_tx"
           send(:alias_method, tx_method, method)
           send(:define_method, method) do |*args, &block|
-            session = ArgumentHelper.session(args)
+            session = args.last.is_a?(Neo4j::Session) ? args.pop : Neo4j::Session.current!
+
             Neo4j::Transaction.run(session.auto_commit?) { send(tx_method, *args, &block) }
           end
         end

data/lib/neo4j-core/query.rb

@@ -18,6 +18,10 @@ module Neo4j
 
       attr_accessor :clauses
 
+      class << self
+        attr_accessor :pretty_cypher
+      end
+
       def initialize(options = {})
         @session = options[:session] || Neo4j::Session.current
 
@@ -26,6 +30,10 @@ module Neo4j
         @_params = {}
       end
 
+      def inspect
+        "#<Query CYPHER: #{ANSI::YELLOW}#{to_cypher.inspect}#{ANSI::CLEAR}>"
+      end
+
       # @method start *args
       # START clause
       # @return [Query]
@@ -133,6 +141,12 @@ module Neo4j
         query.order(*args)
       end
 
+      # Works the same as the #where method, but the clause is surrounded by a
+      # Cypher NOT() function
+      def where_not(*args)
+        build_deeper_query(WhereClause, args, not: true)
+      end
+
       # Works the same as the #set method, but when given a nested array it will set properties rather than setting entire objects
       # @example
       #    # Creates a query representing the cypher: MATCH (n:Person) SET n.age = 19
@@ -174,9 +188,10 @@ module Neo4j
       def response
         return @response if @response
         cypher = to_cypher
-        @response = ActiveSupport::Notifications.instrument('neo4j.cypher_query', context: @options[:context] || 'CYPHER', cypher: cypher, params: merge_params) do
-          @session._query(cypher, merge_params)
-        end
+        pretty_cypher = to_cypher(pretty: true) if self.class.pretty_cypher
+
+        @response = @session._query(cypher, merge_params, context: @options[:context], pretty_cypher: pretty_cypher)
+
         if !response.respond_to?(:error?) || !response.error?
           response
         else
@@ -184,6 +199,17 @@ module Neo4j
         end
       end
 
+      def match_nodes(hash)
+        hash.inject(self) do |query, (variable, node_object)|
+          neo_id = if node_object.respond_to?(:neo_id)
+                     node_object.neo_id
+                   else
+                     node_object
+                   end
+          query.match(variable).where(variable => {neo_id: neo_id})
+        end
+      end
+
       include Enumerable
 
       def count(var = nil)
@@ -257,22 +283,27 @@ module Neo4j
       #
       # @return [String] Resulting cypher query string
       EMPTY = ' '
-      def to_cypher
+      NEWLINE = "\n"
+      def to_cypher(options = {})
         cypher_string = PartitionedClauses.new(@clauses).map do |clauses|
           clauses_by_class = clauses.group_by(&:class)
 
           cypher_parts = CLAUSES.map do |clause_class|
-            clause_class.to_cypher(clauses) if clauses = clauses_by_class[clause_class]
+            clause_class.to_cypher(clauses, options) if clauses = clauses_by_class[clause_class]
           end
 
           cypher_parts.compact!
-          cypher_parts.join(EMPTY).tap(&:strip!)
-        end.join EMPTY
+          cypher_parts.join(options[:pretty] ? NEWLINE : EMPTY).tap(&:strip!)
+        end.join(options[:pretty] ? NEWLINE : EMPTY)
 
         cypher_string = "CYPHER #{@options[:parser]} #{cypher_string}" if @options[:parser]
         cypher_string.tap(&:strip!)
       end
 
+      def print_cypher
+        puts to_cypher(pretty: true).gsub(/\e[^m]+m/, '')
+      end
+
       # Returns a CYPHER query specifying the union of the callee object's query and the argument's query
       #
       # @example