Allow to configure custom inflector

WIP but registration already works

Author: flash-gordon

core/lib/rom/associations/through_identifier.rb

@@ -22,7 +22,7 @@ def self.[](source, target, assoc_name = nil)
 
       # @api private
       def self.default_assoc_name(relation)
-        Inflector.singularize(relation).to_sym
+        relation.inflector.singularize(relation).to_sym
       end
 
       # @api private

core/lib/rom/command_compiler.rb

@@ -66,6 +66,11 @@ def self.registry
     #   @return [Cache] local cache instance
     option :cache, default: -> { Cache.new }
 
+    # @!attribute [r] inflector
+    #   @return [Dry::Inflector] String inflector
+    #   @api private
+    option :inflector, default: -> { Inflector }
+
     # Return a specific command type for a given adapter and relation AST
     #
     # This class holds its own registry where all generated commands are being
@@ -114,7 +119,7 @@ def call(*args)
 
     # @api private
     def type
-      @_type ||= Commands.const_get(Inflector.classify(id))[adapter]
+      @_type ||= Commands.const_get(inflector.classify(id))[adapter]
     rescue NameError
       nil
     end
@@ -139,7 +144,7 @@ def visit_relation(node, parent_relation = nil)
           if meta[:combine_type] == :many
             name
           else
-            { Inflector.singularize(name).to_sym => name }
+            { inflector.singularize(name).to_sym => name }
           end
 
         mapping =
@@ -239,7 +244,7 @@ def setup_associates(klass, relation, _meta, parent_relation)
         if relation.associations.key?(parent_relation)
           parent_relation
         else
-          singular_name = Inflector.singularize(parent_relation).to_sym
+          singular_name = inflector.singularize(parent_relation).to_sym
           singular_name if relation.associations.key?(singular_name)
         end
 

core/lib/rom/command_proxy.rb

@@ -11,7 +11,7 @@ class CommandProxy
     attr_reader :command, :root
 
     # @api private
-    def initialize(command, root = Inflector.singularize(command.name.relation).to_sym)
+    def initialize(command, inflector: nil, root: inflector.singularize(command.name.relation).to_sym)
       @command = command
       @root = root
     end

core/lib/rom/configuration.rb

@@ -6,6 +6,7 @@
 require 'rom/setup'
 require 'rom/configuration_dsl'
 require 'rom/support/notifications'
+require 'rom/support/inflector'
 
 module ROM
   class Configuration
@@ -38,7 +39,7 @@ class Configuration
 
     def_delegators :@setup, :register_relation, :register_command, :register_mapper, :register_plugin,
                    :command_classes, :mapper_classes,
-                   :auto_registration
+                   :auto_registration, :inflector, :inflector=
 
     def_delegators :@environment, :gateways, :gateways_map, :configure, :config
 

core/lib/rom/configuration_dsl/command.rb

@@ -16,10 +16,11 @@ class Command
       # @api private
       def self.build_class(name, relation, options = EMPTY_HASH, &block)
         type = options.fetch(:type) { name }
-        command_type = Inflector.classify(type)
+        inflector = options.fetch(:inflector) { Inflector }
+        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)
+        class_name = generate_class_name(adapter, command_type, relation, inflector)
 
         Dry::Core::ClassBuilder.new(name: class_name, parent: parent).call do |klass|
           klass.register_as(name)
@@ -31,11 +32,11 @@ def self.build_class(name, relation, options = EMPTY_HASH, &block)
       # Create a command subclass name based on adapter, type and relation
       #
       # @api private
-      def self.generate_class_name(adapter, command_type, relation)
+      def self.generate_class_name(adapter, command_type, relation, inflector)
         pieces = ['ROM']
-        pieces << Inflector.classify(adapter)
+        pieces << inflector.classify(adapter)
         pieces << 'Commands'
-        pieces << "#{command_type}[#{Inflector.classify(relation)}s]"
+        pieces << "#{command_type}[#{inflector.classify(relation)}s]"
         pieces.join('::')
       end
     end

core/lib/rom/configuration_dsl/relation.rb

@@ -15,7 +15,8 @@ class Relation
       #
       # @api private
       def self.build_class(name, options = EMPTY_HASH)
-        class_name = "ROM::Relation[#{Inflector.camelize(name)}]"
+        inflector = options.fetch(:inflector) { Inflector }
+        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|

core/lib/rom/relation.rb

@@ -6,6 +6,7 @@
 require 'rom/constants'
 require 'rom/initializer'
 require 'rom/support/memoizable'
+require 'rom/support/inflector'
 
 require 'rom/relation/class_interface'
 
@@ -189,6 +190,11 @@ class Relation
     #   @api private
     option :meta, reader: true, default: -> { EMPTY_HASH }
 
+    # @!attribute [r] inflector
+    #   @return [Dry::Inflector] String inflector
+    #   @api private
+    option :inflector, reader: true, default: -> { Inflector }
+
     # Return schema attribute
     #
     # @example accessing canonical attribute
@@ -596,7 +602,7 @@ def foreign_key(name)
       if attr
         attr.name
       else
-        :"#{Inflector.singularize(name.dataset)}_id"
+        :"#{inflector.singularize(name.dataset)}_id"
       end
     end
 

core/lib/rom/schema/associations_dsl.rb

@@ -11,18 +11,23 @@ class Schema
     # This DSL is exposed in `associations do .. end` blocks in schema defintions.
     #
     # @api public
-    class AssociationsDSL < BasicObject
+    class AssociationsDSL < ::BasicObject
       # @!attribute [r] source
       #   @return [Relation::Name] The source relation
       attr_reader :source
 
+      # @!attribute [r] inflector
+      #   @return [Dry::Inflector] String inflector
+      attr_reader :inflector
+
       # @!attribute [r] registry
       #   @return [RelationRegistry] Relations registry from a rom container
       attr_reader :registry
 
       # @api private
-      def initialize(source, &block)
+      def initialize(source, inflector = ::ROM::Inflector, &block)
         @source = source
+        @inflector = inflector
         @registry = {}
         instance_exec(&block)
       end
@@ -199,7 +204,7 @@ def add(association)
 
       # @api private
       def dataset_name(name)
-        Inflector.pluralize(name).to_sym
+        inflector.pluralize(name).to_sym
       end
     end
   end

core/lib/rom/setup.rb

@@ -28,13 +28,17 @@ class Setup
     # @api private
     attr_reader :notifications
 
+    # @api private
+    attr_accessor :inflector
+
     # @api private
     def initialize(notifications)
       @relation_classes = []
       @command_classes = []
       @mapper_classes = []
       @plugins = []
       @notifications = notifications
+      @inflector = Inflector
     end
 
     # Enable auto-registration for a given setup object
@@ -47,7 +51,7 @@ def initialize(notifications)
     #
     # @api public
     def auto_registration(directory, **options)
-      auto_registration = AutoRegistration.new(directory, **options)
+      auto_registration = AutoRegistration.new(directory, inflector: inflector, **options)
       auto_registration.relations.map { |r| register_relation(r) }
       auto_registration.commands.map { |r| register_command(r) }
       auto_registration.mappers.map { |r| register_mapper(r) }
@@ -58,21 +62,21 @@ def auto_registration(directory, **options)
     #
     # @api private
     def register_relation(*klasses)
-      klasses.reduce(@relation_classes, :<<)
+      @relation_classes.concat(klasses)
     end
 
     # Mapper sub-classes are being registered with this method during setup
     #
     # @api private
     def register_mapper(*klasses)
-      klasses.reduce(@mapper_classes, :<<)
+      @mapper_classes.concat(klasses)
     end
 
     # Command sub-classes are being registered with this method during setup
     #
     # @api private
     def register_command(*klasses)
-      klasses.reduce(@command_classes, :<<)
+      @command_classes.concat(klasses)
     end
 
     # @api private

core/lib/rom/setup/auto_registration.rb

@@ -21,6 +21,8 @@ class AutoRegistration
 
     PathnameType = Types.Constructor(Pathname, &Kernel.method(:Pathname))
 
+    InflectorType = Types.Strict(Dry::Inflector)
+
     DEFAULT_MAPPING = {
       relations: :relations,
       mappers: :mappers,
@@ -51,6 +53,11 @@ class AutoRegistration
       ]
     }
 
+    # @!attribute [r] inflector
+    #   @return [Dry::Inflector] String inflector
+    #   @api private
+    option :inflector, type: InflectorType, default: -> { Inflector }
+
     # Load relation files
     #
     # @api private
@@ -84,19 +91,25 @@ def load_entities(entity)
           case namespace
           when String
             AutoRegistrationStrategies::CustomNamespace.new(
-              namespace: namespace, file: file, directory: directory
+              namespace: namespace,
+              file: file,
+              directory: directory,
+              inflector: inflector
             ).call
           when TrueClass
             AutoRegistrationStrategies::WithNamespace.new(
-              file: file, directory: directory
+              file: file, directory: directory, inflector: inflector
             ).call
           when FalseClass
             AutoRegistrationStrategies::NoNamespace.new(
-              file: file, directory: directory, entity: component_dirs.fetch(entity)
+              file: file,
+              directory: directory,
+              entity: component_dirs.fetch(entity),
+              inflector: inflector
             ).call
           end
 
-        Inflector.constantize(klass_name)
+        inflector.constantize(klass_name)
       end
     end
   end