interactify 0.3.0.pre.RC1 → 0.3.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 319dd56313d82aa987c8eaec40691e43c58e8b72513969e2a6a7a83de17ae311
-  data.tar.gz: 3f5e4ad0464157910bca7bfd1300fa8e23ab825068c84a4c5c0ef5ad0cdb29d6
+  metadata.gz: 918f4f6ae335bb5b8a748603af6a2e9d91dc11ad3d887803bbb2c7b2ba41730e
+  data.tar.gz: fe6506fe246a82d48f5a614d5c576cf74e49f38953c1d4ae98d52f1649f03aaf
 SHA512:
-  metadata.gz: fea0120a4456f108b41ccd48c994e365762bad8ff6424eba9d7ecd0c09c6858805e0456df0655eec86042ed7dc9fa589ffb8f3bdb49a14e79a7e05e30b6737ae
-  data.tar.gz: 64345da2e8b036ad65c639bddb9c0f90f93b1fdbc1415a5cb29f26596fa9169c6a9b0309d9d0ecbb515706251ff473f4ac98f7b41be7d89c089ce3b8537ade54
+  metadata.gz: ce377154a79b527f6eaebe3258d76aadd327521abbe86847b8c9d87b5710e1782bdb02b20b3ef3661ac6dc4ee1d0c6843fdd819ccf6dda8f701e9d95063d5a9c
+  data.tar.gz: 553271645575873bc2a95968c2ff7f01a556dd24527974b6a7bb958a8eeb9f8bb66504bdace2c3736e6faac82c1a438f07d27afa85c3fdc8ac5b051cac4e20c5

data/CHANGELOG.md

@@ -11,12 +11,3 @@
 ## [0.3.0-alpha.1] - 2023-12-29
 
 - Added support for `{if: :condition, then: A, else: B}` in organizers
-
-## [0.3.0-alpha.2] - 2023-12-29
-
-- Remove deep_matching development dependency
-
-## [0.3.0-RC1] - 2023-12-29
-
-- Fixed to work with and make optional dependencies for sidekiq and railties. Confirmed as working with ruby >= 3.1.4
-

data/README.md

@@ -1,18 +1,6 @@
 # Interactify
 
-[![Gem Version](https://badge.fury.io/rb/interactify.svg)](https://badge.fury.io/rb/interactify)
-![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=markburns/interactify)
-[![License](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE)
-![Ruby 3.3.0](https://img.shields.io/badge/ruby-3.3.0-green.svg)
-![Ruby 3.2.2](https://img.shields.io/badge/ruby-3.2.2-green.svg)
-![Ruby 3.1.4](https://img.shields.io/badge/ruby-3.1.4-green.svg)
-[![Code Climate](https://codeclimate.com/github/markburns/interactify/badges/gpa.svg)](https://codeclimate.com/github/markburns/interactify)
-
-Interactify enhances Rails applications by simplifying complex interactor chains. 
-This gem builds on [interactors](https://github.com/collectiveidea/interactor) and [interactor-contracts](https://github.com/michaelherold/interactor-contracts) to improve readability and maintainability of business logic. 
-We depend on activesupport, and optionally on railties and sidekiq. So it's a good fit for Rails projects using Sidekiq, offering advanced features for chain management and debugging. 
-Interactify is about making interactor usage in Rails more efficient and less error-prone, reducing the overhead of traditional interactor orchestration.
-
+Interactify enhances Rails applications by simplifying complex interactor chains. This gem builds on [interactors](https://github.com/collectiveidea/interactor) and [interactor-contracts](https://github.com/michaelherold/interactor-contracts) to improve readability and maintainability of business logic. It's optimized for Rails projects using Sidekiq, offering advanced features for chain management and debugging. Interactify is about making interactor usage in Rails more efficient and less error-prone, reducing the overhead of traditional interactor orchestration.
 ## Installation
 
 ```ruby
@@ -22,7 +10,6 @@ gem 'interactify'
 ## Usage
 
 ### Initializer
-
 ```ruby
 # in config/initializers/interactify.rb
 Interactify.configure do |config|
@@ -224,16 +211,26 @@ class OuterThing
   # ... boilerplate ...
   organize \
     SetupStep,
-
-    # lambda conditional
     self.if(->(c){ c.thing == 'a' }, DoThingA, DoThingB),
+end
 
-    # context conditional
-    self.if(:some_key_on_context, DoThingA, DoThingB),
-
-    # alternative hash syntax
+# or hash syntax
+class OuterThing
+  # ... boilerplate ...
+  organize \
     {if: :key_set_on_context, then: DoThingA, else: DoThingB},
-    AfterDoThis
+    AfterBothCases
+end
+```
+
+### Conditionals with a key from the context 
+
+```ruby
+class OuterThing
+  # ... boilerplate ...
+  organize \
+    self.if(:key_set_on_context, DoThingA, DoThingB),
+    AfterBothCases
 end
 ```
 
@@ -253,7 +250,6 @@ class SomeOrganizer
 end
 
 ```
-
 ### Contract validation failures
 Sometimes contract validation fails at runtime as an exception. It's something unexpected and you'll have an `Interactor::Failure` sent to rollbar/sentry/honeybadger.
 If the context is large it's often hard to spot what the actual problem is or where it occurred.
@@ -302,6 +298,7 @@ Actual promises are:
 step1
 ```
 
+
 ### Interactor wiring specs
 Sometimes you have an interactor chain that fails because something is expected deeper down the chain and not provided further up the chain. 
 The existing way to solve this is with enough integration specs to catch them, hunting and sticking a `byebug`, `debugger` or `binding.pry` in at suspected locations and inferring where in the chain the wiring went awry.
@@ -341,7 +338,17 @@ expect(described_class).to promise_outputs(:order)
 ### Sidekiq Jobs
 Sometimes you want to asyncify an interactor.
 
-#### before
+```ruby
+# before
+class SomeInteractor
+  include Interactify
+
+  def call
+    # ...
+  end
+end
+```
+
 ```diff
 - SomeInteractor.call(*args)
 + class SomeInteractorJob
@@ -355,14 +362,24 @@ Sometimes you want to asyncify an interactor.
 + SomeInteractorJob.perform_async(*args)
 ```
 
-#### after
+```ruby
+# after
+class SomeInteractor
+  include Interactify
+
+  def call
+    # ...
+  end
+end
+```
+
+No need to manually create a job class or handle the perform/call impedance mismatch
+
 ```diff
 - SomeInteractor.call!(*args)
 + SomeInteractor::Async.call!(*args)
 ```
 
-No need to manually create a job class or handle the perform/call impedance mismatch
-
 This also makes it easy to add cron jobs to run interactors. As any interactor can be asyncified.
 By using it's internal Async class.
 

data/lib/interactify/interactor_wiring/constants.rb

@@ -67,7 +67,7 @@ module Interactify
 
       def interactor_klass?(object)
         return unless object.is_a?(Class) && object.ancestors.include?(Interactor)
-        return if Interactify.sidekiq? && object.is_a?(Sidekiq::Job)
+        return if object.is_a?(Sidekiq::Job)
 
         true
       end
@@ -116,9 +116,9 @@ module Interactify
                 .gsub(root.to_s, "")   # "/namespace/sub_namespace/class_name.rb"
                 .gsub("/concerns", "") #  concerns directory is ignored by Zeitwerk
                 .split("/")            # "['', 'namespace', 'sub_namespace', 'class_name.rb']
-                .reject(&:blank?)      # "['namespace', 'sub_namespace', 'class_name.rb']
+                .compact_blank         # "['namespace', 'sub_namespace', 'class_name.rb']
                 .join("/")             # 'namespace/sub_namespace/class_name.rb'
-                .gsub(/\.rb\z/, "")    # 'namespace/sub_namespace/class_name'
+                .gsub(/\.rb\z/, "")     # 'namespace/sub_namespace/class_name'
       end
     end
   end

data/lib/interactify/interactor_wiring.rb

@@ -10,7 +10,7 @@ module Interactify
   class InteractorWiring
     attr_reader :root, :ignore
 
-    def initialize(root:, ignore: [])
+    def initialize(root: Rails.root, ignore: [])
       @root = root.to_s.gsub(%r{/$}, "")
       @ignore = ignore
     end

data/lib/interactify/job_maker.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require "sidekiq"
+require "sidekiq/job"
+
 require "interactify/async_job_klass"
-require "interactify/null_job"
 
 module Interactify
   class JobMaker
@@ -22,8 +24,6 @@ module Interactify
       private
 
       def define_job_klass
-        return NullJob if Interactify.sidekiq_missing?
-
         this = self
 
         invalid_keys = this.opts.symbolize_keys.keys - %i[queue retry dead backtrace pool tags]

data/lib/interactify/jobable.rb

@@ -11,8 +11,6 @@ module Interactify
     #
     # then let's make sure to define Klass::Job separately
     included do |base|
-      next if Interactify.sidekiq_missing?
-
       def base.inherited(klass)
         super_klass = klass.superclass
         super_job = super_klass::Job # really spiffing

data/lib/interactify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Interactify
-  VERSION = "0.3.0-RC1"
+  VERSION = "0.3.0-alpha.1"
 end

data/lib/interactify.rb

@@ -2,6 +2,7 @@
 
 require "interactor"
 require "interactor-contracts"
+require "rails"
 require "active_support/all"
 
 require "interactify/version"
@@ -10,52 +11,6 @@ require "interactify/dsl"
 require "interactify/interactor_wiring"
 require "interactify/promising"
 
-module Interactify
-  def self.railties_missing?
-    @railties_missing
-  end
-
-  def self.railties_missing!
-    @railties_missing = true
-  end
-
-  def self.railties
-    railties?
-  end
-
-  def self.railties?
-    !railties_missing?
-  end
-
-  def self.sidekiq_missing?
-    @sidekiq_missing
-  end
-
-  def self.sidekiq_missing!
-    @sidekiq_missing = true
-  end
-
-  def self.sidekiq
-    sidekiq?
-  end
-
-  def self.sidekiq?
-    !sidekiq_missing?
-  end
-end
-
-begin
-  require "sidekiq"
-rescue LoadError
-  Interactify.sidekiq_missing!
-end
-
-begin
-  require 'rails/railtie'
-rescue LoadError
-  Interactify.railties_missing!
-end
-
 module Interactify
   extend ActiveSupport::Concern
 
@@ -64,14 +19,6 @@ module Interactify
       Interactify::InteractorWiring.new(root: Interactify.configuration.root, ignore:).validate_app
     end
 
-    def sidekiq_missing?
-      @sidekiq_missing
-    end
-
-    def sidekiq_missing!
-      @sidekiq_missing = true
-    end
-
     def reset
       @on_contract_breach = nil
       @before_raise_hook = nil
@@ -162,11 +109,7 @@ module Interactify
     attr_writer :root
 
     def root
-      @root ||= fallback
-    end
-
-    def fallback
-      Rails.root / "app" if Interactify.railties?
+      @root ||= Rails.root / "app"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interactify
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.RC1
+  version: 0.3.0.pre.alpha.1
 platform: ruby
 authors:
 - Mark Burns
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: deep_matching
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,25 +110,10 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
-- Appraisals
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/.bundle/config
-- gemfiles/no_railties_no_sidekiq.gemfile
-- gemfiles/no_railties_no_sidekiq.gemfile.lock
-- gemfiles/railties_6.gemfile
-- gemfiles/railties_6.gemfile.lock
-- gemfiles/railties_6_no_sidekiq.gemfile
-- gemfiles/railties_6_no_sidekiq.gemfile.lock
-- gemfiles/railties_6_sidekiq.gemfile
-- gemfiles/railties_6_sidekiq.gemfile.lock
-- gemfiles/railties_7_no_sidekiq.gemfile
-- gemfiles/railties_7_no_sidekiq.gemfile.lock
-- gemfiles/railties_7_sidekiq.gemfile
-- gemfiles/railties_7_sidekiq.gemfile.lock
 - lib/interactify.rb
 - lib/interactify/async_job_klass.rb
 - lib/interactify/call_wrapper.rb
@@ -132,7 +131,6 @@ files:
 - lib/interactify/job_maker.rb
 - lib/interactify/jobable.rb
 - lib/interactify/mismatching_promise_error.rb
-- lib/interactify/null_job.rb
 - lib/interactify/organizer.rb
 - lib/interactify/promising.rb
 - lib/interactify/rspec/matchers.rb
@@ -156,14 +154,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.8
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Interactors with bells and whistles

data/.ruby-version

@@ -1 +0,0 @@
-3.1.4

data/Appraisals

@@ -1,21 +0,0 @@
-appraise "railties-7-sidekiq" do
-  gem "railties", "7"
-  gem "sidekiq", "7"
-end
-
-appraise "railties-7-no-sidekiq" do
-  gem "railties", "7"
-end
-
-appraise "railties-6-sidekiq" do
-  gem "railties", "6"
-  gem "sidekiq", "7"
-end
-
-appraise "railties-6-no-sidekiq" do
-  gem "railties", "6"
-end
-
-appraise "no-railties-no-sidekiq" do
-  # nothing extra
-end

data/gemfiles/.bundle/config

@@ -1,2 +0,0 @@
----
-BUNDLE_RETRY: "1"

data/gemfiles/no_railties_no_sidekiq.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake", "~> 13.0"
-
-group :development do
-  gem "bundler", "~> 2.0"
-end
-
-group :test do
-  gem "simplecov", require: false
-  gem "rspec", "~> 3.0"
-end
-
-gemspec path: "../"

data/gemfiles/no_railties_no_sidekiq.gemfile.lock

@@ -1,127 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    interactify (0.3.0.pre.alpha.2)
-      activesupport (>= 6.0.0)
-      interactor
-      interactor-contracts
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (7.1.2)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    base64 (0.2.0)
-    bigdecimal (3.1.5)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
-    debug (1.9.1)
-      irb (~> 1.10)
-      reline (>= 0.3.8)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    drb (2.2.0)
-      ruby2_keywords
-    dry-configurable (1.0.1)
-      dry-core (~> 1.0, < 2)
-      zeitwerk (~> 2.6)
-    dry-core (1.0.0)
-      concurrent-ruby (~> 1.0)
-      zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
-    dry-initializer (3.1.1)
-    dry-logic (1.5.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
-      zeitwerk (~> 2.6)
-    dry-schema (1.13.3)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 1.0, >= 1.0.1)
-      dry-core (~> 1.0, < 2)
-      dry-initializer (~> 3.0)
-      dry-logic (>= 1.4, < 2)
-      dry-types (>= 1.7, < 2)
-      zeitwerk (~> 2.6)
-    dry-types (1.7.1)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0)
-      dry-inflector (~> 1.0)
-      dry-logic (~> 1.4)
-      zeitwerk (~> 2.6)
-    dry-validation (1.10.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
-      dry-initializer (~> 3.0)
-      dry-schema (>= 1.12, < 2)
-      zeitwerk (~> 2.6)
-    i18n (1.14.1)
-      concurrent-ruby (~> 1.0)
-    interactor (3.1.2)
-    interactor-contracts (0.3.0)
-      dry-validation (~> 1.0)
-      interactor (~> 3)
-    io-console (0.7.1)
-    irb (1.11.0)
-      rdoc
-      reline (>= 0.3.8)
-    minitest (5.20.0)
-    mutex_m (0.2.0)
-    psych (5.1.2)
-      stringio
-    rake (13.1.0)
-    rdoc (6.6.2)
-      psych (>= 4.0.0)
-    reline (0.4.1)
-      io-console (~> 0.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    ruby2_keywords (0.0.5)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    stringio (3.1.0)
-    thor (1.3.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.12)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler (~> 2.0)
-  debug
-  interactify!
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  simplecov
-
-BUNDLED WITH
-   2.4.22

data/gemfiles/railties_6.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "simplecov", require: false
-gem "rake", "~> 13.0"
-gem "railties", "6"
-gem "sidekiq", "7"
-
-group :test do
-  gem "rspec", "~> 3.0"
-end
-
-gemspec path: "../"