ii_interactor 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e2c11382c90fb3533448d1ddc3ed2f1ca922abb204570beba2eed4ad264fbef
-  data.tar.gz: dd2cd0bab63421c2c45b595438e2b4ef2f914abc041ce1cb1a655cd6ac98575c
+  metadata.gz: a2fdfb2e93eb53ee2b70845fb78c285aae26c237681537ae59893675873974f1
+  data.tar.gz: b85095ca4396ccc3523fbe6f212ed335f057a77dc60e87b0969c14666a5e0d0f
 SHA512:
-  metadata.gz: e4ba848c2b8582434360c1f9f47b646fcea0e1954ec64419d8beb1b46b8bedd73876cc49de3f0a2f6258dc49db034e468b34bb90794a00c8807060cc2304ddb3
-  data.tar.gz: e765a8adb58f62202ca6e35e302846185d575776805aaed73bc9495de7ebd6bca800f864d47bb176da5731b012af6897272e9810efee7f22af56b3807019d7a2
+  metadata.gz: 2b1321aee1be7d0c362315ef1020db0113d77445366617de0e0f9ff010c49d1118f7a26f5182102065efa60eb832616ded910f1e3bd222fc897d5fcaa0947236
+  data.tar.gz: a0d731eb5334b3846530e60858146c9b1f748d01b313917ee7e50153ab5f22f9fdb8a2cc53c24d08459ff7f074ee203579752c4d778bfad618e269c3361e318f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.0.0
+
+* Replace interaction feature with coactive.
+
 ## 1.2.0
 
 * Add variable setting feature.

data/README.md

@@ -129,9 +129,9 @@ Interactor.call(message: 'something')
 #=> something
 ```
 
-### Interactions
+### Coactions
 
-You can call other interactors in the same context using `interact`:
+You can call other interactors in the same context using `coact`:
 
 ```ruby
 class AInteractor < IIInteractor::Base
@@ -147,8 +147,8 @@ class BInteractor < IIInteractor::Base
 end
 
 class MainInteractor < IIInteractor::Base
-  interact AInteractor
-  interact BInteractor
+  coact AInteractor
+  coact BInteractor
 end
 
 MainInteractor.call
@@ -156,166 +156,7 @@ MainInteractor.call
 #   BInteractor
 ```
 
-#### Named interaction
-
-You can also define named interactions.
-The interactors to be called are looked up from all interactors.
-
-```ruby
-class AInteractor < IIInteractor::Base
-  react :some_name
-
-  def call
-    puts self.class.name
-  end
-end
-
-class BInteractor < IIInteractor::Base
-  react :some_name
-
-  def call
-    puts self.class.name
-  end
-end
-
-class MainInteractor < IIInteractor::Base
-  interact :some_name
-end
-
-MainInteractor.call
-#=> AInteractor
-#   BInteractor
-```
-
-Note followings:
-
-* All files in `app/interactors` are loaded in development mode to lookup interactors having same name.
-* The called interactors are unordered.
-
-#### Object based interaction
-
-You can also define object based interactions.
-The interactors to be called are looked up from the namespace corresponding with caller interactor.
-
-```ruby
-class A
-end
-
-class B
-end
-
-class Main::AInteractor < IIInteractor::Base
-  def call
-    puts self.class.name
-  end
-end
-
-class Main::BInteractor < IIInteractor::Base
-  def call
-    puts self.class.name
-  end
-end
-
-class MainInteractor < IIInteractor::Base
-  interact A
-  interact B
-end
-
-MainInteractor.call
-#=> Main::AInteractor
-#   Main::BInteractor
-```
-
-#### Custom interaction
-
-You can also customize lookup of interactors as follows:
-
-```ruby
-class AInteractor < IIInteractor::Base
-  def call
-    puts self.class.name
-  end
-end
-
-class BInteractor < IIInteractor::Base
-  def call
-    puts self.class.name
-  end
-end
-
-class MainInteractor < IIInteractor::Base
-  # set block
-  interact do
-    if @context.condition == 'A'
-      AInteractor
-    else
-      BInteractor
-    end
-  end
-
-  # set method name
-  interact :conditional_interactors
-
-  def conditional_interactors
-    if @context.condition == 'A'
-      AInteractor
-    else
-      BInteractor
-    end
-  end
-end
-
-MainInteractor.call(condition: 'A')
-#=> AInteractor
-
-MainInteractor.call(condition: 'B')
-#=> BInteractor
-```
-
-#### Nested interaction
-
-You can define nested interactions as follows:
-
-```ruby
-class NestedAInteractor < IIInteractor::Base
-  def call
-    puts self.class.name
-  end
-end
-
-class NestedBInteractor < IIInteractor::Base
-  def call
-    puts self.class.name
-  end
-end
-
-class AInteractor < IIInteractor::Base
-  interact NestedAInteractor
-
-  def call
-    puts self.class.name
-  end
-end
-
-class BInteractor < IIInteractor::Base
-  interact NestedBInteractor
-
-  def call
-    puts self.class.name
-  end
-end
-
-class MainInteractor < IIInteractor::Base
-  interact AInteractor
-  interact BInteractor
-end
-
-MainInteractor.call
-#=> NestedAInteractor
-#   AInteractor
-#   NestedBInteractor
-#   BInteractor
-```
+See [coactive](https://github.com/kanety/coactive) for more `coact` examples:
 
 ### Stop interactions
 
@@ -336,8 +177,8 @@ class BInteractor < IIInteractor::Base
 end
 
 class MainInteractor < IIInteractor::Base
-  interact AInteractor
-  interact BInteractor
+  coact AInteractor
+  coact BInteractor
 end
 
 context = MainInteractor.call
@@ -379,8 +220,8 @@ class BInteractor < IIInteractor::Base
 end
 
 class MainInteractor < IIInteractor::Base
-  interact AInteractor
-  interact BInteractor
+  coact AInteractor
+  coact BInteractor
 end
 
 context = MainInteractor.call
@@ -413,8 +254,8 @@ class BInteractor < IIInteractor::Base
 end
 
 class MainInteractor < IIInteractor::Base
-  interact AInteractor
-  interact BInteractor
+  coact AInteractor
+  coact BInteractor
 end
 
 MainInteractor.call do |interactor, message|

data/ii_interactor.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", ">= 5.0"
+  spec.add_dependency "coactive", ">= 0.1"
 
   spec.add_development_dependency "rails", ">= 5.0"
   spec.add_development_dependency "sqlite3"

data/lib/ii_interactor/base.rb

@@ -5,8 +5,7 @@ require_relative 'core'
 require_relative 'variables'
 require_relative 'callbacks'
 require_relative 'instrumentation'
-require_relative 'interaction'
-require_relative 'lookup'
+require_relative 'coactors'
 
 module IIInteractor
   class Base
@@ -14,7 +13,6 @@ module IIInteractor
     include Callbacks
     include Instrumentation
     include Variables
-    include Interaction
-    include Lookup
+    include Coactors
   end
 end

data/lib/ii_interactor/coactors.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module IIInteractor
+  module Coactors
+    extend ActiveSupport::Concern
+
+    included do
+      include Coactive::Base
+
+      configure_coactive do |config|
+        config.load_paths = ['app/interactors']
+        config.class_suffix = 'Interactor'
+        config.use_cache = true
+        config.lookup_superclass_until = ['ActiveRecord::Base', 'ActiveModel::Base']
+      end
+
+      class << self
+        alias_method :interact, :coact
+        alias_method :react, :coaction
+      end
+    end
+  end
+end

data/lib/ii_interactor/core.rb

@@ -17,7 +17,7 @@ module IIInteractor
     end
 
     def call_all
-      planned = lookup.map { |interactor| interactor.new(@context) } + [self]
+      planned = coactors.map { |interactor| interactor.new(@context) } + [self]
       planned.each_with_index do |interactor, i|
         if i == planned.size - 1
           interactor.call_self

data/lib/ii_interactor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IIInteractor
-  VERSION = '1.2.0'
+  VERSION = '2.0.0'
 end

data/lib/ii_interactor.rb

@@ -1,10 +1,10 @@
 require 'active_support'
+require 'coactive'
 
 require 'ii_interactor/version'
 require 'ii_interactor/errors'
 require 'ii_interactor/config'
 require 'ii_interactor/base'
-require 'ii_interactor/loader'
 require 'ii_interactor/log_subscriber'
 
 module IIInteractor
@@ -16,9 +16,5 @@ module IIInteractor
     def config
       Config
     end
-
-    def load
-      Loader.call
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ii_interactor
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: coactive
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -120,18 +134,13 @@ files:
 - lib/ii_interactor.rb
 - lib/ii_interactor/base.rb
 - lib/ii_interactor/callbacks.rb
+- lib/ii_interactor/coactors.rb
 - lib/ii_interactor/config.rb
 - lib/ii_interactor/context.rb
 - lib/ii_interactor/core.rb
 - lib/ii_interactor/errors.rb
 - lib/ii_interactor/instrumentation.rb
-- lib/ii_interactor/interaction.rb
-- lib/ii_interactor/loader.rb
 - lib/ii_interactor/log_subscriber.rb
-- lib/ii_interactor/lookup.rb
-- lib/ii_interactor/lookups/base.rb
-- lib/ii_interactor/lookups/name.rb
-- lib/ii_interactor/lookups/object.rb
 - lib/ii_interactor/variables.rb
 - lib/ii_interactor/version.rb
 homepage: https://github.com/kanety/ii_interactor
@@ -152,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A base interactor to support management of bussiness logic

data/lib/ii_interactor/interaction.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module IIInteractor
-  module Interaction
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :_interactions
-      self._interactions = []
-      class_attribute :_reactions
-      self._reactions = []
-    end
-
-    class_methods do
-      def interact(*interactors, **options, &block)
-        if block
-          self._interactions = _interactions + [block]
-        elsif options[:before]
-          index = self._interactions.index { |interaction| interaction == options[:before] }
-          self._interactions = self._interactions.insert(index, *interactors)
-        else
-          self._interactions = _interactions + interactors
-        end
-      end
-
-      def interactions
-        self._interactions
-      end
-
-      def clear_interactions
-        self._interactions = []
-      end
-
-      def react(*reactions)
-        self._reactions = _reactions + reactions
-      end
-
-      def reactions
-        self._reactions
-      end
-    end
-  end
-end

data/lib/ii_interactor/loader.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module IIInteractor
-  module Loader
-    class << self
-      def call
-        return unless defined?(Rails)
-        return if Rails.application.config.eager_load
-
-        engines = [Rails] + Rails::Engine.subclasses.map(&:instance)
-        engines.each do |engine|
-          Dir["#{engine.root}/app/interactors/**/*.rb"].each do |file|
-            require file
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ii_interactor/lookup.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lookups/base'
-require_relative 'lookups/name'
-require_relative 'lookups/object'
-
-module IIInteractor
-  module Lookup
-    extend ActiveSupport::Concern
-
-    def lookup_all
-      lookup.map { |interactor| [interactor] + interactor.new(@context).lookup_all }.flatten
-    end
-
-    def lookup
-      self.class._interactions.map do |interaction|
-        if interaction.is_a?(Symbol) && respond_to?(interaction, true)
-          send(interaction)
-        elsif interaction.is_a?(Proc)
-          instance_exec(&interaction)
-        else
-          interaction
-        end
-      end.flatten.compact.map do |interaction|
-        if interaction.is_a?(Class) && interaction < IIInteractor::Base
-          interaction
-        else
-          self.class.lookup(interaction)
-        end
-      end.flatten.compact
-    end
-
-    class_methods do
-      def lookup(*interactions)
-        interactions = _interactions unless interactions
-        interactions.map { |interaction| Lookup.call(self, interaction) }.flatten
-      end
-    end
-
-    class << self
-      class_attribute :lookups
-      self.lookups = [Lookups::Name, Lookups::Object]
-
-      class_attribute :cache
-      self.cache = {}
-
-      def call(klass, interaction)
-        with_cache(klass, interaction) do
-          lookup = lookups.detect { |lookup| lookup.call?(interaction) }
-          lookup.new(klass, interaction).call if lookup
-        end
-      end
-
-      private
-
-      def with_cache(klass, interaction)
-        if Config.lookup_cache
-          self.cache[klass] ||= {}
-          self.cache[klass][interaction] ||= yield
-        else
-          yield
-        end
-      end
-    end
-  end
-end

data/lib/ii_interactor/lookups/base.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module IIInteractor
-  module Lookups
-    class Base
-      def initialize(klass, interaction)
-        @klass = klass
-        @interaction = interaction
-      end
-
-      def call
-      end
-
-      class << self
-        def call?(interaction)
-        end
-      end
-    end
-  end
-end

data/lib/ii_interactor/lookups/name.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module IIInteractor
-  module Lookups
-    class Name < Base
-      def call
-        IIInteractor.load
-        IIInteractor::Base.descendants.select do |interactor|
-          interactor._reactions.any? { |reaction| reaction == @interaction }
-        end
-      end
-
-      class << self
-        def call?(interaction)
-          interaction.is_a?(Symbol)
-        end
-      end
-    end
-  end
-end

data/lib/ii_interactor/lookups/object.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module IIInteractor
-  module Lookups
-    class Object < Base
-      def call
-        return if terminate?
-
-        if @interaction.name.present? && (interactor = resolve)
-          interactor
-        elsif @interaction.superclass
-          self.class.new(@klass, @interaction.superclass).call
-        end
-      end
-
-      private
-
-      def terminate?
-        @interaction.name.to_s.in?(['Object', 'ActiveRecord::Base', 'ActiveModel::Base'])
-      end
-
-      def resolve
-        name = resolve_name
-        interactor = name.safe_constantize
-        return interactor if interactor && name == interactor.name
-      end
-
-      def resolve_name
-        namespace = @klass.name.to_s.sub(/Interactor$/, '').to_s
-        [namespace, "#{@interaction.name}Interactor"].join('::')
-      end
-
-      class << self
-        def call?(interaction)
-          interaction.is_a?(Module)
-        end
-      end
-    end
-  end
-end