Remove DI, small refactoring

Author: AnotherRegularDude

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
       - name: Run Linter
         run: bundle exec ci-helper RubocopLint
@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.1", "3.2"]
+        ruby: ["3.1", "3.2", "3.3"]
         experimental: [false]
         include:
           - ruby: head

Gemfile.lock

@@ -3,7 +3,6 @@ PATH
   specs:
     resol (1.0.0)
       dry-configurable (~> 1.2.0)
-      dry-container (~> 0.11)
 
 GEM
   remote: https://rubygems.org/
@@ -23,7 +22,7 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     benchmark (0.4.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
@@ -34,41 +33,40 @@ GEM
     coderay (1.1.3)
     colorize (1.1.0)
     concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    connection_pool (2.5.0)
     diff-lcs (1.5.1)
     docile (1.4.1)
     drb (2.2.1)
     dry-configurable (1.2.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-container (0.11.0)
-      concurrent-ruby (~> 1.0)
-    dry-core (1.0.2)
+    dry-core (1.1.0)
       concurrent-ruby (~> 1.0)
       logger
       zeitwerk (~> 2.6)
-    dry-inflector (1.1.0)
-    dry-initializer (3.1.1)
+    dry-inflector (1.2.0)
+    dry-initializer (3.2.0)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.9.0)
+    json (2.9.1)
     language_server-protocol (3.17.0.3)
-    logger (1.6.3)
+    logger (1.6.5)
     method_source (1.1.0)
     minitest (5.25.4)
     parallel (1.26.3)
     parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    pry (0.15.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    qonfig (0.28.0)
+    qonfig (0.30.0)
+      base64 (>= 0.2)
     racc (1.8.1)
     rack (3.1.8)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.3)
+    regexp_parser (2.10.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -82,45 +80,45 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.66.1)
+    rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
-    rubocop-config-umbrellio (1.66.0.99)
-      rubocop (~> 1.66.0)
+    rubocop-config-umbrellio (1.69.0.101)
+      rubocop (~> 1.69.0)
       rubocop-factory_bot (~> 2.26.0)
-      rubocop-performance (~> 1.22.0)
-      rubocop-rails (~> 2.26.0)
+      rubocop-performance (~> 1.23.0)
+      rubocop-rails (~> 2.28.0)
       rubocop-rake (~> 0.6.0)
-      rubocop-rspec (~> 3.0.0)
-      rubocop-sequel (~> 0.3.3)
+      rubocop-rspec (~> 3.3.0)
+      rubocop-sequel (~> 0.3.0)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-performance (1.22.1)
+    rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.26.2)
+    rubocop-rails (2.28.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (3.0.5)
+    rubocop-rspec (3.3.0)
       rubocop (~> 1.61)
-    rubocop-sequel (0.3.7)
+    rubocop-sequel (0.3.8)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    securerandom (0.4.0)
-    sequel (5.87.0)
+    securerandom (0.4.1)
+    sequel (5.88.0)
       bigdecimal
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -141,7 +139,9 @@ GEM
       concurrent-ruby (~> 1.0)
     umbrellio-sequel-plugins (0.17.0)
       sequel
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.3)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     zeitwerk (2.6.18)
 
 PLATFORMS
@@ -166,4 +166,4 @@ DEPENDENCIES
   smart_initializer
 
 BUNDLED WITH
-   2.4.10
+   2.6.2

lib/resol.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 require "dry-configurable"
-require "dry-container"
+require_relative "resol/version"
+
+require_relative "resol/injector"
+require_relative "resol/plugins"
+require_relative "resol/service"
 
 module Resol
   extend self
@@ -10,11 +14,3 @@ module Resol
 
   setting :classes_allowed_to_patch, default: ["Resol::Service"]
 end
-
-require_relative "resol/version"
-
-require_relative "resol/injector"
-require_relative "resol/plugins"
-require_relative "resol/service"
-
-require_relative "resol/dependency_container"

lib/resol/dependency_container.rb

@@ -1,23 +1,44 @@
 # frozen_string_literal: true
 
 module Resol
+  # The Injector class is responsible for injecting initialization logic provider.
+  #
+  # Supported providers:
+  # - :smart -> uses the `smart_core/initializer`
+  # - :dry   -> uses the `dry-initializer`
   class Injector
     InjectMarker = Module.new
+    NAME_TO_METHOD_MAPPING = {
+      smart: :inject_smart,
+      dry: :inject_dry,
+    }.freeze
 
-    def initialize(proc_register)
-      self.proc_register = proc_register
+    def self.inject_smart(service)
+      require "smart_core/initializer"
+
+      service.include(SmartCore::Initializer)
+    end
+
+    def self.inject_dry(service)
+      require "dry/initializer"
+
+      service.extend(Dry::Initializer)
+    end
+
+    def initialize(initializer_name)
+      self.called_method = NAME_TO_METHOD_MAPPING.fetch(initializer_name.to_sym)
     end
 
     def inject!(service_class)
       error!("parent or this class already injected") if service_class.include?(InjectMarker)
 
-      service_class.instance_eval(&proc_register)
+      self.class.public_send(called_method, service_class)
       service_class.include(InjectMarker)
     end
 
     private
 
-    attr_accessor :proc_register
+    attr_accessor :called_method
 
     def error!(msg)
       raise msg

lib/resol/injector.rb

@@ -24,11 +24,11 @@ def plugin(caller_class, plugin_name)
 
         plugin_module = find_plugin_module(plugin_name)
         if defined?(plugin_module::InstanceMethods)
-          caller_class.prepend(plugin_module::InstanceMethods)
+          caller_class.include(plugin_module::InstanceMethods)
         end
 
         if defined?(plugin_module::ClassMethods)
-          caller_class.singleton_class.prepend(plugin_module::ClassMethods)
+          caller_class.extend(plugin_module::ClassMethods)
         end
 
         plugins << plugin_name

lib/resol/plugins.rb

@@ -12,9 +12,15 @@ def handle_catch(_service)
       end
 
       module InstanceMethods
-        private
+        module PrependedMethods
+          private
+
+          def proceed_return(_service, data) = data
+        end
 
-        def proceed_return(_service, data) = data
+        def self.included(service)
+          service.prepend(PrependedMethods)
+        end
       end
     end
   end

lib/resol/plugins/return_in_service.rb

@@ -38,15 +38,33 @@ def inherited(klass)
         super
       end
 
-      def inject_initializer!(injector_name)
-        injector = DependencyContainer.resolve("external_libs.#{injector_name}")
-        injector.inject!(self)
+      # Allows you to configure an initializer library for this service,
+      # such as `dry-initializer` or `smart_core/initializer`.
+      #
+      # @param initializer_name [String, Symbol]
+      #   The name of the initializer (e.g., `:dry` or `:smart`).
+      # @return [void]
+      def use_initializer!(initializer_name)
+        Resol::Injector.new(initializer_name).inject!(self)
       end
 
       def plugin(...)
         manager.plugin(self, ...)
       end
 
+      # Calls the service using class-level invocation. Builds the service object,
+      # runs any callbacks, and invokes the `#call` instance method.
+      #
+      # @param args [Array] Positional arguments for building service instance.
+      # @param kwargs [Hash] Keyword arguments for building service instance.
+      # @yield [block] An optional block passed into service's `#call`.
+      #
+      # @return [Resol::Success, Resol::Failure]
+      #   Returns a `Resol::Success` if the service completed via `success!`,
+      #   or a `Resol::Failure` if exited with`fail!` calling.
+      #
+      # @raise [InvalidCommandImplementation]
+      #   If neither `#success!` nor `#fail!` is called inside the `#call` method.
       def call(*args, **kwargs, &)
         service = build(*args, **kwargs)
 
@@ -63,23 +81,33 @@ def call(*args, **kwargs, &)
         Resol::Failure(e)
       end
 
+      # Same as {call}, but attempts to resolve value from monad.
+      # If the result is a failure, it raises the error instead of returning a `Resol::Failure`.
+      #
+      # @param args [Array]  Positional arguments for building the service instance.
+      # @param kwargs [Hash] Keyword arguments for building the service instance.
+      # @yield [block] An optional block passed to the service's `#call`.
+      #
+      # @return [Object]
+      #   Returns a value, with which instance of service interrupts with {#success!}.
+      #
+      # @raise [self::Failure]
+      #   Raises an error if the service fails.
       def call!(...)
         call(...).value_or { |error| raise error }
       end
 
       private
 
       def manager
-        @manager ||= DependencyContainer.resolve("lib.plugin_manager")
+        @manager ||= Plugins::Manager.new
       end
 
       def handle_catch(service, &)
         catch(service, &)
       end
     end
 
-    # @!method call
-
     attr_accessor :__result_method__called__
 
     private

lib/resol/service.rb

@@ -18,5 +18,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dry-configurable", "~>1.2.0"
-  spec.add_dependency "dry-container", "~>0.11"
 end

resol.gemspec

@@ -346,7 +346,7 @@ def call
 
   context "when inherited from already injected service" do
     let(:child_service) { Class.new(SmartService) }
-    let(:injecting_proc) { proc { inject_initializer!(:dry_injector) } }
+    let(:injecting_proc) { proc { use_initializer!(:dry) } }
 
     it "tries to inject initializer" do
       expect { child_service.class_eval(&injecting_proc) }.to raise_error do |error|