v0.4.0 support if(:condition, then: [A, B, C], else: [B, C, D]) (#16)

* bump version
* add support for `if(:condition, then: [A, B, C], else: [D, E, F])`
* add missing specs
* add examples to README
* replace Interactify::RSpec with Interactify::RSpecMatchers
avoids a clash when doing
module A
RSpec.describe Subclass

Author: markburns

CHANGELOG.md

@@ -20,3 +20,8 @@
 
 - Fixed to work with and make optional dependencies for sidekiq and railties. Confirmed as working with ruby >= 3.1.4
 
+## [0.4.0] - 2023-12-29
+
+- All internal restructuring/refactoring into domains. 
+- Add support for organize `self.if(:condition, then: A, else: B)` syntax
+- change location of matchers to `require 'interactify/rspec_matchers/matchers'`

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    interactify (0.3.0.pre.RC1)
+    interactify (0.4.0)
       activesupport (>= 6.0.0)
       interactor
       interactor-contracts

README.md

@@ -40,9 +40,10 @@ end
 
 ### Using the RSpec matchers
 ```ruby
-# e.g. in spec/supoort/interactify.rb
-require 'interactify/rspec/matchers'
+# e.g. in spec/support/interactify.rb
+require 'interactify/rspec_matchers/matchers'
 
+# in specs
 expect(described_class).to expect_inputs(:foo, :bar, :baz)
 expect(described_class).to promise_outputs(:fee, :fi, :fo, :fum)
 ```
@@ -232,6 +233,12 @@ class OuterThing
 
     # alternative hash syntax
     {if: :key_set_on_context, then: DoThingA, else: DoThingB},
+
+    # method call with hash syntax, plus implicit chaining
+    self.if(:key_set_on_context, then: [A, B, C], else: [B, C, D]),
+
+    # method call with lambda, hash syntax, and implicit chaining
+    self.if(->(ctx) { ctx.this }, then: [A, B, C], else: [B, C, D]),
     AfterDoThis
 end
 ```

gemfiles/no_railties_no_sidekiq.gemfile

@@ -5,12 +5,14 @@ source "https://rubygems.org"
 gem "rake", "~> 13.0"
 
 group :development do
+  gem "appraisal"
   gem "bundler", "~> 2.0"
 end
 
 group :test do
-  gem "simplecov", require: false
+  gem "debug"
   gem "rspec", "~> 3.0"
+  gem "simplecov", require: false
 end
 
 gemspec path: "../"

gemfiles/no_railties_no_sidekiq.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    interactify (0.3.0.pre.alpha.2)
+    interactify (0.4.0)
       activesupport (>= 6.0.0)
       interactor
       interactor-contracts

gemfiles/railties_6_no_sidekiq.gemfile

@@ -6,12 +6,14 @@ gem "rake", "~> 13.0"
 gem "railties", "6"
 
 group :development do
+  gem "appraisal"
   gem "bundler", "~> 2.0"
 end
 
 group :test do
-  gem "simplecov", require: false
+  gem "debug"
   gem "rspec", "~> 3.0"
+  gem "simplecov", require: false
 end
 
 gemspec path: "../"

gemfiles/railties_6_no_sidekiq.gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: ..
   specs:
-    interactify (0.3.0.pre.alpha.2)
+    interactify (0.4.0)
+      activesupport (>= 6.0.0)
       interactor
       interactor-contracts
 

gemfiles/railties_6_sidekiq.gemfile

@@ -7,12 +7,14 @@ gem "railties", "6"
 gem "sidekiq", "7"
 
 group :development do
+  gem "appraisal"
   gem "bundler", "~> 2.0"
 end
 
 group :test do
-  gem "simplecov", require: false
+  gem "debug"
   gem "rspec", "~> 3.0"
+  gem "simplecov", require: false
 end
 
 gemspec path: "../"

gemfiles/railties_6_sidekiq.gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: ..
   specs:
-    interactify (0.3.0.pre.alpha.2)
+    interactify (0.4.0)
+      activesupport (>= 6.0.0)
       interactor
       interactor-contracts
 

gemfiles/railties_7_no_sidekiq.gemfile

@@ -6,12 +6,14 @@ gem "rake", "~> 13.0"
 gem "railties", "7"
 
 group :development do
+  gem "appraisal"
   gem "bundler", "~> 2.0"
 end
 
 group :test do
-  gem "simplecov", require: false
+  gem "debug"
   gem "rspec", "~> 3.0"
+  gem "simplecov", require: false
 end
 
 gemspec path: "../"

gemfiles/railties_7_no_sidekiq.gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: ..
   specs:
-    interactify (0.3.0.pre.alpha.2)
+    interactify (0.4.0)
+      activesupport (>= 6.0.0)
       interactor
       interactor-contracts
 

gemfiles/railties_7_sidekiq.gemfile

@@ -7,12 +7,14 @@ gem "railties", "7"
 gem "sidekiq", "7"
 
 group :development do
+  gem "appraisal"
   gem "bundler", "~> 2.0"
 end
 
 group :test do
-  gem "simplecov", require: false
+  gem "debug"
   gem "rspec", "~> 3.0"
+  gem "simplecov", require: false
 end
 
 gemspec path: "../"

gemfiles/railties_7_sidekiq.gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: ..
   specs:
-    interactify (0.3.0.pre.alpha.2)
+    interactify (0.4.0)
+      activesupport (>= 6.0.0)
       interactor
       interactor-contracts
 

lib/interactify.rb

@@ -45,6 +45,11 @@ def self.sidekiq?
   end
 end
 
+Interactify.instance_eval do
+  @sidekiq_missing = nil
+  @railties_missing = nil
+end
+
 begin
   require "sidekiq"
 rescue LoadError
@@ -62,7 +67,7 @@ module Interactify
 
   class << self
     def validate_app(ignore: [])
-      Interactify::InteractorWiring.new(root: Interactify.configuration.root, ignore:).validate_app
+      Interactify::Wiring.new(root: Interactify.configuration.root, ignore:).validate_app
     end
 
     def reset

lib/interactify/dsl.rb

@@ -22,12 +22,18 @@ def each(plural_resource_name, *each_loop_klasses)
       )
     end
 
-    def if(condition, succcess_interactor, failure_interactor = nil)
+    def if(condition, success_arg, failure_arg = nil)
+      then_else = if success_arg.is_a?(Hash) && failure_arg.nil?
+                    success_arg.slice(:then, :else)
+                  else
+                    { then: success_arg, else: failure_arg }
+                  end
+
       IfInteractor.attach_klass(
         self,
         condition,
-        succcess_interactor,
-        failure_interactor
+        then_else[:then],
+        then_else[:else]
       )
     end
 

lib/interactify/dsl/each_chain.rb

@@ -26,7 +26,7 @@ def klass
         this = self
 
         Class.new do                                                                    # class SomeNamespace::EachPackage
-          include Interactify                                          #   include Interactify
+          include Interactify                                                           #   include Interactify
 
           expects do                                                                    #   expects do
             required(this.plural_resource_name)                                         #     required(:packages)

lib/interactify/dsl/if_interactor.rb

@@ -1,55 +1,47 @@
 # frozen_string_literal: true
 
 require "interactify/dsl/unique_klass_name"
+require "interactify/dsl/if_klass"
 
 module Interactify
   module Dsl
     class IfInteractor
-      attr_reader :condition, :success_interactor, :failure_interactor, :evaluating_receiver
+      attr_reader :condition, :evaluating_receiver
 
       def self.attach_klass(evaluating_receiver, condition, succcess_interactor, failure_interactor)
         ifable = new(evaluating_receiver, condition, succcess_interactor, failure_interactor)
         ifable.attach_klass
       end
 
-      def initialize(evaluating_receiver, condition, succcess_interactor, failure_interactor)
+      def initialize(evaluating_receiver, condition, succcess_arg, failure_arg)
         @evaluating_receiver = evaluating_receiver
         @condition = condition
-        @success_interactor = succcess_interactor
-        @failure_interactor = failure_interactor
+        @success_arg = succcess_arg
+        @failure_arg = failure_arg
+      end
+
+      def success_interactor
+        @success_interactor ||= build_chain(@success_arg, true)
+      end
+
+      def failure_interactor
+        @failure_interactor ||= build_chain(@failure_arg, false)
       end
 
       # allows us to dynamically create an interactor chain
       # that iterates over the packages and
       # uses the passed in each_loop_klasses
-      # rubocop:disable all
       def klass
-        this = self
-
-        Class.new do                                                           
-          include Interactor                                                    
-          include Interactor::Contracts                                          
-
-          expects do                                                              
-            required(this.condition) unless this.condition.is_a?(Proc)
-          end                                                                       
-
-          define_singleton_method(:source_location) do                               
-            const_source_location this.evaluating_receiver.to_s                                     #     [file, line]
-          end                                                                          
-
-          define_method(:run!) do                                                       
-            result = this.condition.is_a?(Proc) ? this.condition.call(context) : context.send(this.condition)
-            interactor = result ? this.success_interactor : this.failure_interactor
-            interactor&.respond_to?(:call!) ? interactor.call!(context) : interactor&.call(context)
-          end
+        IfKlass.new(self).klass
+      end
 
-          define_method(:inspect) do
-            "<#{this.namespace}::#{this.if_klass_name} #{this.condition} ? #{this.success_interactor} : #{this.failure_interactor}>"
-          end
+      # so we have something to attach subclasses to during building
+      # of the outer class, before we finalize the outer If class
+      def klass_basis
+        @klass_basis ||= Class.new do
+          include Interactify
         end
       end
-      # rubocop:enable all
 
       def attach_klass
         name = if_klass_name
@@ -62,10 +54,27 @@ def namespace
       end
 
       def if_klass_name
-        prefix = condition.is_a?(Proc) ? "Proc" : condition
-        prefix = "If#{prefix.to_s.camelize}"
+        @if_klass_name ||=
+          begin
+            prefix = condition.is_a?(Proc) ? "Proc" : condition
+            prefix = "If#{prefix.to_s.camelize}"
+
+            UniqueKlassName.for(namespace, prefix)
+          end
+      end
+
+      private
 
-        UniqueKlassName.for(namespace, prefix)
+      def build_chain(arg, truthiness)
+        return if arg.nil?
+
+        case arg
+        when Array
+          name = "If#{condition.to_s.camelize}#{truthiness ? 'IsTruthy' : 'IsFalsey'}"
+          klass_basis.chain(name, *arg)
+        else
+          arg
+        end
       end
     end
   end