neo4j-core 5.0.7 → 5.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55656e36d264c6992ce85e4c43cf9e8ed608e838
-  data.tar.gz: df30a6b7b0487cc343e333ed468db3b96fe424fe
+  metadata.gz: 51b5f49436107e6cb6e21dab6fbcaf3ab9b34d7e
+  data.tar.gz: 2d5abdedb5801e570b574be1c11775205f0f02dc
 SHA512:
-  metadata.gz: 82baa7afbcef3d6f046fa582a573c213644c1dd56161f284e70abbee5c55a586f4949e34a8c421c1c7d582a59e7554801c56bc4886714e605a0102294cc99ca2
-  data.tar.gz: 2cd170839c8eb27160a774e050cb75f94a5efb3cffa6b2758ecf0fdf571384e8df5f87bfa347e25cfd21703aa8495f11650bb316b68275557b2df8b2f70ff14b
+  metadata.gz: 743eb5fe7dade48408e0d6f960c2889d1b44bf383da67ac6f9550932b3ba69f5157aadd5acab38807124317b7f0bca7641e63481d0af205a7320d3401cb452f4
+  data.tar.gz: 06a8b66c2b710bbc47d5ceeb2627eaa7224653e377265a331baa01bbbf4f5d23c5f78c0f9af2a86d012c2429eecc06a48b2aff52018ac14626831050ab4f3f5f

data/lib/neo4j-core/query_clauses.rb

@@ -141,12 +141,16 @@ module Neo4j
           end
         end
 
+        def self.paramaterize_key!(key)
+          key.tr_s!('^a-zA-Z0-9', UNDERSCORE)
+          key.gsub!(/^_+|_+$/, '')
+        end
+
         private
 
         def key_value_string(key, value, previous_keys = [], is_set = false)
           param = (previous_keys << key).join(UNDERSCORE)
-          param.tr_s!('^a-zA-Z0-9', UNDERSCORE)
-          param.gsub!(/^_+|_+$/, '')
+          self.class.paramaterize_key!(param)
 
           if value.is_a?(Range)
             add_params("#{param}_range_min" => value.min, "#{param}_range_max" => value.max)
@@ -237,7 +241,7 @@ module Neo4j
           case value
           when Hash then hash_key_value_string(key, value, previous_keys)
           when NilClass then "#{key} IS NULL"
-          when Regexp then regexp_key_value_string(key, value)
+          when Regexp then regexp_key_value_string(key, value, previous_keys)
           when Array, Range then key_value_string(key, value, previous_keys)
           else
             key_value_string(key, value, previous_keys)
@@ -263,9 +267,15 @@ module Neo4j
           end.join(AND)
         end
 
-        def regexp_key_value_string(key, value)
+        def regexp_key_value_string(key, value, previous_keys)
           pattern = (value.casefold? ? '(?i)' : '') + value.source
-          "#{key} =~ #{escape_value(pattern.gsub(/\\/, '\\\\\\'))}"
+
+          param = [previous_keys + [key]].join(UNDERSCORE)
+          self.class.paramaterize_key!(param)
+
+          add_params(param => pattern)
+
+          "#{key} =~ {#{param}}"
         end
 
         class << self

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '5.0.7'
+    VERSION = '5.0.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 5.0.7
+  version: 5.0.8
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -262,7 +262,6 @@ files:
 - lib/neo4j-core.rb
 - lib/neo4j-core/active_entity.rb
 - lib/neo4j-core/cypher_translator.rb
-- lib/neo4j-core/graph_json.rb
 - lib/neo4j-core/hash_with_indifferent_access.rb
 - lib/neo4j-core/helpers.rb
 - lib/neo4j-core/label.rb

data/lib/neo4j-core/graph_json.rb

@@ -1,35 +0,0 @@
-module Neo4j
-  module Core
-    module GraphJSON
-      def self.to_graph_json(objects)
-        nodes = {}
-        edges = {}
-
-        objects.each do |object|
-          case object
-          when Neo4j::ActiveNode, Neo4j::Server::CypherNode
-            nodes[object.neo_id] = {
-              id: object.neo_id,
-              labels: (object.is_a?(Neo4j::ActiveNode) ? [object.class.name] : object.labels),
-              properties: object.attributes
-            }
-          when Neo4j::ActiveRel, Neo4j::Server::CypherRelationship
-            edges[[object.start_node.neo_id, object.end_node.neo_id]] = {
-              source: object.start_node.neo_id,
-              target: object.end_node.neo_id,
-              type: object.rel_type,
-              properties: object.props
-            }
-          else
-            fail "Invalid value found: #{object.inspect}"
-          end
-        end
-
-        {
-          nodes: nodes.values,
-          edges: edges.values
-        }.to_json
-      end
-    end
-  end
-end