neo4j-core 5.0.0.rc.4 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af03b69f505c6ef9e583acb0e392daa6550c30c5
-  data.tar.gz: d6d91dec745200ebb3877f3bd76b597408fa66ab
+  metadata.gz: 04ea30646a9dcb4a050cc2a47c0097eae8e37a9c
+  data.tar.gz: ebb218d8a7280c2f01558cfa24677de1fedd928e
 SHA512:
-  metadata.gz: e6a95cc4aa65f54ea657b87225c9a9bd50e27653d658f56f468594eb03df9f7118b75063e618597197a3d77cd1e8c90489061b18e181bcf0a014ef7ca6f416e5
-  data.tar.gz: f5a5a49f5880f493567b1e9cffded59b7666d2e81046e13fc58fc9e9ae7a9a46669dcd4cf7281d5a097fb2c39bf6929250a0c2e807849f38a1795d25d2def5de
+  metadata.gz: 7652c31855d074b39bdc45f481a2a0e785db6a056b114158a6f045eed8d745e97da899c7ae66d1a7e052c9e80cf6c9a55597abaaf7cce682054728f836868b39
+  data.tar.gz: bd8d1bf52c9e8b76c0d7ee5bdfb85ffffe2d24f0ccdb167c7a305318c878d982640d4ac218e9272ee5056d1bf34f6940fd660d30019bb2a18c5509e4e7e36d7b

data/lib/neo4j-core/version.rb

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

data/lib/neo4j-embedded/cypher_response.rb

@@ -57,7 +57,7 @@ module Neo4j
 
       def unwrap(value)
         if !value.nil? && value.respond_to?(:to_a)
-          value.map { |v| unwrap(v) }
+          value.respond_to?(:to_hash) ? value.to_hash : value.map { |v| unwrap(v) }
         else
           (!value.respond_to?(:wrapper) || unwrapped?) ? value : value.wrapper
         end

data/lib/neo4j-server/cypher_response.rb

@@ -75,7 +75,7 @@ module Neo4j
       end
 
       def map_row_value(value, session)
-        if value.is_a?(Hash)
+        if value.is_a?(Hash) && looks_like_an_object?(value)
           hash_value_as_object(value, session)
         elsif value.is_a?(Array)
           value.map! { |v| map_row_value(v, session) }
@@ -99,6 +99,14 @@ module Neo4j
         unwrapped? ? basic_obj : basic_obj.wrapper
       end
 
+      def looks_like_an_object?(value)
+        if transaction_response?
+          mapped_rest_data[:outgoing_relationships] || (mapped_rest_data[:start] && mapped_rest_data[:properties])
+        else
+          value[:labels] || value[:type]
+        end
+      end
+
       def unwrapped!
         @_unwrapped_obj = true
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc.4
+  version: 5.0.0
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-18 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
@@ -326,9 +325,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5

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