neo4j-core 6.0.6 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c037d5b81726963a9574b6c58cfbbef748754e8
-  data.tar.gz: bbad6e26ebe122998ff8e9a23e99ae69ad82f30c
+  metadata.gz: e65b214c5b462b02973ee2557d0624c893699d31
+  data.tar.gz: c0c28e5026420b375a1a31b9d735845b4f6af5fa
 SHA512:
-  metadata.gz: 24052c8cc454d7ccadce9cd62dd540379668c5809892990f9aa8153dfd24ef0a99fe4f16a24e0398cb8884ffedc344920c77089d18914a516f4e4ff21452da6e
-  data.tar.gz: eeb0dc60794540419917bdb4d407b8b457c450292ed35a18ba60f52cb0e701ad7f42f673bb2783043e704bf8b02fcd4099ad17435da9eee14417e405a3c724e5
+  metadata.gz: 227cb900863ceca9a5513079dbfac35efa785c6f95147ba93f73bfdab277111a13b055c8361d376b3be4da5489da9f5a9ea4492c32ecfacac1d43285c271405b
+  data.tar.gz: 25cc03d274112e3a315de1dc91f664b18f39c2711201d81b577fde2fbd736dfe3a72f15ce9b555dd30bac21deb7fc644b281379c7fed1f4eb4ee5692d5c52191

data/README.md

@@ -31,7 +31,7 @@ All new documentation will be done via our [readthedocs](http://neo4jrb.readthed
 
 #### Contact Us
 
-[![StackOverflow](https://img.shields.io/badge/StackOverflow-Ask%20a%20question!-blue.svg)](http://stackoverflow.com/questions/ask?tags=neo4j.rb+neo4j+ruby)  [![Gitter](https://img.shields.io/badge/Gitter-Join%20our%20chat!-blue.svg)](https://gitter.im/neo4jrb/neo4j?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)  [![Twitter](https://img.shields.io/badge/Twitter-Tweet%20with%20us!-blue.svg)](https://twitter.com/neo4jrb)  [![Mailing list](https://img.shields.io/badge/Mailing%20list-Mail%20us!-blue.svg)](https://groups.google.com/forum/#!forum/neo4jrb)
+[![StackOverflow](https://img.shields.io/badge/StackOverflow-Ask%20a%20question!-blue.svg)](http://stackoverflow.com/questions/ask?tags=neo4j.rb+neo4j+ruby)  [![Gitter](https://img.shields.io/badge/Gitter-Join%20our%20chat!-blue.svg)](https://gitter.im/neo4jrb/neo4j?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)  [![Twitter](https://img.shields.io/badge/Twitter-Tweet%20with%20us!-blue.svg)](https://twitter.com/neo4jrb)
 
 
 ## Developers

data/lib/neo4j-core.rb

@@ -7,6 +7,7 @@ require 'fileutils'
 require 'neo4j-core/version'
 require 'neo4j/property_validator'
 require 'neo4j/property_container'
+require 'neo4j/entity_marshal'
 require 'neo4j-core/active_entity'
 require 'neo4j-core/helpers'
 require 'neo4j-core/query_find_in_batches'
@@ -21,17 +22,5 @@ require 'neo4j/ansi'
 require 'neo4j/relationship'
 require 'neo4j/transaction'
 
-require 'neo4j-server'
-
 require 'rake'
 require 'neo4j/rake_tasks'
-
-if RUBY_PLATFORM == 'java' && !ENV['WITHOUT_NEO4J_EMBEDDED']
-  require 'neo4j-embedded'
-else
-  # just for the tests
-  module Neo4j
-    module Embedded
-    end
-  end
-end

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '6.0.6'
+    VERSION = '6.1.0'
   end
 end

data/lib/neo4j-embedded/embedded_node.rb

@@ -4,6 +4,8 @@ module Neo4j
       include Enumerable
       extend Neo4j::Core::TxMethods
 
+      MARSHAL_INSTANCE_VARIABLES = [:@node, :@match]
+
       def initialize(node, match)
         @node = node
         ::Neo4j::Node.validate_match!(match)
@@ -168,7 +170,7 @@ module Neo4j
               return nil if not iter.has_next
 
               first = iter.next
-              fail "Expected to only find one relationship from node #{neo_id} matching #{match.inspect}" if iter.has_next
+              fail ArgumentError, "Expected to only find one relationship from node #{neo_id} matching" if iter.has_next
               first
             end
 

data/lib/neo4j-embedded/embedded_relationship.rb

@@ -1,6 +1,8 @@
 module Neo4j
   module Embedded
     class EmbeddedRelationship
+      MARSHAL_INSTANCE_VARIABLES = []
+
       class << self
         if !Neo4j::Core::Config.using_new_session?
           Java::OrgNeo4jKernelImplCore::RelationshipProxy.class_eval do

data/lib/neo4j-server/cypher_node.rb

@@ -4,6 +4,8 @@ module Neo4j
       include Neo4j::Server::Resource
       include Neo4j::Core::ActiveEntity
 
+      MARSHAL_INSTANCE_VARIABLES = [:@props, :@labels, :@neo_id]
+
       def initialize(session, value)
         @session = session
 

data/lib/neo4j-server/cypher_relationship.rb

@@ -4,6 +4,8 @@ module Neo4j
       include Neo4j::Server::Resource
       include Neo4j::Core::ActiveEntity
 
+      MARSHAL_INSTANCE_VARIABLES = [:@rel_type, :@props, :@start_node_neo_id, :@end_node_neo_id, :@id]
+
       def initialize(session, value)
         @session = session
         @response_hash = value

data/lib/neo4j/core/cypher_session/transactions.rb

@@ -0,0 +1,20 @@
+module Neo4j
+  module Core
+    class CypherSession
+      module Transactions
+        class Base < Neo4j::Transaction::Base
+          # Will perhaps be a bit odd as we will pass in the adaptor
+          # as the @session for these new transactions
+
+          def query(*args)
+            @adaptor.query(*args)
+          end
+
+          def queries(*args)
+            @adaptor.queries(*args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/core/cypher_session/transactions/http.rb

@@ -0,0 +1,29 @@
+require 'neo4j/core/cypher_session/transactions'
+
+module Neo4j
+  module Core
+    class CypherSession
+      module Transactions
+        class HTTP < Base
+          def commit
+          end
+
+          def delete
+          end
+
+          private
+
+          # Because we're inheriting from the old Transaction class
+          # but the new adaptors work much like the old sessions
+          def adaptor
+            @session
+          end
+
+          def connection
+            adaptor.connection
+          end
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/entity_marshal.rb

@@ -0,0 +1,20 @@
+module Neo4j
+  # To support Ruby marshaling
+  module EntityMarshal
+    def marshal_dump
+      marshal_instance_variables.map(&method(:instance_variable_get))
+    end
+
+    def marshal_load(array)
+      marshal_instance_variables.zip(array).each do |var, value|
+        instance_variable_set(var, value)
+      end
+    end
+
+    private
+
+    def marshal_instance_variables
+      self.class::MARSHAL_INSTANCE_VARIABLES
+    end
+  end
+end

data/lib/neo4j/node.rb

@@ -17,6 +17,7 @@ module Neo4j
     include EntityEquality
     include Wrapper
     include PropertyContainer
+    include EntityMarshal
 
     # @return [Hash<Symbol, Object>] all properties of the node
     def props

data/lib/neo4j/relationship.rb

@@ -24,6 +24,7 @@ module Neo4j
     include PropertyContainer
     include EntityEquality
     include Wrapper
+    include EntityMarshal
 
     # @return [Hash<Symbol,Object>] all properties of the relationship
     def props

data/lib/neo4j/session.rb

@@ -98,6 +98,11 @@ module Neo4j
       # @param [String] endpoint_url The path to the server, either a URL or path to embedded DB
       # @param [Hash] params Additional configuration options
       def open(db_type = :server_db, endpoint_url = nil, params = {})
+        case db_type
+        when :server_db then require 'neo4j-server'
+        when :embedded_db then require 'neo4j-embedded'
+        end
+
         validate_session_num!(db_type)
         name = params[:name]
         default = params[:default]

data/neo4j-core.gemspec

@@ -28,12 +28,12 @@ Neo4j-core provides classes and methods to work with the graph database Neo4j.
   s.add_dependency('faraday', '~> 0.9.0')
   s.add_dependency('net-http-persistent')
   s.add_dependency('httpclient')
-  s.add_dependency('faraday_middleware', '~> 0.9.1')
+  s.add_dependency('faraday_middleware', '~> 0.10.0')
   s.add_dependency('json')
   s.add_dependency('activesupport') # For ActiveSupport::Notifications
   s.add_dependency('multi_json')
   s.add_dependency('faraday_middleware-multi_json')
-  s.add_dependency('neo4j-rake_tasks', '>= 0.3.0')
+  s.add_dependency('neo4j-rake_tasks', '~> 0.3.0')
 
   s.add_development_dependency('pry')
   s.add_development_dependency('yard')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.1.0
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +140,14 @@ dependencies:
   name: neo4j-rake_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
@@ -284,13 +284,15 @@ files:
 - lib/neo4j/core/cypher_session/responses/embedded.rb
 - lib/neo4j/core/cypher_session/responses/http.rb
 - lib/neo4j/core/cypher_session/result.rb
+- lib/neo4j/core/cypher_session/transactions.rb
+- lib/neo4j/core/cypher_session/transactions/http.rb
 - lib/neo4j/core/instrumentable.rb
-- lib/neo4j/core/label.rb
 - lib/neo4j/core/node.rb
 - lib/neo4j/core/path.rb
 - lib/neo4j/core/relationship.rb
 - lib/neo4j/core/wrappable.rb
 - lib/neo4j/entity_equality.rb
+- lib/neo4j/entity_marshal.rb
 - lib/neo4j/label.rb
 - lib/neo4j/node.rb
 - lib/neo4j/property_container.rb

data/lib/neo4j/core/label.rb

@@ -1,127 +0,0 @@
-module Neo4j
-  module Core
-    class Label
-      attr_reader :name
-
-      def initialize(name, session)
-        @name = name
-        @session = session
-        schema_threads = []
-      end
-
-      def create_index(property, options = {})
-        puts "create_index(#{property.inspect}, #{options.inspect})"
-        validate_index_options!(options)
-        properties = property.is_a?(Array) ? property.join(',') : property
-        schema_query("CREATE INDEX ON :`#{@name}`(#{properties})")
-      end
-
-      def drop_index(property, options = {})
-        puts "drop_index(#{property.inspect}, #{options.inspect})"
-        validate_index_options!(options)
-        schema_query("DROP INDEX ON :`#{@name}`(#{property})")
-      end
-
-      # Creates a neo4j constraint on a property
-      # See http://docs.neo4j.org/chunked/stable/query-constraints.html
-      # @example
-      #   label = Neo4j::Label.create(:person, session)
-      #   label.create_constraint(:name, {type: :unique}, session)
-      #
-      def create_constraint(property, constraints)
-        puts "create_constraint(#{property.inspect}, #{constraints.inspect})"
-        cypher = case constraints[:type]
-                 when :unique
-                   "CREATE CONSTRAINT ON (n:`#{name}`) ASSERT n.`#{property}` IS UNIQUE"
-                 else
-                   fail "Not supported constrain #{constraints.inspect} for property #{property} (expected :type => :unique)"
-                 end
-        schema_query(cypher)
-      end
-
-      # Drops a neo4j constraint on a property
-      # See http://docs.neo4j.org/chunked/stable/query-constraints.html
-      # @example
-      #   label = Neo4j::Label.create(:person, session)
-      #   label.create_constraint(:name, {type: :unique}, session)
-      #   label.drop_constraint(:name, {type: :unique}, session)
-      #
-      def drop_constraint(property, constraint)
-        puts "drop_constraint(#{property.inspect}, #{constraint.inspect})"
-        cypher = case constraint[:type]
-                 when :unique
-                   "DROP CONSTRAINT ON (n:`#{name}`) ASSERT n.`#{property}` IS UNIQUE"
-                 else
-                   fail "Not supported constrain #{constraint.inspect}"
-                 end
-        schema_query(cypher)
-      end
-
-      def indexes
-        @session.indexes_for_label(@name)
-      end
-
-      def index?(property)
-        indexes.include?(property)
-      end
-
-      def uniqueness_constraints
-        @session.uniqueness_constraints_for_label(@name)
-      end
-
-      def uniqueness_constraint?(property)
-        uniqueness_constraints.include?(property)
-      end
-
-      def self.wait_for_schema_changes(session)
-        schema_threads(session).map(&:join)
-        set_schema_threads(session, [])
-      end
-
-      private
-
-      # Store schema threads on the session so that we can easily wait for all
-      # threads on a session regardless of label
-      def schema_threads
-        self.class.schema_threads(@session)
-      end
-
-      def schema_threads=(array)
-        self.class.set_schema_threads(@session, array)
-      end
-
-      def self.schema_threads(session)
-        session.instance_variable_get('@_schema_threads') || []
-      end
-
-      def self.set_schema_threads(session, array)
-        session.instance_variable_set('@_schema_threads', array)
-      end
-
-      # If there is a transaction going on, this could block
-      # So we run in a thread and it will go through at the next opportunity
-      def schema_query(cypher)
-        Thread.new do
-          begin
-            puts 'Starting transaction for schema query...'
-            @session.transaction do |tx|
-              puts 'Executing schema query...'
-              tx.query(cypher)
-              puts 'Executed schema query...'
-            end
-          rescue Exception => e
-            puts e.message
-            puts e.backtrace
-          end
-        end.tap do |thread|
-          schema_threads << thread
-        end
-      end
-
-      def validate_index_options!(options)
-        return unless options[:type] && options[:type] != :exact
-        fail "Type #{options[:type]} is not supported"
-      end
-    end
-  end
-end