wip - provide relation registry via configuration

rom-rb · Jun 16, 2021 · b3e3674 · b3e3674
1 parent 2cc38aa
commit b3e3674
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 33 deletions.
diff --git a/lib/rom/components/core.rb b/lib/rom/components/core.rb
@@ -38,6 +38,11 @@ def trigger(event, payload)
         notifications.trigger("configuration.#{event}", payload)
       end
 
+      # @api public
+      def relations
+        configuration.relations
+      end
+
       # @api public
       def notifications
         configuration.notifications

diff --git a/lib/rom/components/relation.rb b/lib/rom/components/relation.rb
@@ -25,7 +25,7 @@ def adapter
       # @return [ROM::Relation]
       #
       # @api public
-      def build(registry:, command_compiler:)
+      def build(command_compiler:)
         unless adapter
           raise MissingAdapterIdentifierError,
                 "Relation class +#{constant}+ is missing the adapter identifier"
@@ -38,7 +38,7 @@ def build(registry:, command_compiler:)
 
         trigger("relations.class.ready", relation: constant, adapter: adapter)
 
-        schema = finalize_schema(registry)
+        schema = finalize_schema
 
         apply_plugins
 
@@ -50,7 +50,7 @@ def build(registry:, command_compiler:)
         mappers = finalize_mappers
 
         options = {
-          __registry__: registry,
+          __registry__: relations,
           mappers: mappers,
           schema: schema,
           inflector: configuration.inflector,
@@ -68,11 +68,11 @@ def build(registry:, command_compiler:)
       private
 
       # @api private
-      def finalize_schema(registry)
+      def finalize_schema
         components.schemas
           .select { |schema| schema.relation == constant }
           .last # TODO: relation DSL auto-defines an empty schema so this is a workaround
-          .build(registry: registry)
+          .build
       end
 
       # @api private

diff --git a/lib/rom/components/schema.rb b/lib/rom/components/schema.rb
@@ -19,7 +19,7 @@ class Schema < Core
       option :relation, type: Types.Instance(Class)
 
       # @api public
-      def build(registry:)
+      def build
         plugins = self.plugins
 
         schema = proc.call do |*args|
@@ -32,7 +32,7 @@ def build(registry:)
           adapter: adapter,
           gateway: gateway,
           relation: relation,
-          registry: registry
+          registry: relations
         }
 
         trigger("relations.schema.allocated", payload)

diff --git a/lib/rom/configuration.rb b/lib/rom/configuration.rb
@@ -7,6 +7,7 @@
 require "rom/setup"
 require "rom/configuration_dsl"
 require "rom/support/inflector"
+require "rom/relation_registry"
 
 module ROM
   class Configuration
@@ -41,6 +42,10 @@ class Configuration
     #   @return [Notifications] Cache
     attr_reader :cache
 
+    # @!attribute [r] relations
+    #   @return [ROM::RelationRegistry] relations
+    attr_reader :relations
+
     def_delegators :@setup, :register_relation, :register_command,
       :register_mapper, :register_plugin, :auto_registration,
       :inflector, :inflector=, :components, :plugins
@@ -60,6 +65,8 @@ def initialize(*args, &block)
       @notifications = Notifications.event_bus(:configuration)
       @cache = Cache.new
 
+      @relations = RelationRegistry.build
+
       block&.call(self)
     end
 

diff --git a/lib/rom/setup/finalize.rb b/lib/rom/setup/finalize.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "rom/relation_registry"
 require "rom/command_compiler"
 require "rom/container"
 
@@ -33,7 +32,7 @@ def initialize(configuration)
     #
     # @api private
     def run!
-      relations = load_relations
+      load_relations
 
       container = Container.new(
         configuration.gateways,
@@ -46,40 +45,37 @@ def run!
       container
     end
 
+    # @api private
+    def relations
+      configuration.relations
+    end
+
     private
 
-    # Build entire relation registry from all known relation subclasses
-    #
-    # This includes both classes created via DSL and explicit definitions
+    # Add relations to the registry
     #
     # @api private
     def load_relations
-      relations = RelationRegistry.new do |registry|
-        command_compiler = CommandCompiler.new(
-          configuration.gateways,
-          registry,
-          Registry.new,
-          notifications,
-          inflector: configuration.inflector
-        )
+      command_compiler = CommandCompiler.new(
+        configuration.gateways,
+        relations,
+        Registry.new,
+        notifications,
+        inflector: configuration.inflector
+      )
+
+      components.relations.each do |component|
+        relation = component.build(command_compiler: command_compiler)
 
-        components.relations.each do |component|
-          # TODO: registry is passed down to build just because schemas are still built there
-          #       once schemas have their own component, registry won't be needed here
-          relation = registry.add(
-            component.key, component.build(registry: registry, command_compiler: command_compiler)
-          )
+        relations.add(component.key, relation)
 
-          notifications.trigger(
-            "configuration.relations.object.registered",
-            relation: relation, registry: registry
-          )
-        end
+        notifications.trigger(
+          "configuration.relations.object.registered",
+          relation: relation, registry: relations
+        )
       end
 
       notifications.trigger("configuration.relations.registry.created", registry: relations)
-
-      relations
     end
   end
 end