neo4j-core 5.0.10 → 5.1.0.rc.1

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '5.0.10'
+    VERSION = '5.1.0.rc.1'
   end
 end

data/lib/neo4j-embedded.rb

@@ -13,4 +13,4 @@ require 'neo4j-embedded/embedded_transaction'
 require 'neo4j-embedded/cypher_response'
 
 # TODO: replace this with https://github.com/intridea/hashie gem
-require 'neo4j-core/hash_with_indifferent_access'
+require 'active_support/hash_with_indifferent_access'

data/lib/neo4j-embedded/embedded_session.rb

@@ -4,7 +4,6 @@ Neo4j::Session.register_db(:embedded_db) do |*args|
   Neo4j::Embedded::EmbeddedSession.new(*args)
 end
 
-
 module Neo4j
   module Embedded
     class EmbeddedSession < Neo4j::Session
@@ -17,16 +16,22 @@ module Neo4j
       def_delegator :@graph_db, :begin_tx
 
       def initialize(db_location, config = {})
+        @config          = config
         @db_location     = db_location
-        @auto_commit     = !!config[:auto_commit]
-        @properties_file = config[:properties_file]
-        if config[:properties_map]
-          props = config[:properties_map].each_with_object({}) { |(k, v), m| m[k.to_s.to_java] = v.to_s.to_java }
-          @properties_map = java.util.HashMap.new(props)
-        end
+        @auto_commit     = !!@config[:auto_commit]
+        @properties_file = @config[:properties_file]
         Neo4j::Session.register(self)
       end
 
+      def properties_map
+        return @properties_map if @properties_map
+
+        props = @config[:properties_map].each_with_object({}) do |(k, v), m|
+          m[k.to_s.to_java] = v.to_s.to_java
+        end
+        @properties_map = java.util.HashMap.new(props)
+      end
+
       def db_type
         :embedded_db
       end
@@ -138,9 +143,10 @@ module Neo4j
       # @param [String] q the cypher query as a String
       # @return (see #query)
       def _query(query, params = {}, options = {})
-        ActiveSupport::Notifications.instrument('neo4j.cypher_query', context: options[:context] || 'CYPHER', cypher: query, params: params) do
+        ActiveSupport::Notifications.instrument('neo4j.cypher_query', params: params, context: options[:context],
+                                                                      cypher: query, pretty_cypher: options[:pretty_cypher], params: params) do
           @engine ||= Java::OrgNeo4jCypherJavacompat::ExecutionEngine.new(@graph_db)
-          @engine.execute(query, Neo4j::Core::HashWithIndifferentAccess.new(params))
+          @engine.execute(query, HashWithIndifferentAccess.new(params))
         end
       rescue StandardError => e
         raise Neo4j::Session::CypherError.new(e.message, e.class, 'cypher error')

data/lib/neo4j-server.rb

@@ -7,7 +7,6 @@ require 'neo4j-server/cypher_node'
 require 'neo4j-server/cypher_label'
 require 'neo4j-server/label'
 require 'neo4j-server/cypher_session'
-require 'neo4j-server/cypher_node_uncommited'
 require 'neo4j-server/cypher_relationship'
 require 'neo4j-server/cypher_response'
 require 'neo4j-server/cypher_transaction'

data/lib/neo4j-server/cypher_node.rb

@@ -2,7 +2,6 @@ module Neo4j
   module Server
     class CypherNode < Neo4j::Node
       include Neo4j::Server::Resource
-      include Neo4j::Core::CypherTranslator
       include Neo4j::Core::ActiveEntity
 
       def initialize(session, value)
@@ -113,8 +112,6 @@ module Neo4j
       end
 
       def set_label(*label_names)
-        q = match_start_query
-
         labels_to_add = label_names.map(&:to_sym).uniq
         labels_to_remove = labels - label_names
 
@@ -122,10 +119,15 @@ module Neo4j
         labels_to_add -= common_labels
         labels_to_remove -= common_labels
 
-        q = q.remove(n: labels_to_remove) unless labels_to_remove.empty?
-        q = q.set(n: labels_to_add) unless labels_to_add.empty?
+        query = _set_label_query(labels_to_add, labels_to_remove)
+        @session._query_or_fail(query, false) unless (labels_to_add + labels_to_remove).empty?
+      end
 
-        @session._query_or_fail(q, false) unless (labels_to_add + labels_to_remove).empty?
+      def _set_label_query(labels_to_add, labels_to_remove)
+        query = match_start_query
+        query = query.remove(n: labels_to_remove) unless labels_to_remove.empty?
+        query = query.set(n: labels_to_add) unless labels_to_add.empty?
+        query
       end
 
       # (see Neo4j::Node#del)

data/lib/neo4j-server/cypher_relationship.rb

@@ -2,7 +2,6 @@ module Neo4j
   module Server
     class CypherRelationship < Neo4j::Relationship
       include Neo4j::Server::Resource
-      include Neo4j::Core::CypherTranslator
       include Neo4j::Core::ActiveEntity
 
       def initialize(session, value)
@@ -93,10 +92,17 @@ module Neo4j
       # (see Neo4j::Relationship#update_props)
       def update_props(properties)
         return if properties.empty?
-        q = "#{match_start} SET " + properties.keys.map do |k|
-          "n.`#{k}`= #{escape_value(properties[k])}"
+
+        params = {}
+        q = "#{match_start} SET " + properties.keys.each_with_index.map do |k, _i|
+          param = k.to_s.tr_s('^a-zA-Z0-9', '_').gsub(/^_+|_+$/, '')
+          params[param] = properties[k]
+
+          "n.`#{k}`= {#{param}}"
         end.join(',')
-        @session._query_or_fail(q, false, neo_id: neo_id)
+
+        @session._query_or_fail(q, false, params.merge(neo_id: neo_id))
+
         properties
       end
 
@@ -127,7 +133,7 @@ module Neo4j
       end
 
       def neo_id_integer(id_or_url)
-        id_or_url.is_a?(Integer) ? id_or_url : id_or_url.match(/\d+$/)[0].to_i
+        id_or_url.is_a?(Integer) ? id_or_url : id_or_url.split('/').last.to_i
       end
     end
   end

data/lib/neo4j-server/cypher_response.rb

@@ -13,6 +13,7 @@ module Neo4j
         end
       end
 
+      class ConstraintViolationError < ResponseError; end
 
       class HashEnumeration
         include Enumerable
@@ -201,9 +202,15 @@ module Neo4j
         self
       end
 
+      CONSTRAINT_ERROR = 'Neo.ClientError.Schema.ConstraintViolation'
       def raise_error
         fail 'Tried to raise error without an error' unless @error
-        fail ResponseError.new(@error_msg, @error_status, @error_code)
+        error_class = constraint_error? ? ConstraintViolationError : ResponseError
+        fail error_class.new(@error_msg, @error_status, @error_code)
+      end
+
+      def constraint_error?
+        @error_code == CONSTRAINT_ERROR || @error_msg.include?('already exists with')
       end
 
       def raise_cypher_error
@@ -228,11 +235,7 @@ module Neo4j
 
         new(response, true).tap do |cr|
           body = response.body
-          if body[:errors].empty?
-            cr.set_data(body[:results].first)
-          else
-            cr.set_error(body[:errors].first)
-          end
+          body[:errors].empty? ? cr.set_data(body[:results].first) : cr.set_error(body[:errors].first)
         end
       end
 

data/lib/neo4j-server/cypher_session.rb

@@ -8,7 +8,6 @@ module Neo4j
 
     class CypherSession < Neo4j::Session
       include Resource
-      include Neo4j::Core::CypherTranslator
 
       alias_method :super_query, :query
       attr_reader :connection
@@ -102,9 +101,14 @@ module Neo4j
       end
 
       def create_node(props = nil, labels = [])
-        id = _query_or_fail(cypher_string(labels, props), true, cypher_prop_list!(props))
-        value = props.nil? ? id : {id: id, metadata: {labels: labels}, data: props}
-        CypherNode.new(self, value)
+        label_string = labels.empty? ? '' : (':' + labels.map { |k| "`#{k}`" }.join(':'))
+        if !props.nil?
+          prop = '{props}'
+          props.each_key { |k| props.delete(k) if props[k].nil? }
+        end
+
+        id = _query_or_fail("CREATE (n#{label_string} #{prop}) RETURN ID(n)", true, props: props)
+        CypherNode.new(self, props.nil? ? id : {id: id, metadata: {labels: labels}, data: props})
       end
 
       def load_node(neo_id)
@@ -114,11 +118,9 @@ module Neo4j
       def load_relationship(neo_id)
         query.unwrapped.optional_match('(n)-[r]-()').where(r: {neo_id: neo_id}).pluck(:r).first
       rescue Neo4j::Session::CypherError => cypher_error
-        if cypher_error.message.match(/not found$/)
-          nil
-        else
-          raise cypher_error
-        end
+        return nil if cypher_error.message.match(/not found$/)
+
+        raise cypher_error
       end
 
       def create_label(name)
@@ -206,13 +208,15 @@ module Neo4j
         query, params = query_and_params(query, params)
 
         curr_tx = Neo4j::Transaction.current
-        ActiveSupport::Notifications.instrument('neo4j.cypher_query', context: options[:context] || 'CYPHER', cypher: query, params: params) do
+        puts options[:pretty_cypher]
+        puts
+        ActiveSupport::Notifications.instrument('neo4j.cypher_query', params: params, context: options[:context],
+                                                                      cypher: query, pretty_cypher: options[:pretty_cypher]) do
           if curr_tx
             curr_tx._query(query, params)
           else
-            url = resource_url(:cypher)
             query = params.nil? ? {'query' => query} : {'query' => query, 'params' => params}
-            response = @connection.post(url, query)
+            response = @connection.post(resource_url(:cypher), query)
             CypherResponse.create_with_no_tx(response)
           end
         end
@@ -235,12 +239,14 @@ module Neo4j
       end
 
       EMPTY = ''
+      NEWLINE_W_SPACES = "\n  "
       def self.log_with
-        clear, yellow, cyan = %W(\e[0m \e[33m \e[36m)
         ActiveSupport::Notifications.subscribe('neo4j.cypher_query') do |_, start, finish, _id, payload|
           ms = (finish - start) * 1000
           params_string = (payload[:params] && payload[:params].size > 0 ? "| #{payload[:params].inspect}" : EMPTY)
-          yield(" #{cyan}#{payload[:context]}#{clear} #{yellow}#{ms.round}ms#{clear} #{payload[:cypher]} #{params_string}")
+          cypher = payload[:pretty_cypher] ? NEWLINE_W_SPACES + payload[:pretty_cypher].gsub(/\n/, NEWLINE_W_SPACES) : payload[:cypher]
+
+          yield(" #{ANSI::CYAN}#{payload[:context] || 'CYPHER'}#{ANSI::CLEAR} #{ANSI::YELLOW}#{ms.round}ms#{ANSI::CLEAR} #{cypher} #{params_string}")
         end
       end
     end

data/lib/neo4j-server/cypher_transaction.rb

@@ -9,7 +9,6 @@ module Neo4j
     # If a transaction is created and then closed without performing any queries, an OpenStruct is returned that behaves like a successfully closed query.
     class CypherTransaction
       include Neo4j::Transaction::Instance
-      include Neo4j::Core::CypherTranslator
       include Resource
 
       attr_reader :commit_url, :query_url, :base_url, :connection

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/neo4j-core.gemspec

@@ -30,11 +30,10 @@ Neo4j-core provides classes and methods to work with the graph database Neo4j.
   s.add_dependency('httpclient')
   s.add_dependency('faraday_middleware', '~> 0.9.1')
   s.add_dependency('json')
-  s.add_dependency('os')  # for Rake task
-  s.add_dependency('zip') # for Rake task
   s.add_dependency('activesupport') # For ActiveSupport::Notifications
   s.add_dependency('multi_json')
   s.add_dependency('faraday_middleware-multi_json')
+  s.add_dependency('neo4j-rake_tasks')
 
   s.add_development_dependency('pry')
   s.add_development_dependency('yard')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 5.0.10
+  version: 5.1.0.rc.1
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -95,21 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: os
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: zip
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: faraday_middleware-multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware-multi_json
+  name: neo4j-rake_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -261,8 +247,6 @@ files:
 - lib/ext/kernel.rb
 - lib/neo4j-core.rb
 - lib/neo4j-core/active_entity.rb
-- lib/neo4j-core/cypher_translator.rb
-- lib/neo4j-core/hash_with_indifferent_access.rb
 - lib/neo4j-core/helpers.rb
 - lib/neo4j-core/label.rb
 - lib/neo4j-core/query.rb
@@ -285,7 +269,6 @@ files:
 - lib/neo4j-server.rb
 - lib/neo4j-server/cypher_label.rb
 - lib/neo4j-server/cypher_node.rb
-- lib/neo4j-server/cypher_node_uncommited.rb
 - lib/neo4j-server/cypher_relationship.rb
 - lib/neo4j-server/cypher_response.rb
 - lib/neo4j-server/cypher_session.rb
@@ -300,8 +283,6 @@ files:
 - lib/neo4j/property_validator.rb
 - lib/neo4j/relationship.rb
 - lib/neo4j/session.rb
-- lib/neo4j/tasks/config_server.rb
-- lib/neo4j/tasks/neo4j_server.rake
 - lib/neo4j/transaction.rb
 - neo4j-core.gemspec
 homepage: https://github.com/neo4jrb/neo4j-core
@@ -326,9 +307,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5

data/lib/neo4j-core/cypher_translator.rb

@@ -1,76 +0,0 @@
-module Neo4j
-  module Core
-    module CypherTranslator
-      # Cypher Helper
-      def escape_value(value)
-        if value.is_a?(String) || value.is_a?(Symbol)
-          "'#{escape_quotes(sanitize_escape_sequences(value.to_s))}'"
-        else
-          value
-        end
-      end
-
-      # Like escape_value but it does not wrap the value in quotes
-      def create_escape_value(value)
-        if value.is_a?(String) || value.is_a?(Symbol)
-          "#{sanitize_escape_sequences(value.to_s)}"
-        else
-          value
-        end
-      end
-
-      # Only following escape sequence characters are allowed in Cypher:
-      #
-      # \t Tab
-      # \b Backspace
-      # \n Newline
-      # \r Carriage return
-      # \f Form feed
-      # \' Single quote
-      # \" Double quote
-      # \\ Backslash
-      #
-      # From:
-      # http://docs.neo4j.org/chunked/stable/cypher-expressions.html#_note_on_string_literals
-      SANITIZE_ESCAPED_REGEXP = /(?<!\\)\\(\\\\)*(?![futbnr'"\\])/
-      EMPTY_PROPS = ''
-
-      def sanitize_escape_sequences(s)
-        s.gsub SANITIZE_ESCAPED_REGEXP, EMPTY_PROPS
-      end
-
-      def escape_quotes(s)
-        s.gsub("'", %q(\\\'))
-      end
-
-      # Cypher Helper
-      def cypher_prop_list!(props)
-        return nil unless props
-        props.reject! { |_, v| v.nil? }
-        {props: props.each { |k, v|  props[k] = create_escape_value(v) }}
-      end
-
-      # Stolen from keymaker
-      # https://github.com/therubymug/keymaker/blob/master/lib/keymaker/parsers/cypher_response_parser.rb
-      def self.translate_response(response_body, result)
-        Hashie::Mash.new(Hash[sanitized_column_names(response_body).zip(result)])
-      end
-
-      def self.sanitized_column_names(response_body)
-        response_body.columns.map { |column| column[/[^\.]+$/] }
-      end
-
-      def cypher_string(labels, props)
-        "CREATE (n#{label_string(labels)} #{prop_identifier(props)}) RETURN ID(n)"
-      end
-
-      def label_string(labels)
-        labels.empty? ? '' : ":#{labels.map { |k| "`#{k}`" }.join(':')}"
-      end
-
-      def prop_identifier(props)
-        '{props}' unless props.nil?
-      end
-    end
-  end
-end