activegraph 10.0.0.pre.alpha.11 → 10.0.0.pre.beta.1

data/lib/{neo4j → active_graph}/core/driver.rb

@@ -1,14 +1,14 @@
 require 'active_support/core_ext/module/attribute_accessors'
-require 'neo4j/core/logging'
-require 'neo4j/core/has_uri'
-require 'neo4j/version'
+require 'active_graph/core/logging'
+require 'active_graph/core/has_uri'
+require 'active_graph/version'
 
-module Neo4j
+module ActiveGraph
   module Core
     class Driver
       include HasUri
 
-      USER_AGENT_STRING = "neo4j-gem/#{::Neo4j::VERSION} (https://github.com/neo4jrb/neo4j)"
+      USER_AGENT_STRING = "neo4j-gem/#{::ActiveGraph::VERSION} (https://github.com/neo4jrb/neo4j)"
 
       attr_accessor :wrap_level
       attr_reader :options, :driver

data/lib/{neo4j → active_graph}/core/has_uri.rb

@@ -1,6 +1,6 @@
 require 'active_support/concern'
 
-module Neo4j
+module ActiveGraph
   module Core
     # Containing the logic for dealing with adaptors which use URIs
     module HasUri

data/lib/{neo4j → active_graph}/core/instrumentable.rb

@@ -1,8 +1,8 @@
 require 'active_support/concern'
 require 'active_support/notifications'
-require 'neo4j/ansi'
+require 'active_graph/ansi'
 
-module Neo4j
+module ActiveGraph
   module Core
     module Instrumentable
       extend ActiveSupport::Concern
@@ -14,7 +14,7 @@ module Neo4j
         def subscribe_to_request
           ActiveSupport::Notifications.subscribe('neo4j.core.bolt.request') do |_, start, finish, _id, _payload|
             ms = (finish - start) * 1000
-            yield " #{ANSI::BLUE}BOLT:#{ANSI::CLEAR} #{ANSI::YELLOW}#{ms.round}ms#{ANSI::CLEAR} #{ActiveBase.current_driver.url_without_password}"
+            yield " #{ANSI::BLUE}BOLT:#{ANSI::CLEAR} #{ANSI::YELLOW}#{ms.round}ms#{ANSI::CLEAR} #{Base.current_driver.url_without_password}"
           end
         end
 
@@ -27,7 +27,7 @@ module Neo4j
             source_line, line_number = Logging.first_external_path_and_line(caller_locations)
 
             yield " #{ANSI::CYAN}#{query.context || 'CYPHER'}#{ANSI::CLEAR} #{cypher} #{params_string}" +
-              ("\n   ↳ #{source_line}:#{line_number}" if ActiveBase.current_driver.options[:verbose_query_logs] && source_line).to_s
+              ("\n   ↳ #{source_line}:#{line_number}" if Base.current_driver.options[:verbose_query_logs] && source_line).to_s
           end
         end
       end

data/lib/{neo4j → active_graph}/core/label.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Core
     class Label
       attr_reader :name
@@ -21,7 +21,7 @@ module Neo4j
       # Creates a neo4j constraint on a property
       # See http://docs.neo4j.org/chunked/stable/query-constraints.html
       # @example
-      #   label = Neo4j::Label.create(:person, driver)
+      #   label = ActiveGraph::Label.create(:person, driver)
       #   label.create_constraint(:name, {type: :unique}, driver)
       #
       def create_constraint(property, constraints)
@@ -41,7 +41,7 @@ module Neo4j
       # Drops a neo4j constraint on a property
       # See http://docs.neo4j.org/chunked/stable/query-constraints.html
       # @example
-      #   label = Neo4j::Label.create(:person, driver)
+      #   label = ActiveGraph::Label.create(:person, driver)
       #   label.create_constraint(:name, {type: :unique}, driver)
       #   label.drop_constraint(:name, {type: :unique}, driver)
       #
@@ -76,7 +76,7 @@ module Neo4j
       end
 
       def constraints(_options = {})
-        Neo4j::Transaction.constraints.select do |definition|
+        ActiveGraph::Transaction.constraints.select do |definition|
           definition[:label] == @name.to_sym
         end
       end
@@ -109,13 +109,13 @@ module Neo4j
 
       class << self
         def indexes
-          Neo4j::Transaction.indexes
+          ActiveGraph::Transaction.indexes
         end
 
         def drop_indexes
           indexes.each do |definition|
             begin
-              Neo4j::Transaction.query("DROP INDEX ON :`#{definition[:label]}`(#{definition[:properties][0]})")
+              ActiveGraph::Transaction.query("DROP INDEX ON :`#{definition[:label]}`(#{definition[:properties][0]})")
             rescue Neo4j::Driver::Exceptions::DatabaseException
               # This will error on each constraint. Ignore and continue.
               next
@@ -124,11 +124,11 @@ module Neo4j
         end
 
         def drop_constraints
-          Neo4j::Transaction.named_constraints.each do |constraint|
-            Neo4j::Transaction.query("DROP CONSTRAINT #{constraint.name}")
+          ActiveGraph::Transaction.named_constraints.each do |constraint|
+            ActiveGraph::Transaction.query("DROP CONSTRAINT #{constraint.name}")
           end
-          Neo4j::Transaction.constraints.each do |definition|
-            Neo4j::Transaction.query("DROP CONSTRAINT ON (n:`#{definition[:label]}`) ASSERT n.`#{definition[:properties][0]}` IS UNIQUE")
+          ActiveGraph::Transaction.constraints.each do |definition|
+            ActiveGraph::Transaction.query("DROP CONSTRAINT ON (n:`#{definition[:label]}`) ASSERT n.`#{definition[:properties][0]}` IS UNIQUE")
           end
         end
 
@@ -138,16 +138,16 @@ module Neo4j
         end
 
         def schema_threads
-          Neo4j::Transaction.instance_variable_get('@_schema_threads') || []
+          ActiveGraph::Transaction.instance_variable_get('@_schema_threads') || []
         end
 
         def set_schema_threads(array)
-          Neo4j::Transaction.instance_variable_set('@_schema_threads', array)
+          ActiveGraph::Transaction.instance_variable_set('@_schema_threads', array)
         end
       end
 
       def schema_query(cypher)
-        Neo4j::Transaction.transaction { |tx| tx.query(cypher, {}) }
+        ActiveGraph::Transaction.transaction { |tx| tx.query(cypher, {}) }
       end
 
       def validate_index_options!(options)

data/lib/{neo4j → active_graph}/core/logging.rb

@@ -1,5 +1,5 @@
 # Copied largely from activerecord/lib/active_record/log_subscriber.rb
-module Neo4j
+module ActiveGraph
   module Core
     module Logging
       class << self
@@ -30,7 +30,7 @@ module Neo4j
         def neo4j_gem_path
           return if !defined?(::Rails.root)
 
-          @neo4j_gem_path ||= File.expand_path('../../..', Neo4j::ActiveBase.method(:current_driver).source_location[0])
+          @neo4j_gem_path ||= File.expand_path('../../..', ActiveGraph::Base.method(:current_driver).source_location[0])
         end
 
         def active_support_gem_path

data/lib/{neo4j → active_graph}/core/node.rb

@@ -1,6 +1,6 @@
-require 'neo4j/core/wrappable'
+require 'active_graph/core/wrappable'
 
-module Neo4j
+module ActiveGraph
   module Core
     module Node
       def props; properties; end

data/lib/{neo4j → active_graph}/core/querable.rb

@@ -1,9 +1,9 @@
-require 'neo4j/core/instrumentable'
-require 'neo4j/transaction'
-require 'neo4j/core/query_builder'
-require 'neo4j/core/responses'
+require 'active_graph/core/instrumentable'
+require 'active_graph/transaction'
+require 'active_graph/core/query_builder'
+require 'active_graph/core/responses'
 
-module Neo4j
+module ActiveGraph
   module Core
     module Querable
       extend ActiveSupport::Concern
@@ -16,7 +16,7 @@ module Neo4j
                     when 3
                       args.pop
                     when 2
-                      args.pop if args[0].is_a?(::Neo4j::Core::Query)
+                      args.pop if args[0].is_a?(::ActiveGraph::Core::Query)
                     end || {}
 
           queries(options) { append(*args) }[0]
@@ -69,7 +69,7 @@ module Neo4j
               result_from_data(transaction.root_tx.run(query.cypher, query.parameters))
             end
           rescue Neo4j::Driver::Exceptions::Neo4jException => e
-            raise Neo4j::Core::CypherError.new_from(e.code, e.message) # , e.stack_track.to_a
+            raise ActiveGraph::Core::CypherError.new_from(e.code, e.message) # , e.stack_track.to_a
           end
         end
 

data/lib/{neo4j → active_graph}/core/query.rb

@@ -1,8 +1,8 @@
-require 'neo4j/core/query_clauses'
-require 'neo4j/core/query_find_in_batches'
+require 'active_graph/core/query_clauses'
+require 'active_graph/core/query_find_in_batches'
 require 'active_support/notifications'
 
-module Neo4j
+module ActiveGraph
   module Core
     # Allows for generation of cypher queries via ruby method calls (inspired by ActiveRecord / arel syntax)
     #
@@ -13,8 +13,8 @@ module Neo4j
     # See also the following link for full cypher language documentation:
     # http://docs.neo4j.org/chunked/milestone/cypher-query-lang.html
     class Query
-      include Neo4j::Core::QueryClauses
-      include Neo4j::Core::QueryFindInBatches
+      include ActiveGraph::Core::QueryClauses
+      include ActiveGraph::Core::QueryFindInBatches
       DEFINED_CLAUSES = {}
 
 
@@ -237,7 +237,7 @@ module Neo4j
       def response
         return @response if @response
 
-        @response = Neo4j::Transaction.query(self, transaction: Transaction.root, wrap_level: (:core_entity if unwrapped?))
+        @response = ActiveGraph::Transaction.query(self, transaction: Transaction.root, wrap_level: (:core_entity if unwrapped?))
       end
 
       def raise_if_cypher_error!(response)
@@ -271,12 +271,12 @@ module Neo4j
       # @method to_a
       # Class is Enumerable.  Each yield is a Hash with the key matching the variable returned and the value being the value for that key from the response
       # @return [Array]
-      # @raise [Neo4j::Server::CypherResponse::ResponseError] Raises errors from neo4j server
+      # @raise [ActiveGraph::Server::CypherResponse::ResponseError] Raises errors from neo4j server
 
 
       # Executes a query without returning the result
       # @return [Boolean] true if successful
-      # @raise [Neo4j::Server::CypherResponse::ResponseError] Raises errors from neo4j server
+      # @raise [ActiveGraph::Server::CypherResponse::ResponseError] Raises errors from neo4j server
       def exec
         response
 
@@ -363,8 +363,8 @@ module Neo4j
       #
       # @example
       #    # Generates cypher: MATCH (n:Person) UNION MATCH (o:Person) WHERE o.age = 10
-      #    q = Neo4j::Core::Query.new.match(o: :Person).where(o: {age: 10})
-      #    result = Neo4j::Core::Query.new.match(n: :Person).union_cypher(q)
+      #    q = ActiveGraph::Core::Query.new.match(o: :Person).where(o: {age: 10})
+      #    result = ActiveGraph::Core::Query.new.match(n: :Person).union_cypher(q)
       #
       # @param other [Query] Second half of UNION
       # @param options [Hash] Specify {all: true} to use UNION ALL
@@ -439,7 +439,7 @@ module Neo4j
               second_to_last << clause
             elsif clause_is_with_following_order_or_limit?(clause)
               second_to_last << clause
-              second_to_last.sort_by! { |c| c.is_a?(::Neo4j::Core::QueryClauses::OrderClause) ? 1 : 0 }
+              second_to_last.sort_by! { |c| c.is_a?(::ActiveGraph::Core::QueryClauses::OrderClause) ? 1 : 0 }
             else
               @partitioning.last << clause
             end
@@ -460,19 +460,19 @@ module Neo4j
           self.class.clause_is_order_or_limit?(clause) &&
             @partitioning[-2] &&
             @partitioning[-1].empty? &&
-            (@partitioning[-2].last.is_a?(::Neo4j::Core::QueryClauses::WithClause) ||
-              @partitioning[-2].last.is_a?(::Neo4j::Core::QueryClauses::OrderClause))
+            (@partitioning[-2].last.is_a?(::ActiveGraph::Core::QueryClauses::WithClause) ||
+              @partitioning[-2].last.is_a?(::ActiveGraph::Core::QueryClauses::OrderClause))
         end
 
         def clause_is_with_following_order_or_limit?(clause)
-          clause.is_a?(::Neo4j::Core::QueryClauses::WithClause) &&
+          clause.is_a?(::ActiveGraph::Core::QueryClauses::WithClause) &&
             @partitioning[-2] && @partitioning[-2].any? { |c| self.class.clause_is_order_or_limit?(c) }
         end
 
         class << self
           def clause_is_order_or_limit?(clause)
-            clause.is_a?(::Neo4j::Core::QueryClauses::OrderClause) ||
-              clause.is_a?(::Neo4j::Core::QueryClauses::LimitClause)
+            clause.is_a?(::ActiveGraph::Core::QueryClauses::OrderClause) ||
+              clause.is_a?(::ActiveGraph::Core::QueryClauses::LimitClause)
           end
         end
       end

data/lib/{neo4j → active_graph}/core/query_builder.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Core
     class QueryBuilder
       attr_reader :queries
@@ -13,7 +13,7 @@ module Neo4j
         query = case args.map(&:class)
                 when [String], [String, Hash]
                   Query.new(args[0], args[1] || {})
-                when [::Neo4j::Core::Query]
+                when [::ActiveGraph::Core::Query]
                   args[0]
                 else
                   fail ArgumentError, "Could not determine query from arguments: #{args.inspect}"
@@ -25,7 +25,7 @@ module Neo4j
       def query
         # `nil` drivers are just a workaround until
         # we phase out `Query` objects containing drivers
-        Neo4j::Core::Query.new(driver: nil)
+        ActiveGraph::Core::Query.new(driver: nil)
       end
     end
   end

data/lib/{neo4j → active_graph}/core/query_clauses.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Core
     module QueryClauses
       class ArgError < StandardError

data/lib/{neo4j → active_graph}/core/query_ext.rb

@@ -1,15 +1,15 @@
-module Neo4j
+module ActiveGraph
   module Core
     class Query
-      # Creates a Neo4j::ActiveNode::Query::QueryProxy object that builds off of a Core::Query object.
+      # Creates a ActiveGraph::Node::Query::QueryProxy object that builds off of a Core::Query object.
       #
-      # @param [Class] model An ActiveNode model to be used as the start of a new QueryuProxy chain
+      # @param [Class] model An Node model to be used as the start of a new QueryuProxy chain
       # @param [Symbol] var The variable to be used to refer to the object from within the new QueryProxy
       # @param [Boolean] optional Indicate whether the new QueryProxy will use MATCH or OPTIONAL MATCH.
-      # @return [Neo4j::ActiveNode::Query::QueryProxy] A QueryProxy object.
+      # @return [ActiveGraph::Node::Query::QueryProxy] A QueryProxy object.
       def proxy_as(model, var, optional = false)
         # TODO: Discuss whether it's necessary to call `break` on the query or if this should be left to the user.
-        Neo4j::ActiveNode::Query::QueryProxy.new(model, nil, node: var, optional: optional, starting_query: self, chain_level: @proxy_chain_level)
+        ActiveGraph::Node::Query::QueryProxy.new(model, nil, node: var, optional: optional, starting_query: self, chain_level: @proxy_chain_level)
       end
 
       # Calls proxy_as with `optional` set true. This doesn't offer anything different from calling `proxy_as` directly but it may be more readable.

data/lib/{neo4j → active_graph}/core/query_find_in_batches.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Core
     module QueryFindInBatches
       def find_in_batches(node_var, prop_var, options = {})
@@ -18,7 +18,7 @@ module Neo4j
 
           break if records_size < batch_size
 
-          primary_key_var = Neo4j::Core::QueryClauses::Clause.from_key_and_single_value(node_var, prop_var)
+          primary_key_var = ActiveGraph::Core::QueryClauses::Clause.from_key_and_single_value(node_var, prop_var)
           records = query.where("#{primary_key_var} > $primary_key_offset")
                          .params(primary_key_offset: primary_key_offset).to_a
         end

data/lib/{neo4j → active_graph}/core/relationship.rb

@@ -1,6 +1,6 @@
-require 'neo4j/core/wrappable'
+require 'active_graph/core/wrappable'
 
-module Neo4j
+module ActiveGraph
   module Core
     module Relationship
       def props; properties; end

data/lib/{neo4j → active_graph}/core/responses.rb

@@ -1,7 +1,7 @@
-require 'neo4j/core/result'
+require 'active_graph/core/result'
 require 'active_support/core_ext/module/attribute_accessors'
 
-module Neo4j
+module ActiveGraph
   module Core
     module Responses
       extend ActiveSupport::Concern
@@ -16,7 +16,7 @@ module Neo4j
             wrap(entity_data.values)
           end
 
-          Neo4j::Core::Result.new(entities_data.keys, rows)
+          ActiveGraph::Core::Result.new(entities_data.keys, rows)
         end
 
         private

data/lib/{neo4j → active_graph}/core/result.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Core
     class Result
       attr_reader :columns, :rows

data/lib/{neo4j → active_graph}/core/schema.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Core
     module Schema
       def version

data/lib/{neo4j → active_graph}/core/schema_errors.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Core
     module SchemaErrors
       class ConstraintValidationFailedError < CypherError;

data/lib/{neo4j → active_graph}/core/wrappable.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Core
     module Wrappable
       extend ActiveSupport::Concern

data/lib/{neo4j → active_graph}/errors.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   # Neo4j.rb Errors
   # Generic Neo4j.rb exception class.
   class Error < StandardError

data/lib/{neo4j → active_graph}/lazy_attribute_hash.rb

@@ -1,6 +1,6 @@
 require 'active_model/attribute_set'
 
-module Neo4j
+module ActiveGraph
   class LazyAttributeHash < ActiveModel::LazyAttributeHash
     def initialize(values, attr_list)
       @types = {}

data/lib/{neo4j → active_graph}/migration.rb

@@ -1,7 +1,7 @@
 require 'benchmark'
-require 'neo4j/migrations/helpers/id_property'
+require 'active_graph/migrations/helpers/id_property'
 
-module Neo4j
+module ActiveGraph
   class Migration
     def migrate
       fail 'not implemented'
@@ -28,11 +28,11 @@ module Neo4j
     end
 
     def query(*args)
-      Neo4j::ActiveBase.current_driver.query(*args)
+      ActiveGraph::Base.current_driver.query(*args)
     end
 
-    class AddIdProperty < Neo4j::Migration
-      include Neo4j::Migrations::Helpers::IdProperty
+    class AddIdProperty < ActiveGraph::Migration
+      include ActiveGraph::Migrations::Helpers::IdProperty
 
       attr_reader :models_filename
 
@@ -55,11 +55,11 @@ module Neo4j
       end
 
       def query(*args)
-        ActiveBase.magic_query(*args)
+        Base.magic_query(*args)
       end
 
       def execute(*args)
-        ActiveBase.query(*args)
+        Base.query(*args)
       end
 
       def setup
@@ -96,7 +96,7 @@ MESSAGE
       # end
 
       # def idless_count(label, id_property)
-      #  Neo4j::ActiveBase.new_query.match(n: label).where("NOT EXISTS(n.#{id_property})").pluck('COUNT(n) AS ids').first
+      #  ActiveGraph::Base.new_query.match(n: label).where("NOT EXISTS(n.#{id_property})").pluck('COUNT(n) AS ids').first
       # end
 
       # def print_status(last_time_taken, max_per_batch, nodes_left)
@@ -113,9 +113,9 @@ MESSAGE
 
 
       # def id_batch_set(label, id_property, new_ids, count)
-      #  tx = Neo4j::ActiveBase.new_transaction
+      #  tx = ActiveGraph::Base.new_transaction
 
-      #  Neo4j::ActiveBase.current_driver.query("MATCH (n:`#{label}`) WHERE NOT EXISTS(n.#{id_property})
+      #  ActiveGraph::Base.current_driver.query("MATCH (n:`#{label}`) WHERE NOT EXISTS(n.#{id_property})
       #    with COLLECT(n) as nodes, #{new_ids} as ids
       #    FOREACH(i in range(0,#{count - 1})|
       #      FOREACH(node in [nodes[i]]|
@@ -124,7 +124,7 @@ MESSAGE
       #    LIMIT #{count}")
 
       #  count
-      # rescue Neo4j::Server::CypherResponse::ResponseError, Faraday::TimeoutError
+      # rescue ActiveGraph::Server::CypherResponse::ResponseError, Faraday::TimeoutError
       #  new_max_per_batch = (max_per_batch * 0.8).round
       #  output "Error querying #{max_per_batch} nodes.  Trying #{new_max_per_batch}"
       #  new_max_per_batch