Allow developers to define #call with arguments for convenience

.rspec

@@ -1,3 +1,4 @@
 --color
+--format documentation
 --order random
 --require spec_helper

.rubocop.yml

@@ -0,0 +1,47 @@
+# This should always correspond to the required Ruby version specified in the
+# gemspec.
+AllCops:
+  TargetRubyVersion: 2.5
+
+# TODO: What should we do here?
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Allow some style changes in the specs.
+AmbiguousBlockAssociation:
+  Exclude:
+    - spec/**/*
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*
+Metrics/ModuleLength:
+  Exclude:
+    - spec/**/*
+Style/BlockDelimiters:
+  Exclude:
+    - spec/**/*
+
+# Here, inconsistent indentation helps to understand tree nature of callbacks.
+Layout/ArrayAlignment:
+  Exclude:
+    - spec/integration_spec.rb
+
+# TODO: Remove when throw is used rather than raise in Interactor::Context.fail!
+Lint/SuppressedException:
+  Exclude:
+    - lib/interactor.rb
+Style/RescueModifier:
+  Exclude:
+    - spec/**/*
+
+# These style conventions are personal preference.
+Style/EmptyMethod:
+  Enabled: false
+Layout/IndentArray:
+  EnforcedStyle: consistent
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+Style/SymbolArray:
+  Enabled: false
+Style/WordArray:
+  Enabled: false

.standard.yml

@@ -1,4 +1,4 @@
-ruby_version: 2.3.0
+ruby_version: 2.5.0
 ignore:
   - 'spec/**/*':
     - Lint/AmbiguousBlockAssociation

.travis.yml

@@ -5,33 +5,21 @@ before_install:
 branches:
   only:
     - master
-    - v3
-env:
-  global:
-    - secure: | # CODECLIMATE_REPO_TOKEN
-        BIemhM273wHZMpuULDMYGPsxYdfw+NMw7IQbOD6gy5r+dha07y9ssTYYE5Gn
-        t1ptAb09lhQ4gexXTr83i6angMrnHgQ1ZX2wfeoZ0FvWDHQht9YkXyiNH+R6
-        odHUeDIYAlUiqLX9nAkklL89Rc22BrHMGGNyuA8Uc5sktW5P/FE=
+    - v4
+cache: bundler
 language: ruby
 matrix:
   allow_failures:
-    - rvm: "2.0"
-    - rvm: "2.1"
-    - rvm: "2.2"
     - rvm: ruby-head
 notifications:
   webhooks:
     on_start: always
     urls:
       - http://buildlight.collectiveidea.com/
 rvm:
-  - "2.0"
-  - "2.1"
-  - "2.2"
-  - "2.3"
-  - "2.4"
   - "2.5"
   - "2.6"
   - "2.7"
   - ruby-head
 script: bundle exec rake
+sudo: false

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.0 / Unreleased
+
+* [ENHANCEMENT] Drop support for all EOL Ruby versions (< 2.5)
+
 ## 3.1.2 / 2019-12-29
 * [BUGFIX] Fix Context#fail! on Ruby 2.7
 

Gemfile

@@ -7,4 +7,5 @@ gem "standard"
 group :test do
   gem "codeclimate-test-reporter", require: false
   gem "rspec", "~> 3.7"
+  gem "rubocop", "~> 0.85.0"
 end

README.md

@@ -11,7 +11,7 @@
 Add Interactor to your Gemfile and `bundle install`.
 
 ```ruby
-gem "interactor", "~> 3.0"
+gem "interactor", "~> 4.0"
 ```
 
 ## What is an Interactor?

Rakefile

@@ -1,7 +1,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
 require "standard/rake"
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop)
 
 task default: [:spec, :standard]

interactor.gemspec

@@ -2,7 +2,7 @@ require "English"
 
 Gem::Specification.new do |spec|
   spec.name = "interactor"
-  spec.version = "3.1.2"
+  spec.version = "4.0.0"
 
   spec.author = "Collective Idea"
   spec.email = "[email protected]"
@@ -11,9 +11,9 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/collectiveidea/interactor"
   spec.license = "MIT"
 
-  spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files = spec.files.grep(/^spec/)
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
+  spec.required_ruby_version = ">= 2.5"
+
+  spec.add_development_dependency "rake", "~> 13.0"
 end

lib/interactor.rb

@@ -112,8 +112,17 @@ def initialize(context = {})
   #
   # Returns nothing.
   def run
-    run!
-  rescue Failure
+    catch(:early_return) do
+      with_hooks do
+        call(*arguments_for_call)
+        context.called!(self)
+      end
+    end
+
+    context.rollback! if context.failure?
+  rescue
+    context.rollback!
+    raise
   end
 
   # Internal: Invoke an Interactor instance along with all defined hooks. The
@@ -139,13 +148,8 @@ def run
   # Returns nothing.
   # Raises Interactor::Failure if the context is failed.
   def run!
-    with_hooks do
-      call
-      context.called!(self)
-    end
-  rescue
-    context.rollback!
-    raise
+    run
+    raise(Failure, context) if context.failure?
   end
 
   # Public: Invoke an Interactor instance without any hooks, tracking, or
@@ -163,4 +167,28 @@ def call
   # Returns nothing.
   def rollback
   end
+
+  private
+
+  # Internal: Determine what keyword arguments (if any) should be passed to the
+  # "call" instance method when invoking an Interactor. The "call" instance
+  # method may accept any number of keyword arguments. This method will extract
+  # values from the context in order to populate those arguments based on their
+  # names.
+  #
+  # Returns an Array of arguments to be applied as an argument list.
+  def arguments_for_call
+    positional_arguments = []
+    keyword_arguments = {}
+
+    method(:call).parameters.each do |(type, name)|
+      next unless type == :keyreq || type == :key
+      next unless context.include?(name)
+
+      keyword_arguments[name] = context[name]
+    end
+
+    positional_arguments << keyword_arguments if keyword_arguments.any?
+    positional_arguments
+  end
 end

lib/interactor/context.rb

@@ -53,7 +53,7 @@ class Context < OpenStruct
     #
     # Returns the Interactor::Context.
     def self.build(context = {})
-      self === context ? context : new(context)
+      context.is_a?(Context) ? context : new(context)
     end
 
     # Public: Whether the Interactor::Context is successful. By default, a new
@@ -121,9 +121,13 @@ def failure?
     #
     # Raises Interactor::Failure initialized with the Interactor::Context.
     def fail!(context = {})
-      context.each { |key, value| self[key.to_sym] = value }
+      context.each { |key, value| self[key] = value }
       @failure = true
-      raise Failure, self
+      signal_early_return!
+    end
+
+    def signal_early_return!
+      throw :early_return
     end
 
     # Internal: Track that an Interactor has been called. The "called!" method
@@ -158,6 +162,15 @@ def rollback!
       @rolled_back = true
     end
 
+    # Public: Check for the presence of a given key in the context. This does
+    # not check whether the value is truthy, just whether the key is set to any
+    # value at all.
+    #
+    # Returns true if the key is found or false otherwise.
+    def include?(key)
+      table.include?(key.to_sym)
+    end
+
     # Internal: An Array of successfully called Interactor instances invoked
     # against this Interactor::Context instance.
     #

lib/interactor/organizer.rb

@@ -8,7 +8,7 @@ module Interactor
   #   class MyOrganizer
   #     include Interactor::Organizer
   #
-  #     organizer InteractorOne, InteractorTwo
+  #     organize InteractorOne, InteractorTwo
   #   end
   module Organizer
     # Internal: Install Interactor::Organizer's behavior in the given class.
@@ -41,11 +41,12 @@ module ClassMethods
       #     include Interactor::Organizer
       #
       #     organize [InteractorThree, InteractorFour]
+      #     organize InteractorFive
       #   end
       #
       # Returns nothing.
       def organize(*interactors)
-        @organized = interactors.flatten
+        organized.concat(interactors.flatten)
       end
 
       # Internal: An Array of declared Interactors to be invoked.
@@ -76,7 +77,8 @@ module InstanceMethods
       # Returns nothing.
       def call
         self.class.organized.each do |interactor|
-          interactor.call!(context)
+          context.signal_early_return! if context.failure?
+          interactor.call(context)
         end
       end
     end