rom-core 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cea9b3d9020f60a964a7105e7ac77e32e954126
-  data.tar.gz: 1e74ac03ad226c75e291d58163ffb0e3caff57eb
+  metadata.gz: b493c6e32485de5b046e45b4d152c132da1cc72e
+  data.tar.gz: 6950b1e104d52dcfdfcbe4e65bf195862589a9d4
 SHA512:
-  metadata.gz: 776153acc7f3bce777c713d37a706456e58165e78c0c4c7ffbe598c301250de2bb93b845524fe1b6f2b04b10bfdf109e46f166e5bda33471040aaa254949130e
-  data.tar.gz: b1bc73e397c05f2c5372d16d5dba21f153669dde45b89a2129bf01b45adafbfbe325969d0b6cbac7c84225f7b7bfd1d5d1418decb266e601bafa0226b3a99f87
+  metadata.gz: 72e458a263d518a0886f281b0f2eed44b0e819b3405b2f79e9bcd8f23cb8e505a40929721c975b3a0e1862bf81714a46785d2747a6f867b6cc7cde9f642461ab
+  data.tar.gz: 6d7b2eaf896b27e9b773867c3a92780e27f517fb1e40cb191356472c781c10bb6b121aeabed42c495efcddd3d7af86ebabead413d9b50f16fc42e53acd601856

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# v4.1.0 2017-11-17
+
+## Added
+
+* Support for providing a custom mapper compiler by adapters (solnic)
+* Support for aliased attributes in auto-mapping (solnic)
+* Support for command plugin options, ie `use :timestamps, timestamps: %i(created_at, updated_at), datestamps: %i(:written_on)` (GustavoCaso)
+* `''configuration.relations.class.ready''` event is triggered with `:adapter` filter (solnic)
+
+## Fixed
+
+* `'configuration.commands.class.before_build'` event is triggered with `:adapter` set, so that adapters can subscribe only to their events. This fixes a bug where an incorrect adapter would try to handle this event with a command class coming from another adapter (solnic)
+* Command compiler no longer uses global temporary registry (solnic)
+
+## Changed
+
+* Uses `dry-inflector` now (solnic)
+
+[Compare v4.0.2...v4.1.0](https://github.com/rom-rb/rom/compare/v4.0.2...v4.1.0)
+
 # v4.0.2 2017-11-02
 
 ## Added

data/README.md

@@ -11,7 +11,7 @@ Core API for rom-rb and its adapters and extensions.
 Resources:
 
 * [User documentation](http://rom-rb.org/learn/core)
-* [API documentation](http://rubydoc.info/gems/rom-core)
+* [API documentation](http://api.rom-rb.org/rom/)
 
 ## License
 

data/lib/rom/associations/definitions/abstract.rb

@@ -124,7 +124,7 @@ module ROM
         #
         # @api public
         def type
-          Dry::Core::Inflector.demodulize(self.class.name).to_sym
+          Inflector.demodulize(self.class.name).to_sym
         end
       end
     end

data/lib/rom/associations/through_identifier.rb

@@ -1,4 +1,4 @@
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 
 module ROM
   module Associations
@@ -20,7 +20,7 @@ module ROM
 
       # @api private
       def self.default_assoc_name(relation)
-        Dry::Core::Inflector.singularize(relation).to_sym
+        Inflector.singularize(relation).to_sym
       end
 
       # @api private

data/lib/rom/command_compiler.rb

@@ -1,4 +1,4 @@
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 
 require 'rom/initializer'
 require 'rom/commands'
@@ -17,7 +17,7 @@ module ROM
 
     # @api private
     def self.registry
-      @__registry__ ||= Hash.new { |h, k| h[k] = {} }
+      Hash.new { |h, k| h[k] = {} }
     end
 
     # @!attribute [r] gateways
@@ -52,6 +52,10 @@ module ROM
     #   @return [Array<Symbol>] a list of optional plugins that will be enabled for commands
     option :plugins, optional: true, default: -> { EMPTY_ARRAY }
 
+    # @!attribute [r] plugins_options
+    #   @return [Hash] a hash of options for the plugins
+    option :plugins_options, optional: true, default: -> { EMPTY_HASH }
+
     # @!attribute [r] meta
     #   @return [Array<Symbol>] Meta data for a command
     option :meta, optional: true
@@ -82,12 +86,13 @@ module ROM
     # @api private
     def call(*args)
       cache.fetch_or_store(args.hash) do
-        type, adapter, ast, plugins, meta = args
+        type, adapter, ast, plugins, plugins_options, meta = args
 
         compiler = with(
           id: type,
           adapter: adapter,
           plugins: Array(plugins),
+          plugins_options: plugins_options,
           meta: meta
         )
 
@@ -107,7 +112,7 @@ module ROM
 
     # @api private
     def type
-      @_type ||= Commands.const_get(Dry::Core::Inflector.classify(id))[adapter]
+      @_type ||= Commands.const_get(Inflector.classify(id))[adapter]
     rescue NameError
       nil
     end
@@ -132,7 +137,7 @@ module ROM
           if meta[:combine_type] == :many
             name
           else
-            { Dry::Core::Inflector.singularize(name).to_sym => name }
+            { Inflector.singularize(name).to_sym => name }
           end
 
         mapping =
@@ -191,14 +196,15 @@ module ROM
         end
 
         plugins.each do |plugin|
-          klass.use(plugin)
+          plugin_options = plugins_options.fetch(plugin) { EMPTY_HASH }
+          klass.use(plugin, plugin_options)
         end
 
         gateway = gateways[relation.gateway]
 
         notifications.trigger(
           'configuration.commands.class.before_build',
-          command: klass, gateway: gateway, dataset: relation.dataset
+          command: klass, gateway: gateway, dataset: relation.dataset, adapter: adapter
         )
 
         klass.extend_for_relation(relation) if klass.restrictable
@@ -227,7 +233,7 @@ module ROM
         if relation.associations.key?(parent_relation)
           parent_relation
         else
-          singular_name = Dry::Core::Inflector.singularize(parent_relation).to_sym
+          singular_name = Inflector.singularize(parent_relation).to_sym
           singular_name if relation.associations.key?(singular_name)
         end
 

data/lib/rom/command_proxy.rb

@@ -1,4 +1,4 @@
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 
 module ROM
   # TODO: look into making command graphs work without the root key in the input
@@ -9,7 +9,7 @@ module ROM
     attr_reader :command, :root
 
     # @api private
-    def initialize(command, root = Dry::Core::Inflector.singularize(command.name.relation).to_sym)
+    def initialize(command, root = Inflector.singularize(command.name.relation).to_sym)
       @command = command
       @root = root
     end

data/lib/rom/commands/class_interface.rb

@@ -1,5 +1,5 @@
 require 'dry/core/class_builder'
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 
 module ROM
   # Base command class with factory class-level interface and setup-related logic
@@ -39,7 +39,7 @@ module ROM
       #
       # @api public
       def [](adapter)
-        adapter_namespace(adapter).const_get(Dry::Core::Inflector.demodulize(name))
+        adapter_namespace(adapter).const_get(Inflector.demodulize(name))
       end
 
       # Return namespaces that contains command subclasses of a specific adapter
@@ -85,7 +85,7 @@ module ROM
       # @api public
       def create_class(name, type, &block)
         klass = Dry::Core::ClassBuilder
-          .new(name: "#{Dry::Core::Inflector.classify(type)}[:#{name}]", parent: type)
+          .new(name: "#{Inflector.classify(type)}[:#{name}]", parent: type)
           .call
 
         if block
@@ -109,8 +109,8 @@ module ROM
       # @option _options [Symbol] :adapter (:default) first adapter to check for plugin
       #
       # @api public
-      def use(plugin, _options = EMPTY_HASH)
-        ROM.plugin_registry.commands.fetch(plugin, adapter).apply_to(self)
+      def use(plugin, options = EMPTY_HASH)
+        ROM.plugin_registry.commands.fetch(plugin, adapter).apply_to(self, options)
       end
 
       # Extend a command class with relation view methods
@@ -235,7 +235,7 @@ module ROM
       #
       # @api private
       def default_name
-        Dry::Core::Inflector.underscore(Dry::Core::Inflector.demodulize(name)).to_sym
+        Inflector.underscore(Inflector.demodulize(name)).to_sym
       end
 
       # Return default options based on class macros

data/lib/rom/configuration_dsl/command.rb

@@ -1,4 +1,4 @@
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 require 'dry/core/class_builder'
 
 module ROM
@@ -14,7 +14,7 @@ module ROM
       # @api private
       def self.build_class(name, relation, options = EMPTY_HASH, &block)
         type = options.fetch(:type) { name }
-        command_type = Dry::Core::Inflector.classify(type)
+        command_type = Inflector.classify(type)
         adapter = options.fetch(:adapter)
         parent = ROM::Command.adapter_namespace(adapter).const_get(command_type)
         class_name = generate_class_name(adapter, command_type, relation)
@@ -31,9 +31,9 @@ module ROM
       # @api private
       def self.generate_class_name(adapter, command_type, relation)
         pieces = ['ROM']
-        pieces << Dry::Core::Inflector.classify(adapter)
+        pieces << Inflector.classify(adapter)
         pieces << 'Commands'
-        pieces << "#{command_type}[#{Dry::Core::Inflector.classify(relation)}s]"
+        pieces << "#{command_type}[#{Inflector.classify(relation)}s]"
         pieces.join('::')
       end
     end

data/lib/rom/configuration_dsl/relation.rb

@@ -1,5 +1,5 @@
 require 'dry/core/class_builder'
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 
 module ROM
   module ConfigurationDSL
@@ -13,7 +13,7 @@ module ROM
       #
       # @api private
       def self.build_class(name, options = EMPTY_HASH)
-        class_name = "ROM::Relation[#{Dry::Core::Inflector.camelize(name)}]"
+        class_name = "ROM::Relation[#{Inflector.camelize(name)}]"
         adapter = options.fetch(:adapter)
 
         Dry::Core::ClassBuilder.new(name: class_name, parent: ROM::Relation[adapter]).call do |klass|

data/lib/rom/core.rb

@@ -29,6 +29,7 @@ require 'rom/create_container'
 require 'rom/plugins/relation/registry_reader'
 require 'rom/plugins/relation/instrumentation'
 require 'rom/plugins/command/schema'
+require 'rom/plugins/command/timestamps'
 require 'rom/plugins/schema/timestamps'
 
 module ROM
@@ -40,5 +41,6 @@ module ROM
     register :registry_reader, ROM::Plugins::Relation::RegistryReader, type: :relation
     register :instrumentation, ROM::Plugins::Relation::Instrumentation, type: :relation
     register :schema, ROM::Plugins::Command::Schema, type: :command
+    register :timestamps, ROM::Plugins::Command::Timestamps, type: :command
   end
 end

data/lib/rom/gateway.rb

@@ -32,6 +32,22 @@ module ROM
     #    @param [Symbol] adapter The adapter identifier
     defines :adapter
 
+    # @!method self.mapper_compiler
+    #  Get or set gateway-specific mapper compiler class
+    #
+    #  @overload mapper_compiler
+    #    Return mapper compiler class
+    #    @return [Class]
+    #
+    #  @overload mapper_compiler(klass)
+    #    @example
+    #      class MyGateway < ROM::Gateway
+    #        mapper_compiler MyMapperCompiler
+    #      end
+    #
+    #    @param [Class] klass The mapper compiler class
+    defines :mapper_compiler
+
     # @!attribute [r] connection
     #   @return [Object] The gateway's connection object (type varies across adapters)
     attr_reader :connection
@@ -178,6 +194,15 @@ module ROM
       transaction_runner(opts).run(opts, &block)
     end
 
+    # Return configured mapper compiler class
+    #
+    # @return [Class]
+    #
+    # @api private
+    def mapper_compiler
+      self.class.mapper_compiler
+    end
+
     private
 
     # @api private

data/lib/rom/mapper_registry.rb

@@ -12,7 +12,9 @@ module ROM
 
     # @!attribute [r] compiler
     #   @return [MapperCompiler] A mapper compiler instance
-    option :compiler, default: -> { MapperCompiler.new(cache: cache) }
+    option :compiler, default: -> do
+      MapperCompiler.new(cache: cache)
+    end
 
     # @see Registry
     # @api public

data/lib/rom/memory.rb

@@ -1,4 +1,5 @@
 require 'rom/memory/gateway'
 require 'rom/memory/relation'
+require 'rom/memory/mapper_compiler'
 
 ROM.register_adapter(:memory, ROM::Memory)

data/lib/rom/memory/mapper_compiler.rb

@@ -0,0 +1,8 @@
+require 'rom/mapper_compiler'
+
+module ROM
+  module Memory
+    class MapperCompiler < ROM::MapperCompiler
+    end
+  end
+end

data/lib/rom/memory/relation.rb

@@ -30,6 +30,13 @@ module ROM
         schema.project(*names).(self)
       end
 
+      # Rename attributes in a relation
+      #
+      # @api public
+      def rename(mapping)
+        schema.rename(mapping).(self)
+      end
+
       # Insert tuples into the relation
       #
       # @example

data/lib/rom/plugin.rb

@@ -15,7 +15,7 @@ module ROM
     #
     # @api private
     def apply_to(klass, options = EMPTY_HASH)
-      if options.any?
+      if mod.respond_to?(:new)
         klass.send(:include, mod.new(options))
       else
         klass.send(:include, mod)

data/lib/rom/plugins/command/timestamps.rb

@@ -0,0 +1,150 @@
+require 'set'
+
+module ROM
+  module Plugins
+    module Command
+      # A plugin for automatically adding timestamp values
+      # when executing a command
+      #
+      # Set up attributes to timestamp when the command is called
+      #
+      # @example
+      #   class CreateTask < ROM::Commands::Create[:sql]
+      #     result :one
+      #     use :timestamps, timestamps: %i(created_at, updated_at), datestamps: %i(:written)
+      #   end
+      #
+      #   create_user = rom.command(:user).create.curry(name: 'Jane')
+      #
+      #   result = create_user.call
+      #   result[:created_at]  #=> Time.now.utc
+      #
+      # @api public
+      class Timestamps < Module
+        attr_reader :timestamps, :datestamps
+        def initialize(timestamps: [], datestamps: [])
+          @timestamps = store_attributes(timestamps)
+          @datestamps = store_attributes(datestamps)
+        end
+
+        # @api private
+        def store_attributes(attr)
+          attr.is_a?(Array) ? attr : Array[attr]
+        end
+
+        # @api private
+        def included(klass)
+          initialize_timestamp_attributes(klass)
+          klass.include(InstanceMethods)
+          klass.extend(ClassInterface)
+          super
+        end
+
+        def initialize_timestamp_attributes(klass)
+          klass.defines :timestamp_columns, :datestamp_columns
+          klass.timestamp_columns Set.new
+          klass.datestamp_columns Set.new
+          klass.before :set_timestamps
+          klass.timestamp_columns klass.timestamp_columns.merge(timestamps) if timestamps.any?
+          klass.datestamp_columns klass.datestamp_columns.merge(datestamps) if datestamps.any?
+        end
+
+        module InstanceMethods
+          # @api private
+          def timestamp_columns
+            self.class.timestamp_columns
+          end
+
+          # @api private
+          def datestamp_columns
+            self.class.datestamp_columns
+          end
+
+          # Set the timestamp attributes on the given tuples
+          #
+          # @param [Array<Hash>, Hash] tuples the input tuple(s)
+          #
+          # @return [Array<Hash>, Hash]
+          #
+          # @api private
+          def set_timestamps(tuples, *)
+            timestamps = build_timestamps
+
+            case tuples
+            when Hash
+              timestamps.merge(tuples)
+            when Array
+              tuples.map { |t| timestamps.merge(t) }
+            end
+          end
+
+          private
+
+          # @api private
+          def build_timestamps
+            time        = Time.now.utc
+            date        = Date.today
+            timestamps  = {}
+
+            timestamp_columns.each do |column|
+              timestamps[column.to_sym] = time
+            end
+
+            datestamp_columns.each do |column|
+              timestamps[column.to_sym] = date
+            end
+
+            timestamps
+          end
+        end
+
+        module ClassInterface
+          # @api private
+          # Set up attributes to timestamp when the command is called
+          #
+          # @example
+          #   class CreateTask < ROM::Commands::Create[:sql]
+          #     result :one
+          #     use :timestamps
+          #     timestamps :created_at, :updated_at
+          #   end
+          #
+          #   create_user = rom.command(:user).create.curry(name: 'Jane')
+          #
+          #   result = create_user.call
+          #   result[:created_at]  #=> Time.now.utc
+          #
+          # @param [Array<Symbol>] names A list of attribute names
+          #
+          # @api public
+          def timestamps(*names)
+            timestamp_columns timestamp_columns.merge(names)
+          end
+          alias timestamp timestamps
+
+          # Set up attributes to datestamp when the command is called
+          #
+          # @example
+          #   class CreateTask < ROM::Commands::Create[:sql]
+          #     result :one
+          #     use :timestamps
+          #     datestamps :created_on, :updated_on
+          #   end
+          #
+          #   create_user = rom.command(:user).create.curry(name: 'Jane')
+          #
+          #   result = create_user.call
+          #   result[:created_at]  #=> Date.today
+          #
+          # @param [Array<Symbol>] names A list of attribute names
+          #
+          # @api public
+          def datestamps(*names)
+            datestamp_columns datestamp_columns.merge(names)
+          end
+          alias datestamp datestamps
+        end
+      end
+    end
+  end
+end

data/lib/rom/registry.rb

@@ -37,6 +37,16 @@ module ROM
       ElementNotFoundError
     end
 
+    # @api private
+    def merge(other)
+      self.class.new(Hash(other), options)
+    end
+
+    # @api private
+    def to_hash
+      elements
+    end
+
     # @api private
     def map(&block)
       new_elements = elements.each_with_object({}) do |(name, element), h|

data/lib/rom/relation.rb

@@ -175,7 +175,7 @@ module ROM
 
     # @!attribute [r] mappers
     #   @return [MapperRegistry] an optional mapper registry (empty by default)
-    option :mappers, default: -> { MapperRegistry.new }
+    option :mappers, default: -> { self.class.mapper_registry }
 
     # @!attribute [r] commands
     #   @return [CommandRegistry] Command registry
@@ -602,7 +602,7 @@ module ROM
       if attr
         attr.name
       else
-        :"#{Dry::Core::Inflector.singularize(name.dataset)}_id"
+        :"#{Inflector.singularize(name.dataset)}_id"
       end
     end
 

data/lib/rom/relation/class_interface.rb

@@ -1,6 +1,6 @@
 require 'set'
 
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 
 require 'rom/constants'
 require 'rom/relation/name'
@@ -250,6 +250,24 @@ module ROM
         ROM.plugin_registry.relations.fetch(plugin, adapter).apply_to(self, options)
       end
 
+      # Build default mapper registry
+      #
+      # @return [MapperRegistry]
+      #
+      # @api private
+      def mapper_registry(opts = EMPTY_HASH)
+        adapter_ns = ROM.adapters[adapter]
+
+        compiler =
+          if adapter_ns && adapter_ns.const_defined?(:MapperCompiler)
+            adapter_ns.const_get(:MapperCompiler)
+          else
+            MapperCompiler
+          end
+
+        MapperRegistry.new({}, { compiler: compiler.new(opts) }.merge(opts))
+      end
+
       # @api private
       def curried
         Curried
@@ -274,7 +292,7 @@ module ROM
       #
       # @api private
       def default_name
-        Name[Dry::Core::Inflector.underscore(name).tr('/', '_').to_sym]
+        Name[Inflector.underscore(name).tr('/', '_').to_sym]
       end
 
       # @api private

data/lib/rom/relation/combined.rb

@@ -70,10 +70,10 @@ module ROM
       # Return a new combined relation with adjusted node returned from a block
       #
       # @example with a node identifier
-      #   aggregate(:tasks).node(:tasks) { |tasks| tasks.prioritized }
+      #   combine(:tasks).node(:tasks) { |tasks| tasks.prioritized }
       #
       # @example with a nested path
-      #   aggregate(tasks: :tags).node(tasks: :tags) { |tags| tags.where(name: 'red') }
+      #   combine(tasks: :tags).node(tasks: :tags) { |tags| tags.where(name: 'red') }
       #
       # @param [Symbol] name The node relation name
       #

data/lib/rom/relation/commands.rb

@@ -35,8 +35,8 @@ module ROM
       # @return [ROM::Command]
       #
       # @api public
-      def command(type, mapper: nil, use: EMPTY_ARRAY, **opts)
-        base_command = commands.key?(type) ? commands[type] : commands[type, adapter, to_ast, use, opts]
+      def command(type, mapper: nil, use: EMPTY_ARRAY, plugins_options: EMPTY_HASH, **opts)
+        base_command = commands.key?(type) ? commands[type] : commands[type, adapter, to_ast, use, plugins_options, opts]
 
         command =
           if mapper

data/lib/rom/schema/associations_dsl.rb

@@ -1,4 +1,4 @@
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 
 require 'rom/associations/definitions'
 
@@ -197,7 +197,7 @@ module ROM
 
       # @api private
       def dataset_name(name)
-        ::Dry::Core::Inflector.pluralize(name).to_sym
+        Inflector.pluralize(name).to_sym
       end
     end
   end

data/lib/rom/setup/auto_registration.rb

@@ -1,6 +1,6 @@
 require 'pathname'
 
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 
 require 'rom/types'
 require 'rom/initializer'
@@ -94,7 +94,7 @@ module ROM
             ).call
           end
 
-        Dry::Core::Inflector.constantize(klass_name)
+        Inflector.constantize(klass_name)
       end
     end
   end

data/lib/rom/setup/auto_registration_strategies/custom_namespace.rb

@@ -1,6 +1,6 @@
 require 'pathname'
 
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 require 'rom/types'
 require 'rom/setup/auto_registration_strategies/base'
 
@@ -28,7 +28,7 @@ module ROM
 
         path_arr.reverse.each do |dir|
           const_fragment = potential.unshift(
-            Dry::Core::Inflector.camelize(dir)
+            Inflector.camelize(dir)
           ).join("::")
 
           constant = "#{namespace}::#{const_fragment}"
@@ -40,7 +40,7 @@ module ROM
 
         # If we have reached this point, its means constant is not defined and
         # NameError will be thrown if we attempt to camelize something like:
-        # `"#{namespace}::#{Dry::Core::Inflector.camelize(filename)}"`
+        # `"#{namespace}::#{Inflector.camelize(filename)}"`
         # so we can assume naming convention was not respected in required
         # file.
 
@@ -63,7 +63,7 @@ module ROM
 
       # @api private
       def ns_const
-        @namespace_constant ||= Dry::Core::Inflector.constantize(namespace)
+        @namespace_constant ||= Inflector.constantize(namespace)
       end
 
       # @api private

data/lib/rom/setup/auto_registration_strategies/no_namespace.rb

@@ -1,6 +1,6 @@
 require 'pathname'
 
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 require 'rom/types'
 require 'rom/setup/auto_registration_strategies/base'
 
@@ -22,7 +22,7 @@ module ROM
       #
       # @api private
       def call
-        Dry::Core::Inflector.camelize(
+        Inflector.camelize(
           file.sub(/^#{directory}\/#{entity}\//, '').sub(EXTENSION_REGEX, '')
         )
       end

data/lib/rom/setup/auto_registration_strategies/with_namespace.rb

@@ -1,6 +1,6 @@
 require 'pathname'
 
-require 'dry/core/inflector'
+require 'rom/support/inflector'
 require 'rom/setup/auto_registration_strategies/base'
 
 module ROM
@@ -18,7 +18,7 @@ module ROM
       #
       # @api private
       def call
-        Dry::Core::Inflector.camelize(
+        Inflector.camelize(
           file.sub(/^#{directory.dirname}\//, '').sub(EXTENSION_REGEX, '')
         )
       end

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

@@ -31,7 +31,7 @@ module ROM
 
           notifications.trigger(
             'configuration.commands.class.before_build',
-            command: klass, gateway: gateway, dataset: relation.dataset
+            command: klass, gateway: gateway, dataset: relation.dataset, adapter: relation.adapter
           )
 
           klass.extend_for_relation(relation) if klass.restrictable

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

@@ -43,7 +43,7 @@ module ROM
 
             klass.use(:registry_reader, relation_names)
 
-            notifications.trigger('configuration.relations.class.ready', relation: klass)
+            notifications.trigger('configuration.relations.class.ready', relation: klass, adapter: klass.adapter)
 
             relations[key] = build_relation(klass, registry)
           end
@@ -101,13 +101,22 @@ module ROM
           dataset: dataset, relation: klass, adapter: klass.adapter
         )
 
-        mappers = @mappers.key?(rel_key) ? @mappers[rel_key] : MapperRegistry.new({}, cache: @mappers.cache)
-
-        options = { __registry__: registry, mappers: mappers, schema: schema, **plugin_options }
+        options = { __registry__: registry, mappers: mapper_registry(rel_key, klass), schema: schema, **plugin_options }
 
         klass.new(dataset, options)
       end
 
+      # @api private
+      def mapper_registry(rel_key, rel_class)
+        registry = rel_class.mapper_registry(cache: @mappers.cache)
+
+        if @mappers.key?(rel_key)
+          registry.merge(@mappers[rel_key])
+        else
+          registry
+        end
+      end
+
       # @api private
       def plugin_options
         relation_plugins.map(&:config).map(&:to_hash).reduce(:merge) || EMPTY_HASH

data/lib/rom/support/inflector.rb

@@ -0,0 +1,7 @@
+require 'dry/inflector'
+
+module ROM
+  Inflector = Dry::Inflector.new do |i|
+    i.plural(/people\z/i, 'people')
+  end
+end

data/lib/rom/support/notifications.rb

@@ -103,6 +103,16 @@ module ROM
         @payload.fetch(name)
       end
 
+      # Coerce an event to a hash
+      #
+      # @return [Hash]
+      #
+      # @api public
+      def to_h
+        @payload
+      end
+      alias_method :to_hash, :to_h
+
       # Get or set a payload
       #
       # @overload

data/lib/rom/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Core
-    VERSION = '4.0.2'.freeze
+    VERSION = '4.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-core
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: dry-inflector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +100,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.1
-- !ruby/object:Gem::Dependency
-  name: dry-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -106,20 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +234,7 @@ files:
 - lib/rom/memory/commands.rb
 - lib/rom/memory/dataset.rb
 - lib/rom/memory/gateway.rb
+- lib/rom/memory/mapper_compiler.rb
 - lib/rom/memory/relation.rb
 - lib/rom/memory/schema.rb
 - lib/rom/memory/storage.rb
@@ -235,6 +244,7 @@ files:
 - lib/rom/plugin_base.rb
 - lib/rom/plugin_registry.rb
 - lib/rom/plugins/command/schema.rb
+- lib/rom/plugins/command/timestamps.rb
 - lib/rom/plugins/relation/instrumentation.rb
 - lib/rom/plugins/relation/registry_reader.rb
 - lib/rom/plugins/schema/timestamps.rb
@@ -268,6 +278,7 @@ files:
 - lib/rom/setup/finalize/finalize_mappers.rb
 - lib/rom/setup/finalize/finalize_relations.rb
 - lib/rom/support/configurable.rb
+- lib/rom/support/inflector.rb
 - lib/rom/support/memoizable.rb
 - lib/rom/support/notifications.rb
 - lib/rom/transaction.rb