Address some rubocop offenses

.rubocop.yml

@@ -20,6 +20,13 @@ Layout/SpaceInLambdaLiteral:
 Lint/BooleanSymbol:
   Enabled: false
 
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - "spec/**/*_spec.rb"
+    - "core/spec/**/*_spec.rb"
+    - "repository/spec/**/*_spec.rb"
+    - "changeset/spec/**/*_spec.rb"
+
 Lint/SuppressedException:
   Exclude:
     - "spec/spec_helper.rb"
@@ -53,6 +60,9 @@ Naming/MethodName:
 Naming/PredicateName:
   Enabled: false
 
+Style/AccessorGrouping:
+  EnforcedStyle: separated
+
 Style/AccessModifierDeclarations:
   Enabled: false
 
@@ -69,6 +79,9 @@ Style/BlockDelimiters:
 Style/ClassAndModuleChildren:
   Exclude:
     - "spec/**/*_spec.rb"
+    - "core/spec/**/*_spec.rb"
+    - "repository/spec/**/*_spec.rb"
+    - "changeset/spec/**/*_spec.rb"
 
 Style/ConditionalAssignment:
   Enabled: false
@@ -88,6 +101,9 @@ Style/FormatString:
 Style/GuardClause:
   Enabled: false
 
+Style/HashAsLastArrayItem:
+  EnforcedStyle: no_braces
+
 Style/IfUnlessModifier:
   Enabled: false
 

bin/console

@@ -78,7 +78,9 @@ rom = ROM.container(config)
 repo = UserRepo.new(rom)
 
 class Context
-  attr_reader :rom, :repo
+  attr_reader :rom
+
+  attr_reader :repo
 
   def initialize(rom, repo)
     @rom = rom

changeset/lib/rom/changeset/stateful.rb

@@ -131,8 +131,8 @@ def self.pipes
       # @return [Changeset]
       #
       # @api public
-      def map(*steps, &block)
-        extend(*steps, for_diff: true, &block)
+      def map(*steps, &)
+        extend(*steps, for_diff: true, &)
       end
 
       # Pipe changeset's data using custom steps define on the pipe.
@@ -150,10 +150,10 @@ def map(*steps, &block)
       # @api public
       def extend(*steps, **options, &block)
         if block
-          if !steps.empty?
-            extend(*steps, **options).extend(**options, &block)
-          else
+          if steps.empty?
             with(pipe: pipe.compose(Pipe.new(block).bind(self), **options))
+          else
+            extend(*steps, **options).extend(**options, &block)
           end
         else
           with(pipe: steps.reduce(pipe.with(**options)) { |a, e| a.compose(pipe[e], **options) })
@@ -266,9 +266,9 @@ def respond_to_missing?(meth, include_private = false)
       end
 
       # @api private
-      def method_missing(meth, *args, **kwargs, &block)
+      def method_missing(meth, ...)
         if __data__.respond_to?(meth)
-          response = __data__.__send__(meth, *args, **kwargs, &block)
+          response = __data__.__send__(meth, ...)
 
           if response.is_a?(__data__.class)
             with(__data__: response)

changeset/spec/shared/models.rb

@@ -11,7 +11,9 @@ module Models
         class User
           include Dry::Equalizer(:id, :name)
 
-          attr_reader :id, :name
+          attr_reader :id
+
+          attr_reader :name
 
           def initialize(attrs)
             @id = attrs[:id]
@@ -22,7 +24,11 @@ def initialize(attrs)
         class Task
           include Dry::Equalizer(:id, :user_id, :title)
 
-          attr_reader :id, :user_id, :title
+          attr_reader :id
+
+          attr_reader :user_id
+
+          attr_reader :title
 
           def initialize(attrs)
             @id = attrs[:id]
@@ -34,7 +40,9 @@ def initialize(attrs)
         class Tag
           include Dry::Equalizer(:id, :task_id, :name)
 
-          attr_reader :id, :task_id, :name
+          attr_reader :id
+          attr_reader :task_id
+          attr_reader :name
 
           def initialize(attrs)
             @id = attrs[:id]

core/lib/rom/command_proxy.rb

@@ -8,7 +8,9 @@ module ROM
   #
   # @api private
   class CommandProxy
-    attr_reader :command, :root
+    attr_reader :command
+
+    attr_reader :root
 
     # @api private
     def initialize(command, root = Inflector.singularize(command.name.relation).to_sym)

core/lib/rom/configuration_dsl/command_dsl.rb

@@ -8,7 +8,11 @@ module ConfigurationDSL
     #
     # @private
     class CommandDSL
-      attr_reader :relation, :adapter, :command_classes
+      attr_reader :relation
+
+      attr_reader :adapter
+
+      attr_reader :command_classes
 
       # @api private
       def initialize(relation, adapter = nil, &)

core/lib/rom/configuration_dsl/mapper_dsl.rb

@@ -8,7 +8,11 @@ module ConfigurationDSL
     #
     # @private
     class MapperDSL
-      attr_reader :configuration, :mapper_classes, :defined_mappers
+      attr_reader :configuration
+
+      attr_reader :mapper_classes
+
+      attr_reader :defined_mappers
 
       # @api private
       def initialize(configuration, mapper_classes, block)

core/lib/rom/configuration_dsl/relation.rb

@@ -17,9 +17,11 @@ def self.build_class(name, options = EMPTY_HASH)
         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|
+        ::Dry::Core::ClassBuilder.new(
+          name: class_name, parent: ::ROM::Relation[adapter]
+        ).call do |klass|
           klass.gateway(options.fetch(:gateway, :default))
-          klass.schema(name) {}
+          klass.schema(name) { nil }
         end
       end
     end

core/lib/rom/environment.rb

@@ -10,7 +10,9 @@ module ROM
   class Environment
     include Configurable
 
-    attr_reader :gateways, :gateways_map
+    attr_reader :gateways
+
+    attr_reader :gateways_map
 
     # @api private
     def initialize(*args)

core/lib/rom/mapper/attribute_dsl.rb

@@ -16,7 +16,17 @@ class Mapper
     class AttributeDSL
       include ModelDSL
 
-      attr_reader :attributes, :options, :copy_keys, :symbolize_keys, :reject_keys, :steps
+      attr_reader :attributes
+
+      attr_reader :options
+
+      attr_reader :copy_keys
+
+      attr_reader :symbolize_keys
+
+      attr_reader :reject_keys
+
+      attr_reader :steps
 
       # @param [Array] attributes accumulator array
       # @param [Hash] options
@@ -88,7 +98,7 @@ def attribute(name, options = EMPTY_HASH, &block)
       end
 
       def exclude(name)
-        attributes << [name, { exclude: true }]
+        attributes << [name,  exclude: true]
       end
 
       # Perform transformations sequentially
@@ -101,8 +111,8 @@ def exclude(name)
       #   end
       #
       # @api public
-      def step(options = EMPTY_HASH, &block)
-        steps << new(options, &block)
+      def step(options = EMPTY_HASH, &)
+        steps << new(options, &)
       end
 
       # Define an embedded attribute
@@ -330,8 +340,8 @@ def unfold(name, options = EMPTY_HASH)
       #   @option options [Symbol] :type The type, either :array (default) or :hash
       #
       # @api public
-      def combine(name, options, &block)
-        dsl = new(options, &block)
+      def combine(name, options, &)
+        dsl = new(options, &)
 
         attr_opts = {
           type: options.fetch(:type, :array),
@@ -409,8 +419,8 @@ def dsl(name_or_attrs, options, &block)
       # Used by embedded, wrap and group
       #
       # @api private
-      def attributes_from_block(name, options, &block)
-        dsl = new(options, &block)
+      def attributes_from_block(name, options, &)
+        dsl = new(options, &)
         header = dsl.header
         add_attribute(name, options.update(header: header))
         header.each { |attr| remove(attr.key) unless name == attr.key }

core/lib/rom/mapper/model_dsl.rb

@@ -8,7 +8,11 @@ class Mapper
     #
     # @private
     module ModelDSL
-      attr_reader :attributes, :builder, :klass
+      attr_reader :attributes
+
+      attr_reader :builder
+
+      attr_reader :klass
 
       DEFAULT_TYPE = :poro
 

core/lib/rom/model_builder.rb

@@ -19,7 +19,11 @@ module ROM
   class ModelBuilder
     attr_reader :name
 
-    attr_reader :const_name, :namespace, :klass
+    attr_reader :const_name
+
+    attr_reader :namespace
+
+    attr_reader :klass
 
     # Return model builder subclass based on type
     #

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

@@ -23,7 +23,9 @@ module Command
       #
       # @api public
       class Timestamps < Module
-        attr_reader :timestamps, :datestamps
+        attr_reader :timestamps
+
+        attr_reader :datestamps
 
         def initialize(timestamps: [], datestamps: [])
           @timestamps = store_attributes(timestamps)

core/lib/rom/relation/name.rb

@@ -54,7 +54,6 @@ def self.cache
       attr_reader :dataset
 
       attr_reader :aliaz
-
       attr_reader :key
 
       # @api private

core/lib/rom/relation/view_dsl.rb

@@ -24,12 +24,12 @@ class ViewDSL
       attr_reader :new_schema
 
       # @api private
-      def initialize(name, schema, &block)
+      def initialize(name, schema, &)
         @name = name
         @schema = schema
         @new_schema = nil
         @relation_block = nil
-        instance_eval(&block)
+        instance_eval(&)
       end
 
       # Define a schema for a relation view
@@ -50,8 +50,8 @@ def schema(&block)
       # @see Relation::ClassInterface.view
       #
       # @api public
-      def relation(&block)
-        @relation_block = proc(&block)
+      def relation(&)
+        @relation_block = proc(&)
       end
 
       # Return procs captured by the DSL

core/lib/rom/schema.rb

@@ -188,8 +188,8 @@ def call(relation)
     # @yield [Attribute]
     #
     # @api public
-    def each(&block)
-      attributes.each(&block)
+    def each(&)
+      attributes.each(&)
     end
 
     # Check if schema has any attributes
@@ -457,20 +457,19 @@ def set!(key, value)
 
     # @api private
     def count_index
-      map(&:name).map { |name| [name, count { |attr| attr.name == name }] }.to_h
+      map(&:name).to_h { |name| [name, count { |attr| attr.name == name }] }
     end
 
     # @api private
     def name_index
-      map { |attr| [attr.name, attr] }.to_h
+      to_h { |attr| [attr.name, attr] }
     end
 
     # @api private
     def source_index
       select(&:source)
         .group_by(&:source)
-        .map { |src, grp| [src.to_sym, grp.map { |attr| [attr.name, attr] }.to_h] }
-        .to_h
+        .to_h { |src, grp| [src.to_sym, grp.to_h { |attr| [attr.name, attr] }] }
     end
 
     # @api private

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

@@ -55,8 +55,8 @@ def call
       # @api private
       def name_error_message(attempted)
         'required file does not define expected constant name; either ' \
-        'register your constant explicitly of try following the path' \
-        "naming convention like:\n\n\t- #{attempted.join("\n\t- ")}\n"
+          'register your constant explicitly of try following the path' \
+          "naming convention like:\n\n\t- #{attempted.join("\n\t- ")}\n"
       end
 
       # @api private

core/lib/rom/setup/finalize.rb

@@ -22,9 +22,23 @@ module ROM
   #
   # @private
   class Finalize
-    attr_reader :gateways, :repo_adapter,
-                :relation_classes, :mapper_classes, :mapper_objects,
-                :command_classes, :plugins, :config, :notifications
+    attr_reader :gateways
+
+    attr_reader :repo_adapter
+
+    attr_reader :relation_classes
+
+    attr_reader :mapper_classes
+
+    attr_reader :mapper_objects
+
+    attr_reader :command_classes
+
+    attr_reader :plugins
+
+    attr_reader :config
+
+    attr_reader :notifications
 
     # @api private
     def initialize(options)