Refactoring: introduce Hanami::Model::Configuration#migrations_logger…

… as private API

lib/hanami/model/configuration.rb

@@ -21,15 +21,20 @@ class Configuration < ROM::Configuration
       # @api private
       attr_reader :logger
 
+      # @since x.x.x
+      # @api private
+      attr_reader :migrations_logger
+
       # @since 0.2.0
       # @api private
       def initialize(configurator)
         super(configurator.backend, configurator.url)
-        @migrations   = configurator._migrations
-        @schema       = configurator._schema
-        @logger       = configurator._logger
-        @mappings     = {}
-        @entities     = {}
+        @migrations        = configurator._migrations
+        @schema            = configurator._schema
+        @logger            = configurator._logger
+        @migrations_logger = configurator._migrations_logger
+        @mappings          = {}
+        @entities          = {}
       end
 
       # NOTE: This must be changed when we want to support several adapters at the time

lib/hanami/model/configurator.rb

@@ -29,6 +29,10 @@ class Configurator
       # @api private
       attr_reader :_logger
 
+      # @since x.x.x
+      # @api private
+      attr_reader :_migrations_logger
+
       # @since 0.7.0
       # @api private
       def self.build(&block)
@@ -70,6 +74,13 @@ def logger(stream, options = {})
         opts = options.merge(stream: stream)
         @_logger = Hanami::Logger.new('hanami.model', opts)
       end
+
+      # @since x.x.x
+      # @api private
+      def migrations_logger(stream = $stdout)
+        require 'hanami/model/migrator/logger'
+        @_migrations_logger = Hanami::Model::Migrator::Logger.new(stream)
+      end
     end
   end
 end

lib/hanami/model/migrator.rb

@@ -237,9 +237,9 @@ def self.version
       #
       # @since 0.7.0
       # @api private
-      def initialize(configuration: self.class.configuration, stream: $stdout)
+      def initialize(configuration: self.class.configuration)
         @configuration = configuration
-        @adapter       = Adapter.for(configuration, stream)
+        @adapter       = Adapter.for(configuration)
       end
 
       # @since 0.7.0

lib/hanami/model/migrator/adapter.rb

@@ -1,6 +1,5 @@
 require 'uri'
 require 'shellwords'
-require 'hanami/model/migrator/logger'
 
 module Hanami
   module Model
@@ -26,8 +25,8 @@ class Adapter
         #
         # @since 0.4.0
         # @api private
-        def self.for(configuration, stream) # rubocop:disable Metrics/MethodLength
-          connection = connection_for(configuration, stream)
+        def self.for(configuration) # rubocop:disable Metrics/MethodLength
+          connection = connection_for(configuration)
 
           case connection.database_type
           when :sqlite
@@ -49,10 +48,10 @@ class << self
 
           # @since 0.7.0
           # @api private
-          def connection_for(configuration, stream)
+          def connection_for(configuration)
             Sequel.connect(
               configuration.url,
-              loggers: [Hanami::Model::Migrator::Logger.new(stream)]
+              loggers: [configuration.migrations_logger]
             )
           rescue Sequel::AdapterNotFound
             raise MigrationError.new("Current adapter (#{configuration.adapter.type}) doesn't support SQL database operations.")

test/integration/migration/mysql.rb

@@ -3,7 +3,7 @@
     @schema     = Pathname.new("#{__dir__}/../../../tmp/schema.sql").expand_path
     @connection = Sequel.connect(ENV['HANAMI_DATABASE_URL'])
 
-    Hanami::Model::Migrator::Adapter.for(Hanami::Model.configuration, TestIO.stream).dump
+    Hanami::Model::Migrator::Adapter.for(Hanami::Model.configuration).dump
   end
 
   describe 'columns' do

test/integration/migration/postgresql.rb

@@ -3,7 +3,7 @@
     @schema     = Pathname.new("#{__dir__}/../../../tmp/schema.sql").expand_path
     @connection = Sequel.connect(ENV['HANAMI_DATABASE_URL'])
 
-    Hanami::Model::Migrator::Adapter.for(Hanami::Model.configuration, TestIO.stream).dump
+    Hanami::Model::Migrator::Adapter.for(Hanami::Model.configuration).dump
   end
 
   describe 'columns' do

test/integration/migration/sqlite.rb

@@ -3,7 +3,7 @@
     @schema     = Pathname.new("#{__dir__}/../../../tmp/schema.sql").expand_path
     @connection = Sequel.connect(ENV['HANAMI_DATABASE_URL'])
 
-    Hanami::Model::Migrator::Adapter.for(Hanami::Model.configuration, TestIO.stream).dump
+    Hanami::Model::Migrator::Adapter.for(Hanami::Model.configuration).dump
   end
 
   describe 'columns' do

test/migrator/mysql.rb

@@ -2,15 +2,15 @@
 
 describe 'MySQL Database migrations' do
   let(:migrator) do
-    Hanami::Model::Migrator.new(configuration: configuration, stream: TestIO.stream)
+    Hanami::Model::Migrator.new(configuration: configuration)
   end
 
   let(:random) { SecureRandom.hex(4) }
 
   # General variables
   let(:migrations)     { Pathname.new(__dir__ + '/../fixtures/migrations') }
   let(:schema)         { nil }
-  let(:config)         { OpenStruct.new(backend: :sql, url: url, _migrations: migrations, _schema: schema) }
+  let(:config)         { OpenStruct.new(backend: :sql, url: url, _migrations: migrations, _schema: schema, _migrations_logger: Hanami::Model::Migrator::Logger.new(ENV['HANAMI_DATABASE_LOGGER'])) }
   let(:configuration)  { Hanami::Model::Configuration.new(config) }
 
   # Variables for `apply` and `prepare`
@@ -250,7 +250,7 @@
       it 'creates database, loads schema and migrate' do
         # Simulate already existing schema.sql, without existing database and pending migrations
         connection = Sequel.connect(url)
-        Hanami::Model::Migrator::Adapter.for(configuration, TestIO.stream).dump
+        Hanami::Model::Migrator::Adapter.for(configuration).dump
 
         migration = target_migrations.join('20160831095616_create_abuses.rb')
         File.open(migration, 'w+') do |f|

test/migrator/postgresql.rb

@@ -2,15 +2,15 @@
 
 describe 'PostgreSQL Database migrations' do
   let(:migrator) do
-    Hanami::Model::Migrator.new(configuration: configuration, stream: TestIO.stream)
+    Hanami::Model::Migrator.new(configuration: configuration)
   end
 
   let(:random) { SecureRandom.hex(4) }
 
   # General variables
   let(:migrations)     { Pathname.new(__dir__ + '/../fixtures/migrations') }
   let(:schema)         { nil }
-  let(:config)         { OpenStruct.new(backend: :sql, url: url, _migrations: migrations, _schema: schema) }
+  let(:config)         { OpenStruct.new(backend: :sql, url: url, _migrations: migrations, _schema: schema, _migrations_logger: Hanami::Model::Migrator::Logger.new(ENV['HANAMI_DATABASE_LOGGER'])) }
   let(:configuration)  { Hanami::Model::Configuration.new(config) }
 
   # Variables for `apply` and `prepare`
@@ -298,7 +298,7 @@
       it 'creates database, loads schema and migrate' do
         # Simulate already existing schema.sql, without existing database and pending migrations
         connection = Sequel.connect(url)
-        Hanami::Model::Migrator::Adapter.for(configuration, TestIO.stream).dump
+        Hanami::Model::Migrator::Adapter.for(configuration).dump
 
         migration = target_migrations.join('20160831095616_create_abuses.rb')
         File.open(migration, 'w+') do |f|

test/migrator/sqlite.rb

@@ -2,15 +2,15 @@
 
 describe 'Filesystem SQLite Database migrations' do
   let(:migrator) do
-    Hanami::Model::Migrator.new(configuration: configuration, stream: TestIO.stream)
+    Hanami::Model::Migrator.new(configuration: configuration)
   end
 
   let(:random) { SecureRandom.hex }
 
   # General variables
   let(:migrations)     { Pathname.new(__dir__ + '/../fixtures/migrations') }
   let(:schema)         { nil }
-  let(:config)         { OpenStruct.new(backend: :sql, url: url, _migrations: migrations, _schema: schema) }
+  let(:config)         { OpenStruct.new(backend: :sql, url: url, _migrations: migrations, _schema: schema, _migrations_logger: Hanami::Model::Migrator::Logger.new(ENV['HANAMI_DATABASE_LOGGER'])) }
   let(:configuration)  { Hanami::Model::Configuration.new(config) }
   let(:url) do
     db = database
@@ -236,7 +236,7 @@
       it 'creates database, loads schema and migrate' do
         # Simulate already existing schema.sql, without existing database and pending migrations
         connection = Sequel.connect(url)
-        Hanami::Model::Migrator::Adapter.for(configuration, TestIO.stream).dump
+        Hanami::Model::Migrator::Adapter.for(configuration).dump
 
         migration = target_migrations.join('20160831095616_create_abuses.rb')
         File.open(migration, 'w+') do |f|

test/support/database/strategies/sql.rb

@@ -1,6 +1,7 @@
 require_relative 'abstract'
 require 'hanami/utils/blank'
 require 'pathname'
+require 'stringio'
 
 module Database
   module Strategies
@@ -29,6 +30,8 @@ def configure
           logger     ENV['HANAMI_DATABASE_LOGGER'], level: :debug
           migrations Dir.pwd + '/test/fixtures/database_migrations'
           schema     Dir.pwd + '/tmp/schema.sql'
+
+          migrations_logger ENV['HANAMI_DATABASE_LOGGER']
         end
       end