rom-core 5.0.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bccec1ca22ee806eff149f4e61c1c6cf75eed1dfb1944ee7635239fdff7d7d26
-  data.tar.gz: 6ed39c371e2541d83e0060df63278444b852713f3c8a177242b1c41bbbeb14cb
+  metadata.gz: 56abc0d6388e2082f26604f39229af054e25a5a1298485f6a609a7c8c7163ebd
+  data.tar.gz: 6ec5cb049f5793102d5f9287b48b607fb2e9bd9c8b2f92e045aef3fd45245e4b
 SHA512:
-  metadata.gz: 4f53fba8d16d7483f9b1779bcf461b71c4d3ed7cde17466765e022284a310c61947317340380ca8d9065ac8a4a0741d0c777b55f161d085355aa67a52d062f9e
-  data.tar.gz: e1508e8c595774a991c7a57eaa15bff719b83a022c768cc1f7e05931001321045524975ade75295c8e6963882cfe78f03f5f7dae4111916248f3364b2780200e
+  metadata.gz: e197ca01ddf489798f0d4681bf5061ffaecdbcedf97a30fa909132382ce18854bccce3d90f48c6a6d5f3fc0060901a9713e5879a6b2f882e93d47bf980a59610
+  data.tar.gz: 23520577e017af6e42227c5c04e56f030d8b1a9b5db2554cf2d6b93e5365f5fb94bd374450e37c75cecc30b492abd22a3b8a078864e1f087ea90bfe3aaec13ce

data/lib/rom/command.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/core/deprecations'
 require 'dry/core/class_attributes'
 
 require 'rom/types'
@@ -33,7 +32,6 @@ module ROM
     include Commands
     include Pipeline::Operator
 
-
     # @!method self.adapter
     #   Get or set adapter identifier
     #

data/lib/rom/command_compiler.rb

@@ -181,20 +181,26 @@ module ROM
     #
     # @param [Symbol] rel_name A relation identifier from the container registry
     # @param [Symbol] type The command type
-    # @param [Hash] meta Meta information from relation AST
+    # @param [Hash] rel_meta Meta information from relation AST
     # @param [Symbol] parent_relation Optional parent relation identifier
     #
     # @return [ROM::Command]
     #
     # @api private
-    def register_command(rel_name, type, meta, parent_relation = nil)
+    def register_command(rel_name, type, rel_meta, parent_relation = nil)
       relation = relations[rel_name]
 
       type.create_class(rel_name, type) do |klass|
-        klass.result(meta.fetch(:combine_type, result))
+        klass.result(rel_meta.fetch(:combine_type, result))
 
-        if meta[:combine_type]
-          setup_associates(klass, relation, meta, parent_relation)
+        klass.input(meta.fetch(:input, relation.input_schema))
+
+        meta.each do |name, value|
+          klass.public_send(name, value)
+        end
+
+        if rel_meta[:combine_type]
+          setup_associates(klass, relation, rel_meta, parent_relation)
         end
 
         plugins.each do |plugin|
@@ -211,7 +217,7 @@ module ROM
 
         klass.extend_for_relation(relation) if klass.restrictable
 
-        registry[rel_name][type] = klass.build(relation, input: relation.input_schema)
+        registry[rel_name][type] = klass.build(relation)
       end
     end
 

data/lib/rom/commands/class_interface.rb

@@ -112,7 +112,7 @@ module ROM
       #
       # @api public
       def use(plugin, options = EMPTY_HASH)
-        ROM.plugin_registry.commands.fetch(plugin, adapter).apply_to(self, options)
+        ROM.plugin_registry[:command].fetch(plugin, adapter).apply_to(self, options)
       end
 
       # Extend a command class with relation view methods

data/lib/rom/configuration.rb

@@ -54,8 +54,6 @@ module ROM
       @notifications = Notifications.event_bus(:configuration)
       @setup = Setup.new(notifications)
 
-      use :mappers # enable mappers by default
-
       block.call(self) if block
     end
 
@@ -73,7 +71,7 @@ module ROM
       elsif plugin.is_a?(Hash)
         plugin.to_a.each { |p| use(*p) }
       else
-        ROM.plugin_registry.configuration.fetch(plugin).apply_to(self, options)
+        ROM.plugin_registry[:configuration].fetch(plugin).apply_to(self, options)
       end
 
       self

data/lib/rom/configuration_dsl.rb

@@ -2,6 +2,7 @@
 
 require 'rom/configuration_dsl/relation'
 require 'rom/configuration_dsl/command_dsl'
+require 'rom/configuration_dsl/mapper_dsl'
 
 module ROM
   # This extends Configuration class with the DSL methods
@@ -51,6 +52,13 @@ module ROM
       register_command(*CommandDSL.new(name, default_adapter, &block).command_classes)
     end
 
+    # Mapper definition DSL
+    #
+    # @api public
+    def mappers(&block)
+      register_mapper(*MapperDSL.new(self, mapper_classes, block).mapper_classes)
+    end
+
     # Configures a plugin for a specific adapter to be enabled for all relations
     #
     # @example
@@ -70,7 +78,9 @@ module ROM
     # @api public
     def plugin(adapter, spec, &block)
       type, name = spec.flatten(1)
-      plugin = plugin_registry.send(type).adapter(adapter).fetch(name) { plugin_registry.send(type).fetch(name) }
+      plugin = plugin_registry[type].adapter(adapter).fetch(name) do
+        plugin_registry[type].fetch(name)
+      end
 
       if block
         register_plugin(plugin.configure(&block))

data/lib/rom/{mapper → configuration_dsl}/mapper_dsl.rb

@@ -3,7 +3,7 @@
 require 'rom/mapper/builder'
 
 module ROM
-  class Mapper
+  module ConfigurationDSL
     # Mapper definition DSL used by Setup DSL
     #
     # @private
@@ -30,7 +30,7 @@ module ROM
       #
       # @api public
       def define(name, options = EMPTY_HASH, &block)
-        @defined_mappers << Builder.build_class(name, (@mapper_classes + @defined_mappers), options, &block)
+        @defined_mappers << Mapper::Builder.build_class(name, (@mapper_classes + @defined_mappers), options, &block)
         self
       end
 

data/lib/rom/constants.rb

@@ -50,7 +50,7 @@ module ROM
 
     # @api private
     def set_message(key, registry)
-      "#{key.inspect} doesn't exist in #{registry.class.name} registry"
+      "#{key.inspect} doesn't exist in #{registry.type} registry"
     end
   end
 

data/lib/rom/core.rb

@@ -7,13 +7,11 @@ require 'rom/version'
 require 'rom/constants'
 
 # core parts
-require 'rom/configuration_plugin'
 require 'rom/plugin'
 require 'rom/schema_plugin'
 require 'rom/relation'
 require 'rom/mapper'
 require 'rom/processor/transproc'
-require 'rom/mapper/configuration_plugin'
 require 'rom/commands'
 
 # rom Global
@@ -28,6 +26,15 @@ require 'rom/container'
 # container factory
 require 'rom/create_container'
 
+# register known plugin types
+require 'rom/schema_plugin'
+
+ROM::Plugins.register(:command)
+ROM::Plugins.register(:mapper)
+ROM::Plugins.register(:relation)
+ROM::Plugins.register(:schema, plugin_type: ROM::SchemaPlugin)
+ROM::Plugins.register(:configuration, adapter: false)
+
 # register core plugins
 require 'rom/plugins/relation/registry_reader'
 require 'rom/plugins/relation/instrumentation'
@@ -39,7 +46,6 @@ module ROM
   extend Global
 
   plugins do
-    register :mappers, ROM::Mapper::ConfigurationPlugin, type: :configuration
     register :timestamps, ROM::Plugins::Schema::Timestamps, type: :schema
     register :registry_reader, ROM::Plugins::Relation::RegistryReader, type: :relation
     register :instrumentation, ROM::Plugins::Relation::Instrumentation, type: :relation

data/lib/rom/{version.rb → core/version.rb}

@@ -2,6 +2,6 @@
 
 module ROM
   module Core
-    VERSION = '5.0.2'
+    VERSION = '5.1.0'
   end
 end

data/lib/rom/mapper.rb

@@ -2,7 +2,6 @@
 
 require 'rom/constants'
 require 'rom/mapper/dsl'
-require 'rom/mapper/configuration_plugin'
 
 module ROM
   # Mapper is a simple object that uses transformers to load relations

data/lib/rom/mapper/dsl.rb

@@ -40,7 +40,7 @@ module ROM
         def use(plugin, options = {})
           adapter = options.fetch(:adapter, :default)
 
-          ROM.plugin_registry.mappers.fetch(plugin, adapter).apply_to(self)
+          ROM.plugin_registry[:mapper].fetch(plugin, adapter).apply_to(self)
         end
 
         # Return base_relation used for creating mapper registry

data/lib/rom/plugin.rb

@@ -1,26 +1,44 @@
 # frozen_string_literal: true
 
+require 'rom/initializer'
 require 'rom/constants'
-require 'rom/plugin_base'
 require 'rom/support/configurable'
 
 module ROM
   # Plugin is a simple object used to store plugin configurations
   #
   # @private
-  class Plugin < PluginBase
+  class Plugin
+    extend Initializer
     include Configurable
 
-    # Apply this plugin to the provided class
+    # @!attribute [r] name
+    #   @return [Symbol] plugin name
+    # @api private
+    param :name
+
+    # @!attribute [r] mod
+    #   @return [Module] a module representing the plugin
+    # @api private
+    param :mod
+
+    # @!attribute [r] type
+    #   @return [Symbol] plugin type
+    # @api private
+    option :type
+
+    # Apply this plugin to the target
     #
-    # @param [Class] klass
+    # @param [Class,Object] target
     #
     # @api private
-    def apply_to(klass, options = EMPTY_HASH)
-      if mod.respond_to?(:new)
-        klass.send(:include, mod.new(options))
-      else
-        klass.send(:include, mod)
+    def apply_to(target, options = EMPTY_HASH)
+      if mod.respond_to?(:apply)
+        mod.apply(target, options)
+      elsif mod.respond_to?(:new)
+        target.include(mod.new(options))
+      elsif target.is_a?(::Module)
+        target.include(mod)
       end
     end
   end

data/lib/rom/plugin_registry.rb

@@ -1,54 +1,20 @@
 # frozen_string_literal: true
 
+require 'concurrent/map'
 require 'rom/registry'
+require 'rom/plugins'
 
 module ROM
   # Stores all registered plugins
   #
   # @api private
   class PluginRegistry
-    # Internal registry for configuration plugins
-    #
-    # @return [ConfigurationPluginRegistry]
-    #
-    # @api private
-    attr_reader :configuration
-
-    # Internal registry for command plugins
-    #
-    # @return [InternalPluginRegistry]
-    #
-    # @api private
-    attr_reader :commands
-
-    # Internal registry for mapper plugins
-    #
-    # @return [InternalPluginRegistry]
-    #
-    # @api private
-    attr_reader :mappers
-
-    # Internal registry for relation plugins
-    #
-    # @return [InternalPluginRegistry]
-    #
     # @api private
-    attr_reader :relations
-
-    # Internal registry for schema plugins
-    #
-    # @return [InternalPluginRegistry]
-    #
-    # @api private
-    attr_reader :schemas
+    attr_reader :types
 
     # @api private
     def initialize
-      @configuration = ConfigurationPluginRegistry.new
-      @mappers = InternalPluginRegistry.new
-      @commands = InternalPluginRegistry.new
-      @relations = InternalPluginRegistry.new
-      @schemas = InternalPluginRegistry.new(SchemaPlugin)
+      @types = ::Concurrent::Map.new
     end
 
     # Register a plugin for future use
@@ -61,24 +27,35 @@ module ROM
     # @option options [Symbol] :adapter (:default) which adapter this plugin
     # applies to. Leave blank for all adapters
     def register(name, mod, options = EMPTY_HASH)
-      type    = options.fetch(:type)
-      adapter = options.fetch(:adapter, :default)
+      type(options.fetch(:type)).register(name, mod, options)
+    end
 
-      plugins_for(type, adapter).register(name, mod, options)
+    # @api private
+    def type(type)
+      types.fetch_or_store(type) do
+        if Plugins[type][:adapter]
+          AdapterPluginsContainer.new(type)
+        else
+          PluginsContainer.new({}, type: type)
+        end
+      end
     end
 
-    private
+    # @api private
+    def [](type)
+      types.fetch(singularize(type))
+    end
 
-    # Determine which specific registry to use
+    # Old API compatibility
     #
     # @api private
-    def plugins_for(type, adapter)
+    def singularize(type)
       case type
-      when :configuration then configuration
-      when :command       then commands.adapter(adapter)
-      when :mapper        then mappers.adapter(adapter)
-      when :relation      then relations.adapter(adapter)
-      when :schema        then schemas.adapter(adapter)
+      when :relations then :relation
+      when :commands then :command
+      when :mappers then :mapper
+      when :schemas then :schema
+      else type
       end
     end
   end
@@ -86,23 +63,12 @@ module ROM
   # Abstract registry defining common behaviour
   #
   # @api private
-  class PluginRegistryBase < Registry
-    include Dry::Equalizer(:elements, :plugin_type)
+  class PluginsContainer < Registry
+    include Dry::Equalizer(:elements, :type)
 
     # @!attribute [r] plugin_type
     #   @return [Class] Typically ROM::PluginBase or its descendant
-    option :plugin_type
-
-    # Retrieve a registered plugin
-    #
-    # @param [Symbol] name The plugin to retrieve
-    #
-    # @return [Plugin]
-    #
-    # @api public
-    def [](name)
-      elements[name]
-    end
+    option :type
 
     # Assign a plugin to this environment registry
     #
@@ -112,52 +78,19 @@ module ROM
     #
     # @api private
     def register(name, mod, options)
-      elements[name] = plugin_type.new(mod, options)
+      elements[name] = plugin_type.new(name, mod, options)
     end
 
-    # Returns plugin name by instance
-    #
-    # @return [Symbol] Plugin name
-    #
     # @api private
-    def plugin_name(plugin)
-     tuple = elements.find { |(_, p)| p.equal?(plugin) }
-     tuple[0] if tuple
+    def plugin_type
+      Plugins[type][:plugin_type]
     end
   end
 
-  # A registry storing environment specific plugins
-  #
-  # @api private
-  class ConfigurationPluginRegistry < PluginRegistryBase
-    # @api private
-    def initialize(*args, **kwargs)
-      super(*args, **kwargs, plugin_type: ConfigurationPlugin)
-    end
-
-    # Return an environment plugin
-    #
-    # @param [Symbol] name The name of the environment plugin
-    #
-    # @raise [UnknownPluginError] if no plugin is found with the given name
-    #
-    # @api public
-    def fetch(name)
-      self[name] || raise(UnknownPluginError, name)
-    end
-  end
-
-  # A registry storing adapter specific plugins
-  #
-  # @api private
-  class AdapterPluginRegistry < PluginRegistryBase
-    option :plugin_type, default: -> { Plugin }
-  end
-
   # Store a set of registries grouped by adapter
   #
   # @api private
-  class InternalPluginRegistry
+  class AdapterPluginsContainer
     # Return the existing registries
     #
     # @return [Hash]
@@ -166,8 +99,12 @@ module ROM
     attr_reader :registries
 
     # @api private
-    def initialize(plugin_type = Plugin)
-      @registries = Hash.new { |h, v| h[v] = AdapterPluginRegistry.new({}, plugin_type: plugin_type) }
+    attr_reader :type
+
+    # @api private
+    def initialize(type)
+      @registries = ::Hash.new { |h, v| h[v] = PluginsContainer.new({}, type: type) }
+      @type = type
     end
 
     # Return the plugin registry for a specific adapter
@@ -181,6 +118,11 @@ module ROM
       registries[name]
     end
 
+    # @api private
+    def register(name, mod, options)
+      adapter(options.fetch(:adapter, :default)).register(name, mod, options)
+    end
+
     # Return the plugin for a given adapter
     #
     # @param [Symbol] name The name of the plugin
@@ -190,8 +132,11 @@ module ROM
     #
     # @api public
     def fetch(name, adapter_name = :default)
-      adapter(adapter_name)[name] || adapter(:default)[name] ||
-        raise(UnknownPluginError, name)
+      adapter(adapter_name).fetch(name) do
+        adapter(:default).fetch(name) do
+          raise(UnknownPluginError, name)
+        end
+      end
     end
 
     alias_method :[], :fetch

data/lib/rom/plugins.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'dry/container'
+require 'rom/plugin'
+
+module ROM
+  # Registry of all known plugin types (command, relation, mapper, etc)
+  #
+  # @api private
+  module Plugins
+    extend ::Dry::Container::Mixin
+
+    class << self
+      # @api private
+      def register(entity_type, plugin_type: Plugin, adapter: true)
+        super(entity_type, plugin_type: plugin_type, adapter: adapter)
+      end
+    end
+  end
+end

data/lib/rom/registry.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'dry/equalizer'
+require 'dry/core/cache'
+require 'dry/core/class_builder'
 
 require 'rom/initializer'
 require 'rom/cache'
@@ -10,6 +12,7 @@ module ROM
   # @api private
   class Registry
     extend Initializer
+    extend Dry::Core::Cache
 
     include Enumerable
     include Dry::Equalizer(:elements)
@@ -34,6 +37,15 @@ module ROM
       end
     end
 
+    # @api private
+    def self.[](identifier)
+      fetch_or_store(identifier) do
+        Dry::Core::ClassBuilder
+          .new(parent: self, name: "#{name}[:#{identifier}]")
+          .call
+      end
+    end
+
     # @api private
     def self.element_not_found_error
       ElementNotFoundError
@@ -80,6 +92,10 @@ module ROM
     end
     alias_method :[], :fetch
 
+    def type
+      self.class.name
+    end
+
     # @api private
     def respond_to_missing?(name, include_private = false)
       elements.key?(name) || super

data/lib/rom/relation/class_interface.rb

@@ -249,7 +249,7 @@ module ROM
       #
       # @api public
       def use(plugin, options = EMPTY_HASH)
-        ROM.plugin_registry.relations.fetch(plugin, adapter).apply_to(self, options)
+        ROM.plugin_registry[:relation].fetch(plugin, adapter).apply_to(self, options)
       end
 
       # Build default mapper registry

data/lib/rom/relation/combined.rb

@@ -22,7 +22,7 @@ module ROM
       # @api public
       def self.new(relation, nodes)
         struct_ns = relation.options[:struct_namespace]
-        new_nodes = nodes.map { |node| node.struct_namespace(struct_ns) }
+        new_nodes = nodes.uniq.map { |node| node.struct_namespace(struct_ns) }
 
         root =
           if relation.is_a?(self)

data/lib/rom/relation/commands.rb

@@ -19,7 +19,7 @@ module ROM
       #   users.command(:create, result: many)
       #
       # @example build a command which uses a specific plugin
-      #   users.command(:create, plugin: :timestamps)
+      #   users.command(:create, use: :timestamps)
       #
       # @example build a command which sends results through a custom mapper
       #   users.command(:create, mapper: :my_mapper_identifier)

data/lib/rom/schema/associations_dsl.rb

@@ -178,7 +178,7 @@ module ROM
       #
       # @api private
       def call
-        AssociationSet.new(registry)
+        AssociationSet[source.relation].new(registry)
       end
 
       private

data/lib/rom/schema/dsl.rb

@@ -165,20 +165,19 @@ module ROM
 
       # Enables for the schema
       #
-      # @param [Symbol] plugin Plugin name
+      # @param [Symbol] plugin_name Plugin name
       # @param [Hash] options Plugin options
       #
       # @api public
-      def use(plugin, options = ::ROM::EMPTY_HASH)
-        mod = ::ROM.plugin_registry.schemas.adapter(adapter).fetch(plugin)
-        app_plugin(mod, options)
+      def use(plugin_name, options = ::ROM::EMPTY_HASH)
+        plugin = ::ROM.plugin_registry[:schema].fetch(plugin_name, adapter)
+        app_plugin(plugin, options)
       end
 
       # @api private
       def app_plugin(plugin, options = ::ROM::EMPTY_HASH)
-        plugin_name = ::ROM.plugin_registry.schemas.adapter(adapter).plugin_name(plugin)
         plugin.extend_dsl(self)
-        @plugins[plugin_name] = [plugin, plugin.config.to_hash.merge(options)]
+        @plugins[plugin.name] = [plugin, plugin.config.to_hash.merge(options)]
       end
 
       # @api private
@@ -187,9 +186,9 @@ module ROM
         instance_exec(&definition) if definition
 
         schema_class.define(relation, opts) do |schema|
-          plugins.values.each { |(plugin, options)|
+          plugins.values.each do |plugin, options|
             plugin.apply_to(schema, options)
-          }
+          end
         end
       end
 

data/lib/rom/schema_plugin.rb

@@ -1,22 +1,10 @@
 # frozen_string_literal: true
 
-require 'rom/plugin_base'
+require 'rom/plugin'
 
 module ROM
   # @api private
-  class SchemaPlugin < PluginBase
-    include Configurable
-
-    # Apply this plugin to the provided configuration
-    #
-    # @param [ROM::Schema] schema A schema instance for extension
-    # @param [Hash] options Extension options
-    #
-    # @api private
-    def apply_to(schema, options = EMPTY_HASH)
-      mod.apply(schema, options) if mod.respond_to?(:apply)
-    end
-
+  class SchemaPlugin < Plugin
     # Extends a DSL instance with a module provided by the plugin
     #
     # @param [ROM::Schema::DSL] dsl

data/lib/rom/setup/finalize.rb

@@ -77,7 +77,7 @@ module ROM
     #
     # @api private
     def load_relations(mappers)
-      global_plugins = plugins.select { |p| p.relation? || p.schema? }
+      global_plugins = plugins.select { |p| p.type == :relation || p.type == :schema }
 
       FinalizeRelations.new(
         gateways,

data/lib/rom/setup/finalize/finalize_relations.rb

@@ -126,12 +126,12 @@ module ROM
 
       # @api private
       def relation_plugins
-        @plugins.select(&:relation?)
+        @plugins.select { |p| p.type == :relation }
       end
 
       # @api private
       def schema_plugins
-        @plugins.select(&:schema?)
+        @plugins.select { |p| p.type == :schema }
       end
 
       # @api private

data/lib/rom/transformer.rb

@@ -13,7 +13,68 @@ module ROM
   class Transformer < Transproc::Transformer[ROM::Processor::Transproc::Functions]
     extend Dry::Core::ClassAttributes
 
-    defines :relation, :register_as
+    # @!method self.register_as
+    #  Get or set registration name
+    #
+    #  @overload register_as
+    #    Return the registration name
+    #    @return [Symbol]
+    #
+    #  @overload register_as(name)
+    #    Configure registration name
+    #
+    #    @example
+    #      class MyMapper < ROM::Transformer
+    #        relation :users
+    #        register_as :my_mapper
+    #      end
+    #
+    #    @param name [Symbol] The registration name
+    defines :register_as
+
+    # Configure relation for the transformer
+    #
+    # @example with a custom name
+    #   class UsersMapper < ROM::Transformer
+    #     relation :users, as: :json_serializer
+    #
+    #     map do
+    #       rename_keys user_id: :id
+    #       deep_stringify_keys
+    #     end
+    #   end
+    #
+    #   users.map_with(:json_serializer)
+    #
+    # @param name [Symbol]
+    # @param options [Hash]
+    # @option options :as [Symbol] Mapper identifier
+    #
+    # @api public
+    def self.relation(name = Undefined, options = EMPTY_HASH)
+      return @relation if name.equal?(Undefined) && defined?(@relation)
+      register_as(options.fetch(:as, name))
+      @relation = name
+    end
+
+    # Define transformation pipeline
+    #
+    # @example
+    #   class UsersMapper < ROM::Transformer
+    #     map do
+    #       rename_keys user_id: :id
+    #       deep_stringify_keys
+    #     end
+    #   end
+    #
+    # @return [self]
+    #
+    # @api public
+    def self.map(&block)
+      define! do
+        map_array(&block)
+      end
+    end
 
     # This is needed to make transformers compatible with rom setup
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-core
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -135,6 +135,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -142,6 +145,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -220,11 +226,12 @@ files:
 - lib/rom/configuration_dsl.rb
 - lib/rom/configuration_dsl/command.rb
 - lib/rom/configuration_dsl/command_dsl.rb
+- lib/rom/configuration_dsl/mapper_dsl.rb
 - lib/rom/configuration_dsl/relation.rb
-- lib/rom/configuration_plugin.rb
 - lib/rom/constants.rb
 - lib/rom/container.rb
 - lib/rom/core.rb
+- lib/rom/core/version.rb
 - lib/rom/create_container.rb
 - lib/rom/data_proxy.rb
 - lib/rom/enumerable_dataset.rb
@@ -243,9 +250,7 @@ files:
 - lib/rom/mapper.rb
 - lib/rom/mapper/attribute_dsl.rb
 - lib/rom/mapper/builder.rb
-- lib/rom/mapper/configuration_plugin.rb
 - lib/rom/mapper/dsl.rb
-- lib/rom/mapper/mapper_dsl.rb
 - lib/rom/mapper/model_dsl.rb
 - lib/rom/mapper_compiler.rb
 - lib/rom/mapper_registry.rb
@@ -267,8 +272,8 @@ files:
 - lib/rom/open_struct.rb
 - lib/rom/pipeline.rb
 - lib/rom/plugin.rb
-- lib/rom/plugin_base.rb
 - lib/rom/plugin_registry.rb
+- lib/rom/plugins.rb
 - lib/rom/plugins/command/schema.rb
 - lib/rom/plugins/command/timestamps.rb
 - lib/rom/plugins/relation/instrumentation.rb
@@ -314,11 +319,14 @@ files:
 - lib/rom/transaction.rb
 - lib/rom/transformer.rb
 - lib/rom/types.rb
-- lib/rom/version.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/rom-rb/rom/tree/master/core
+  documentation_uri: https://api.rom-rb.org/rom/
+  mailing_list_uri: https://discourse.rom-rb.org/
+  bug_tracker_uri: https://github.com/rom-rb/rom/issues
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/rom/configuration_plugin.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'rom/plugin_base'
-
-module ROM
-  # ConfigurationPlugin is a simple object used to store configuration plugin configurations
-  #
-  # @private
-  class ConfigurationPlugin < PluginBase
-    # Apply this plugin to the provided configuration
-    #
-    # @param [ROM::Configuration] configuration
-    #
-    # @api private
-    def apply_to(configuration, options = {})
-      mod.apply(configuration, options)
-    end
-  end
-end

data/lib/rom/mapper/configuration_plugin.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'rom/mapper/mapper_dsl'
-
-module ROM
-  class Mapper
-    # Model DSL allows setting a model class
-    #
-    # @private
-    module ConfigurationPlugin
-      # Mapper definition DSL used by Setup DSL
-      #
-      # @private
-
-      def self.apply(configuration, options = {})
-        configuration.extend Methods
-        configuration
-      end
-
-      module Methods
-        def mappers(&block)
-          register_mapper(*MapperDSL.new(self, mapper_classes, block).mapper_classes)
-        end
-      end
-
-    end
-  end
-end

data/lib/rom/plugin_base.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module ROM
-  # Abstract plugin base
-  #
-  # @private
-  class PluginBase
-    # @return [Module] a module representing the plugin
-    #
-    # @api private
-    attr_reader :mod
-
-    # @return [Hash] configuration options
-    #
-    # @api private
-    attr_reader :options
-
-    # @api private
-    attr_reader :type
-
-    # @api private
-    def initialize(mod, options)
-      @mod      = mod
-      @options  = options
-      @type = options.fetch(:type)
-    end
-
-    # @api private
-    def relation?
-      type == :relation
-    end
-
-    # @api private
-    def schema?
-      type == :schema
-    end
-
-    # Apply this plugin to the provided class
-    #
-    # @param [Mixed] _base
-    #
-    # @api private
-    def apply_to(_base)
-      raise NotImplementedError, "#{self.class}#apply_to not implemented"
-    end
-  end
-end