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

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

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Migrations
     extend ActiveSupport::Autoload
     autoload :Helpers
@@ -10,17 +10,17 @@ module Neo4j
 
     class << self
       def check_for_pending_migrations!
-        return if Neo4j::Config.configuration['skip_migration_check']
+        return if ActiveGraph::Config.configuration['skip_migration_check']
 
-        runner = Neo4j::Migrations::Runner.new
+        runner = ActiveGraph::Migrations::Runner.new
         pending = runner.pending_migrations
-        fail ::Neo4j::PendingMigrationError, pending if pending.any?
+        fail ::ActiveGraph::PendingMigrationError, pending if pending.any?
       end
 
       attr_accessor :currently_running_migrations
 
       def maintain_test_schema!
-        Neo4j::Migrations::Runner.new(silenced: true).all
+        ActiveGraph::Migrations::Runner.new(silenced: true).all
       end
     end
   end

data/lib/{neo4j → active_graph}/migrations/base.rb

@@ -1,10 +1,10 @@
-module Neo4j
+module ActiveGraph
   module Migrations
     class Base
-      include Neo4j::Migrations::Helpers
-      include Neo4j::Migrations::Helpers::Schema
-      include Neo4j::Migrations::Helpers::IdProperty
-      include Neo4j::Migrations::Helpers::Relationships
+      include ActiveGraph::Migrations::Helpers
+      include ActiveGraph::Migrations::Helpers::Schema
+      include ActiveGraph::Migrations::Helpers::IdProperty
+      include ActiveGraph::Migrations::Helpers::Relationships
 
       def initialize(migration_id, options = {})
         @migration_id = migration_id
@@ -63,11 +63,11 @@ module Neo4j
       end
 
       def migration_transaction(&block)
-        ActiveBase.run_transaction(transactions?, &block)
+        ActiveGraph::Base.run_transaction(transactions?, &block)
       end
 
       def log_queries
-        subscriber = Neo4j::Transaction.subscribe_to_query(&method(:output))
+        subscriber = ActiveGraph::Transaction.subscribe_to_query(&method(:output))
         yield
       ensure
         ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber

data/lib/{neo4j → active_graph}/migrations/check_pending.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Migrations
     class CheckPending
       def initialize(app)
@@ -7,10 +7,10 @@ module Neo4j
       end
 
       def call(env)
-        latest_migration = Neo4j::Migrations::Runner.latest_migration
+        latest_migration = ActiveGraph::Migrations::Runner.latest_migration
         mtime = latest_migration ? latest_migration.version.to_i : 0
         if @last_check < mtime
-          Neo4j::Migrations.check_for_pending_migrations!
+          ActiveGraph::Migrations.check_for_pending_migrations!
           @last_check = mtime
         end
         @app.call(env)

data/lib/{neo4j → active_graph}/migrations/helpers.rb

@@ -1,6 +1,6 @@
 require 'benchmark'
 
-module Neo4j
+module ActiveGraph
   module Migrations
     module Helpers
       extend ActiveSupport::Concern
@@ -18,7 +18,7 @@ module Neo4j
       end
 
       def rename_property(label, old_property, new_property)
-        fail Neo4j::MigrationError, format(PROPERTY_ALREADY_DEFINED, new_property: new_property, label: label) if property_exists?(label, new_property)
+        fail ActiveGraph::MigrationError, format(PROPERTY_ALREADY_DEFINED, new_property: new_property, label: label) if property_exists?(label, new_property)
         by_label(label).set("n.#{new_property} = n.#{old_property}")
                        .remove("n.#{old_property}").exec
       end
@@ -50,7 +50,7 @@ module Neo4j
       end
 
       def execute(string, params = {})
-        ActiveBase.query(string, params).to_a
+        ActiveGraph::Base.query(string, params).to_a
       end
 
       def say_with_time(message)
@@ -67,7 +67,7 @@ module Neo4j
       end
 
       def query(*args)
-        ActiveBase.new_query(*args)
+        ActiveGraph::Base.new_query(*args)
       end
 
       protected

data/lib/{neo4j → active_graph}/migrations/helpers/id_property.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Migrations
     module Helpers
       module IdProperty
@@ -27,7 +27,7 @@ module Neo4j
         end
 
         def id_batch_set(label, id_property, new_ids, count)
-          tx = ActiveBase.new_transaction
+          tx = ActiveGraph::Base.new_transaction
 
           execute("MATCH (n:`#{label}`) WHERE NOT EXISTS(n.#{id_property})
             with COLLECT(n) as nodes, #{new_ids} as ids
@@ -38,7 +38,7 @@ module Neo4j
             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

data/lib/{neo4j → active_graph}/migrations/helpers/relationships.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Migrations
     module Helpers
       module Relationships

data/lib/{neo4j → active_graph}/migrations/helpers/schema.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Migrations
     module Helpers
       module Schema
@@ -9,7 +9,7 @@ module Neo4j
         def add_constraint(label, property, options = {})
           force = options[:force] || false
           type = options[:type] || :uniqueness
-          label_object = ActiveBase.label_object(label)
+          label_object = ActiveGraph::Base.label_object(label)
           if label_object.constraint?(property)
             if force
               label_object.drop_constraint(property, type: type)
@@ -22,7 +22,7 @@ module Neo4j
 
         def add_index(label, property, options = {})
           force = options[:force] || false
-          label_object = ActiveBase.label_object(label)
+          label_object = ActiveGraph::Base.label_object(label)
           if label_object.index?(property)
             if force
               label_object.drop_index(property)
@@ -35,13 +35,13 @@ module Neo4j
 
         def drop_constraint(label, property, options = {})
           type = options[:type] || :uniqueness
-          label_object = ActiveBase.label_object(label)
+          label_object = ActiveGraph::Base.label_object(label)
           fail_missing_constraint_or_index!(:constraint, label, property) if !options[:force] && !label_object.constraint?(property)
           label_object.drop_constraint(property, type: type)
         end
 
         def drop_index(label, property, options = {})
-          label_object = ActiveBase.label_object(label)
+          label_object = ActiveGraph::Base.label_object(label)
           fail_missing_constraint_or_index!(:index, label, property) if !options[:force] && !label_object.index?(property)
           label_object.drop_index(property)
         end
@@ -49,12 +49,12 @@ module Neo4j
         protected
 
         def fail_missing_constraint_or_index!(type, label, property)
-          fail Neo4j::MigrationError,
+          fail ActiveGraph::MigrationError,
                format(MISSING_CONSTRAINT_OR_INDEX, type: type, label: label, property: property)
         end
 
         def fail_duplicate_constraint_or_index!(type, label, property)
-          fail Neo4j::MigrationError,
+          fail ActiveGraph::MigrationError,
                format(DUPLICATE_CONSTRAINT_OR_INDEX, type: type, label: label, property: property)
         end
       end

data/lib/{neo4j → active_graph}/migrations/migration_file.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Migrations
     class MigrationFile
       attr_reader :file_name, :symbol_name, :class_name, :version

data/lib/{neo4j → active_graph}/migrations/runner.rb

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Migrations
     class Runner
       STATUS_TABLE_FORMAT = '%-10s %-20s %s'.freeze
@@ -57,10 +57,10 @@ module Neo4j
       end
 
       def mark_versions_as_complete(versions)
-        Neo4j::ActiveBase.new_query
+        ActiveGraph::Base.new_query
                          .with('$versions AS versions').params(versions: versions).break
                          .unwind(version: :versions).break
-                         .merge('(:`Neo4j::Migrations::SchemaMigration` {migration_id: version})')
+                         .merge('(:`ActiveGraph::Migrations::SchemaMigration` {migration_id: version})')
                          .exec
       end
 

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

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Migrations
     module Schema
       class << self

data/lib/{neo4j → active_graph}/migrations/schema_migration.rb

@@ -1,7 +1,7 @@
-module Neo4j
+module ActiveGraph
   module Migrations
     class SchemaMigration
-      include Neo4j::ActiveNode
+      include ActiveGraph::Node
       id_property :migration_id
       property :migration_id, type: String
       property :incomplete, type: Boolean

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

@@ -1,5 +1,5 @@
 require 'set'
-module Neo4j
+module ActiveGraph
   # This is here to support the removed functionality of being able to
   # defined indexes and constraints on models
   # This code should be removed later
@@ -32,7 +32,7 @@ module Neo4j
       def model_constraints
         return @model_constraints if @model_constraints
 
-        constraints = Neo4j::Transaction.constraints.each_with_object({}) do |row, result|
+        constraints = ActiveGraph::Transaction.constraints.each_with_object({}) do |row, result|
           result[row[:label]] ||= []
           result[row[:label]] << row[:properties]
         end
@@ -43,7 +43,7 @@ module Neo4j
       def model_indexes
         return @model_indexes if @model_indexes
 
-        indexes = Neo4j::Transaction.indexes.each_with_object({}) do |row, result|
+        indexes = ActiveGraph::Transaction.indexes.each_with_object({}) do |row, result|
           result[row[:label]] ||= []
           result[row[:label]] << row[:properties]
         end
@@ -66,16 +66,16 @@ module Neo4j
 
       def ensure_model_data_state!
         # If we load a new model, reset everything
-        if @previously_loaded_models_count != Neo4j::ActiveNode.loaded_classes.size
+        if @previously_loaded_models_count != ActiveGraph::Node.loaded_classes.size
           # Make sure we've finalized id_property details and have called
           # add_ constraint/index methods above
-          Neo4j::ActiveNode.loaded_classes.each(&:ensure_id_property_info!)
+          ActiveGraph::Node.loaded_classes.each(&:ensure_id_property_info!)
           reload_models_data!
         end
       end
 
       def reload_models_data!
-        @previously_loaded_models_count = Neo4j::ActiveNode.loaded_classes.size
+        @previously_loaded_models_count = ActiveGraph::Node.loaded_classes.size
         @model_indexes = @model_constraints = nil
       end
 
@@ -101,7 +101,7 @@ module Neo4j
 
         return if messages.values.all?(&:empty?)
 
-        fail ::Neo4j::DeprecatedSchemaDefinitionError, validation_error_message(messages)
+        fail ::ActiveGraph::DeprecatedSchemaDefinitionError, validation_error_message(messages)
       end
 
       def validation_error_message(messages)
@@ -122,7 +122,7 @@ MSG
       end
 
       def log_warning!(index_or_constraint, model, property_name)
-        Neo4j::ActiveBase.logger.warn "WARNING: The #{index_or_constraint} option is no longer supported (Defined on #{model.name} for #{property_name})"
+        ActiveGraph::Base.logger.warn "WARNING: The #{index_or_constraint} option is no longer supported (Defined on #{model.name} for #{property_name})"
       end
 
       private

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

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   # Makes Neo4j nodes and relationships behave like ActiveRecord objects.
   # By including this module in your class it will create a mapping for the node to your ruby class
   # by using a Neo4j Label with the same name as the class. When the node is loaded from the database it
@@ -7,45 +7,45 @@ module Neo4j
   # in a new object of that class.
   #
   # = ClassMethods
-  # * {Neo4j::ActiveNode::Labels::ClassMethods} defines methods like: <tt>index</tt> and <tt>find</tt>
-  # * {Neo4j::ActiveNode::Persistence::ClassMethods} defines methods like: <tt>create</tt> and <tt>create!</tt>
-  # * {Neo4j::ActiveNode::Property::ClassMethods} defines methods like: <tt>property</tt>.
+  # * {ActiveGraph::Node::Labels::ClassMethods} defines methods like: <tt>index</tt> and <tt>find</tt>
+  # * {ActiveGraph::Node::Persistence::ClassMethods} defines methods like: <tt>create</tt> and <tt>create!</tt>
+  # * {ActiveGraph::Node::Property::ClassMethods} defines methods like: <tt>property</tt>.
   #
   # @example Create a Ruby wrapper for a Neo4j Node
   #   class Company
-  #      include Neo4j::ActiveNode
+  #      include ActiveGraph::Node
   #      property :name
   #   end
   #   company = Company.new
   #   company.name = 'My Company AB'
   #   Company.save
   #
-  module ActiveNode
+  module Node
     extend ActiveSupport::Concern
 
     MARSHAL_INSTANCE_VARIABLES = [:@attributes, :@_persisted_obj, :@default_property_value]
 
-    include Neo4j::Shared
-    include Neo4j::Shared::Identity
-    include Neo4j::Shared::Marshal
-    include Neo4j::ActiveNode::Initialize
-    include Neo4j::ActiveNode::IdProperty
-    include Neo4j::Shared::SerializedProperties
-    include Neo4j::ActiveNode::Property
-    include Neo4j::ActiveNode::Reflection
-    include Neo4j::ActiveNode::Persistence
-    include Neo4j::ActiveNode::Validations
-    include Neo4j::ActiveNode::Callbacks
-    include Neo4j::ActiveNode::Query
-    include Neo4j::ActiveNode::Labels
-    include Neo4j::ActiveNode::Rels
-    include Neo4j::ActiveNode::Unpersisted
-    include Neo4j::ActiveNode::HasN
-    include Neo4j::ActiveNode::Scope
-    include Neo4j::ActiveNode::Dependent
-    include Neo4j::ActiveNode::Enum
-    include Neo4j::Shared::PermittedAttributes
-    include Neo4j::ActiveNode::DependentCallbacks
+    include ActiveGraph::Shared
+    include ActiveGraph::Shared::Identity
+    include ActiveGraph::Shared::Marshal
+    include ActiveGraph::Node::Initialize
+    include ActiveGraph::Node::IdProperty
+    include ActiveGraph::Shared::SerializedProperties
+    include ActiveGraph::Node::Property
+    include ActiveGraph::Node::Reflection
+    include ActiveGraph::Node::Persistence
+    include ActiveGraph::Node::Validations
+    include ActiveGraph::Node::Callbacks
+    include ActiveGraph::Node::Query
+    include ActiveGraph::Node::Labels
+    include ActiveGraph::Node::Rels
+    include ActiveGraph::Node::Unpersisted
+    include ActiveGraph::Node::HasN
+    include ActiveGraph::Node::Scope
+    include ActiveGraph::Node::Dependent
+    include ActiveGraph::Node::Enum
+    include ActiveGraph::Shared::PermittedAttributes
+    include ActiveGraph::Node::DependentCallbacks
 
     def initialize(args = nil)
       self.class.ensure_id_property_info! # So that we make sure all objects have an id_property
@@ -66,7 +66,7 @@ module Neo4j
 
     module ClassMethods
       def nodeify(object)
-        if object.is_a?(::Neo4j::ActiveNode) || object.nil?
+        if object.is_a?(::ActiveGraph::Node) || object.nil?
           object
         else
           self.find(object)
@@ -75,7 +75,7 @@ module Neo4j
     end
 
     included do
-      include Neo4j::Timestamps if Neo4j::Config[:record_timestamps]
+      include ActiveGraph::Timestamps if ActiveGraph::Config[:record_timestamps]
       LOADED_CLASSES << self
 
       def self.inherited?
@@ -83,7 +83,7 @@ module Neo4j
       end
 
       def self.inherited(other)
-        Neo4j::ActiveNode::Labels.clear_wrapped_models
+        ActiveGraph::Node::Labels.clear_wrapped_models
 
         LOADED_CLASSES << other
         other.instance_variable_set('@inherited', true)
@@ -92,7 +92,7 @@ module Neo4j
           other.inherit_property k.to_sym, v.clone, declared_properties[k].options
         end
 
-        Neo4j::ActiveNode::Labels.add_wrapped_class(other)
+        ActiveGraph::Node::Labels.add_wrapped_class(other)
         super
       end
 
@@ -104,6 +104,6 @@ module Neo4j
       end
     end
 
-    ActiveSupport.run_load_hooks(:active_node, self)
+    ActiveSupport.run_load_hooks(:node, self)
   end
 end

data/lib/{neo4j/active_node → active_graph/node}/callbacks.rb

@@ -1,8 +1,8 @@
-module Neo4j
-  module ActiveNode
+module ActiveGraph
+  module Node
     module Callbacks #:nodoc:
       extend ActiveSupport::Concern
-      include Neo4j::Shared::Callbacks
+      include ActiveGraph::Shared::Callbacks
     end
   end
 end

data/lib/{neo4j/active_node → active_graph/node}/dependent.rb

@@ -1,5 +1,5 @@
-module Neo4j
-  module ActiveNode
+module ActiveGraph
+  module Node
     module Dependent
       def dependent_children
         @dependent_children ||= []

data/lib/{neo4j/active_node → active_graph/node}/dependent/association_methods.rb

@@ -1,5 +1,5 @@
-module Neo4j
-  module ActiveNode
+module ActiveGraph
+  module Node
     module Dependent
       module AssociationMethods
         def validate_dependent(value)