activegraph 11.1.0.alpha.2 → 11.1.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cea5056d3980b49a22a7b7fce375b776f58f420e1612b1b5d5578e56b20dcc4
-  data.tar.gz: 66361ac53d3d004201ee95c3ac5ee8810435bc16fc81ba281e19b3a3969cc945
+  metadata.gz: 711b583f7886a76627f5b3f696e38de523bfefb0309eaed03c0b05c3667ad0b6
+  data.tar.gz: 0daad52238037ba7b78fd4fca0c98cecf81d4b9b48b8af8505bfd28def03c7f4
 SHA512:
-  metadata.gz: 1ac6ed636cf918c6112b4e60b7f4cb1ffca0c42b2c14f9e63082130a19598be099536fc10c71ae92122e5b6c900b5f9c865305bcf7a0beacd3128144a85a904d
-  data.tar.gz: 3555cf27ff1990c870e257e15c0cb6d42a38741029aebc787f30cabc14f08d8487ce3701fe3e1e55ed55731f06237cfe55dbdb2f09243a6967d392f9c9147c7a
+  metadata.gz: 9a456ac9a035520694c24d68e58e687208237dabfd185f57d845ec36a8caee1ade2f03cabc3cfb8a9dae1dff6dcbec2645b757a2b2935d88de2594a0f0ff7ba3
+  data.tar.gz: 9ce3325eafd3f5edffa5b0931039748e652150e0a403312eddbfd9a7321af5bbce72f3c31ae7e11588e6f2890ec3045abd5fba38bdc515ed36dcc505eb92e71c

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/tasks/migration.rake

@@ -91,6 +91,9 @@ COMMENT
 
       ActiveGraph::Base.transaction do
         runner = ActiveGraph::Migrations::Runner.new
+      end
+
+      ActiveGraph::Base.transaction do
         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.2'
+  VERSION = '11.1.0.alpha.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 11.1.0.alpha.2
+  version: 11.1.0.alpha.3
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel