remove need for passing self

Author: markburns

CHANGELOG.md

@@ -1,5 +1,5 @@
 ## [Unreleased]
-- Add support for `Interactify.with(self, queue: 'within_30_seconds', retry: 3)`
+- Add support for `Interactify.with(queue: 'within_30_seconds', retry: 3)`
 
 ## [0.5.0] - 2024-01-01
 - Add support for `SetA = Interactify { _1.a = 'a' }`, lambda and block class creation syntax

README.md

@@ -471,7 +471,7 @@ By using it's internal Async class.
 ### Sidekiq options
 ```ruby
 class SomeInteractor
-  include Interactify.with(self, queue: 'within_30_seconds')
+  include Interactify.with(queue: 'within_30_seconds')
 end
 ```
 

lib/interactify.rb

@@ -28,79 +28,36 @@ def included(base)
       base.include Interactify::WithDefaultJob
     end
 
-    # creates a module to include that
-    # has specified sidekiq options
-    #
-    # E.g.
-    #
-    # class ExampleInteractor
-    #   include Interactify.with(self, queue: 'within_30_seconds', retries: 3)
-    #
-    #   expect :foo
-    # end
-    #
-    # creates
-    # - ExampleInteractor::InteractifyWithOptions
-    # - ExampleInteractor::JobWith__Queue_Within30Seconds__Retries_3
-    # - ExampleInteractor::Job (an alias of above)
-    # - ExampleInteractor::AsyncWith__Queue_Within30Seconds__Retries_3
-    # - ExampleInteractor::Async (an alias of above)
-    def with(receiver, sidekiq_opts = {})
+    def with(sidekiq_opts = {})
       sidekiq_opts = sidekiq_opts.symbolize_keys
       klass_name = Async::JobMaker::VALID_KEYS.map do |key|
         next unless sidekiq_opts.key?(key)
 
         "__#{key.to_s.camelize}_#{sidekiq_opts[key].to_s.camelize}"
       end.compact.join
 
-      klass_suffix = Dsl.unique_klass_name(
-        namespace: receiver,
-        klass_name: "With#{klass_name}",
-        camelize: false
-      )
+      Module.new do
+        define_singleton_method :included do |receiver|
+          klass_suffix = Dsl.unique_klass_name(
+            namespace: receiver,
+            klass_name: "With#{klass_name}",
+            camelize: false
+          )
 
-      receiver.const_set(:InteractifyWithOptions, Module.new)
-      mod = receiver.const_get(:InteractifyWithOptions)
-      job_klass = nil
-      async_klass = nil
+          receiver.instance_eval do
+            include Interactify::Core
+            include Interactify::Async::Jobable
+            interactor_job(opts: sidekiq_opts, klass_suffix:)
 
-      mod.instance_eval do
-        define_singleton_method :included do |base|
-          base.include Interactify::Core
-          base.include Interactify::Async::Jobable
-
-          base.interactor_job(opts: sidekiq_opts, klass_suffix:)
-          job_klass = base.const_get :"Job#{klass_suffix}"
-          async_klass = base.const_get :"Async#{klass_suffix}"
-          receiver.const_set("Job", job_klass)
-          receiver.const_set("Async", async_klass)
+            const_set("Job", const_get(:"Job#{klass_suffix}"))
+            const_set("Async", const_get(:"Async#{klass_suffix}"))
+          end
         end
       end
-
-      mod
     end
   end
 
   module WithDefaultJob
-    # defines two classes on the receiver class
-    # the first is the job class
-    # the second is the async class
-    # the async class is a wrapper around the job class
-    # that allows it to be used in an interactor chain
-    #
-    # E.g.
-    #
-    # class ExampleInteractor
-    #  include Interactify
-    #  expect :foo
-    # end
-    #
-    # ExampleInteractor::Job is a class availabe to be used in a sidekiq yaml file
-    #
-    # doing the following will immediately enqueue a job
-    # that calls the interactor ExampleInteractor with (foo: 'bar')
-    #
-    # ExampleInteractor::Async.call(foo: 'bar')
     def self.included(base)
       base.include Interactify::Core
       base.include Interactify::Async::Jobable

spec/lib/interactify.with_spec.rb

@@ -33,7 +33,6 @@
       module self::SomeNamespace
         class Optionified
           include Interactify.with(
-            self,
             queue: 'within_30_seconds',
             retry: 3
           )