neo4j-core 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93580bb5b39ff35b25715174887abea69fccf773
-  data.tar.gz: fe2bface702fde07f2277b3365a6f14ac8078e64
+  metadata.gz: eb1c2e88da0bcf522a38391e45af4b9c67a48c2f
+  data.tar.gz: b9cdb19be15670a567413623d4cc65912885ec17
 SHA512:
-  metadata.gz: 625874e1ba9ae52f5eec44d9dd11a943b8b4293ea25a5738ba387b9f0ba193d0964d56b70c6e95d6855b260dac05b5b47e2494250074d785d4a94ca7f5ba580b
-  data.tar.gz: 4b99b3a43db8bdd36b2fa8e00b883bef2f21c6c3aa91566e1cbb0502aa584febbba932d4b5b1d076aa29893e647748a6517f78213414acf24038c219ca78e969
+  metadata.gz: 957878bf744e5c4876c8bf978803bd547f1102c0232cb0f4a7ccce65165bb8808b96c5e440eccdea28be32f238dea15d732893d84dda3578fac23d027bde0301
+  data.tar.gz: 5c69bf4a5b696e9d4fa87bf0f1e94918b688aa7ffefeade4ff9540c79037f054491fb6f98542e47d099e840578fcc21b1da4d7aaf4049f27b55bc2bf0d9820db

data/Gemfile

@@ -7,6 +7,7 @@ gemspec
 
 group 'development' do
   gem 'guard-rspec', require: false
+  gem 'overcommit'
 end
 
 group 'test' do

data/lib/neo4j-core/query_clauses.rb

@@ -264,6 +264,8 @@ module Neo4j
       class WhereClause < Clause
         KEYWORD = 'WHERE'
 
+        PAREN_SURROUND_REGEX = /^\s*\(.+\)\s*$/
+
         def from_key_and_value(key, value, previous_keys = [])
           case value
           when Hash then hash_key_value_string(key, value, previous_keys)
@@ -279,7 +281,7 @@ module Neo4j
           def clause_strings(clauses)
             clauses.flat_map do |clause|
               Array(clause.value).map do |v|
-                (clause.options[:not] ? 'NOT' : '') + "(#{v})"
+                (clause.options[:not] ? 'NOT' : '') + (v.to_s.match(PAREN_SURROUND_REGEX) ? v.to_s : "(#{v})")
               end
             end
           end
@@ -314,7 +316,7 @@ module Neo4j
         end
 
         class << self
-          ARG_HAS_QUESTION_MARK_REGEX = /(^|\s)\?(\s|$)/
+          ARG_HAS_QUESTION_MARK_REGEX = /(^|\(|\s)\?(\s|\)|$)/
 
           def from_args(args, options = {})
             query_string, params = args
@@ -322,7 +324,7 @@ module Neo4j
             if query_string.is_a?(String) && (query_string.match(ARG_HAS_QUESTION_MARK_REGEX) || params.is_a?(Hash))
               if !params.is_a?(Hash)
                 question_mark_params_param = self.question_mark_params_param
-                query_string.gsub!(ARG_HAS_QUESTION_MARK_REGEX, "\\1{#{question_mark_params_param}}\\2")
+                query_string = query_string.gsub(ARG_HAS_QUESTION_MARK_REGEX, "\\1{#{question_mark_params_param}}\\2")
                 params = {question_mark_params_param.to_sym => params}
               end
 

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '5.1.1'
+    VERSION = '5.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty