feature: remove dry-* trash

Gemfile

@@ -1,9 +1,8 @@
 source 'https://gems.railsc.ru'
 source 'https://rubygems.org'
 
-gem "riddle", github: "pat/riddle", branch: "develop", require: false
+gem "riddle", git: "https://github.com/pat/riddle", branch: "develop", require: false
 gem 'pg', '< 1'
 
 # Specify your gem's dependencies in ts_customizer.gemspec
 gemspec
-gem 'dry-auto_inject', '< 0.6.0'

lib/sphinx/integration.rb

@@ -1,6 +1,4 @@
 require 'active_support/all'
-require "dry/container"
-require "dry/auto_inject"
 require 'redis'
 require 'redis-mutex'
 require 'resque-integration'
@@ -26,9 +24,6 @@ module Integration
     autoload :ServerStatus, 'sphinx/integration/server_status'
     autoload :TransmitterJob, 'sphinx/integration/transmitter_job'
     autoload :ReplayerJob, 'sphinx/integration/replayer_job'
-
-    Container = ::Dry::Container.new
-    AutoInject = ::Dry::AutoInject(Container)
   end
 end
 

lib/sphinx/integration/extensions/thinking_sphinx.rb

@@ -82,7 +82,7 @@ def log(message, severity = ::Logger::INFO)
     alias_method :info, :log
 
     def logger
-      @logger ||= ::Sphinx::Integration::Container["logger.sphinx_log"]
+      @logger ||= ::Sphinx::Integration.fetch(:di)[:loggers][:sphinx_file].call
     end
   end
 end

lib/sphinx/integration/helper.rb

@@ -8,8 +8,6 @@ module HelperAdapters
   end
 
   class Helper
-    include ::Sphinx::Integration::AutoInject.hash["logger.notificator", logger: "logger.stdout"]
-
     %i(running? stop start suspend resume restart clean copy_config reload).each do |method_name|
       define_method(method_name) do
         begin
@@ -23,8 +21,6 @@ class Helper
     end
 
     def initialize(options = {})
-      super
-
       ::ThinkingSphinx.context.define_indexes
 
       @options = options
@@ -57,7 +53,7 @@ def configure
     def index
       log "Index sphinx"
 
-      ::Sphinx::Integration::Mysql::Replayer.new(logger: logger).reset
+      ::Sphinx::Integration::Mysql::Replayer.new.reset
 
       @indexes.each do |index|
         index.indexing do
@@ -72,7 +68,6 @@ def index
       end
     rescue StandardError => error
       log_error(error)
-      raise
     end
 
     alias_method :reindex, :index
@@ -110,5 +105,13 @@ def log_error(exception)
       logger.debug(exception.backtrace.join("\n")) if exception.backtrace
       notificator.call(exception.message)
     end
+
+    def logger
+      @logger ||= ::Sphinx::Integration.fetch(:di)[:loggers][:stdout].call
+    end
+
+    def notificator
+      @notificator ||= ::Sphinx::Integration.fetch(:di)[:error_notificator]
+    end
   end
 end

lib/sphinx/integration/helper_adapters/base.rb

@@ -4,16 +4,16 @@ module HelperAdapters
       class Base
         CORE_POSTFIX = 'core'.freeze
 
-        include ::Sphinx::Integration::AutoInject.hash[logger: "logger.stdout"]
-
         def initialize(options = {})
-          super
-
           @options = options
         end
 
         private
 
+        def logger
+          @logger ||= ::Sphinx::Integration.fetch(:di)[:loggers][:stdout].call
+        end
+
         def config
           ThinkingSphinx::Configuration.instance
         end

lib/sphinx/integration/helper_adapters/remote.rb

@@ -4,8 +4,6 @@ module Sphinx
   module Integration
     module HelperAdapters
       class SshProxy
-        include ::Sphinx::Integration::AutoInject.hash[logger: "logger.stdout"]
-
         DEFAULT_SSH_OPTIONS = {
           user: "sphinx",
           port: 22,
@@ -70,6 +68,10 @@ def execute(*args)
         end
       end
 
+      def logger
+        @logger ||= ::Sphinx::Integration.fetch(:di)[:loggers][:stdout].call
+      end
+
       class Remote < Base
         def initialize(*)
           super

lib/sphinx/integration/mysql/replayer.rb

@@ -4,8 +4,6 @@ module Sphinx
   module Integration
     module Mysql
       class Replayer
-        include ::Sphinx::Integration::AutoInject.hash[logger: "logger.stdout"]
-
         TIMEOUT = 60.seconds
 
         delegate :mysql_client, :update_log, :soft_delete_log, to: :sphinx_config
@@ -92,6 +90,10 @@ def soft_delete(ids_by_indexes)
         def sphinx_config
           @sphinx_config ||= ThinkingSphinx::Configuration.instance.tap { |config| config.mysql_read_timeout = TIMEOUT }
         end
+
+        def logger
+          @logger ||= ::Sphinx::Integration.fetch(:di)[:loggers][:stdout].call
+        end
       end
     end
   end

lib/sphinx/integration/railtie.rb

@@ -39,35 +39,37 @@ class Railtie < Rails::Railtie
     end
 
     initializer "sphinx-integration.common", before: :load_config_initializers do |app|
-      ::Sphinx::Integration::Container.namespace("logger") do
-        register "stdout", -> do
-          logger = ::Logger.new(STDOUT)
-          logger.formatter = ::Logger::Formatter.new
-          logger.level = ::Logger.const_get(::ThinkingSphinx::Configuration.instance.log_level.upcase)
-          logger
-        end
-
-        register "sphinx_log", -> do
-          logger = ::Logger.new(::Rails.root.join("log", "sphinx.log"))
-          logger.formatter = ::Logger::Formatter.new
-          logger.level = ::Logger.const_get(::ThinkingSphinx::Configuration.instance.log_level.upcase)
-          logger
-        end
-
-        register "index_log", -> do
-          logger = ::Logger.new(::Rails.root.join("log", "index.log"))
-          logger.formatter = ::Logger::Formatter.new
-          logger.level = ::Logger::INFO
-          logger
-        end
-
-        register "notificator", ->(message) do
-          client = ::Twinkle::Client
-          client.create_message("sadness", "#{message} on #{`hostname`}", hashtags: ["#sphinx"]) if client.config.token
-        end
-      end
-
-      app.config.sphinx_integration = {rebuild: {pass_sphinx_stop: false}}
+      app.config.sphinx_integration = {
+        rebuild: {pass_sphinx_stop: false},
+        # Custom DI container
+        di: {
+          loggers: {
+            stdout: -> {
+              logger = ::Logger.new(STDOUT)
+              logger.formatter = ::Logger::Formatter.new
+              logger.level = ::Logger.const_get(::ThinkingSphinx::Configuration.instance.log_level.upcase)
+              logger
+            },
+            sphinx_file: -> {
+              logger = ::Logger.new(::Rails.root.join("log", "sphinx.log"))
+              logger.formatter = ::Logger::Formatter.new
+              logger.level = ::Logger.const_get(::ThinkingSphinx::Configuration.instance.log_level.upcase)
+              logger
+            },
+            indexer_file: -> {
+              logger = ::Logger.new(::Rails.root.join("log", "index.log"))
+              logger.formatter = ::Logger::Formatter.new
+              logger.level = ::Logger::INFO
+              logger
+            }
+          },
+          error_notificator: ->(message) {
+            client = ::Twinkle::Client
+            client.create_message("sadness", "#{message} on #{`hostname`}", hashtags: ["#sphinx"]) if client.config.token
+            client
+          }
+        }
+      }
     end
 
     initializer 'sphinx_integration.rspec' do

lib/sphinx/integration/replayer_job.rb

@@ -8,7 +8,7 @@ class ReplayerJob
 
       def self.execute(index_name)
         replayer = ::Sphinx::Integration::Mysql::Replayer.new(
-          logger: ::Sphinx::Integration::Container['logger.index_log']
+          logger: ::Sphinx::Integration.fetch(:di)[:loggers][:indexer_file].call
         )
 
         replayer.replay

lib/sphinx/integration/tasks.rake

@@ -7,65 +7,65 @@ namespace :sphinx do
   task :start, [:host] => :environment do |_, args|
     Sphinx::Integration::Helper.new(
       host: args[:host],
-      logger: Sphinx::Integration::Container["logger.index_log"]
+      logger: ::Sphinx::Integration.fetch(:di)[:loggers][:indexer_file].call
     ).start
   end
 
   desc 'Stop Sphinx'
   task :stop, [:host] => :environment do |_, args|
     Sphinx::Integration::Helper.new(
       host: args[:host],
-      logger: Sphinx::Integration::Container["logger.index_log"]
+      logger: ::Sphinx::Integration.fetch(:di)[:loggers][:indexer_file].call
     ).stop
   end
 
   desc 'Suspend Sphinx'
   task :suspend, [:host] => :environment do |_, args|
     Sphinx::Integration::Helper.new(
       host: args[:host],
-      logger: Sphinx::Integration::Container["logger.index_log"]
+      logger: ::Sphinx::Integration.fetch(:di)[:loggers][:indexer_file].call
     ).suspend
   end
 
   desc 'Resume Sphinx'
   task :resume, [:host] => :environment do |_, args|
     Sphinx::Integration::Helper.new(
       host: args[:host],
-      logger: Sphinx::Integration::Container["logger.index_log"]
+      logger: ::Sphinx::Integration.fetch(:di)[:loggers][:indexer_file].call
     ).resume
   end
 
   desc 'Restart Sphinx'
   task :restart, [:host] => :environment do |_, args|
     Sphinx::Integration::Helper.new(
       host: args[:host],
-      logger: Sphinx::Integration::Container["logger.index_log"]
+      logger: ::Sphinx::Integration.fetch(:di)[:loggers][:indexer_file].call
     ).restart
   end
 
-  desc "Index Sphinx. Task args: host (default: ''), rotate (default: true), log_device (default: index_log), *indexes (optional)"
+  desc "Index Sphinx. Task args: host (default: ''), rotate (default: true), log_device (default: indexer_file), *indexes (optional)"
   task :index, %i(host rotate log_device) => :environment do |_, args|
     Rails.application.eager_load!
 
     rotate = %w(true yes y 1).include?(args[:rotate].presence || 'true')
-    log_device = args[:log_device].presence || 'index_log'
+    log_device = args[:log_device].presence.to_sym || :indexer_file
 
     Sphinx::Integration::Helper.new(
       host: args[:host],
       rotate: rotate,
       indexes: args.extras,
-      logger: ::Sphinx::Integration::Container["logger.#{log_device}"]
+      logger: ::Sphinx::Integration.fetch(:di)[:loggers][log_device].call
     ).index
   end
 
   desc 'Rebuild Sphinx'
   task :rebuild, %i[log_device] => ['sphinx:set_indexing_mode', :environment] do |_, args|
     Rails.application.eager_load!
 
-    log_device = args[:log_device].presence || 'index_log'
+    log_device = args[:log_device].presence.to_sym || :indexer_file
 
     Sphinx::Integration::Helper.new(
-      logger: Sphinx::Integration::Container["logger.#{log_device}"]
+      logger: ::Sphinx::Integration.fetch(:di)[:loggers][log_device].call
     ).rebuild
   end
 
@@ -87,23 +87,23 @@ namespace :sphinx do
   task :copy_conf, [:host] => :environment do |_, args|
     Sphinx::Integration::Helper.new(
       host: args[:host],
-      logger: ::Sphinx::Integration::Container["logger.index_log"]
+      logger: ::Sphinx::Integration.fetch(:di)[:loggers][:indexer_file].call
     ).copy_config
   end
 
   desc 'Clean Sphinx files (indexes and binlogs)'
   task :clean, [:host] => :environment do |_, args|
     Sphinx::Integration::Helper.new(
       host: args[:host],
-      logger: ::Sphinx::Integration::Container["logger.index_log"]
+      logger: ::Sphinx::Integration.fetch(:di)[:loggers][:indexer_file].call
     ).clean
   end
 
   desc 'Reload config or rotate indexes'
   task :reload, [:host] => :environment do |_, args|
     Sphinx::Integration::Helper.new(
       host: args[:host],
-      logger: ::Sphinx::Integration::Container["logger.index_log"]
+      logger: ::Sphinx::Integration.fetch(:di)[:loggers][:indexer_file].call
     ).reload
   end
 end

spec/sphinx/integration/helper_spec.rb

@@ -37,14 +37,14 @@
 
     context "when raised exception" do
       it "logs a error" do
-        logger = spy(:logger)
-        notificator = spy(:notificator)
-        helper = described_class.new(default_options.merge(logger: logger, notificator: notificator))
+        helper = described_class.new(default_options)
 
-        expect(adapter).to receive(:index).and_raise(StandardError.new("error message"))
-        expect { helper.index }.to raise_error(StandardError)
-        expect(logger).to have_received(:error).with("error message")
-        expect(notificator).to have_received(:call).with("error message")
+        allow(adapter).to receive(:index).and_raise(StandardError.new("error message"))
+
+        expect_any_instance_of(::Logger).to receive(:error).with("error message")
+        expect(Sphinx::Integration[:di][:error_notificator]).to receive(:call).with("error message")
+
+        helper.index
       end
     end
   end

sphinx-integration.gemspec

@@ -30,8 +30,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'thinking-sphinx', '= 2.0.14'
   gem.add_runtime_dependency 'net-ssh'
   gem.add_runtime_dependency 'request_store', '>= 1.2.1'
-  gem.add_runtime_dependency 'dry-container', '>= 0.3.4'
-  gem.add_runtime_dependency 'dry-auto_inject', '>= 0.3.0'
   gem.add_runtime_dependency 'twinkle-client', '>= 0.2.0'
   gem.add_runtime_dependency 'resque-integration', '>= 3.5.0'