activegraph 11.3.1 → 11.5.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1ae9faa69f9792692e849f1d3de64c0a22b8e5623302cde0b1e707bfb443bba
-  data.tar.gz: 57cb8e74aae28b60346bd7c908ed4e793df433c0722b3ab2322320d5a9bab217
+  metadata.gz: '0101891bd10ab15f40fe0b95d8f9801addbad38e6a9a620d6ed3172538f13b81'
+  data.tar.gz: 29cd3cdd821bdd01723767210820b441d175c20722d086791e3b6f96c60e7860
 SHA512:
-  metadata.gz: c5de6bb15067a8c93a14be2dd8949d70d0edcbc1bdabcab2c0880e11dda13f9bfcbdddc51c82438d7cd1642fafb841cbe6b03ca714d1633f3c8b09396531eb0c
-  data.tar.gz: 976b9fa40c5056de62e7dc9fc3437c107adf13b09f5d1b07b660b79f92f74c9434c18114e4bab1c16e845f529e145c4b337e461cf77b5a4f40d5255a9619103f
+  metadata.gz: 236ae57612400438f2ea424600e5b4013790d9fe77840421727f83e5158ca4c8622cc8b2bda502d19c8f212956c86111f25b38fe5d3a68e2ef4819620432aa53
+  data.tar.gz: e699e3c4788af542fec9c1b74552b08309a8bd3611a25232445c0bf8a7a4f292067ee3cb86db5c7ed7a34dc134eff8a1fea59c772b778a58de2b1c3d1ec47bb1

data/CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [11.4.0] 2023-02-12
+
+## Fixed
+
+- Added support for cypher UNION
+
 ## [11.3.1] 2023-02-12
 
 ## Fixed

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 # gem 'neo4j-ruby-driver', path: '../neo4j-ruby-driver'
 
-gem 'listen', '< 3.1'
+# gem 'listen', '< 3.1'
 
 active_model_version = ENV['ACTIVE_MODEL_VERSION']
 gem 'activemodel', "~> #{active_model_version}" if active_model_version&.length&.positive?

data/activegraph.gemspec

@@ -33,8 +33,8 @@ DESCRIPTION
   s.add_dependency('activemodel', '>= 4.0')
   s.add_dependency('activesupport', '>= 4.0')
   s.add_dependency('i18n', '!= 1.8.8') # https://github.com/jruby/jruby/issues/6547
-  s.add_dependency('neo4j-ruby-driver', '>= 4.4.1')
-  s.add_dependency('orm_adapter', '~> 0.5.0')
+  s.add_dependency('neo4j-ruby-driver', '>= 4.4.1', '< 5')
+  s.add_dependency('orm_adapter', '>= 0.5.0')
   s.add_dependency('sorted_set')
   s.add_development_dependency('guard')
   s.add_development_dependency('guard-rspec')
@@ -47,5 +47,5 @@ DESCRIPTION
   s.add_development_dependency('rubocop', '>= 0.56.0')
   s.add_development_dependency('yard')
   s.add_development_dependency('dryspec')
-  s.add_development_dependency('rspec', '< 3.10') # Cannot proxy frozen objects
+  s.add_development_dependency('rspec', '>= 3.10')
 end

data/lib/active_graph/attribute_set.rb

@@ -1,7 +1,3 @@
-# frozen_string_literal: true
-
-require 'active_model/attribute_set'
-
 module ActiveGraph
   class AttributeSet < ActiveModel::AttributeSet
     def initialize(attr_hash, attr_list)

data/lib/active_graph/base.rb

@@ -1,6 +1,3 @@
-require 'active_graph/core/querable'
-require 'active_graph/core/schema'
-
 module ActiveGraph
   # To contain any base login for Node/Relationship which
   # is external to the main classes

data/lib/active_graph/config.rb

@@ -26,7 +26,6 @@ module ActiveGraph
 
       # @return [Hash] the default file loaded by yaml
       def defaults
-        require 'yaml'
         @defaults ||= ActiveSupport::HashWithIndifferentAccess.new(YAML.load_file(default_file))
       end
 

data/lib/active_graph/core/instrumentable.rb

@@ -1,8 +1,3 @@
-require 'active_support/concern'
-require 'active_support/notifications'
-require 'active_graph/ansi'
-require 'active_graph/core/logging'
-
 module ActiveGraph
   module Core
     module Instrumentable

data/lib/active_graph/core/querable.rb

@@ -1,8 +1,3 @@
-require 'active_graph/core/instrumentable'
-require 'active_graph/transaction'
-require 'active_graph/core/query_builder'
-require 'active_graph/core/record'
-
 module ActiveGraph
   module Core
     module Querable

data/lib/active_graph/core/query.rb

@@ -1,7 +1,3 @@
-require 'active_graph/core/query_clauses'
-require 'active_graph/core/query_find_in_batches'
-require 'active_support/notifications'
-
 module ActiveGraph
   module Core
     # Allows for generation of cypher queries via ruby method calls (inspired by ActiveRecord / arel syntax)
@@ -15,9 +11,9 @@ module ActiveGraph
     class Query
       include ActiveGraph::Core::QueryClauses
       include ActiveGraph::Core::QueryFindInBatches
+      include QueryExt
       DEFINED_CLAUSES = {}
 
-
       attr_accessor :clauses
 
       class Parameters
@@ -162,8 +158,8 @@ module ActiveGraph
       # DETACH DELETE clause
       # @return [Query]
 
-      METHODS = %w[start match optional_match call using where create create_unique merge set on_create_set on_match_set remove unwind delete detach_delete with with_distinct return order skip limit] # rubocop:disable Metrics/LineLength
-      BREAK_METHODS = %(with with_distinct call)
+      METHODS = %w[start match optional_match call using where create create_unique merge set on_create_set on_match_set remove unwind delete detach_delete with with_distinct return order skip limit union call_subquery_start call_subquery_end] # rubocop:disable Layout/LineLength
+      BREAK_METHODS = %w(with with_distinct call call_subquery_start call_subquery_end)
 
       CLAUSIFY_CLAUSE = proc { |method| const_get(method.to_s.split('_').map(&:capitalize).join + 'Clause') }
       CLAUSES = METHODS.map(&CLAUSIFY_CLAUSE)
@@ -247,7 +243,7 @@ module ActiveGraph
           neo_id = (node_object.respond_to?(:neo_id) ? node_object.neo_id : node_object)
 
           match_method = optional_match ? :optional_match : :match
-          query.send(match_method, variable).where(variable => {neo_id: neo_id})
+          query.send(match_method, variable).where(variable => { neo_id: })
         end
       end
 
@@ -271,7 +267,6 @@ module ActiveGraph
       # @return [Array]
       # @raise [ActiveGraph::Server::CypherResponse::ResponseError] Raises errors from neo4j server
 
-
       # Executes a query without returning the result
       # @return [Boolean] true if successful
       # @raise [ActiveGraph::Server::CypherResponse::ResponseError] Raises errors from neo4j server
@@ -318,6 +313,7 @@ module ActiveGraph
       # @return [String] Resulting cypher query string
       EMPTY = ' '
       NEWLINE = "\n"
+
       def to_cypher(options = {})
         join_string = options[:pretty] ? NEWLINE : EMPTY
 
@@ -334,6 +330,7 @@ module ActiveGraph
         cypher_string = "CYPHER #{@options[:parser]} #{cypher_string}" if @options[:parser]
         cypher_string.tap(&:strip!)
       end
+
       alias cypher to_cypher
 
       def pretty_cypher

data/lib/active_graph/core/query_clauses.rb

@@ -28,7 +28,7 @@ module ActiveGraph
         def value
           return @value if @value
 
-          [String, Symbol, Integer, Hash, NilClass].each do |arg_class|
+          [String, Symbol, Integer, Hash, NilClass, Array].each do |arg_class|
             from_method = "from_#{arg_class.name.downcase}"
             return @value = send(from_method, @arg) if @arg.is_a?(arg_class) && respond_to?(from_method)
           end
@@ -130,13 +130,15 @@ module ActiveGraph
           def to_cypher(clauses, pretty = false)
             string = clause_string(clauses, pretty)
 
-            final_keyword = if pretty
-                              "#{clause_color}#{keyword}#{ANSI::CLEAR}"
-                            else
-                              keyword
-                            end
+            "#{final_keyword(pretty)} #{string}" if !string.empty?
+          end
 
-            "#{final_keyword} #{string}" if !string.empty?
+          def final_keyword(pretty)
+            if pretty
+              "#{clause_color}#{keyword}#{ANSI::CLEAR}"
+            else
+              keyword
+            end
           end
 
           def clause_string(clauses, pretty)
@@ -256,6 +258,30 @@ module ActiveGraph
         end
       end
 
+      class UnionClause < Clause
+        KEYWORD = ''
+
+        def from_array(args)
+          "#{args[1]} RETURN #{args[0]} AS #{args.last}"
+        end
+
+        class << self
+          def from_args(args, params, options = {})
+            params.add_params(args[2])
+
+            [from_arg(args, params, options)]
+          end
+
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+
+          def clause_join
+            ' UNION '
+          end
+        end
+      end
+
       class WhereClause < Clause
         KEYWORD = 'WHERE'
 
@@ -349,6 +375,38 @@ module ActiveGraph
         end
       end
 
+      class CallSubqueryStartClause < Clause
+        KEYWORD = 'CALL {'
+
+        def from_nilclass(_value)
+          ' '
+        end
+
+        def from_string(value)
+          value
+        end
+
+        class << self
+          def to_cypher(clauses, pretty = false)
+            super || final_keyword(pretty)
+          end
+
+          def clause_strings(clauses)
+            clauses.map!(&:value)
+          end
+        end
+      end
+
+      class CallSubqueryEndClause < Clause
+        KEYWORD = '}'
+
+        class << self
+          def to_cypher(_clauses, pretty = false)
+            final_keyword(pretty)
+          end
+        end
+      end
+
       class MatchClause < Clause
         KEYWORD = 'MATCH'
 

data/lib/active_graph/core/query_ext.rb

@@ -1,6 +1,6 @@
 module ActiveGraph
   module Core
-    class Query
+    module QueryExt
       # Creates a ActiveGraph::Node::Query::QueryProxy object that builds off of a Core::Query object.
       #
       # @param [Class] model An Node model to be used as the start of a new QueryuProxy chain

data/lib/active_graph/core/record.rb

@@ -1,8 +1,3 @@
-# frozen_string_literal: true
-
-require 'active_graph/core/result'
-require 'active_support/core_ext/module/attribute_accessors'
-
 module ActiveGraph
   module Core
     module Record

data/lib/active_graph/core/result.rb

@@ -16,6 +16,11 @@ module ActiveGraph
         @records&.each(&block) || super
       end
 
+      ## To avoid to_a on Neo4j::Driver::Result as that one does not call the above block
+      def to_a
+        map.to_a
+      end
+
       def store
         return if @records
         keys

data/lib/active_graph/core/wrappable.rb

@@ -8,7 +8,7 @@ module ActiveGraph
       end
 
       class_methods do
-        def wrapper_callback(proc)
+        def wrapper_callback(&proc)
           fail 'Callback already specified!' if @wrapper_callback
           @wrapper_callback = proc
         end

data/lib/active_graph/generators/active_model.rb

@@ -0,0 +1,33 @@
+class ActiveGraph::Generators::ActiveModel < Rails::Generators::ActiveModel #:nodoc:
+  def self.all(klass)
+    "#{klass}.all"
+  end
+
+  def self.find(klass, params = nil)
+    "#{klass}.find(#{params})"
+  end
+
+  def self.build(klass, params = nil)
+    if params
+      "#{klass}.new(#{params})"
+    else
+      "#{klass}.new"
+    end
+  end
+
+  def save
+    "#{name}.save"
+  end
+
+  def update_attributes(params = nil)
+    "#{name}.update_attributes(#{params})"
+  end
+
+  def errors
+    "#{name}.errors"
+  end
+
+  def destroy
+    "#{name}.destroy"
+  end
+end

data/lib/active_graph/generators/generated_attribute.rb

@@ -0,0 +1,17 @@
+module ActiveGraph
+  module Generators
+    module GeneratedAttribute #:nodoc:
+      def type_class
+        case type.to_s.downcase
+        when 'any' then 'any'
+        when 'datetime' then 'DateTime'
+        when 'date' then 'Date'
+        when 'integer', 'number', 'fixnum' then 'Integer'
+        when 'float' then 'Float'
+        else
+          'String'
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,3 @@
-# frozen_string_literal: true
-
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'active_graph.rb')
-
 module ActiveGraph
   module Generators
     class MigrationGenerator < ::Rails::Generators::NamedBase

data/lib/{rails/generators/active_graph_generator.rb → active_graph/generators/migration_helper.rb}

@@ -1,13 +1,3 @@
-# frozen_string_literal: true
-
-require 'rails/generators/named_base'
-require 'rails/generators/active_model'
-
-module ActiveGraph
-  module Generators #:nodoc:
-  end
-end
-
 module ActiveGraph::Generators::MigrationHelper
   extend ActiveSupport::Concern
 
@@ -54,68 +44,3 @@ module ActiveGraph::Generators::MigrationHelper
     FileUtils.rm(real_file_name) if @behavior == :revoke
   end
 end
-
-module ActiveGraph::Generators::SourcePathHelper
-  extend ActiveSupport::Concern
-
-  module ClassMethods
-    def source_root
-      @_neo4j_source_root ||= File.expand_path(File.join(File.dirname(__FILE__),
-                                                         'active_graph', generator_name, 'templates'))
-    end
-  end
-end
-
-
-class ActiveGraph::Generators::ActiveModel < Rails::Generators::ActiveModel #:nodoc:
-  def self.all(klass)
-    "#{klass}.all"
-  end
-
-  def self.find(klass, params = nil)
-    "#{klass}.find(#{params})"
-  end
-
-  def self.build(klass, params = nil)
-    if params
-      "#{klass}.new(#{params})"
-    else
-      "#{klass}.new"
-    end
-  end
-
-  def save
-    "#{name}.save"
-  end
-
-  def update_attributes(params = nil)
-    "#{name}.update_attributes(#{params})"
-  end
-
-  def errors
-    "#{name}.errors"
-  end
-
-  def destroy
-    "#{name}.destroy"
-  end
-end
-
-
-module Rails
-  module Generators
-    class GeneratedAttribute #:nodoc:
-      def type_class
-        case type.to_s.downcase
-        when 'any' then 'any'
-        when 'datetime' then 'DateTime'
-        when 'date' then 'Date'
-        when 'integer', 'number', 'fixnum' then 'Integer'
-        when 'float' then 'Float'
-        else
-          'String'
-        end
-      end
-    end
-  end
-end

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

@@ -1,7 +1,3 @@
-# frozen_string_literal: true
-
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'active_graph.rb')
-
 class ActiveGraph::Generators::ModelGenerator < Rails::Generators::NamedBase #:nodoc:
   include ::ActiveGraph::Generators::SourcePathHelper
   include ::ActiveGraph::Generators::MigrationHelper

data/lib/active_graph/generators/source_path_helper.rb

@@ -0,0 +1,10 @@
+module ActiveGraph::Generators::SourcePathHelper
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def source_root
+      @_neo4j_source_root ||= File.expand_path(File.join(File.dirname(__FILE__),
+                                                         generator_name, 'templates'))
+    end
+  end
+end

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

@@ -1,7 +1,3 @@
-# frozen_string_literal: true
-
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'active_graph.rb')
-
 module ActiveGraph
   module Generators
     class UpgradeV8Generator < ::Rails::Generators::Base

data/lib/active_graph/lazy_attribute_hash.rb

@@ -1,5 +1,3 @@
-require 'active_model/attribute_set'
-
 module ActiveGraph
   class LazyAttributeHash < ActiveModel::LazyAttributeHash
     def initialize(values, attr_list)

data/lib/active_graph/migration.rb

@@ -1,6 +1,3 @@
-require 'benchmark'
-require 'active_graph/migrations/helpers/id_property'
-
 module ActiveGraph
   class Migration
     def migrate

data/lib/active_graph/migrations/helpers.rb

@@ -1,14 +1,7 @@
-require 'benchmark'
-
 module ActiveGraph
   module Migrations
     module Helpers
       extend ActiveSupport::Concern
-      extend ActiveSupport::Autoload
-
-      autoload :Schema
-      autoload :IdProperty
-      autoload :Relationships
 
       PROPERTY_ALREADY_DEFINED = 'Property `%{new_property}` is already defined in `%{label}`. '\
                                  'To overwrite, call `remove_property(:%{label}, :%{new_property})` before this method.'.freeze

data/lib/active_graph/migrations/runner.rb

@@ -1,7 +1,3 @@
-# frozen_string_literal: true
-
-require 'sorted_set'
-
 module ActiveGraph
   module Migrations
     class Runner

data/lib/active_graph/migrations.rb

@@ -1,13 +1,5 @@
 module ActiveGraph
   module Migrations
-    extend ActiveSupport::Autoload
-    autoload :Helpers
-    autoload :MigrationFile
-    autoload :Base
-    autoload :Runner
-    autoload :SchemaMigration
-    autoload :CheckPending
-
     class << self
       def check_for_pending_migrations!
         return if ActiveGraph::Config.configuration['skip_migration_check']

data/lib/active_graph/model_schema.rb

@@ -1,4 +1,3 @@
-require 'set'
 module ActiveGraph
   # This is here to support the removed functionality of being able to
   # defined indexes and constraints on models

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

@@ -1,6 +1,3 @@
-require 'active_support/inflector/inflections'
-require 'active_graph/class_arguments'
-
 module ActiveGraph
   module Node
     module HasN

data/lib/active_graph/node/labels.rb

@@ -1,5 +1,3 @@
-require 'active_graph/core/label'
-
 module ActiveGraph
   module Node
     # Provides a mapping between neo4j labels and Ruby classes
@@ -76,7 +74,7 @@ module ActiveGraph
 
       def self.clear_wrapped_models
         MODELS_FOR_LABELS_CACHE.clear
-        ActiveGraph::NodeWrapping::CONSTANTS_FOR_LABELS_CACHE.clear
+        ActiveGraph::Node::Wrapping::CONSTANTS_FOR_LABELS_CACHE.clear
       end
 
       module ClassMethods

data/lib/active_graph/node/orm_adapter.rb

@@ -1,11 +1,5 @@
-require 'orm_adapter'
-
 module ActiveGraph
   module Node
-    module ClassMethods
-      include OrmAdapter::ToAdapter
-    end
-
     class OrmAdapter < ::OrmAdapter::Base
       module ClassMethods
         include ActiveModel::Callbacks