neo4j-core 5.0.0.rc.2 → 5.0.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 175f153d73ec96ef88b075a88f1809e20d7b6695
-  data.tar.gz: fdc7802630370e76f2906e0cb81318053fd7e5dc
+  metadata.gz: efd3a180ba80337ada8311b1ca7dbf2c9d3a1d5b
+  data.tar.gz: feaef1009aca073d05b6ac7e54b22a746c76d552
 SHA512:
-  metadata.gz: 1da826e295992cd5d64c752dac4c920d555c56b2665f45172de21ed62defc871707717f4965e55a855553d84be157f745c31c6c1593f3bb26dcd1a43bb6951e2
-  data.tar.gz: a788e681ed3c623c360882ff69dc9a341eab5d733f0bded3bf7d30cd5feb4b8e4a2c5ced2c4d6795297e08047c038983b331dbde7d558ae19139ff70c5132cbb
+  metadata.gz: a141d208d880c0aa0ef8ac89c9264dffc382b84ce7c9703f376bb9fb8cf87fa8d19d28e25128c9312d9174d04cf24c3d6bb00482d8cd74d168d0478a98f7bc72
+  data.tar.gz: 8bfa569810bcacd5d96246864570ff642d50cfa7832bff07e4f14b4bb84b1bf01d4880ed496ce3539f87df834a17856836821e36dbe63593c1096e891ab5187d

data/lib/neo4j-core/graph_json.rb

@@ -0,0 +1,35 @@
+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

data/lib/neo4j-core/query_clauses.rb

@@ -465,8 +465,8 @@ module Neo4j
           when String, Symbol then "#{key}:`#{value}`"
           when Hash
             if @options[:set_props]
-              attribute_string = value.map { |k, v| "#{k}: #{v.inspect}" }.join(Clause::COMMA_SPACE)
-              "#{key} = {#{attribute_string}}"
+              @params["#{key}_set_props".freeze.to_sym] = value
+              "#{key} = {#{key}_set_props}"
             else
               value.map { |k, v| key_value_string("#{key}.`#{k}`", v, ['setter'], true) }
             end

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '5.0.0.rc.2'
+    VERSION = '5.0.0.rc.3'
   end
 end

data/lib/neo4j-server/cypher_node.rb

@@ -31,7 +31,7 @@ module Neo4j
       # (see Neo4j::Node#create_rel)
       def create_rel(type, other_node, props = nil)
         q = @session.query.match(:a, :b).where(a: {neo_id: neo_id}, b: {neo_id: other_node.neo_id})
-            .create("(a)-[r:`#{type}`]->(b)").break.set(r: props).return(r: :neo_id)
+            .create("(a)-[r:`#{type}`]->(b)").break.set_props(r: props).return(r: :neo_id)
 
         id = @session._query_or_fail(q, true)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc.2
+  version: 5.0.0.rc.3
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -262,6 +262,7 @@ 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