neo4j-core 4.0.7 → 5.0.0.rc.1

data/lib/neo4j-server/label.rb

@@ -0,0 +1,40 @@
+module Neo4j
+  class Label
+    class << self
+      def constraints(session = Neo4j::Session.current)
+        session.connection.get(CONSTRAINT_PATH).body
+      end
+
+      def constraint?(label_name, property, session = Neo4j::Session.current)
+        label_constraints = session.connection.get("#{CONSTRAINT_PATH}/#{label_name}").body
+        !label_constraints.select { |c| c[:label] == label_name.to_s && c[:property_keys].first == property.to_s }.empty?
+      end
+
+      def indexes(session = Neo4j::Session.current)
+        session.connection.get(INDEX_PATH).body
+      end
+
+      def index?(label_name, property, session = Neo4j::Session.current)
+        label_indexes = session.connection.get("#{INDEX_PATH}/#{label_name}").body
+        !label_indexes.select { |i| i[:label] == label_name.to_s && i[:property_keys].first == property.to_s }.empty?
+      end
+
+      def drop_all_indexes(session = Neo4j::Session.current)
+        indexes.each do |i|
+          begin
+            session._query_or_fail("DROP INDEX ON :`#{i[:label]}`(#{i[:property_keys].first})")
+          rescue Neo4j::Server::CypherResponse::ResponseError
+            # This will error on each constraint. Ignore and continue.
+            next
+          end
+        end
+      end
+
+      def drop_all_constraints(session = Neo4j::Session.current)
+        constraints.each do |c|
+          session._query_or_fail("DROP CONSTRAINT ON (n:`#{c[:label]}`) ASSERT n.`#{c[:property_keys].first}` IS UNIQUE")
+        end
+      end
+    end
+  end
+end

data/lib/neo4j-server/resource.rb

@@ -7,44 +7,43 @@ module Neo4j
       attr_reader :resource_data, :resource_url
 
       def init_resource_data(resource_data, resource_url)
-        fail "Exception #{resource_data['exception']}" if resource_data['exception']
+        fail "Exception #{resource_data[:exception]}" if resource_data[:exception]
         fail "Expected @resource_data to be Hash got #{resource_data.inspect}" unless resource_data.respond_to?(:[])
 
-        @resource_url = resource_url
         @resource_data = resource_data
+        @resource_url = resource_url
 
         self
       end
 
       def wrap_resource(connection = Neo4j::Session.current)
-        url = resource_url('transaction')
+        url = resource_url(:transaction)
         CypherTransaction.new(url, connection)
       end
 
       def resource_url(key = nil)
         return @resource_url if key.nil?
-
-        @resource_data.fetch key.to_s
+        @resource_data.fetch key
       rescue KeyError
         raise "No resource key '#{key}', available #{@resource_data.keys.inspect}"
       end
 
-      def handle_response_error(response, msg = 'Error for request')
-        fail ServerException, "#{msg} #{response.env && response.env[:url].to_s}, #{response.status}, #{response.status}"
+      def expect_response_code!(response, expected_code, msg = 'Error for request')
+        handle_response_error!(response, "Expected response code #{expected_code} #{msg}") unless response.status == expected_code
+        response
       end
 
-      def expect_response_code(response, expected_code, msg = 'Error for request')
-        handle_response_error(response, "Expected response code #{expected_code} #{msg}") unless response.status == expected_code
-        response
+      def handle_response_error!(response, msg = 'Error for request')
+        fail ServerException, "#{msg} #{response.env && response.env[:url].to_s}, #{response.status}"
       end
 
       def response_exception(response)
         return nil if response.body.nil? || response.body.empty?
-        JSON.parse(response.body)['exception']
+        JSON.parse(response.body)[:exception]
       end
 
       def resource_headers
-        {'Content-Type' => 'application/json', 'Accept' => 'application/json', 'User-Agent' => ::Neo4j::Session.user_agent_string}
+        {'Content-Type' => 'application/json', 'Accept' => 'application/json; charset=UTF-8', 'User-Agent' => ::Neo4j::Session.user_agent_string}
       end
 
       def resource_url_id(url = resource_url)

data/lib/neo4j-server.rb

@@ -1,9 +1,11 @@
 require 'json'
 require 'faraday'
 require 'faraday_middleware'
+require 'faraday_middleware/multi_json'
 require 'neo4j-server/resource'
 require 'neo4j-server/cypher_node'
 require 'neo4j-server/cypher_label'
+require 'neo4j-server/label'
 require 'neo4j-server/cypher_session'
 require 'neo4j-server/cypher_node_uncommited'
 require 'neo4j-server/cypher_relationship'

data/neo4j-core.gemspec

@@ -6,7 +6,7 @@ require 'neo4j-core/version'
 Gem::Specification.new do |s|
   s.name     = 'neo4j-core'
   s.version  = Neo4j::Core::VERSION
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
 
   s.authors  = 'Andreas Ronge, Chris Grigg, Brian Underwood'
   s.email    = 'andreas.ronge@gmail.com, chris@subvertallmedia.com, brian@brian-underwood.codes'
@@ -33,12 +33,15 @@ Neo4j-core provides classes and methods to work with the graph database Neo4j.
   s.add_dependency('os')  # for Rake task
   s.add_dependency('zip') # for Rake task
   s.add_dependency('activesupport') # For ActiveSupport::Notifications
+  s.add_dependency('multi_json')
+  s.add_dependency('faraday_middleware-multi_json')
 
   s.add_development_dependency('pry')
   s.add_development_dependency('yard')
   s.add_development_dependency('simplecov')
   s.add_development_dependency('guard')
   s.add_development_dependency('guard-rubocop')
+  s.add_development_dependency('rubocop', '~> 0.29.1')
 
   if RUBY_PLATFORM == 'java'
     s.add_dependency('neo4j-community', '>= 2.1.1')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 5.0.0.rc.1
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -136,6 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware-multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.29.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.29.1
 description: |
   Neo4j-core provides classes and methods to work with the graph database Neo4j.
 email: andreas.ronge@gmail.com, chris@subvertallmedia.com, brian@brian-underwood.codes
@@ -216,10 +258,10 @@ extra_rdoc_files:
 files:
 - Gemfile
 - README.md
+- lib/ext/kernel.rb
 - 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
@@ -237,6 +279,7 @@ files:
 - lib/neo4j-embedded/embedded_relationship.rb
 - lib/neo4j-embedded/embedded_session.rb
 - lib/neo4j-embedded/embedded_transaction.rb
+- lib/neo4j-embedded/label.rb
 - lib/neo4j-embedded/property.rb
 - lib/neo4j-embedded/to_java.rb
 - lib/neo4j-server.rb
@@ -247,6 +290,7 @@ files:
 - lib/neo4j-server/cypher_response.rb
 - lib/neo4j-server/cypher_session.rb
 - lib/neo4j-server/cypher_transaction.rb
+- lib/neo4j-server/label.rb
 - lib/neo4j-server/resource.rb
 - lib/neo4j/entity_equality.rb
 - lib/neo4j/label.rb
@@ -278,12 +322,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 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