neo4j-core 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da521626106112cd3b3f3f2a4f7ea630f9cf147f
-  data.tar.gz: d6c94b7d176c36d70d0436db4f307dd9bc478c15
+  metadata.gz: 20021948746b82897d81ebb31d4a59767358dcd2
+  data.tar.gz: 6cd5c4daf6d4a3ba0a0e42265633bbefc3e48a91
 SHA512:
-  metadata.gz: af84ab4cc337da17517d0443ba699b7ec247d26b92d3258862ad9cf151b9fbfae877ad72b05ea73fb6661f37eb3ec4511e9485d21bd6a7404c70086d6228fe05
-  data.tar.gz: ebea9a3a22f0f70ff051f0ab1d2fce8e466a94afb021c9c96e2043320f044ec17671639b2b07bba8ad0d337c40f9e5ec81ba56e4935cf7a84521b3d636d2c7b6
+  metadata.gz: 8676dfad9c081b81a232d32d4fd9466a47918ad4de2ccfbd0d4bff7215b1fe2050e9d395d23d04f5e40c8c52c6c92ec546c746f60aa7d959a511c647e9a742c7
+  data.tar.gz: 07531aa910bac193d36a0c16b76df81ef7862579c3981d0f4bce5dacb130aeb744445336a65b9b163d0c3d4d4a49fd518e7d492849b466025532ee27dce7b7b4

data/lib/neo4j-core.rb

@@ -7,6 +7,7 @@ require 'neo4j/property_container'
 require 'neo4j-core/active_entity'
 require 'neo4j-core/helpers'
 require 'neo4j-core/cypher_translator'
+require 'neo4j-core/query_find_in_batches'
 require 'neo4j-core/query'
 
 require 'neo4j/entity_equality'

data/lib/neo4j-core/query.rb

@@ -12,6 +12,7 @@ module Neo4j::Core
   # http://docs.neo4j.org/chunked/milestone/cypher-query-lang.html
   class Query
     include Neo4j::Core::QueryClauses
+    include Neo4j::Core::QueryFindInBatches
 
     def initialize(options = {})
       @session = options[:session] || Neo4j::Session.current
@@ -113,6 +114,14 @@ module Neo4j::Core
     alias_method :offset, :skip
     alias_method :order_by, :order
 
+    # Clears out previous order clauses and allows only for those specified by args
+    def reorder(*args)
+      query = self.copy
+
+      query.remove_clause_class(OrderClause)
+      query.order(*args)
+    end
+
     # Works the same as the #set method, but when given a nested array it will set properties rather than setting entire objects
     # @example
     #    # Creates a query representing the cypher: MATCH (n:Person) SET n.age = 19
@@ -210,7 +219,7 @@ module Neo4j::Core
     end
 
     def return_query(columns)
-      query = self.dup
+      query = self.copy
       query.remove_clause_class(ReturnClause)
 
       columns = columns.map do |column_definition|
@@ -270,6 +279,15 @@ module Neo4j::Core
       end.params(other_query._params)
     end
 
+    MEMOIZED_INSTANCE_VARIABLES = [:response, :merge_params]
+    def copy
+      self.dup.tap do |query|
+        MEMOIZED_INSTANCE_VARIABLES.each do |var|
+          query.instance_variable_set("@#{var}", nil)
+        end
+      end
+    end
+
     protected
     attr_accessor :session, :options, :clauses, :_params
 
@@ -285,14 +303,14 @@ module Neo4j::Core
     private
 
     def build_deeper_query(clause_class, args = {}, options = {})
-      self.dup.tap do |new_query|
+      self.copy.tap do |new_query|
         new_query.add_clauses [nil] if [nil, WithClause].include?(clause_class)
         new_query.add_clauses clause_class.from_args(args, options) if clause_class
       end
     end
 
     def break_deeper_query
-      self.dup.tap do |new_query|
+      self.copy.tap do |new_query|
         new_query.add_clauses [nil]
       end
     end

data/lib/neo4j-core/query_find_in_batches.rb

@@ -0,0 +1,41 @@
+module Neo4j::Core
+  module QueryFindInBatches
+
+    def find_in_batches(node_var, prop_var, options = {})
+      invalid_keys = options.keys.map(&:to_sym) - [:batch_size]
+      raise ArgumentError, "Invalid keys: #{invalid_keys.join(', ')}" if not invalid_keys.empty?
+
+      batch_size = options.delete(:batch_size) || 1000
+
+      query = self.reorder(node_var => prop_var).limit(batch_size)
+
+      records = query.to_a
+
+      while records.any?
+        records_size = records.size
+        primary_key_offset = begin
+                               records.last.send(node_var).send(prop_var)
+                             rescue NoMethodError
+                               begin
+                                 records.last.send(node_var)[prop_var.to_sym]
+                               rescue NoMethodError
+                                 records.last.send("#{node_var}.#{prop_var}") # In case we're explicitly returning it
+                               end
+                             end
+
+        yield records
+
+        break if records_size < batch_size
+
+        records = query.where("#{node_var}.#{prop_var} > {primary_key_offset}").params(primary_key_offset: primary_key_offset).to_a
+      end
+    end
+
+    def find_each(*args)
+      find_in_batches(*args) do |batch|
+        batch.each { |result| yield result }
+      end
+    end
+  end
+end
+

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "3.0.4"
+    VERSION = "3.0.5"
   end
 end

data/lib/neo4j-server/cypher_session.rb

@@ -8,7 +8,7 @@ module Neo4j::Server
   class CypherSession < Neo4j::Session
     include Resource
     include Neo4j::Core::CypherTranslator
-    
+
     alias_method :super_query, :query
     attr_reader :connection
 
@@ -36,6 +36,7 @@ module Neo4j::Server
     # @param [String] endpoint_url - the url to the neo4j server, defaults to 'http://localhost:7474'
     # @param [Hash] params faraday params, see #create_connection or an already created faraday connection
     def self.open(endpoint_url=nil, params = {})
+      extract_basic_auth(endpoint_url, params)
       connection = params[:connection] || create_connection(params)
       url = endpoint_url || 'http://localhost:7474'
       response = connection.get(url)
@@ -48,6 +49,15 @@ module Neo4j::Server
       CypherSession.new(data_url, connection)
     end
 
+    def self.extract_basic_auth(url, params)
+      return unless url && URI(url).userinfo
+      params[:basic_auth] = {
+        username: URI(url).user,
+        password: URI(url).password
+      }
+    end
+    private_class_method :extract_basic_auth
+
     def initialize(data_url, connection)
       @connection = connection
       Neo4j::Session.register(self)
@@ -168,7 +178,7 @@ module Neo4j::Server
 
     def find_nodes(label_name, key, value)
       value = "'#{value}'" if value.is_a? String
-      
+
       response = _query_or_fail <<-CYPHER
         MATCH (n:`#{label_name}`)
         WHERE n.#{key} = #{value}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -154,6 +154,7 @@ files:
 - lib/neo4j-core/label.rb
 - lib/neo4j-core/query.rb
 - lib/neo4j-core/query_clauses.rb
+- lib/neo4j-core/query_find_in_batches.rb
 - lib/neo4j-core/version.rb
 - lib/neo4j-embedded.rb
 - lib/neo4j-embedded/cypher_response.rb
@@ -214,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neo4j-core
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby