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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 217c3ae41fd67404756345d1b5ea0275eab6b9649ff2bb71f3ee8a95ead6b1b6
-  data.tar.gz: 194cf4f01c0ca88789cbed9d25e7c1b2051cf62958691d8515ec8e57b95ffcc4
+  metadata.gz: f490d36cc6732adb06aca4752e589f4dfc689d307cd33e54fe912a2273d30160
+  data.tar.gz: 61c9355e4403e04dc723071b70b1cc0e27ebb92fae5e27ba6c6c9a349d1dce38
 SHA512:
-  metadata.gz: 28747760b9362f5d40ebe356ee3fbb0d37dc021172a80f4b043d9e2be6cb691c31d5cff32a1b28066af6e859d207c9b0fe07bd920ac7b92abffc788faf3afdcb
-  data.tar.gz: 32e2fca54d349147a76c961eae0e2f79effb54ebf2d55632f3c1bccc6e8686aa5abf7e31698e15451a21e74bbb1401fb078d5092092b5b7d9b1710dce4e35f6f
+  metadata.gz: d51a94b8d915e1815913d28ffb96602c3ca8aa74328313bb5d838af00cb8c77ff2bf9f0d6e70289fcbf12061e6d3665980442193ed0818fd9d41684d571287f3
+  data.tar.gz: 5dacdeb85d6b9bff6dbf7ad76e041a98117fa49e36feb702dcac3995c8d573c68af89c413d80f7f9f1c3a52b360d8166858660e4bea99e18072e3982d9bd24b7

data/README.md

@@ -1,4 +1,4 @@
-# Welcome to Neo4j.rb
+# Welcome to Active Graph (f.k.a. Neo4j.rb)
 
 ## Code Status
 
@@ -21,7 +21,7 @@ All new documentation will be done via our [readthedocs](http://neo4jrb.readthed
 
 # Introduction
 
-Neo4j.rb is an Active Model compliant Ruby/JRuby wrapper for [the Neo4j graph database](http://www.neo4j.org/). It uses the [neo4j-core](https://github.com/neo4jrb/neo4j-core) and [active_attr](https://github.com/cgriego/active_attr) gems.
+Neo4j.rb is an Active Model compliant Ruby/JRuby wrapper for [the Neo4j graph database](http://www.neo4j.org/). It uses the [neo4j-ruby-driver](https://github.com/neo4jrb/neo4j-ruby-driver) and [active_attr](https://github.com/cgriego/active_attr) gems.
 
 Neo4j is a transactional, open-source graph database.  A graph database manages data in a connected data structure, capable of  representing any kind of data in a very accessible way.  Information is stored in nodes and relationships connecting them, both of which can have arbitrary properties.  To learn more visit [What is a Graph Database?](http://neo4j.com/developer/graph-database/)
 

data/{neo4j.gemspec → activegraph.gemspec}

@@ -1,19 +1,17 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
-require 'neo4j/version'
-
+require 'active_graph/version'
 
 Gem::Specification.new do |s|
   s.name     = 'activegraph'
-  s.version  = Neo4j::VERSION
+  s.version  = ActiveGraph::VERSION
 
   s.required_ruby_version = ((RUBY_PLATFORM == 'java') ? '>= 1.9.3' : '>= 2.1.9')
 
   s.authors  = 'Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek'
   s.email    = 'andreas.ronge@gmail.com, public@brian-underwood.codes, chris@subvertallmedia.com, heinrich@mail.com'
-  s.homepage = 'https://github.com/neo4jrb/neo4j/'
-  s.rubyforge_project = 'neo4j'
+  s.homepage = 'https://github.com/neo4jrb/activegraph/'
   s.summary = 'A graph database for Ruby'
   s.license = 'MIT'
   s.description = <<-DESCRIPTION
@@ -21,15 +19,15 @@ A Neo4j OGM (Object-Graph-Mapper) for Ruby heavily inspired by ActiveRecord.
 DESCRIPTION
 
   s.require_path = 'lib'
-  s.files = Dir.glob('{bin,lib,config}/**/*') + %w(README.md CHANGELOG.md CONTRIBUTORS Gemfile neo4j.gemspec)
+  s.files = Dir.glob('{bin,lib,config}/**/*') + %w(README.md CHANGELOG.md CONTRIBUTORS Gemfile activegraph.gemspec)
   s.executables = []
   s.extra_rdoc_files = %w( README.md )
   s.rdoc_options = ['--quiet', '--title', 'Neo4j.rb', '--line-numbers', '--main', 'README.rdoc', '--inline-source']
   s.metadata = {
     'homepage_uri' => 'http://neo4jrb.io/',
-    'changelog_uri' => 'https://github.com/neo4jrb/neo4j/blob/master/CHANGELOG.md',
-    'source_code_uri' => 'https://github.com/neo4jrb/neo4j/',
-    'bug_tracker_uri' => 'https://github.com/neo4jrb/neo4j/issues'
+    'changelog_uri' => 'https://github.com/neo4jrb/activegraph/blob/master/CHANGELOG.md',
+    'source_code_uri' => 'https://github.com/neo4jrb/activegraph/',
+    'bug_tracker_uri' => 'https://github.com/neo4jrb/activegraph/issues'
   }
 
   s.add_dependency('activemodel', '>= 4.0')

data/config/neo4j/config.yml

@@ -8,7 +8,7 @@
 #id_property_type: :auto
 #id_property_type_value: :uuid
 
-# Example, (probably more useful directly on Neo4j::ActiveNode classes instead as a global configuration)
+# Example, (probably more useful directly on ActiveGraph::Node classes instead as a global configuration)
 #id_property: title_id
 #id_property_type: :on
 #id_property_type_value: :some_method
@@ -20,14 +20,14 @@
 identity_map: false
 
 # TODO
-# When using the Neo4j::Model you can let neo4j automatically set timestamps when updating/creating nodes.
+# When using the ActiveGraph::Model you can let neo4j automatically set timestamps when updating/creating nodes.
 # If set to true neo4j.rb automatically timestamps create and update operations if the model has properties named created_at/created_on or updated_at/updated_on
 # (similar to ActiveRecord).
 timestamps: true
 
-# Store a property on objects to cache their ActiveNode/ActiveRel class. It prevents each object load from requiring two database queries.
+# Store a property on objects to cache their Node/Relationship class. It prevents each object load from requiring two database queries.
 # Strings shorter than 44 characters are classified, so this will have almost no impact on disk footprint. See http://docs.neo4j.org/chunked/stable/short-strings.html.
-# Alternatively, call class method Neo4j::ActiveNode:cache_class to set this on specific models.
+# Alternatively, call class method ActiveGraph::Node:cache_class to set this on specific models.
 # By default, this property is called _classname, set as symbol to override.
 cache_class_names: true
 # class_name_property:  :_classname

data/lib/active_graph.rb

@@ -0,0 +1,120 @@
+require 'forwardable'
+require 'active_graph/version'
+
+require 'active_graph/core'
+require 'active_graph/core/query_ext' # From this gem
+
+require 'active_graph/transactions'
+require 'active_graph/base'
+require 'active_graph/model_schema'
+
+require 'active_model'
+require 'active_support/concern'
+require 'active_support/core_ext/class/attribute.rb'
+require 'active_support/core_ext/class/subclasses.rb'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'json'
+
+require 'active_graph/lazy_attribute_hash'
+require 'active_graph/attribute_set'
+require 'active_graph/errors'
+require 'active_graph/config'
+require 'active_graph/wrapper'
+require 'active_graph/relationship/rel_wrapper'
+require 'active_graph/node/node_wrapper'
+require 'active_graph/shared/type_converters'
+require 'active_graph/shared/rel_type_converters'
+require 'active_graph/shared/marshal'
+require 'active_graph/type_converters'
+require 'active_graph/paginated'
+require 'active_graph/schema/operation'
+
+require 'active_graph/timestamps'
+require 'active_graph/undeclared_properties'
+
+require 'active_graph/shared/callbacks'
+require 'active_graph/shared/filtered_hash'
+require 'active_graph/shared/declared_property/index'
+require 'active_graph/shared/declared_property'
+require 'active_graph/shared/declared_properties'
+require 'active_graph/shared/enum'
+require 'active_graph/shared/mass_assignment'
+require 'active_graph/shared/attributes'
+require 'active_graph/shared/typecasted_attributes'
+require 'active_graph/shared/property'
+require 'active_graph/shared/persistence'
+require 'active_graph/shared/validations'
+require 'active_graph/shared/identity'
+require 'active_graph/shared/serialized_properties'
+require 'active_graph/shared/typecaster'
+require 'active_graph/shared/initialize'
+require 'active_graph/shared/query_factory'
+require 'active_graph/shared/cypher'
+require 'active_graph/shared/permitted_attributes'
+require 'active_graph/shared'
+
+require 'active_graph/relationship/callbacks'
+require 'active_graph/relationship/initialize'
+require 'active_graph/relationship/property'
+require 'active_graph/relationship/persistence/query_factory'
+require 'active_graph/relationship/persistence'
+require 'active_graph/relationship/validations'
+require 'active_graph/relationship/query'
+require 'active_graph/relationship/related_node'
+require 'active_graph/relationship/types'
+require 'active_graph/relationship'
+
+require 'active_graph/node/dependent_callbacks'
+require 'active_graph/node/node_list_formatter'
+require 'active_graph/node/dependent'
+require 'active_graph/node/dependent/query_proxy_methods'
+require 'active_graph/node/dependent/association_methods'
+require 'active_graph/node/enum'
+require 'active_graph/node/query_methods'
+require 'active_graph/node/query/query_proxy_methods'
+require 'active_graph/node/query/query_proxy_methods_of_mass_updating'
+require 'active_graph/node/query/query_proxy_enumerable'
+require 'active_graph/node/query/query_proxy_find_in_batches'
+require 'active_graph/node/query/query_proxy_eager_loading'
+require 'active_graph/node/query/query_proxy_eager_loading/association_tree'
+require 'active_graph/node/query/query_proxy_link'
+require 'active_graph/node/labels/index'
+require 'active_graph/node/labels/reloading'
+require 'active_graph/node/labels'
+require 'active_graph/node/id_property/accessor'
+require 'active_graph/node/id_property'
+require 'active_graph/node/callbacks'
+require 'active_graph/node/initialize'
+require 'active_graph/node/property'
+require 'active_graph/node/persistence'
+require 'active_graph/node/validations'
+require 'active_graph/node/rels'
+require 'active_graph/node/reflection'
+require 'active_graph/node/unpersisted'
+require 'active_graph/node/has_n'
+require 'active_graph/node/has_n/association_cypher_methods'
+require 'active_graph/node/has_n/association/rel_wrapper'
+require 'active_graph/node/has_n/association/rel_factory'
+require 'active_graph/node/has_n/association'
+require 'active_graph/node/query/query_proxy'
+require 'active_graph/node/query'
+require 'active_graph/node/scope'
+require 'active_graph/node'
+
+require 'active_support/concern'
+require 'active_graph/core/cypher_error'
+require 'active_graph/core/schema_errors'
+
+module ActiveGraph
+  extend ActiveSupport::Autoload
+  autoload :Migrations
+  autoload :Migration
+end
+
+load 'active_graph/tasks/migration.rake'
+
+require 'active_graph/node/orm_adapter'
+if defined?(Rails)
+  require 'rails/generators'
+  require 'rails/generators/neo4j_generator'
+end

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

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module ANSI
     CLEAR = "\e[0m"
     BOLD = "\e[1m"

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

@@ -2,10 +2,10 @@
 
 require 'active_model/attribute_set'
 
-module Neo4j
+module ActiveGraph
   class AttributeSet < ActiveModel::AttributeSet
     def initialize(attr_hash, attr_list)
-      hashmap = Neo4j::LazyAttributeHash.new(attr_hash, attr_list)
+      hashmap = ActiveGraph::LazyAttributeHash.new(attr_hash, attr_list)
       super(hashmap)
     end
 
@@ -26,7 +26,7 @@ module Neo4j
     end
 
     def ==(other)
-      other.is_a?(Neo4j::AttributeSet) ? super : to_hash == other
+      other.is_a?(ActiveGraph::AttributeSet) ? super : to_hash == other
     end
   end
 end

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

@@ -1,7 +1,9 @@
-module Neo4j
-  # To contain any base login for ActiveNode/ActiveRel which
+module ActiveGraph
+  # To contain any base login for Node/Relationship which
   # is external to the main classes
-  module ActiveBase
+  module Base
+    include ActiveGraph::Transactions
+
     at_exit do
       @driver&.close
     end
@@ -14,6 +16,10 @@ module Neo4j
         end
       end
 
+      def driver
+        current_driver.driver
+      end
+
       def on_establish_driver(&block)
         @establish_driver_block = block
       end
@@ -23,8 +29,8 @@ module Neo4j
       end
 
       def new_driver(url, options = {})
-        verbose_query_logs = Neo4j::Config.fetch(:verbose_query_logs, false)
-        Neo4j::Core::Driver
+        verbose_query_logs = ActiveGraph::Config.fetch(:verbose_query_logs, false)
+        ActiveGraph::Core::Driver
           .new(url, options, verbose_query_logs: verbose_query_logs)
       end
 
@@ -50,19 +56,19 @@ module Neo4j
 
       def new_transaction
         validate_model_schema!
-        Neo4j::Transaction.new
+        ActiveGraph::Transaction.new
       end
 
       def new_query(options = {})
         validate_model_schema!
-        Neo4j::Core::Query.new({driver: current_driver}.merge(options))
+        ActiveGraph::Core::Query.new({driver: current_driver}.merge(options))
       end
 
       def magic_query(*args)
         if args.empty? || args.map(&:class) == [Hash]
-          ActiveBase.new_query(*args)
+          Base.new_query(*args)
         else
-          ActiveBase.current_driver.query(*args)
+          Base.current_driver.query(*args)
         end
       end
 
@@ -72,17 +78,17 @@ module Neo4j
       end
 
       def label_object(label_name)
-        Neo4j::Core::Label.new(label_name)
+        ActiveGraph::Core::Label.new(label_name)
       end
 
       def logger
-        @logger ||= (Neo4j::Config[:logger] || ActiveSupport::Logger.new(STDOUT))
+        @logger ||= (ActiveGraph::Config[:logger] || ActiveSupport::Logger.new(STDOUT))
       end
 
       private
 
       def validate_model_schema!
-        Neo4j::ModelSchema.validate_model_schema! unless Neo4j::Migrations.currently_running_migrations
+        ActiveGraph::ModelSchema.validate_model_schema! unless ActiveGraph::Migrations.currently_running_migrations
       end
     end
   end

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

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module ClassArguments
     class << self
       INVALID_CLASS_ARGUMENT_ERROR = 'option must by String, Symbol, false, nil, or an Array of Symbols/Strings'
@@ -14,8 +14,8 @@ module Neo4j
         fail ArgumentError, "#{context} #{INVALID_CLASS_ARGUMENT_ERROR} (was #{class_argument.inspect})"
       end
 
-      def active_node_model?(class_constant)
-        class_constant.included_modules.include?(Neo4j::ActiveNode)
+      def node_model?(class_constant)
+        class_constant.included_modules.include?(ActiveGraph::Node)
       end
 
       def constantize_argument(class_argument)
@@ -26,8 +26,8 @@ module Neo4j
           class_argument.map(&method(:constantize_argument))
         else
           class_argument.to_s.constantize.tap do |class_constant|
-            if !active_node_model?(class_constant)
-              fail ArgumentError, "#{class_constant} is not an ActiveNode model"
+            if !node_model?(class_constant)
+              fail ArgumentError, "#{class_constant} is not an Node model"
             end
           end
         end

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

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   # == Keeps configuration for neo4j
   #
   # == Configurations keys
@@ -43,13 +43,13 @@ module Neo4j
       # Yields the configuration
       #
       # @example
-      #   Neo4j::Config.use do |config|
+      #   ActiveGraph::Config.use do |config|
       #     config[:storage_path] = '/var/neo4j'
       #   end
       #
       # @return nil
       # @yield config
-      # @yieldparam [Neo4j::Config] config - this configuration class
+      # @yieldparam [ActiveGraph::Config] config - this configuration class
       def use
         @configuration ||= ActiveSupport::HashWithIndifferentAccess.new
         yield @configuration
@@ -100,35 +100,35 @@ module Neo4j
       end
 
       def fail_on_pending_migrations
-        Neo4j::Config[:fail_on_pending_migrations].nil? ? true : Neo4j::Config[:fail_on_pending_migrations]
+        ActiveGraph::Config[:fail_on_pending_migrations].nil? ? true : ActiveGraph::Config[:fail_on_pending_migrations]
       end
 
       def include_root_in_json
         # we use ternary because a simple || will always evaluate true
-        Neo4j::Config[:include_root_in_json].nil? ? true : Neo4j::Config[:include_root_in_json]
+        ActiveGraph::Config[:include_root_in_json].nil? ? true : ActiveGraph::Config[:include_root_in_json]
       end
 
       def module_handling
-        Neo4j::Config[:module_handling] || :none
+        ActiveGraph::Config[:module_handling] || :none
       end
 
       # @return [Class] The configured timestamps type (e.g. Integer) or the default DateTime.
       def timestamp_type
-        Neo4j::Config[:timestamp_type] || DateTime
+        ActiveGraph::Config[:timestamp_type] || DateTime
       end
 
       def association_model_namespace
-        Neo4j::Config[:association_model_namespace] || nil
+        ActiveGraph::Config[:association_model_namespace] || nil
       end
 
       def association_model_namespace_string
-        namespace = Neo4j::Config[:association_model_namespace]
+        namespace = ActiveGraph::Config[:association_model_namespace]
         return nil if namespace.nil?
         "::#{namespace}"
       end
 
       def enums_case_sensitive
-        Neo4j::Config[:enums_case_sensitive] || false
+        ActiveGraph::Config[:enums_case_sensitive] || false
       end
     end
   end

data/lib/active_graph/core.rb

@@ -0,0 +1,14 @@
+require 'active_graph/transaction'
+require 'active_graph/core/instrumentable'
+require 'active_graph/core/query'
+require 'active_graph/core/driver'
+require 'active_graph/core/responses'
+
+require 'neo4j_ruby_driver'
+require 'active_graph/core/wrappable'
+require 'active_graph/core/node'
+require 'active_graph/core/relationship'
+
+Neo4j::Driver::Types::Entity.include ActiveGraph::Core::Wrappable
+Neo4j::Driver::Types::Node.prepend ActiveGraph::Core::Node
+Neo4j::Driver::Types::Relationship.include ActiveGraph::Core::Relationship

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

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Core
     class ConnectionFailedError < StandardError;
     end

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

@@ -1,4 +1,4 @@
-module Neo4j
+module ActiveGraph
   module Core
     class CypherError < StandardError
       attr_reader :code, :original_message, :stack_trace