activegraph 11.1.0.alpha.1 → 11.1.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62237e7dafd589f3a2abe8180ada5c30b7bc12dffa5e165c428dfb4c4a25af7b
-  data.tar.gz: 002ef52d6ad7e0f6735db23c37b033dc24df6af2e0ddd116d593ed88f21f00a1
+  metadata.gz: 314c68d13c5f37c277a4a53b84f58dd054ae5d2be176e8e575dc92a44099124f
+  data.tar.gz: 36e153d37023168ac51a7f6f1b26854c3588fa7394f796f04720fedf619d601e
 SHA512:
-  metadata.gz: 4657e85cf211773ba1749e475b1110476fab90a312bb5233f78ca459653ef477090d7c38753390948afb539e21bd831a9960c1395dbbee5f15d0fcb3b40f3f91
-  data.tar.gz: 8023fed0a8ae2ab3b84aa6c76ba0aecbe3ed9d93bbf2d70b094c91afdb1e9a459927dd5f473a046fd7b3ccb45a85b833bb775b9ed4c9374fd9cee06ba182735e
+  metadata.gz: 7487ba2280bab3230701541f00da5133af8ab6760454a58fdf06c2ff20340a14734577b026a1dffe232c75248b3cd821ebea42a9fbd4c581a3ef5e296c1a2d1f
+  data.tar.gz: 4f03ea6939f779b78c3cb0141d50553894d4b2baf98f408ecc3f3cb91098b7df64abe577fe8586283cb499de6c4fa674a8f4c756388f5df64c08887c0b9abd7f

data/activegraph.gemspec

@@ -33,7 +33,7 @@ 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.0.alpha.5')
+  s.add_dependency('neo4j-ruby-driver', '>= 4.4.0.alpha.7')
   s.add_dependency('orm_adapter', '~> 0.5.0')
   s.add_dependency('sorted_set')
   s.add_development_dependency('guard')

data/lib/active_graph/node/validations.rb

@@ -5,7 +5,6 @@ module ActiveGraph
       extend ActiveSupport::Concern
       include ActiveGraph::Shared::Validations
 
-
       # @return [Boolean] true if valid
       def valid?(context = nil)
         context ||= (new_record? ? :create : :update)
@@ -19,7 +18,6 @@ module ActiveGraph
         end
       end
 
-
       class UniquenessValidator < ::ActiveModel::EachValidator
         def initialize(options)
           super(options.reverse_merge(case_sensitive: true))
@@ -32,14 +30,19 @@ module ActiveGraph
         end
 
         def found(record, attribute, value)
-          conditions = scope_conditions(record)
+          scopes, attributes = Array(options[:scope] || []).partition { |s| s.is_a?(Proc) }
+          conditions = scope_conditions(record, attributes)
 
           # TODO: Added as find(:name => nil) throws error
           value = '' if value.nil?
 
           conditions[attribute] = options[:case_sensitive] ? value : /#{Regexp.escape(value.to_s)}/i
 
-          found = record.class.as(:result).where(conditions)
+          found = if scopes.empty?
+                    record.class.as(:result)
+                  else
+                    scopes.reduce(record) { |proxy, scope| proxy.instance_eval(&scope) }
+                  end.where(conditions)
           found = found.where_not(neo_id: record.neo_id) if record._persisted_obj
           found
         end
@@ -48,8 +51,8 @@ module ActiveGraph
           super || 'has already been taken'
         end
 
-        def scope_conditions(instance)
-          Array(options[:scope] || []).inject({}) do |conditions, key|
+        def scope_conditions(instance, attributes)
+          attributes.inject({}) do |conditions, key|
             conditions.merge(key => instance[key])
           end
         end

data/lib/active_graph/railtie.rb

@@ -72,7 +72,7 @@ module ActiveGraph
       register_neo4j_cypher_logging
 
       method = url.is_a?(Enumerable) ? :routing_driver : :driver
-      Neo4j::Driver::GraphDatabase.send(method, url, auth_token, config)
+      Neo4j::Driver::GraphDatabase.send(method, url, auth_token, **config)
     end
 
     def final_driver_config!(config)

data/lib/active_graph/tasks/migration.rake

@@ -89,8 +89,8 @@ COMMENT
 
       ActiveGraph::Migrations::Schema.synchronize_schema_data(schema_data, args[:remove_missing])
 
+      runner = ActiveGraph::Base.transaction { ActiveGraph::Migrations::Runner.new }
       ActiveGraph::Base.transaction do
-        runner = ActiveGraph::Migrations::Runner.new
         runner.mark_versions_as_complete(schema_data[:versions]) # Run in test mode?
       end
     end

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '11.1.0.alpha.1'
+  VERSION = '11.1.0.alpha.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 11.1.0.alpha.1
+  version: 11.1.0.alpha.4
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.0.alpha.5
+        version: 4.4.0.alpha.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.0.alpha.5
+        version: 4.4.0.alpha.7
 - !ruby/object:Gem::Dependency
   name: orm_adapter
   requirement: !ruby/object:Gem::Requirement