neo4j-core 5.0.10 → 5.1.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 973a3091e4ac4ffe027b846627a315a70b79e182
-  data.tar.gz: d9cc32add98996c8efacb94e44034f78cd2c39b3
+  metadata.gz: 1ca70d80670e3232da4c5b05833cfa06ced3adf5
+  data.tar.gz: 7d32346859088e577bba8617ecd8b3d13f553880
 SHA512:
-  metadata.gz: 38e2ebd378bfcccc0fad41b1adcae148da01a6f692f978c3bb134593ad7e2bcc93cb4e3ea7ca637386a4e747442ff2db232ef9eed18d551334c038a109b9f1c3
-  data.tar.gz: c136b1a82abad7ca652b516cd4a3e50da7170a0cc4b6e529f8134d30cb734886f0d56351d13d0304faff390ffa590cb611931ddbd887a6605d9ad143c4288034
+  metadata.gz: 4853d0684c0d1a9b1ca8d0af69e414a3b31ddaacb68535e9bddd3c489a3bea65142bf68114e858903cdaf5a5f3b6d5fcdae7c52663477a0555821bd681175a61
+  data.tar.gz: f870bc4b2b1dad67d625fde00a37f1e5ace304e31d26b2cc48396e937fd72a0d94a10f73a05fe1977fc9c4cc9cd6a257ff1a80d9b74e0b4234b0562543553162

data/Gemfile

@@ -2,20 +2,16 @@ 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
 
 group 'development' do
   gem 'guard-rspec', require: false
-  gem 'overcommit'
 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-core.rb

@@ -9,7 +9,6 @@ require 'neo4j/property_validator'
 require 'neo4j/property_container'
 require 'neo4j-core/active_entity'
 require 'neo4j-core/helpers'
-require 'neo4j-core/cypher_translator'
 require 'neo4j-core/query_find_in_batches'
 require 'neo4j-core/query'
 

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: #{to_cypher.inspect}>"
+      end
+
       # @method start *args
       # START clause
       # @return [Query]
@@ -174,8 +182,9 @@ module Neo4j
       def response
         return @response if @response
         cypher = to_cypher
+        pretty_cypher = to_cypher(pretty: true).gsub(/\e[^m]+m/, '') #if self.class.pretty_cypher
 
-        @response = @session._query(cypher, merge_params, context: @options[:context])
+        @response = @session._query(cypher, merge_params, context: @options[:context], pretty_cypher: pretty_cypher)
 
         if !response.respond_to?(:error?) || !response.error?
           response
@@ -268,22 +277,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

data/lib/neo4j-core/query_clauses.rb

@@ -11,7 +11,6 @@ module Neo4j
 
 
       class Clause
-        include CypherTranslator
         UNDERSCORE = '_'
         COMMA_SPACE = ', '
         AND = ' AND '
@@ -53,8 +52,10 @@ module Neo4j
         end
 
         def node_from_key_and_value(key, value, options = {})
-          var = var_from_key_and_value(key, value, options[:prefer] || :var)
-          label = label_from_key_and_value(key, value, options[:prefer] || :var)
+          prefer = options[:prefer] || :var
+          var = var_from_key_and_value(key, value, prefer)
+          label = label_from_key_and_value(key, value, prefer)
+
           attributes = attributes_from_key_and_value(key, value)
 
           prefix_value = value
@@ -131,13 +132,34 @@ module Neo4j
             new(arg, options) if !arg.respond_to?(:empty?) || !arg.empty?
           end
 
-          def to_cypher(clauses)
+          def to_cypher(clauses, options = {})
             @question_mark_param_index = 1
 
-            string = clause_string(clauses)
-            string.strip!
+            string = clause_string(clauses, options)
+
+            final_keyword = if options[:pretty]
+                              "#{clause_color}#{keyword}#{ANSI::CLEAR}"
+                            else
+                              keyword
+                            end
+
+            "#{final_keyword} #{string}" if string.size > 0
+          end
+
+          def clause_string(clauses, options = {})
+            join_string = clause_join + (options[:pretty] ? "\n  " : '')
 
-            "#{keyword} #{string}" if string.size > 0
+            strings = clause_strings(clauses)
+            string = ((options[:pretty] && strings.size > 1) ? "\n  " : '')
+            string + strings.join(join_string).strip
+          end
+
+          def clause_join
+            ''
+          end
+
+          def clause_color
+            ANSI::CYAN
           end
         end
 
@@ -228,8 +250,12 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(Clause::COMMA_SPACE)
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            Clause::COMMA_SPACE
           end
         end
       end
@@ -249,8 +275,12 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).tap(&:flatten!).map! { |value| "(#{value})" }.join(Clause::AND)
+          def clause_strings(clauses)
+            clauses.map!(&:value).tap(&:flatten!).map! { |value| "(#{value})" }
+          end
+
+          def clause_join
+            Clause::AND
           end
         end
 
@@ -322,8 +352,12 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(Clause::COMMA_SPACE)
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            Clause::COMMA_SPACE
           end
         end
       end
@@ -344,8 +378,12 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(Clause::COMMA_SPACE)
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            Clause::COMMA_SPACE
           end
         end
       end
@@ -354,8 +392,12 @@ module Neo4j
         KEYWORD = 'USING'
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(" #{keyword} ")
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            " #{keyword} "
           end
         end
       end
@@ -386,8 +428,16 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(', ')
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            ', '
+          end
+
+          def clause_color
+            ANSI::GREEN
           end
         end
       end
@@ -398,6 +448,12 @@ module Neo4j
 
       class MergeClause < CreateClause
         KEYWORD = 'MERGE'
+
+        class << self
+          def clause_color
+            ANSI::MAGENTA
+          end
+        end
       end
 
       class DeleteClause < Clause
@@ -408,8 +464,16 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(Clause::COMMA_SPACE)
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            Clause::COMMA_SPACE
+          end
+
+          def clause_color
+            ANSI::RED
           end
         end
       end
@@ -435,8 +499,12 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(Clause::COMMA_SPACE)
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            Clause::COMMA_SPACE
           end
         end
       end
@@ -461,8 +529,8 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.last.value
+          def clause_strings(clauses)
+            [clauses.last.value]
           end
         end
       end
@@ -483,8 +551,8 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.last.value
+          def clause_strings(clauses)
+            [clauses.last.value]
           end
         end
       end
@@ -510,8 +578,16 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(Clause::COMMA_SPACE)
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            Clause::COMMA_SPACE
+          end
+
+          def clause_color
+            ANSI::YELLOW
           end
         end
       end
@@ -550,8 +626,12 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(Clause::COMMA_SPACE)
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            Clause::COMMA_SPACE
           end
         end
       end
@@ -571,8 +651,12 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(' UNWIND ')
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            ' UNWIND '
           end
         end
       end
@@ -602,8 +686,12 @@ module Neo4j
         end
 
         class << self
-          def clause_string(clauses)
-            clauses.map!(&:value).join(Clause::COMMA_SPACE)
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            Clause::COMMA_SPACE
           end
         end
       end