neo4j-core 3.0.0.alpha.9 → 3.0.0.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 603fa5b52e151a255cb6af0c99ee8a13442cfb58
-  data.tar.gz: c2045779a04c9d9680ed3ff4ff811f5f6f42ba3d
+  metadata.gz: 8a84afded3b491b86251ab1b129c8722e921fd0b
+  data.tar.gz: c2db2be7dfdf1cf1dc33f5a13d43c3083b24e46d
 SHA512:
-  metadata.gz: 5f26e769116c75daa0666eb77a2278c59e36652f195d2c4b81dcba47b5837028e216d30c8c1fb55fa096791c14f63da78dce00464eee059bc803c4ab4598655d
-  data.tar.gz: 0fcf3a37a9833e1c6d37d24173e8c895536a0f2cc0ea3e0201452b8f27a89038854481ece391016e6d66159b67d5d100c257837321549b76c254a475a346ca25
+  metadata.gz: fd6fccc4a3ba5c2980b0ed478d65d5a2389f1da43f24540fd5e823fdf91b5b7a5cd1148a6f0049b5f4c3db698617235a40ce52aea7da2d81c9e263b0b9231a76
+  data.tar.gz: 22ad54611e1d5d896f94e5d47265c08e9dd27dd26132f7e9b9262eb4097a01e2030f2ebb806636c1d6c20999d2751291225c548f54e6ad999ac989982a82532d

data/lib/neo4j-core/cypher_translator.rb

@@ -1,14 +1,38 @@
 module Neo4j::Core
   module CypherTranslator
     # Cypher Helper
-    def escape_value(value)
-      case value
-        when String
-          "'#{value.gsub("'", %q(\\\'))}'"
-        else
-          value
-      end
-    end
+     def escape_value(value)
+       result = case value
+         when String
+           sanitized = sanitize_escape_sequences(value)
+           "'#{escape_quotes(sanitized)}'"
+         else
+           value
+       end
+       result
+     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'"\\])/
+     def sanitize_escape_sequences(s)
+       s.gsub SANITIZE_ESCAPED_REGEXP, ''
+     end
+
+     def escape_quotes(s)
+       s.gsub("'", %q(\\\'))
+     end
 
     # Cypher Helper
     def cypher_prop_list(props)

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "3.0.0.alpha.9"
+    VERSION = "3.0.0.alpha.10"
   end
 end

data/lib/neo4j-embedded/property.rb

@@ -35,7 +35,11 @@ module Neo4j::Embedded::Property
 
   def _update_props(hash)
     hash.each_pair do |k,v|
-      set_property(k,v)
+      if v.nil?
+        remove_property(k)
+      else
+        set_property(k,v)
+      end
     end
     hash
   end

data/lib/neo4j-server/cypher_node.rb

@@ -51,10 +51,22 @@ module Neo4j::Server
       properties
     end
 
+    def remove_properties(properties)
+      q = "START n=node(#{neo_id}) REMOVE " + properties.map do |k|
+        "n.`#{k}`"
+      end.join(', ')
+      @session._query_or_fail(q)
+    end
+
     # (see Neo4j::Node#update_props)
     def update_props(properties)
       return if properties.empty?
-      q = "START n=node(#{neo_id}) SET " + properties.keys.map do |k|
+
+      removed_keys = properties.keys.select{|k| properties[k].nil?}
+      remove_properties(removed_keys) unless removed_keys.empty?
+      properties_to_set = properties.keys - removed_keys
+      return if properties_to_set.empty?
+      q = "START n=node(#{neo_id}) SET " + properties_to_set.map do |k|
         "n.`#{k}`= #{escape_value(properties[k])}"
       end.join(',')
       @session._query_or_fail(q)

data/lib/neo4j-server/cypher_session.rb

@@ -5,7 +5,9 @@ module Neo4j::Server
     response = HTTParty.get(endpoint_url || 'http://localhost:7474')
     raise "Server not available on #{endpoint_url} (response code #{response.code})" unless response.code == 200
     root_data = JSON.parse(response.body)
-    Neo4j::Server::CypherSession.new(root_data['data'])
+    data_url = root_data['data']
+    data_url << '/' unless data_url.end_with?('/') 
+    Neo4j::Server::CypherSession.new(data_url)
   end
 
   class CypherSession < Neo4j::Session

data/lib/neo4j-server/cypher_transaction.rb

@@ -36,7 +36,7 @@ module Neo4j::Server
 
         # So we have to do this workaround
         params.each_pair do |k,v|
-          statement[:statement].gsub!("{ #{k} }", escape_value(v))
+          statement[:statement].gsub!("{ #{k} }", "#{escape_value(v)}")
         end
       end
       response = HTTParty.post(@exec_url, headers: resource_headers, body: body.to_json)

data/lib/neo4j/session.rb

@@ -50,23 +50,23 @@ module Neo4j
     # Returns an enumerable of hash values, column => value
     #
     # @example Using the Cypher DSL
-    #  q = Neo4j.query("START n=node({param}) RETURN n", :param => 0)
+    #  q = session.query("START n=node({param}) RETURN n", :param => 0)
     #  q.first[:n] #=> the node
     #  q.columns.first => :n
     #
     # @example Using the Cypher DSL
-    #  q = Neo4j.query{ match node(3) <=> node(:x); ret :x}
+    #  q = session.query{ match node(3) <=> node(:x); ret :x}
     #  q.first[:n] #=> the @node
     #  q.columns.first => :n
     #
     # @example Using the Cypher DSL and one parameter (n=Neo4j.ref_node)
-    #  q = Neo4j.query(Neo4j.ref_node){|n| n <=> node(:x); :x}
+    #  q = session.query(Neo4j.ref_node){|n| n <=> node(:x); :x}
     #  q.first[:n] #=> the @node
     #  q.columns.first => :n
     #
     # @example Using an array of nodes
     #  # same as - two_nodes=node(Neo4j.ref_node.neo_id, node_b.neo_id), b = node(b.neo_id)
-    #  q = Neo4j.query([Neo4j.ref_node, node_b], node_c){|two_nodes, b| two_nodes <=> b; b}
+    #  q = session.query([Neo4j.ref_node, node_b], node_c){|two_nodes, b| two_nodes <=> b; b}
     #
     # @see Cypher
     # @see http://docs.neo4j.org/chunked/milestone/cypher-query-lang.html The Cypher Query Language Documentation
@@ -100,7 +100,7 @@ module Neo4j
         register(create_session(db_type, params), name, default)
       end
 
-      def create_session(db_type, params)
+      def create_session(db_type, params = {})
         unless (@@factories[db_type])
           raise "Can't connect to database '#{db_type}', available #{@@factories.keys.join(',')}"
         end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.9
+  version: 3.0.0.alpha.10
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   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: json
   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: 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: neo4j-cypher
   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'
 description: |
@@ -77,21 +77,15 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- lib/neo4j/entity_equality.rb
-- lib/neo4j/label.rb
-- lib/neo4j/node.rb
-- lib/neo4j/property_container.rb
-- lib/neo4j/property_validator.rb
-- lib/neo4j/relationship.rb
-- lib/neo4j/session.rb
-- lib/neo4j/tasks/neo4j_server.rb
-- lib/neo4j/transaction.rb
+- Gemfile
+- README.md
+- lib/neo4j-core.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/version.rb
-- lib/neo4j-core.rb
+- lib/neo4j-embedded.rb
 - lib/neo4j-embedded/embedded_database.rb
 - lib/neo4j-embedded/embedded_impermanent_session.rb
 - lib/neo4j-embedded/embedded_label.rb
@@ -100,7 +94,7 @@ files:
 - lib/neo4j-embedded/embedded_session.rb
 - lib/neo4j-embedded/property.rb
 - lib/neo4j-embedded/to_java.rb
-- lib/neo4j-embedded.rb
+- lib/neo4j-server.rb
 - lib/neo4j-server/cypher_label.rb
 - lib/neo4j-server/cypher_node.rb
 - lib/neo4j-server/cypher_node_uncommited.rb
@@ -109,38 +103,43 @@ files:
 - lib/neo4j-server/cypher_session.rb
 - lib/neo4j-server/cypher_transaction.rb
 - lib/neo4j-server/resource.rb
-- lib/neo4j-server.rb
-- lib/test.rb
-- README.md
-- Gemfile
+- lib/neo4j/entity_equality.rb
+- lib/neo4j/label.rb
+- lib/neo4j/node.rb
+- lib/neo4j/property_container.rb
+- lib/neo4j/property_validator.rb
+- lib/neo4j/relationship.rb
+- lib/neo4j/session.rb
+- lib/neo4j/tasks/neo4j_server.rb
+- lib/neo4j/transaction.rb
 - neo4j-core.gemspec
 homepage: http://github.com/andreasronge/neo4j-core/tree
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --quiet
-- --title
+- "--quiet"
+- "--title"
 - Neo4j::Core
-- --line-numbers
-- --main
+- "--line-numbers"
+- "--main"
 - README.rdoc
-- --inline-source
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: neo4j-core
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A graph database for JRuby

data/lib/test.rb

@@ -1,11 +0,0 @@
-class Hej
-  attr_accessor :values
-
-  def []=(key, v)
-    self.values = *v
-  end
-end
-
-h = Hej.new
-h[:koo] = 1
-puts "h: #{h.values.inspect}"