neo4j-core 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d3cbf5325e61b512d3ee45eb02a58125794fc80
-  data.tar.gz: db9a665ef9d8a6dade91ad8f715969737d21390a
+  metadata.gz: b74f69f9b3d8758405b41493b43eb58c9d7113fb
+  data.tar.gz: bca8ba4bdf95e2caef2d07d396da5e47c5f7d41f
 SHA512:
-  metadata.gz: 17b7d282f266d5167f92eeec3c06daf0d5321eed771d895544dadcb0f2dc8346f97e612d67156a43d033093caa805f1b18c03f010c65775966068c8768f30145
-  data.tar.gz: 7d3023581c880837bfc13d714b873303012d01cd3fcd6ae3409e419220e488a960c3517ad590c48e14bcdb5a49f8360c991dd6fa39da19537444174c9ec8b850
+  metadata.gz: be6fa6687915b5ab2974d3f8089d21732cf58b5d75981e0b7a979fa3beff6e3d5f2ca23e84ce5527e6409df4cc5e2f21f3e5b295d7fcc2a81446f18afd50f419
+  data.tar.gz: d60a1cf05c0e317d61d468bc5e7641d1c48e57ba8a3f94214126430ba747458ef22f0962d645d03dc1b3b06ea1165f7f6be34ba5254ae60182ae872d881a83b0

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.rb

@@ -174,9 +174,9 @@ module Neo4j
       def response
         return @response if @response
         cypher = to_cypher
-        @response = ActiveSupport::Notifications.instrument('neo4j.cypher_query', context: @options[:context] || 'CYPHER', cypher: cypher, params: merge_params) do
-          @session._query(cypher, merge_params)
-        end
+
+        @response = @session._query(cypher, merge_params, context: @options[:context])
+
         if !response.respond_to?(:error?) || !response.error?
           response
         else

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '5.0.1'
+    VERSION = '5.0.2'
   end
 end

data/lib/neo4j-embedded/embedded_session.rb

@@ -137,7 +137,7 @@ module Neo4j
       # Remember that you should close the resource iterator.
       # @param [String] q the cypher query as a String
       # @return (see #query)
-      def _query(q, params = {})
+      def _query(q, params = {}, options = {})
         @engine ||= Java::OrgNeo4jCypherJavacompat::ExecutionEngine.new(@graph_db)
         @engine.execute(q, Neo4j::Core::HashWithIndifferentAccess.new(params))
       rescue StandardError => e

data/lib/neo4j-server/cypher_session.rb

@@ -195,26 +195,24 @@ module Neo4j
       end
 
       def _query_entity_data(query, id = nil, params = {})
-        _query_response(query, params).entity_data(id)
-      end
-
-      def _query_response(query, params = {})
         _query(query, params).tap do |response|
           response.raise_error if response.error?
-        end
+        end.entity_data(id)
       end
 
-      def _query(query, params = {})
+      def _query(query, params = {}, options = {})
         query, params = query_and_params(query, params)
 
         curr_tx = Neo4j::Transaction.current
-        if curr_tx
-          curr_tx._query(query, params)
-        else
-          url = resource_url(:cypher)
-          query = params.nil? ? {'query' => query} : {'query' => query, 'params' => params}
-          response = @connection.post(url, query)
-          CypherResponse.create_with_no_tx(response)
+        ActiveSupport::Notifications.instrument('neo4j.cypher_query', context: options[:context] || 'CYPHER', cypher: query, params: params) do
+          if curr_tx
+            curr_tx._query(query, params)
+          else
+            url = resource_url(:cypher)
+            query = params.nil? ? {'query' => query} : {'query' => query, 'params' => params}
+            response = @connection.post(url, query)
+            CypherResponse.create_with_no_tx(response)
+          end
         end
       end
 

data/lib/neo4j/tasks/neo4j_server.rake

@@ -78,9 +78,21 @@ namespace :neo4j do
     system_or_fail("#{install_location(args)}/bin/neo4j #{command}")
   end
 
-  desc 'Install Neo4j with auth disabled in v2.2+, example neo4j:install[community-2.1.3,development]'
+  def get_edition(args)
+    edition_string = args[:edition]
+
+    edition_string.gsub(/-latest$/) do
+      require 'open-uri'
+      puts 'Retrieving latest version...'
+      latest_version = JSON.parse(open('https://api.github.com/repos/neo4j/neo4j/releases/latest').read)['tag_name']
+      puts "Latest version is: #{latest_version}"
+      "-#{latest_version}"
+    end
+  end
+
+  desc 'Install Neo4j with auth disabled in v2.2+, example neo4j:install[community-latest,development]'
   task :install, :edition, :environment do |_, args|
-    edition = args[:edition]
+    edition = get_edition(args)
     environment = get_environment(args)
     puts "Installing Neo4j-#{edition} environment: #{environment}"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-01 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