neo4j-core 3.0.0.rc.4 → 3.0.0.rc.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4e034ba33270fdcb1cb5b5535d039fd9efde54
-  data.tar.gz: 532daaec0377fe3e610b2d76acd2b69a8f3c96e2
+  metadata.gz: b46b6f89a49ae652827b9c2b5dd687ec3e65180b
+  data.tar.gz: a830aa50a4fd7de437c9e3e80e5247ed0064bb9e
 SHA512:
-  metadata.gz: 733e818958cc4ae6ad35d5a8c6a6d9a86e7d12c8117f35734c15520974cabb40deff43b25761d971fe78e19aa5b742b7105b463d5d584d91027a3bccd1f076fc
-  data.tar.gz: 1d72fb9147c87fe03b6c9bc82aff383dad9fce34213da4020f5a7afbb840241e48006a16fb6d667725ba3c7a139fc80b396e671dfe6750d6ebaf9da512fbd83c
+  metadata.gz: a6bbd3ae59d56a28b15c19cd05fbb8ddd780bed3d90afc77c26e47d39a8a81a8e05a1823890cf4aa81caf241fa50bc6f49c9e6ce2054481c65db8c85c4d6f795
+  data.tar.gz: a93ed3d6e72c500b130c9fb6521f130376ffa6bc5818288be6d82383fc6d365f4637b00ede8f3a5a7911c09dca7e05b234278a9802626ac2f726d40eb1ecb1a1

data/Gemfile

@@ -7,6 +7,9 @@ gem 'zip'
 #gem 'neo4j-advanced',   '>= 1.8.1', '< 2.0', :require => false
 #gem 'neo4j-enterprise', '>= 1.8.1', '< 2.0', :require => false
 
+gem 'coveralls', require: false
+gem 'simplecov-html', require: false
+
 group 'development' do
   gem 'yard'
   gem 'simplecov'

data/README.md

@@ -1,4 +1,4 @@
-# Neo4j-core v3.0 [![Code Climate](https://codeclimate.com/github/andreasronge/neo4j-core.png)](https://codeclimate.com/github/andreasronge/neo4j-core) [![Build Status](https://travis-ci.org/andreasronge/neo4j-core.png)](https://travis-ci.org/andreasronge/neo4j-core)
+# Neo4j-core v3.0 [![Code Climate](https://codeclimate.com/github/andreasronge/neo4j-core.png)](https://codeclimate.com/github/andreasronge/neo4j-core) [![Build Status](https://travis-ci.org/neo4jrb/neo4j-core.png)](https://travis-ci.org/andreasronge/neo4j-core) [![Coverage Status](https://coveralls.io/repos/neo4jrb/neo4j-core/badge.png?branch=master)](https://coveralls.io/r/neo4jrb/neo4j-core?branch=master)
 
 A simple Ruby wrapper around the Neo4j graph database that works with the server and embedded Neo4j API. This gem can be used both from JRuby and normal MRI.
 It can be used standalone without the neo4j gem.
@@ -24,6 +24,7 @@ It can be used standalone without the neo4j gem.
 ## Contributing
 
 Pull request with high test coverage and good [code climate](https://codeclimate.com/github/andreasronge/neo4j-core) values will be accepted faster.
+Notice, only JRuby can run all the tests (embedded and server db). To run tests with coverage: `rake coverage`.
 
 ## License
 * Neo4j.rb - MIT, see the LICENSE file http://github.com/andreasronge/neo4j-core/tree/master/LICENSE.

data/lib/neo4j-core/query.rb

@@ -99,7 +99,7 @@ module Neo4j::Core
 
     METHODS = %w[with start match optional_match using where set create create_unique merge on_create_set on_match_set remove unwind delete return order skip limit]
 
-    CLAUSES = METHODS.map {|method| const_get(method.split('_').map {|c| c.capitalize }.join + 'Clause') }
+    CLAUSES = METHODS.map { |method| const_get(method.split('_').map { |c| c.capitalize }.join + 'Clause') }
 
     METHODS.each_with_index do |clause, i|
       clause_class = CLAUSES[i]
@@ -145,7 +145,7 @@ module Neo4j::Core
     def response
       return @response if @response
       cypher = self.to_cypher
-      @response = ActiveSupport::Notifications.instrument('neo4j.cypher_query', context: @options[:context] || 'CYPHER', cypher: cypher, params: @_params) do
+      @response = ActiveSupport::Notifications.instrument('neo4j.cypher_query', context: @options[:context] || 'CYPHER', cypher: cypher, params: merge_params) do
         @session._query(cypher, merge_params)
       end
       if !response.respond_to?(:error?) || !response.error?
@@ -163,7 +163,7 @@ module Neo4j::Core
         response.to_node_enumeration
       else
         Neo4j::Embedded::ResultWrapper.new(response, self.to_cypher)
-      end.each {|object| yield object }
+      end.each { |object| yield object }
     end
 
     # @method to_a
@@ -191,19 +191,7 @@ module Neo4j::Core
     #    Query.new.match(n: :Person).return(p: :name}.pluck('p, DISTINCT p.name') # => Array of [node, name] pairs
     #
     def pluck(*columns)
-      query = self.dup
-      query.remove_clause_class(ReturnClause)
-
-      columns = columns.map do |column_definition|
-        if column_definition.is_a?(Hash)
-          column_definition.map {|k, v| "#{k}.#{v}" }
-        else
-          column_definition
-        end
-      end.flatten.map(&:to_sym)
-
-      query = query.return(columns)
-
+      query = return_query(columns)
       columns = query.response.columns
 
       case columns.size
@@ -211,7 +199,7 @@ module Neo4j::Core
         raise ArgumentError, 'No columns specified for Query#pluck'
       when 1
         column = columns[0]
-        query.map {|row| row[column] }
+        query.map { |row| row[column] }
       else
         query.map do |row|
           columns.map do |column|
@@ -221,6 +209,20 @@ module Neo4j::Core
       end
     end
 
+    def return_query(columns)
+      query = self.dup
+      query.remove_clause_class(ReturnClause)
+
+      columns = columns.map do |column_definition|
+        if column_definition.is_a?(Hash)
+          column_definition.map { |k, v| "#{k}.#{v}" }
+        else
+          column_definition
+        end
+      end.flatten.map(&:to_sym)
+
+      query.return(columns)
+    end
 
     # Returns a CYPHER query string from the object query representation
     # @example
@@ -310,11 +312,8 @@ module Neo4j::Core
     end
 
     def merge_params
-      @clauses.compact.inject(@_params) {|params, clause| params.merge(clause.params) }
+      @merge_params ||= @clauses.compact.inject(@_params) { |params, clause| params.merge(clause.params) }
     end
 
   end
 end
-
-
-

data/lib/neo4j-core/query_clauses.rb

@@ -112,6 +112,17 @@ module Neo4j::Core
 
       private
 
+      def key_value_string(key, value, previous_keys = [], force_equals = false)
+        param = (previous_keys + [key]).join('_').gsub(/[\(\)\._]+/, '_')
+        @params[param.to_sym] = value
+
+        if !value.is_a?(Array) || force_equals
+          "#{key} = {#{param}}"
+        else
+          "#{key} IN {#{param}}"
+        end
+      end
+
       def format_label(label_string)
         label_string = label_string.to_s.strip
         if !label_string.empty? && label_string[0] != ':'
@@ -184,19 +195,6 @@ module Neo4j::Core
           clauses.map(&:value).join(' AND ')
         end
       end
-
-      private
-
-      def key_value_string(key, value, previous_keys = [])
-        param = (previous_keys + [key]).join('_').gsub(/[\(\)\._]+/, '_')
-        @params = @params.merge(param.to_sym => value)
-
-        if value.is_a?(Array)
-          "#{key} IN {#{param}}"
-        else
-          "#{key} = {#{param}}"
-        end
-      end
     end
 
 
@@ -386,7 +384,7 @@ module Neo4j::Core
             "#{key} = {#{attribute_string}}"
           else
             value.map do |k, v|
-              "#{key}.#{k} = #{v.inspect}"
+              key_value_string("#{key}.#{k}", v, ['setter'], true)
             end
           end
         else

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "3.0.0.rc.4"
+    VERSION = "3.0.0.rc.5"
   end
 end

data/lib/neo4j-embedded/embedded_ha_session.rb

@@ -0,0 +1,21 @@
+require 'neo4j-enterprise'
+
+Neo4j::Session.register_db(:ha_db) do |*args|
+  Neo4j::Embedded::EmbeddedHaSession.new(*args)
+end
+
+module Neo4j::Embedded
+  class EmbeddedHaSession < EmbeddedSession
+    def start
+      raise Error.new("Embedded HA Neo4j db is already running") if running?
+      puts "Start embedded HA Neo4j db at #{db_location}"
+      factory    = Java::OrgNeo4jGraphdbFactory::HighlyAvailableGraphDatabaseFactory.new
+      db_service = factory.newHighlyAvailableDatabaseBuilder(db_location)
+
+      raise Error.new("Need properties file for HA configuration") unless properties_file
+      db_service.loadPropertiesFromFile(properties_file)
+      @graph_db = db_service.newGraphDatabase()
+      Neo4j::Session._notify_listeners(:session_available, self)
+    end
+  end
+end

data/lib/neo4j-embedded/embedded_label.rb

@@ -53,6 +53,18 @@ module Neo4j::Embedded
     end
     tx_methods :indexes
 
+    def uniqueness_constraints()
+      {
+          property_keys: @session.graph_db.schema.constraints(as_java).select do |index_def|
+            index_def.is_a?(Java::OrgNeo4jKernelImplCoreapiSchema::PropertyUniqueConstraintDefinition)
+          end.map do |index_def|
+            index_def.property_keys.map{|x| x.to_sym}
+          end
+      }
+    end
+    tx_methods :uniqueness_constraints
+
+
     def drop_index(*properties)
       @session.graph_db.schema.indexes(as_java).each do |index_def|
         # at least one match, TODO

data/lib/neo4j-embedded/embedded_session.rb

@@ -11,15 +11,16 @@ module Neo4j::Embedded
     class Error < StandardError
     end
 
-    attr_reader :graph_db, :db_location
+    attr_reader :graph_db, :db_location, :properties_file
     extend Forwardable
     extend Neo4j::Core::TxMethods
     def_delegator :@graph_db, :begin_tx
 
 
     def initialize(db_location, config={})
-      @db_location = db_location
-      @auto_commit = !!config[:auto_commit]
+      @db_location     = db_location
+      @auto_commit     = !!config[:auto_commit]
+      @properties_file = config[:properties_file]
       Neo4j::Session.register(self)
     end
 
@@ -34,8 +35,10 @@ module Neo4j::Embedded
     def start
       raise Error.new("Embedded Neo4j db is already running") if running?
       puts "Start embedded Neo4j db at #{db_location}"
-      factory = Java::OrgNeo4jGraphdbFactory::GraphDatabaseFactory.new
-      @graph_db = factory.newEmbeddedDatabase(db_location)
+      factory    = Java::OrgNeo4jGraphdbFactory::GraphDatabaseFactory.new
+      db_service = factory.newEmbeddedDatabaseBuilder(db_location)
+      db_service.loadPropertiesFromFile(properties_file) if properties_file
+      @graph_db = db_service.newGraphDatabase()
       Neo4j::Session._notify_listeners(:session_available, self)
       @engine = Java::OrgNeo4jCypherJavacompat::ExecutionEngine.new(@graph_db)
     end

data/lib/neo4j-embedded/property.rb

@@ -80,8 +80,6 @@ module Neo4j::Embedded::Property
       remove_property(k)
     elsif (Array === v)
       case v[0]
-        when NilClass
-          set_property(k, [].to_java(:string))
         when String
           set_property(k, v.to_java(:string))
         when Float

data/lib/neo4j-server.rb

@@ -1,6 +1,6 @@
-require 'httparty'
 require 'json'
-require 'neo4j-server/neo4j_server_endpoint'
+require 'faraday'
+require 'faraday_middleware'
 require 'neo4j-server/resource'
 require 'neo4j-server/cypher_node'
 require 'neo4j-server/cypher_label'

data/lib/neo4j-server/cypher_label.rb

@@ -24,5 +24,9 @@ module Neo4j::Server
     def indexes
       @session.indexes(@name)
     end
+
+    def uniqueness_constraints
+      @session.uniqueness_constraints(@name)
+    end
   end
-end
+end

data/lib/neo4j-server/cypher_response.rb

@@ -117,7 +117,7 @@ module Neo4j::Server
     end
 
     def raise_unless_response_code(code)
-      raise "Response code #{response.code}, expected #{code} for #{response.request.path}, #{response.body}" unless response.code == code
+      raise "Response code #{response.code}, expected #{code} for #{response.request.path}, #{response.body}" unless response.status == code
     end
 
     def each_data_row
@@ -155,26 +155,26 @@ module Neo4j::Server
 
 
     def self.create_with_no_tx(response)
-      case response.code
+      case response.status
         when 200
-          CypherResponse.new(response).set_data(response['data'], response['columns'])
+          CypherResponse.new(response).set_data(response.body['data'], response.body['columns'])
         when 400
-          CypherResponse.new(response).set_error(response['message'], response['exception'], response['fullname'])
+          CypherResponse.new(response).set_error(response.body['message'], response.body['exception'], response.body['fullname'])
         else
-          raise "Unknown response code #{response.code} for #{response.request.path.to_s}"
+          raise "Unknown response code #{response.status} for #{response.env[:url].to_s}"
       end
     end
 
     def self.create_with_tx(response)
-      raise "Unknown response code #{response.code} for #{response.request.path.to_s}" unless response.code == 200
+      raise "Unknown response code #{response.status} for #{response.request_uri}" unless response.status == 200
 
-      first_result = response['results'][0]
+      first_result = response.body['results'][0]
       cr = CypherResponse.new(response, true)
 
-      if (response['errors'].empty?)
+      if (response.body['errors'].empty?)
         cr.set_data(first_result['data'], first_result['columns'])
       else
-        first_error = response['errors'].first
+        first_error = response.body['errors'].first
         cr.set_error(first_error['message'], first_error['status'], first_error['code'])
       end
       cr

data/lib/neo4j-server/cypher_session.rb

@@ -10,28 +10,46 @@ module Neo4j::Server
     include Neo4j::Core::CypherTranslator
     
     alias_method :super_query, :query
-
+    attr_reader :connection
+
+    # @param [Hash] params could be empty or contain basic authentication user and password
+    # @return [Faraday]
+    # @see https://github.com/lostisland/faraday
+    def self.create_connection(params)
+      init_params = params[:initialize] and params.delete(:initialize)
+      conn = Faraday.new(init_params) do |b|
+        b.request :basic_auth, params[:basic_auth][:username], params[:basic_auth][:password] if params[:basic_auth]
+        b.request :json
+        #b.response :logger
+        b.response :json, :content_type => "application/json"
+        #b.use Faraday::Response::RaiseError
+        b.use Faraday::Adapter::NetHttpPersistent
+        # b.adapter  Faraday.default_adapter
+      end
+      conn.headers = {'Content-Type' => 'application/json'}
+      conn
+    end
 
     # Opens a session to the database
     # @see Neo4j::Session#open
     #
     # @param [String] endpoint_url - the url to the neo4j server, defaults to 'http://localhost:7474'
-    # @param [Hash] params - see https://github.com/jnunemaker/httparty/blob/master/lib/httparty.rb for supported HTTParty options
+    # @param [Hash] params faraday params, see #create_connection or an already created faraday connection
     def self.open(endpoint_url=nil, params = {})
-      endpoint = Neo4jServerEndpoint.new(params)
+      connection = params[:connection] || create_connection(params)
       url = endpoint_url || 'http://localhost:7474'
-      response = endpoint.get(url)
-      raise "Server not available on #{url} (response code #{response.code})" unless response.code == 200
-      
-      root_data = JSON.parse(response.body)
+      response = connection.get(url)
+      raise "Server not available on #{url} (response code #{response.status})" unless response.status == 200
+
+      root_data = response.body
       data_url = root_data['data']
       data_url << '/' unless data_url.end_with?('/')
 
-      CypherSession.new(data_url, endpoint)
+      CypherSession.new(data_url, connection)
     end
 
-    def initialize(data_url, endpoint = nil)
-      @endpoint = endpoint || Neo4jServerEndpoint.new(data_url)
+    def initialize(data_url, connection)
+      @connection = connection
       Neo4j::Session.register(self)
       initialize_resource(data_url)
       Neo4j::Session._notify_listeners(:session_available, self)
@@ -54,9 +72,9 @@ module Neo4j::Server
     end
 
     def initialize_resource(data_url)
-      response = @endpoint.get(data_url)
+      response = @connection.get(data_url)
       expect_response_code(response,200)
-      data_resource = JSON.parse(response.body)
+      data_resource = response.body
       raise "No data_resource for #{response.body}" unless data_resource
       # store the resource data
       init_resource_data(data_resource, data_url)
@@ -72,7 +90,7 @@ module Neo4j::Server
         # Handle nested transaction "placebo transaction"
         Neo4j::Transaction.current.push_nested!
       else
-        wrap_resource(self, 'transaction', CypherTransaction, nil, :post, @endpoint)
+        wrap_resource(self, 'transaction', CypherTransaction, :post, @connection)
       end
       Neo4j::Transaction.current
     end
@@ -111,10 +129,24 @@ module Neo4j::Server
       CypherLabel.new(self, name)
     end
 
+    def uniqueness_constraints(label)
+      response = @connection.get("#{@resource_url}schema/constraint/#{label}/uniqueness")
+      expect_response_code(response, 200)
+      data_resource = response.body
+
+      property_keys = data_resource.map do |row|
+        row['property_keys'].map(&:to_sym)
+      end
+
+      {
+          property_keys: property_keys
+      }
+    end
+
     def indexes(label)
-      response = @endpoint.get("#{@resource_url}schema/index/#{label}")
+      response = @connection.get("#{@resource_url}schema/index/#{label}")
       expect_response_code(response, 200)
-      data_resource = JSON.parse(response.body)
+      data_resource = response.body
 
       property_keys = data_resource.map do |row|
         row['property_keys'].map(&:to_sym)
@@ -142,9 +174,11 @@ module Neo4j::Server
     end
 
     def query(*args)
-      if [[String], [String, String]].include?(args.map(&:class))
+      if [[String], [String, Hash]].include?(args.map(&:class))
         query, params = args[0,2]
-        _query(query, params).to_node_enumeration(query)
+        response = _query(query, params)
+        response.raise_error if response.error?
+        response.to_node_enumeration(query)
       else
         options = args[0] || {}
         Neo4j::Core::Query.new(options.merge(session: self))
@@ -175,21 +209,38 @@ module Neo4j::Server
         curr_tx._query(q, params)
       else
         url = resource_url('cypher')
-        q = params.nil? ? {query: q} : {query: q, params: params}
-        response = @endpoint.post(url, headers: resource_headers, body: q.to_json)
+        q = params.nil? ? { 'query' => q } : { 'query' => q, 'params' => params}
+        response = @connection.post(url, q)
         CypherResponse.create_with_no_tx(response)
       end
     end
 
     def search_result_to_enumerable_first_column(response)
       return [] unless response.data
+      if Neo4j::Transaction.current
+        search_result_to_enumerable_first_column_with_tx(response)
+      else
+        search_result_to_enumerable_first_column_without_tx(response)
+      end
+    end
+
+    def search_result_to_enumerable_first_column_with_tx(response)
       Enumerator.new do |yielder|
         response.data.each do |data|
-          yielder << CypherNode.new(self, data[0]).wrapper
+          data["row"].each do |id|
+            yielder << CypherNode.new(self, id).wrapper
+          end
         end
       end
     end
 
+    def search_result_to_enumerable_first_column_without_tx(response)
+      Enumerator.new do |yielder|
+        response.data.each do |data|
+          yielder << CypherNode.new(self, data[0]).wrapper
+        end
+      end
+  end
 
     def map_column(key, map, data)
       case map[key]

data/lib/neo4j-server/cypher_transaction.rb

@@ -15,11 +15,12 @@ module Neo4j::Server
       end
     end
 
-    def initialize(db, response, url, endpoint)
-      @endpoint = endpoint
-      @commit_url = response['commit']
-      @exec_url = response.headers['location']
-      init_resource_data(response, url)
+    def initialize(db, response, url, connection)
+      @connection = connection
+      @commit_url = response.body['commit']
+      @exec_url = response.headers['Location']
+      raise "NO ENDPOINT URL #{@connection} : HEAD: #{response.headers.inspect}" if !@exec_url || @exec_url.empty?
+      init_resource_data(response.body, url)
       expect_response_code(response,201)
       register_instance
     end
@@ -41,18 +42,18 @@ module Neo4j::Server
           statement[:statement].gsub!("{ #{k} }", "#{escape_value(v)}")
         end
       end
-      response = @endpoint.post(@exec_url, headers: resource_headers, body: body.to_json)
+      response = @connection.post(@exec_url, body)
       _create_cypher_response(response)
     end
 
     def _create_cypher_response(response)
-      first_result = response['results'][0]
+      first_result = response.body['results'][0]
       cr = CypherResponse.new(response, true)
 
-      if (response['errors'].empty?)
+      if (response.body['errors'].empty?)
         cr.set_data(first_result['data'], first_result['columns'])
       else
-        first_error = response['errors'].first
+        first_error = response.body['errors'].first
         cr.set_error(first_error['message'], first_error['code'], first_error['code'])
       end
       cr
@@ -61,13 +62,14 @@ module Neo4j::Server
 
 
     def _delete_tx
-      response = @endpoint.delete(@exec_url, headers: resource_headers)
+      response = @connection.delete(@exec_url, headers: resource_headers)
       expect_response_code(response,200)
       response
     end
 
     def _commit_tx
-      response = @endpoint.post(@commit_url, headers: resource_headers)
+      response = @connection.post(@commit_url)
+
       expect_response_code(response,200)
       response
     end

data/lib/neo4j-server/resource.rb

@@ -8,7 +8,7 @@ module Neo4j
       attr_reader :resource_data, :resource_url
 
       def init_resource_data(resource_data, resource_url)
-        raise "Exception #{response['exception']}" if resource_data['exception']
+        raise "Exception #{resource_data['exception']}" if resource_data['exception']
         @resource_url = resource_url
         @resource_data = resource_data
         raise "expected @resource_data to be Hash got #{@resource_data.class}" unless @resource_data.respond_to?(:[])
@@ -16,30 +16,29 @@ module Neo4j
       end
 
 
-      def wrap_resource(db, rel, resource_class, args=nil, verb=:get, payload=nil, endpoint)
-        url = resource_url(rel, args)
-        response = endpoint.send(verb, url, headers: {'Content-Type' => 'application/json'}, body: payload)
-        response.code == 404 ? nil : resource_class.new(db, response, url, endpoint)
+      def wrap_resource(db, rel, resource_class, verb=:get, payload={}, connection)
+        url = resource_url(rel)
+        response = case verb
+          when :get then connection.get(url, payload)
+          when :post then connection.post(url, payload)
+          else raise "Illegal verb #{verb}"
+        end
+        response.status == 404 ? nil : resource_class.new(db, response, url, connection)
       end
 
-      def resource_url(rel=nil, args=nil)
+      def resource_url(rel=nil)
         return @resource_url unless rel
         url = @resource_data[rel.to_s]
         raise "No resource rel '#{rel}', available #{@resource_data.keys.inspect}" unless url
-        return url unless args
-        if (args.is_a?(Hash))
-          args.keys.inject(url){|ack, key| ack.sub("{#{key}}",args[key].to_s)}
-        else
-          "#{url}/#{args.to_s}"
-        end
+        url
       end
 
-      def handle_response_error(response, msg="Error for request", url = response.request.path.to_s )
-        raise ServerException.new("#{msg} #{url}, #{response.code}, #{response.body}")
+      def handle_response_error(response, msg="Error for request" )
+        raise ServerException.new("#{msg} #{response.env && response.env[:url].to_s}, #{response.status}, #{response.status}")
       end
 
-      def expect_response_code(response, expected_code, msg="Error for request", url=response.request.path.to_s )
-        handle_response_error(response, "Expected response code #{expected_code} #{msg}",url) unless response.code == expected_code
+      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
 
@@ -59,15 +58,6 @@ module Neo4j
       def convert_from_json_value(value)
         JSON.parse(value, :quirks_mode => true)
       end
-
-      def convert_to_json_value(value)
-        case value
-          when String
-            %Q["#{value}"]
-          else
-            value.to_s
-        end
-      end
     end
   end
 end

data/lib/neo4j/session.rb

@@ -78,7 +78,21 @@ module Neo4j
     end
 
     class << self
-      # Creates a new session to Neo4j
+      # Creates a new session to Neo4j.
+      # This will be the default session to be used unless there is already a session created (see #current and #set_current)
+      #
+      # @example A Neo4j Server session
+      #   Neo4j::Session.open(:server_db, 'http://localhost:7474', {basic_auth: {username: 'foo', password: 'bar'}})
+      #
+      # @example Using a user defined Faraday HTTP connection
+      #   connection = Faraday.new do |b|
+      #     # faraday config
+      #   end
+      #   Neo4j::Session.open(:server_db, 'http://localhost:7474', connection: connection)
+      #
+      # @example A embedded Neo4j session
+      #   Neo4j::Session.open(:embedded_db, 'path/to/db')
+      #
       # @see also Neo4j::Server::CypherSession#open for :server_db params
       # @param db_type the type of database, e.g. :embedded_db, or :server_db
       def open(db_type=:server_db, *params)
@@ -90,6 +104,7 @@ module Neo4j
         register(create_session(db_type, params), name, default)
       end
 
+      # @private
       def create_session(db_type, params = {})
         unless (@@factories[db_type])
           raise "Can't connect to database '#{db_type}', available #{@@factories.keys.join(',')}"
@@ -97,24 +112,29 @@ module Neo4j
         @@factories[db_type].call(*params)
       end
 
+      # @return [Neo4j::Session] the current session
       def current
         @@current_session
       end
 
+      # Returns the current session or raise an exception if no session is available
       def current!
         raise "No session, please create a session first with Neo4j::Session.open(:server_db) or :embedded_db" unless current
         current
       end
 
       # @see Neo4j::Session#query
-      def query(options = {})
-        current!.query(options)
+      def query(*args)
+        current!.query(*args)
       end
 
+      # Returns a session with given name or else raise an exception
       def named(name)
         @@all_sessions[name] || raise("No session named #{name}.")
       end
 
+      # Sets the session to be used as default
+      # @param [Neo4j::Session] session the session to use
       def set_current(session)
         @@current_session = session
       end
@@ -130,19 +150,23 @@ module Neo4j
         end
       end
 
+      # @private
       def add_listener(&listener)
         self._listeners << listener
       end
 
+      # @private
       def _listeners
         @@listeners ||= []
         @@listeners
       end
 
+      # @private
       def _notify_listeners(event, data)
         _listeners.each {|li| li.call(event, data)}
       end
 
+      # @private
       def register(session, name = nil, default = nil)
         if default == true
           set_current(session)
@@ -150,9 +174,10 @@ module Neo4j
           set_current(session) unless @@current_session
         end
         @@all_sessions[name] = session if name
-        @@current_session
+        session
       end
 
+      # @private
       def unregister(session)
         @@current_session = nil if @@current_session == session
       end
@@ -161,6 +186,7 @@ module Neo4j
          "Neo4j::Session available: #{@@factories && @@factories.keys}"
       end
 
+      # @private
       def register_db(db, &session_factory)
         puts "replace factory for #{db}" if @@factories[db]
         @@factories[db] = session_factory

data/lib/neo4j/tasks/{neo4j_server.rb → neo4j_server.rake}

@@ -2,6 +2,7 @@
 require 'os'
 require 'httparty'
 require 'zip'
+require 'httparty'
 require File.expand_path("../config_server", __FILE__)
 
 namespace :neo4j do

data/neo4j-core.gemspec

@@ -30,6 +30,10 @@ It comes included with the Apache Lucene document database.
 
   # Not released yet
   s.add_dependency("httparty")
+  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("json")
   s.add_dependency("os")  # for Rake task
   s.add_dependency("zip") # for Rake task
@@ -37,5 +41,6 @@ It comes included with the Apache Lucene document database.
 
   if RUBY_PLATFORM == 'java'
     s.add_dependency("neo4j-community", '~> 2.1.1')
+    s.add_development_dependency 'ruby-debug'
   end
 end

metadata

@@ -1,99 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.4
+  version: 3.0.0.rc.5
 platform: ruby
 authors:
 - Andreas Ronge
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
+  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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: 0.9.0
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: json
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: os
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httpclient
   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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: zip
+  name: 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: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: activesupport
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: neo4j-community
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
-  prerelease: false
+        version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   You can think of Neo4j as a high-performance graph engine with all the features of a mature and robust database.
   The programmer works with an object-oriented, flexible network structure rather than with strict and static tables
@@ -105,19 +147,9 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- Gemfile
+- README.md
 - lib/neo4j-core.rb
-- lib/neo4j-embedded.rb
-- lib/neo4j-server.rb
-- lib/neo4j/entity_equality.rb
-- lib/neo4j/label.rb
-- lib/neo4j/node.rb
-- lib/neo4j/property_container.rb
-- lib/neo4j/property_validator.rb
-- lib/neo4j/relationship.rb
-- lib/neo4j/session.rb
-- lib/neo4j/transaction.rb
-- lib/neo4j/tasks/config_server.rb
-- lib/neo4j/tasks/neo4j_server.rb
 - lib/neo4j-core/active_entity.rb
 - lib/neo4j-core/cypher_translator.rb
 - lib/neo4j-core/hash_with_indifferent_access.rb
@@ -126,8 +158,10 @@ files:
 - lib/neo4j-core/query.rb
 - lib/neo4j-core/query_clauses.rb
 - lib/neo4j-core/version.rb
+- lib/neo4j-embedded.rb
 - lib/neo4j-embedded/cypher_response.rb
 - lib/neo4j-embedded/embedded_database.rb
+- lib/neo4j-embedded/embedded_ha_session.rb
 - lib/neo4j-embedded/embedded_impermanent_session.rb
 - lib/neo4j-embedded/embedded_label.rb
 - lib/neo4j-embedded/embedded_node.rb
@@ -136,6 +170,7 @@ files:
 - lib/neo4j-embedded/embedded_transaction.rb
 - lib/neo4j-embedded/property.rb
 - lib/neo4j-embedded/to_java.rb
+- lib/neo4j-server.rb
 - lib/neo4j-server/cypher_label.rb
 - lib/neo4j-server/cypher_node.rb
 - lib/neo4j-server/cypher_node_uncommited.rb
@@ -143,40 +178,47 @@ files:
 - lib/neo4j-server/cypher_response.rb
 - lib/neo4j-server/cypher_session.rb
 - lib/neo4j-server/cypher_transaction.rb
-- lib/neo4j-server/neo4j_server_endpoint.rb
 - lib/neo4j-server/resource.rb
-- README.md
-- Gemfile
+- lib/neo4j/entity_equality.rb
+- lib/neo4j/label.rb
+- lib/neo4j/node.rb
+- lib/neo4j/property_container.rb
+- lib/neo4j/property_validator.rb
+- lib/neo4j/relationship.rb
+- lib/neo4j/session.rb
+- lib/neo4j/tasks/config_server.rb
+- lib/neo4j/tasks/neo4j_server.rake
+- lib/neo4j/transaction.rb
 - neo4j-core.gemspec
 homepage: http://github.com/andreasronge/neo4j-core/tree
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
-- --quiet
-- --title
+- "--quiet"
+- "--title"
 - Neo4j::Core
-- --line-numbers
-- --main
+- "--line-numbers"
+- "--main"
 - README.rdoc
-- --inline-source
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: neo4j-core
-rubygems_version: 2.1.9
-signing_key:
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []

data/lib/neo4j-server/neo4j_server_endpoint.rb

@@ -1,24 +0,0 @@
-module Neo4j::Server
-  class Neo4jServerEndpoint
-    def initialize(params = {})
-      @params = params
-    end
-
-    def merged_options(options)
-      options.merge!(@params)
-    end
-
-    def get(url, options={})
-      HTTParty.get(url, merged_options(options))
-    end
-
-    def post(url, options={})
-      HTTParty.post(url, merged_options(options))
-    end
-
-    def delete(url, options={})
-      HTTParty.delete(url, merged_options(options))
-    end
-
-  end
-end