activegraph 10.0.0.pre.beta.5 → 10.0.0.pre.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f768ee99674bbc10fb6c1094921b8f6f7840cfdd6c2d2ae442e4cc33d243690a
-  data.tar.gz: 46d381583be9bd03f45d8b6f684d2bc3ae0e394ebcbd2685d57cda834f354e24
+  metadata.gz: f2d132e9650a26653214b08a0eb1011f3055423f8b06595ccfa6916d0bafe535
+  data.tar.gz: 39d0462710f928dbe895ec75c1e6b82f137cb73681c2f41edf069f8da56321e3
 SHA512:
-  metadata.gz: fbd8b19f5894b9b5b528887aff9616f62d08818c90a03e1b9144850c1c832061f6af598a4d5ebf8a1d9e9751bfb6a1ba7bfa730df83a43070e0f95081a799347
-  data.tar.gz: 4c02f0e0ab88bffdafb794a892aacd46351118bb7dbe179a1fab56dc2febe9a6bee08d2d0c6850580c039b493e5eb76cc4a77b57a272c09d2f4a286f134d237b
+  metadata.gz: 83b22026f597bd92afdf7e27319f3d4c5e40dcb54d5b121f4cbab3d32e669e29199e90cc9f662500698c9abf336fe7905de46eb57d1ec368fff8361531afc1eb
+  data.tar.gz: ac6c4bc78512ddf185e0245c28cb78b8f09cd80aeb10d583ae591a3d542ff5a269b918aad9895805ba73267bece5330b0417166fbe7298a29dfa5f0e65f1936f

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.3.5')
+  s.add_development_dependency("neo4j-#{ENV['driver'] == 'java' ? 'java' : 'ruby'}-driver", '>= 0.4.0')
   s.add_development_dependency('os')
   s.add_development_dependency('pry')
   s.add_development_dependency('railties', '>= 4.0')

data/lib/active_graph/core/querable.rb

@@ -1,14 +1,13 @@
 require 'active_graph/core/instrumentable'
 require 'active_graph/transaction'
 require 'active_graph/core/query_builder'
-require 'active_graph/core/responses'
+require 'active_graph/core/record'
 
 module ActiveGraph
   module Core
     module Querable
       extend ActiveSupport::Concern
       include Instrumentable
-      include Responses
 
       class_methods do
         def query(*args)
@@ -43,14 +42,11 @@ module ActiveGraph
           setup_queries!(queries, skip_instrumentation: options[:skip_instrumentation])
 
           ActiveSupport::Notifications.instrument('neo4j.core.bolt.request') do
-            self.wrap_level = options[:wrap_level]
             transaction do |tx|
               queries.map do |query|
-                result_from_data(tx.run(query.cypher, query.parameters))
+                tx.run(query.cypher, query.parameters).tap { |result| result.wrap = options[:wrap] != false }
               end
             end
-          rescue Neo4j::Driver::Exceptions::Neo4jException => e
-            raise ActiveGraph::Core::CypherError.new_from(e.code, e.message) # , e.stack_track.to_a
           end
         end
       end

data/lib/active_graph/core/query.rb

@@ -235,7 +235,7 @@ module ActiveGraph
       def response
         return @response if @response
 
-        @response = ActiveGraph::Base.query(self, wrap_level: (:core_entity if unwrapped?))
+        @response = ActiveGraph::Base.query(self, wrap: !unwrapped?)
       end
 
       def raise_if_cypher_error!(response)
@@ -294,7 +294,7 @@ module ActiveGraph
         fail ArgumentError, 'No columns specified for Query#pluck' if columns.size.zero?
 
         query = return_query(columns)
-        columns = query.response.columns
+        columns = query.response.keys
 
         if columns.size == 1
           column = columns[0]

data/lib/active_graph/core/query_find_in_batches.rb

@@ -36,13 +36,10 @@ module ActiveGraph
       end
 
       def primary_key_offset(last_record, node_var, prop_var)
-        last_record.send(node_var).send(prop_var)
-      rescue NoMethodError
-        begin
-          last_record.send(node_var).properties[prop_var.to_sym]
-        rescue NoMethodError
-          last_record.send("#{node_var}.#{prop_var}") # In case we're explicitly returning it
-        end
+        node = last_record[node_var]
+        return node.send(prop_var) if node&.respond_to?(prop_var)
+        return node.properties[prop_var.to_sym] if node&.respond_to?(:properties)
+        last_record["#{node_var}.#{prop_var}"] # In case we're explicitly returning it
       end
     end
   end

data/lib/active_graph/core/record.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'active_graph/core/result'
+require 'active_support/core_ext/module/attribute_accessors'
+
+module ActiveGraph
+  module Core
+    module Record
+      attr_writer :wrap
+
+      def values
+        wrap(super)
+      end
+
+      def first
+        wrap(super)
+      end
+
+      def [](key)
+        wrap(super)
+      end
+
+      def to_h
+        wrap(super)
+      end
+
+      private
+
+      def wrap(value)
+        return value unless wrap?
+
+        case value
+        when Neo4j::Driver::Types::Entity
+          value.wrap
+        when Neo4j::Driver::Types::Path
+          value
+        when Hash
+          value.transform_values(&method(:wrap))
+        when Enumerable
+          value.map!(&method(:wrap))
+        else
+          value
+        end
+      end
+
+      def wrap?
+        @wrap
+      end
+    end
+  end
+end

data/lib/active_graph/core/result.rb

@@ -1,31 +1,28 @@
 module ActiveGraph
   module Core
-    class Result
-      attr_reader :columns, :rows
+    module Result
+      attr_writer :wrap
 
-      def initialize(columns, rows)
-        @columns = columns.map(&:to_sym)
-        @rows = rows
-        @struct_class = Struct.new(:index, *@columns)
+      def wrap?
+        @wrap
       end
 
-      include Enumerable
-
-      def each
-        structs.each do |struct|
-          yield struct
-        end
+      def each(&block)
+        wrap? ? wrapping_each(&block) : super
       end
 
-      def structs
-        @structs ||= rows.each_with_index.map do |row, index|
-          @struct_class.new(index, *row)
-        end
-      end
+      private
 
-      def hashes
-        @hashes ||= rows.map do |row|
-          Hash[@columns.zip(row)]
+      def wrapping_each(&block)
+        if @records
+          @records.each(&block)
+        else
+          @records = []
+          method(:each).super_method.call do |record|
+            record.wrap = wrap?
+            @records << record
+            block_given? ? yield(record) : record
+          end
         end
       end
     end

data/lib/active_graph/core/schema.rb

@@ -5,14 +5,14 @@ module ActiveGraph
         result = query('CALL dbms.components()', {}, skip_instrumentation: true)
 
         # BTW: community / enterprise could be retrieved via `result.first.edition`
-        result.first.versions[0]
+        result.first[:versions][0]
       end
 
       def indexes
         result = query('CALL db.indexes()', {}, skip_instrumentation: true)
 
         result.map do |row|
-          { type: row.type.to_sym, label: label(result, row), properties: properties(row), state: row.state.to_sym }
+          { type: row[:type].to_sym, label: label(result, row), properties: properties(row), state: row[:state].to_sym }
         end
       end
 
@@ -27,29 +27,33 @@ module ActiveGraph
       private
 
       def v4_filter(row)
-        row.uniqueness == 'UNIQUE'
+        row[:uniqueness] == 'UNIQUE'
       end
 
       def v3_filter(row)
-        row.type == 'node_unique_property'
+        row[:type] == 'node_unique_property'
       end
 
       def label(result, row)
-        (v34?(result) ? row.label : (v4?(result) ? row.labelsOrTypes : row.tokenNames).first).to_sym
+        if v34?(result)
+          row[:label]
+        else
+          (v4?(result) ? row[:labelsOrTypes] : row[:tokenNames]).first
+        end.to_sym
       end
 
       def v4?(result)
         return @v4 unless @v4.nil?
-        @v4 = result.columns.include?(:labelsOrTypes)
+        @v4 = result.keys.include?(:labelsOrTypes)
       end
 
       def v34?(result)
         return @v34 unless @v34.nil?
-        @v34 = result.columns.include?(:label)
+        @v34 = result.keys.include?(:label)
       end
 
       def properties(row)
-        row.properties.map(&:to_sym)
+        row[:properties].map(&:to_sym)
       end
     end
   end

data/lib/active_graph/core.rb

@@ -1,7 +1,7 @@
 require 'active_graph/transaction'
 require 'active_graph/core/instrumentable'
 require 'active_graph/core/query'
-require 'active_graph/core/responses'
+require 'active_graph/core/record'
 
 require 'neo4j_ruby_driver'
 require 'active_graph/core/wrappable'
@@ -11,3 +11,5 @@ 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
+Neo4j::Driver::StatementResult.prepend ActiveGraph::Core::Result
+Neo4j::Driver::Record.prepend ActiveGraph::Core::Record

data/lib/active_graph/migrations/schema.rb

@@ -24,7 +24,7 @@ module ActiveGraph
 
         def fetch_index_descriptions
           result = ActiveGraph::Base.query('CALL db.indexes()')
-          if result.columns.include?(:description)
+          if result.keys.include?(:description)
             v3_indexes(result)
           else
             v4_indexes(result)

data/lib/active_graph/node/persistence.rb

@@ -67,7 +67,7 @@ module ActiveGraph::Node
     # @return [ActiveGraph::Node] A CypherNode or EmbeddedNode
     def _create_node(node_props, labels = labels_for_create)
       query = "CREATE (n:`#{Array(labels).join('`:`')}`) SET n = $props RETURN n"
-      neo4j_query(query, {props: node_props}, wrap_level: :core_entity).to_a[0].n
+      neo4j_query(query, {props: node_props}, wrap: false).to_a[0][:n]
     end
 
     # As the name suggests, this inserts the primary key (id property) into the properties hash.
@@ -157,7 +157,7 @@ module ActiveGraph::Node
       def load_entity(id)
         query = query_base_for(id, :n).return(:n)
         result = neo4j_query(query).first
-        result && result.n
+        result && result[:n]
       end
 
       def query_base_for(neo_id, var = :n)

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

@@ -16,7 +16,7 @@ module ActiveGraph
           @_cache = IdentityMap.new
           build_query
             .map do |record, eager_data|
-            cache_and_init(record, with_associations_tree)
+            record = cache_and_init(record, with_associations_tree)
             eager_data.zip(with_associations_tree.paths.map(&:last)).each do |eager_records, element|
               eager_records.first.zip(eager_records.last).each do |eager_record|
                 add_to_cache(*eager_record, element)

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

@@ -4,13 +4,13 @@ module ActiveGraph
       module QueryProxyFindInBatches
         def find_in_batches(options = {})
           query.return(identity).find_in_batches(identity, @model.primary_key, options) do |batch|
-            yield batch.map(&identity)
+            yield batch.map { |record| record[identity] }
           end
         end
 
         def find_each(options = {})
           query.return(identity).find_each(identity, @model.primary_key, options) do |result|
-            yield result.send(identity)
+            yield result[identity]
           end
         end
       end

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

@@ -93,7 +93,8 @@ module ActiveGraph
                              "#{var}.#{association_id_key} = $other_node_id"
                            end
             node_id = other.respond_to?(:neo_id) ? other.neo_id : other
-            self.where(where_filter).params(other_node_id: node_id).query.reorder.return("count(#{var}) as count").first.count > 0
+            self.where(where_filter).params(other_node_id: node_id).query.reorder.return("count(#{var}) as count")
+                .first[:count].positive?
           end
         end
 

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

@@ -27,7 +27,7 @@ module ActiveGraph
           query_with_target(identifier) do |target|
             begin
               self.query.with(target).optional_match("(#{target})-[#{target}_rel]-()").delete("#{target}, #{target}_rel").exec
-            rescue ActiveGraph::Core::CypherError # <=- Seems hacky
+            rescue Neo4j::Driver::Exceptions::ClientException # <=- Seems hacky
               self.query.delete(target).exec
             end
             clear_source_object_cache

data/lib/active_graph/node/query_methods.rb

@@ -25,7 +25,7 @@ module ActiveGraph
       def count(distinct = nil)
         fail(ActiveGraph::InvalidParameterError, ':count accepts the `:distinct` symbol or nil as a parameter') unless distinct.nil? || distinct == :distinct
         q = distinct.nil? ? 'n' : 'DISTINCT n'
-        self.query_as(:n).return("count(#{q}) AS count").first.count
+        self.query_as(:n).return("count(#{q}) AS count").first[:count]
       end
 
       alias size count
@@ -39,13 +39,13 @@ module ActiveGraph
 
       def find_in_batches(options = {})
         self.query_as(:n).return(:n).find_in_batches(:n, primary_key, options) do |batch|
-          yield batch.map(&:n)
+          yield batch.map { |record| record[:n] }
         end
       end
 
       def find_each(options = {})
         self.query_as(:n).return(:n).find_each(:n, primary_key, options) do |batch|
-          yield batch.n
+          yield batch[:n]
         end
       end
 

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

@@ -22,7 +22,7 @@ module ActiveGraph::Relationship::Persistence
       node_before_callbacks! do
         res = query_factory(rel, rel_id, iterative_query).query.unwrapped.return(*unpersisted_return_ids).first
         node_symbols.each { |n| wrap!(send(n), res, n) }
-        @unwrapped_rel = res.send(rel_id)
+        @unwrapped_rel = res[rel_id]
       end
     end
 
@@ -83,8 +83,8 @@ module ActiveGraph::Relationship::Persistence
     #   in, making the object reflect as "persisted".
     # @param [Symbol] key :from_node or :to_node, the object to request from the response.
     def wrap!(node, res, key)
-      return if node.persisted? || !res.respond_to?(key)
-      unwrapped = res.send(key)
+      return if node.persisted? || !res.keys.include?(key)
+      unwrapped = res[key]
       node.init_on_load(unwrapped, unwrapped.props)
     end
 

data/lib/active_graph/relationship/query.rb

@@ -17,7 +17,7 @@ module ActiveGraph::Relationship
         query = ActiveGraph::Base.new_query
         result = query.match('()-[r]-()').where('ID(r)' => key.to_i).limit(1).return(:r).first
         fail RecordNotFound.new("Couldn't find #{name} with 'id'=#{key.inspect}", name, key) if result.blank?
-        result.r
+        result[:r]
       end
 
       # Performs a very basic match on the relationship.

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '10.0.0-beta.5'
+  VERSION = '10.0.0-beta.6'
 end

data/lib/active_graph.rb

@@ -117,7 +117,7 @@ load 'active_graph/tasks/migration.rake'
 require 'active_graph/node/orm_adapter'
 if defined?(Rails)
   require 'rails/generators'
-  require 'rails/generators/neo4j_generator'
+  require 'rails/generators/active_graph_generator'
 end
 
 Neo4j::Driver::Transaction.prepend ActiveGraph::Transaction

data/lib/rails/generators/{neo4j → active_graph}/migration/migration_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'active_graph.rb')
 
 module ActiveGraph

data/lib/rails/generators/{neo4j → active_graph}/model/model_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'active_graph.rb')
 
 class ActiveGraph::Generators::ModelGenerator < Rails::Generators::NamedBase #:nodoc:
@@ -62,7 +64,6 @@ class ActiveGraph::Generators::ModelGenerator < Rails::Generators::NamedBase #:n
     options[:indices]
   end
 
-
   def index_fragment(property)
     return if !options[:indices] || !options[:indices].include?(property)
 

data/lib/rails/generators/{neo4j → active_graph}/upgrade_v8/upgrade_v8_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'active_graph.rb')
 
 module ActiveGraph

data/lib/rails/generators/{neo4j_generator.rb → active_graph_generator.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/named_base'
 require 'rails/generators/active_model'
 
@@ -59,7 +61,7 @@ module ActiveGraph::Generators::SourcePathHelper
   module ClassMethods
     def source_root
       @_neo4j_source_root ||= File.expand_path(File.join(File.dirname(__FILE__),
-                                                         'neo4j', generator_name, 'templates'))
+                                                         'active_graph', generator_name, 'templates'))
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.0.0.pre.beta.5
+  version: 10.0.0.pre.beta.6
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -272,8 +272,8 @@ files:
 - lib/active_graph/core/query_clauses.rb
 - 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/responses.rb
 - lib/active_graph/core/result.rb
 - lib/active_graph/core/schema.rb
 - lib/active_graph/core/schema_errors.rb
@@ -378,14 +378,14 @@ files:
 - lib/active_graph/undeclared_properties.rb
 - lib/active_graph/version.rb
 - lib/active_graph/wrapper.rb
-- lib/rails/generators/neo4j/migration/migration_generator.rb
-- lib/rails/generators/neo4j/migration/templates/migration.erb
-- lib/rails/generators/neo4j/model/model_generator.rb
-- lib/rails/generators/neo4j/model/templates/migration.erb
-- lib/rails/generators/neo4j/model/templates/model.erb
-- lib/rails/generators/neo4j/upgrade_v8/templates/migration.erb
-- lib/rails/generators/neo4j/upgrade_v8/upgrade_v8_generator.rb
-- lib/rails/generators/neo4j_generator.rb
+- lib/rails/generators/active_graph/migration/migration_generator.rb
+- lib/rails/generators/active_graph/migration/templates/migration.erb
+- lib/rails/generators/active_graph/model/model_generator.rb
+- lib/rails/generators/active_graph/model/templates/migration.erb
+- lib/rails/generators/active_graph/model/templates/model.erb
+- lib/rails/generators/active_graph/upgrade_v8/templates/migration.erb
+- lib/rails/generators/active_graph/upgrade_v8/upgrade_v8_generator.rb
+- lib/rails/generators/active_graph_generator.rb
 homepage: https://github.com/neo4jrb/activegraph/
 licenses:
 - MIT

data/lib/active_graph/core/responses.rb

@@ -1,50 +0,0 @@
-require 'active_graph/core/result'
-require 'active_support/core_ext/module/attribute_accessors'
-
-module ActiveGraph
-  module Core
-    module Responses
-      extend ActiveSupport::Concern
-
-      included do
-        mattr_accessor :wrap_level
-      end
-
-      class_methods do
-        def result_from_data(entities_data)
-          rows = entities_data.map do |entity_data|
-            wrap(entity_data.values)
-          end
-
-          ActiveGraph::Core::Result.new(entities_data.keys, rows)
-        end
-
-        private
-
-        def wrap(value)
-          case value
-          when Neo4j::Driver::Types::Entity
-            wrap_by_level(value)
-          when Neo4j::Driver::Types::Path
-            value
-          when Hash
-            value.map { |key, val| [key, wrap(val)] }.to_h
-          when Enumerable
-            value.map(&method(:wrap))
-          else
-            value
-          end
-        end
-
-        def wrap_by_level(entity)
-          case wrap_level
-          when :core_entity
-            entity
-          else
-            entity.wrap
-          end
-        end
-      end
-    end
-  end
-end