activegraph 10.0.0.pre.beta.8 → 10.0.0.pre.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca2e28b863dbc266bb8f33c14507f473a476beea1076effcae5348179df07950
-  data.tar.gz: 4f4757827f9ece88a3944cfa64bacdc0ee4ca7d5abc82aad98ea01c4cf421969
+  metadata.gz: 8550db7a7318c874038288f06c18b61626de59b1e15ef6da84106c655a765ddc
+  data.tar.gz: 917fa4fa44b7ece60ddacae791ae73fb70632743092cb51f0efd062d4114a2c2
 SHA512:
-  metadata.gz: 9b9174c954408a250198d647b2146d200728ae4ff54247ebca82c6c5fa375854dfeec47f05b4cc2fdc8ac28f2adba0d08b5b745f0079d08425edb4eefb4e55f3
-  data.tar.gz: efb7332fc14cc7acddb6dde5eba71e6b975b37bcbe53dc15098e89d02009d4e585c150dfd924d2a745d1a33e64c727bbfe9e603f7b9cac5895efd1b566f44ace
+  metadata.gz: 1d995c7d4ca8bbc0639434f2f284f532554a65d551ce977ee1566d84b3df50b92b2565d99ed9fbb82a3d9b3a425900c813cc16213eec9b8fd0f10e3bfc2432d3
+  data.tar.gz: c8532396f2b1a154733ff443ea6cd846b690b723cf86db8b37efe8153ebdf71b5fc923bfcf4c2ded43016cdd1a5213fe62222e928768d12e00d0ba5f2ee65d6c

data/activegraph.gemspec

@@ -38,7 +38,7 @@ DESCRIPTION
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('guard-rubocop')
   s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
-  s.add_development_dependency("neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", '>= 0.4.0')
+  s.add_development_dependency("neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", '>= 0.4.1')
   s.add_development_dependency('os')
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 4.0')

data/lib/active_graph/core.rb

@@ -1,15 +1,14 @@
-require 'active_graph/transaction'
 require 'active_graph/core/instrumentable'
+require 'active_graph/core/entity'
+require 'active_graph/core/node'
 require 'active_graph/core/query'
 require 'active_graph/core/record'
-
-require 'neo4j_ruby_driver'
 require 'active_graph/core/wrappable'
-require 'active_graph/core/node'
-require 'active_graph/core/relationship'
+require 'active_graph/transaction'
+require 'neo4j_ruby_driver'
 
 Neo4j::Driver::Types::Entity.include ActiveGraph::Core::Wrappable
+Neo4j::Driver::Types::Entity.prepend ActiveGraph::Core::Entity
 Neo4j::Driver::Types::Node.prepend ActiveGraph::Core::Node
-Neo4j::Driver::Types::Relationship.include ActiveGraph::Core::Relationship
 Neo4j::Driver::StatementResult.prepend ActiveGraph::Core::Result
 Neo4j::Driver::Record.prepend ActiveGraph::Core::Record

data/lib/active_graph/core/entity.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ActiveGraph
+  module Core
+    module Entity
+      def properties
+        @properties ||= super
+      end
+    end
+  end
+end

data/lib/active_graph/core/node.rb

@@ -1,23 +1,15 @@
-require 'active_graph/core/wrappable'
+# frozen_string_literal: true
 
 module ActiveGraph
   module Core
     module Node
-      def props; properties; end
-      # Perhaps we should deprecate this?
-      def neo_id; id; end
-
-      def ==(other)
-        other.is_a?(Node) && neo_id == other.neo_id
+      def neo_id
+        id
       end
 
       def labels
         @labels ||= super
       end
-
-      def properties
-        @properties ||= super
-      end
     end
   end
 end

data/lib/active_graph/node/has_n/association.rb

@@ -121,7 +121,7 @@ module ActiveGraph
         attr_reader :relationship_class_name
 
         def relationship_class_type
-          relationship_class._type.to_sym
+          relationship_class.type.to_sym
         end
 
         def relationship_class

data/lib/active_graph/node/initialize.rb

@@ -16,6 +16,6 @@ module ActiveGraph::Node::Initialize
 
   def init_on_reload(reloaded)
     @attributes = nil
-    init_on_load(reloaded, reloaded.props)
+    init_on_load(reloaded, reloaded.properties)
   end
 end

data/lib/active_graph/node/node_wrapper.rb

@@ -6,7 +6,7 @@ wrapping_proc = proc do |node|
   next node if not found_class
 
   found_class.new.tap do |wrapped_node|
-    wrapped_node.init_on_load(node, node.props)
+    wrapped_node.init_on_load(node, node.properties)
   end
 end
 Neo4j::Driver::Types::Node.wrapper_callback(wrapping_proc)

data/lib/active_graph/node/persistence.rb

@@ -55,7 +55,7 @@ module ActiveGraph::Node
     # @return true
     def create_model
       node = _create_node(props_for_create)
-      init_on_load(node, node.props)
+      init_on_load(node, node.properties)
       @deferred_nodes = nil
       true
     end

data/lib/active_graph/node/query/query_proxy_eager_loading.rb

@@ -62,7 +62,7 @@ module ActiveGraph
           if rel.is_a?(ActiveGraph::Relationship)
             rel.instance_variable_set(direction == :in ? '@from_node' : '@to_node', node)
           end
-          @_cache[direction == :out ? rel.start_node_neo_id : rel.end_node_neo_id]
+          @_cache[direction == :out ? rel.start_node_id : rel.end_node_id]
             .association_proxy(element.name).add_to_cache(node, rel)
         end
 

data/lib/active_graph/relationship.rb

@@ -4,7 +4,7 @@ module ActiveGraph
   module Relationship
     extend ActiveSupport::Concern
 
-    MARSHAL_INSTANCE_VARIABLES = [:@attributes, :@rel_type, :@_persisted_obj]
+    MARSHAL_INSTANCE_VARIABLES = [:@attributes, :@type, :@_persisted_obj]
 
     include ActiveGraph::Shared
     include ActiveGraph::Relationship::Initialize

data/lib/active_graph/relationship/initialize.rb

@@ -9,10 +9,10 @@ module ActiveGraph::Relationship
     # @param [ActiveGraph::Relationship] to_node_id The neo_id of the ending node of this rel
     # @param [String] type the relationship type
     def init_on_load(persisted_rel, from_node_id, to_node_id, type)
-      @rel_type = type
+      @type = type
       @_persisted_obj = persisted_rel
       changed_attributes_clear!
-      @attributes = convert_and_assign_attributes(persisted_rel.props)
+      @attributes = convert_and_assign_attributes(persisted_rel.properties)
       load_nodes(from_node_id, to_node_id)
     end
 
@@ -21,7 +21,7 @@ module ActiveGraph::Relationship
       init_on_load(unwrapped_reloaded,
                    unwrapped_reloaded.start_node_id,
                    unwrapped_reloaded.end_node_id,
-                   unwrapped_reloaded.rel_type)
+                   unwrapped_reloaded.type)
       self
     end
   end

data/lib/active_graph/relationship/persistence.rb

@@ -47,8 +47,8 @@ module ActiveGraph::Relationship
       validate_node_classes!
       delete_has_one_rel
       rel = _create_rel
-      return self unless rel.respond_to?(:props)
-      init_on_load(rel, from_node, to_node, @rel_type)
+      return self unless rel.respond_to?(:properties)
+      init_on_load(rel, from_node, to_node, @type)
       true
     end
 

data/lib/active_graph/relationship/persistence/query_factory.rb

@@ -85,7 +85,7 @@ module ActiveGraph::Relationship::Persistence
     def wrap!(node, res, key)
       return if node.persisted? || !res.keys.include?(key)
       unwrapped = res[key]
-      node.init_on_load(unwrapped, unwrapped.props)
+      node.init_on_load(unwrapped, unwrapped.properties)
     end
 
     def node_symbols

data/lib/active_graph/relationship/property.rb

@@ -17,16 +17,13 @@ module ActiveGraph::Relationship
     alias end_node to_node
 
     %w(start_node end_node).each do |direction|
-      define_method("#{direction}_neo_id") { send(direction).neo_id if direction }
+      define_method("#{direction}_id") { send(direction).neo_id if direction }
     end
-    alias from_node_neo_id start_node_neo_id
-    alias to_node_neo_id end_node_neo_id
 
     # @return [String] a string representing the relationship type that will be created
     def type
       self.class.type
     end
-    alias rel_type type
 
     def initialize(attributes = nil)
       super(attributes)

data/lib/active_graph/relationship/query.rb

@@ -51,12 +51,12 @@ module ActiveGraph::Relationship
 
       def where_query
         deprecation_warning!
-        ActiveGraph::Base.new_query.match("#{cypher_string(:outbound)}-[r1:`#{self._type}`]->#{cypher_string(:inbound)}")
+        ActiveGraph::Base.new_query.match("#{cypher_string(:outbound)}-[r1:`#{type}`]->#{cypher_string(:inbound)}")
       end
 
       def all_query
         deprecation_warning!
-        ActiveGraph::Base.new_query.match("#{cypher_string}-[r1:`#{self._type}`]->#{cypher_string(:inbound)}")
+        ActiveGraph::Base.new_query.match("#{cypher_string}-[r1:`#{type}`]->#{cypher_string(:inbound)}")
       end
 
       def cypher_string(dir = :outbound)

data/lib/active_graph/relationship/rel_wrapper.rb

@@ -1,4 +1,4 @@
-require 'active_graph/core/relationship'
+# frozen_string_literal: true
 
 wrapping_proc = proc do |relationship|
   ActiveGraph::RelWrapping.wrapper(relationship)
@@ -9,9 +9,9 @@ module ActiveGraph
   module RelWrapping
     class << self
       def wrapper(rel)
-        rel.props.symbolize_keys!
+        rel.properties.symbolize_keys!
         begin
-          most_concrete_class = class_from_type(rel.rel_type).constantize
+          most_concrete_class = class_from_type(rel.type).constantize
           return rel unless most_concrete_class < ActiveGraph::Relationship
           most_concrete_class.new
         rescue NameError => e
@@ -23,8 +23,8 @@ module ActiveGraph
         end
       end
 
-      def class_from_type(rel_type)
-        ActiveGraph::Relationship::Types::WRAPPED_CLASSES[rel_type] || ActiveGraph::Relationship::Types::WRAPPED_CLASSES[rel_type] = rel_type.to_s.downcase.camelize
+      def class_from_type(type)
+        ActiveGraph::Relationship::Types::WRAPPED_CLASSES[type] || ActiveGraph::Relationship::Types::WRAPPED_CLASSES[type] = type.to_s.downcase.camelize
       end
     end
   end

data/lib/active_graph/relationship/types.rb

@@ -14,7 +14,7 @@ module ActiveGraph
       # and Lesson is 'EnrolledIn'." After all, that is a big part of why we have models, right? To make our lives easier?
       #
       # A model is added to WRAPPED_CLASSES when it is initalized AND when the `type` class method is called within a model. This means that
-      # it's possible a model will be added twice: once with the rel_type version of the model name, again with the custom type. deal_with_it.gif.
+      # it's possible a model will be added twice: once with the type version of the model name, again with the custom type. deal_with_it.gif.
       WRAPPED_CLASSES = {}
 
       included do
@@ -34,16 +34,14 @@ module ActiveGraph
         # @param [Boolean] auto Should the given_type be changed in compliance with the gem's rel decorator setting?
         def type(given_type = nil, auto = false)
           case
-          when !given_type && rel_type?
-            @rel_type
+          when !given_type && type?
+            @type
           when given_type
             assign_type!(given_type, auto)
           else
             assign_type!(namespaced_model_name, true)
           end
         end
-        alias rel_type type
-        alias _type type # should be deprecated
 
         def namespaced_model_name
           case ActiveGraph::Config[:module_handling]
@@ -65,14 +63,14 @@ module ActiveGraph
           _wrapped_classes[type.to_sym] = self.name
         end
 
-        def rel_type?
-          !!@rel_type
+        def type?
+          !!@type
         end
 
         private
 
         def assign_type!(given_type, auto)
-          @rel_type = (auto ? decorated_rel_type(given_type) : given_type).tap do |type|
+          @type = (auto ? decorated_rel_type(given_type) : given_type).tap do |type|
             add_wrapped_class(type)
           end
         end

data/lib/active_graph/shared/declared_properties.rb

@@ -174,7 +174,7 @@ module ActiveGraph::Shared
       (value.is_a?(Array) && supports_array?(key)) || !EXCLUDED_TYPES.include?(value.class)
     end
 
-    # @param [Symbol] key An undeclared property value found in the _persisted_obj.props hash.
+    # @param [Symbol] key An undeclared property value found in the _persisted_obj.properties hash.
     # Typically, this is a node's id property, which will not be registered as other properties are.
     # In the future, this should probably be reworked a bit. This class should either not know or care
     # about the id property or it should be in charge of it. In the meantime, this improves

data/lib/active_graph/shared/identity.rb

@@ -14,7 +14,7 @@ module ActiveGraph
 
       # @return [Integer, nil] the neo4j id of the node if persisted or nil
       def neo_id
-        _persisted_obj ? _persisted_obj.neo_id : nil
+        _persisted_obj ? _persisted_obj.id : nil
       end
 
       def id

data/lib/active_graph/shared/persistence.rb

@@ -13,7 +13,7 @@ module ActiveGraph::Shared
       return if skip_update?
       props = props_for_update
       neo4j_query(query_as(:n).set(n: props))
-      _persisted_obj.props.merge!(props)
+      _persisted_obj.properties.merge!(props)
       changed_attributes_clear!
     end
 
@@ -30,7 +30,7 @@ module ActiveGraph::Shared
     # @return [Hash]
     def props_for_create
       inject_timestamps!
-      props_with_defaults = inject_defaults!(props)
+      props_with_defaults = inject_defaults!(properties)
       converted_props = props_for_db(props_with_defaults)
       return converted_props unless self.class.respond_to?(:default_property_values)
       inject_primary_key!(converted_props)
@@ -143,7 +143,7 @@ module ActiveGraph::Shared
     end
 
     # @return [Hash] all defined and none nil properties
-    def props
+    def properties
       attributes.reject { |_, v| v.nil? }.symbolize_keys
     end
 
@@ -197,7 +197,7 @@ module ActiveGraph::Shared
         db_values = props_for_db(hash)
         neo4j_query(query_as(:n).set(n: db_values))
         db_values.each_pair { |k, v| self.public_send(:"#{k}=", v) }
-        _persisted_obj.props.merge!(db_values)
+        _persisted_obj.properties.merge!(db_values)
         changed_attributes_selective_clear!(db_values)
         true
       end

data/lib/active_graph/shared/query_factory.rb

@@ -18,7 +18,7 @@ module ActiveGraph::Shared
       case
       when graph_obj.respond_to?(:labels_for_create)
         NodeQueryFactory
-      when graph_obj.respond_to?(:rel_type)
+      when graph_obj.respond_to?(:type)
         RelQueryFactory
       else
         fail "Unable to find factory for #{graph_obj}"

data/lib/active_graph/undeclared_properties.rb

@@ -16,7 +16,7 @@ module ActiveGraph
     alias [] read_attribute
 
     def read_undeclared_property(name)
-      _persisted_obj ? _persisted_obj.props[name] : (undeclared_properties && undeclared_properties[name])
+      _persisted_obj ? _persisted_obj.properties[name] : (undeclared_properties && undeclared_properties[name])
     end
 
     def write_attribute(name, value)

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '10.0.0-beta.8'
+  VERSION = '10.0.0-beta.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.0.0.pre.beta.8
+  version: 10.0.0.pre.beta.9
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,7 @@ files:
 - lib/active_graph/core.rb
 - lib/active_graph/core/connection_failed_error.rb
 - lib/active_graph/core/cypher_error.rb
+- lib/active_graph/core/entity.rb
 - lib/active_graph/core/instrumentable.rb
 - lib/active_graph/core/label.rb
 - lib/active_graph/core/logging.rb
@@ -273,7 +274,6 @@ files:
 - lib/active_graph/core/query_ext.rb
 - lib/active_graph/core/query_find_in_batches.rb
 - lib/active_graph/core/record.rb
-- lib/active_graph/core/relationship.rb
 - lib/active_graph/core/result.rb
 - lib/active_graph/core/schema.rb
 - lib/active_graph/core/schema_errors.rb

data/lib/active_graph/core/relationship.rb

@@ -1,13 +0,0 @@
-require 'active_graph/core/wrappable'
-
-module ActiveGraph
-  module Core
-    module Relationship
-      def props; properties; end
-      def neo_id; id; end
-      def start_node_neo_id; start_node_id; end
-      def end_node_neo_id; end_node_id; end
-      def rel_type; type; end
-    end
-  end
-end